Index: vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/PuntBoring/Test.cls.xml
===================================================================
diff -u -r60047 -r60191
--- vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/PuntBoring/Test.cls.xml	(.../Test.cls.xml)	(revision 60047)
+++ vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/PuntBoring/Test.cls.xml	(.../Test.cls.xml)	(revision 60191)
@@ -7,11 +7,18 @@
 <Implementation><![CDATA[
 	
 		Set Puntboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.PuntBoring).%New(15,15,5,5)
-		
 		Do ..AssertSvg(Puntboring, "<svg x=""12.5"" y=""12.5"" height=""5"" width=""5"" id=""puntboring"">  <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""0"" x2=""5"" y2=""5""></line>  <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""5"" x2=""5"" y2=""0""></line></svg>")
 ]]></Implementation>
 </Method>
 
+<Method name="Test invulling objecten DoorBoring">
+<Implementation><![CDATA[
+	
+		Set Puntboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.PuntBoring).%New(15,15,5,5)
+		Do $$$AssertEquals(Puntboring.SvgBox.CrossDiags.Count(),1)
+]]></Implementation>
+</Method>
+
 <Method name="AssertSvg">
 <FormalSpec>SvgObject:TECH.Svg.Basis.DomElement,VerwachteXml:%String</FormalSpec>
 <Private>1</Private>
Index: APPS/Halux/PPS/ALUFrees/Svg/BasisElement/TCross.cls.xml
===================================================================
diff -u -r60134 -r60191
--- APPS/Halux/PPS/ALUFrees/Svg/BasisElement/TCross.cls.xml	(.../TCross.cls.xml)	(revision 60134)
+++ APPS/Halux/PPS/ALUFrees/Svg/BasisElement/TCross.cls.xml	(.../TCross.cls.xml)	(revision 60191)
@@ -26,9 +26,9 @@
 <Implementation><![CDATA[
 	Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
 	Set ..HorizontalLine = BasisElementFactory.MaakLijn(0,0, Width, 0)
-	Do ..HorizontalLine.SetFill(kleur)
+	Do ..HorizontalLine.SetStroke(kleur)
 	Set ..VerticalLine = BasisElementFactory.MaakLijn(Width/2, 0, Width/2, Height)
-	Do ..VerticalLine.SetFill(kleur)
+	Do ..VerticalLine.SetStroke(kleur)
 	Quit $$$OK
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossDiag/Test.cls.xml
===================================================================
diff -u -r60047 -r60191
--- vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossDiag/Test.cls.xml	(.../Test.cls.xml)	(revision 60047)
+++ vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossDiag/Test.cls.xml	(.../Test.cls.xml)	(revision 60191)
@@ -10,6 +10,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test invulling objecten CrossDiag">
+<Implementation><![CDATA[
+		Set CrossDiag = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag).%New(25,30)
+		Do $$$AssertEquals("TECH.Svg.Basis.Line",CrossDiag.TopLine.%ClassName(1))
+		Do $$$AssertEquals(CrossDiag.TopLine.X2,25)
+		Do $$$AssertEquals(CrossDiag.TopLine.Y2,30)
+		Do $$$AssertEquals("TECH.Svg.Basis.Line",CrossDiag.BottomLine.%ClassName(1))
+		Do $$$AssertEquals(CrossDiag.BottomLine.X2,25)
+		Do $$$AssertEquals(CrossDiag.BottomLine.Y1,30)
+]]></Implementation>
+</Method>
+
 <Method name="AssertSvg">
 <FormalSpec>SvgObject:TECH.Svg.Basis.DomElement,VerwachteXml:%String</FormalSpec>
 <Private>1</Private>
Index: vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/SpecialeBoring/Test.cls.xml
===================================================================
diff -u -r60047 -r60191
--- vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/SpecialeBoring/Test.cls.xml	(.../Test.cls.xml)	(revision 60047)
+++ vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/SpecialeBoring/Test.cls.xml	(.../Test.cls.xml)	(revision 60191)
@@ -11,6 +11,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test invulling objecten DoorBoring">
+<Implementation><![CDATA[
+		Set SpecialeBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.SpecialeBoring).%New(15,15,5,5)
+		Do $$$AssertEquals(SpecialeBoring.SvgBox.CrossVHs.Count(),1)
+]]></Implementation>
+</Method>
+
 <Method name="AssertSvg">
 <FormalSpec>SvgObject:TECH.Svg.Basis.DomElement,VerwachteXml:%String</FormalSpec>
 <Private>1</Private>
Index: vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/TCross/Test.cls.xml
===================================================================
diff -u -r60047 -r60191
--- vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/TCross/Test.cls.xml	(.../Test.cls.xml)	(revision 60047)
+++ vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/TCross/Test.cls.xml	(.../Test.cls.xml)	(revision 60191)
@@ -6,10 +6,24 @@
 <Method name="Test bestaan TCross">
 <Implementation><![CDATA[
 		Set TCross = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross).%New(30,30)
-		Do ..AssertSvg(TCross, "<line fill=""black"" x1=""0"" y1=""0"" x2=""30"" y2=""0""></line><line fill=""black"" x1=""15"" y1=""0"" x2=""15"" y2=""30""></line>")
+		Do ..AssertSvg(TCross, "<line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""0"" x2=""30"" y2=""0""></line><line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""15"" y1=""0"" x2=""15"" y2=""30""></line>")
 ]]></Implementation>
 </Method>
 
+<Method name="Test invulling objecten CrossVH">
+<Implementation><![CDATA[
+		Set TCross = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross).%New(25,30)
+		Do $$$AssertEquals("TECH.Svg.Basis.Line",TCross.HorizontalLine.%ClassName(1))
+		Do $$$AssertEquals(TCross.HorizontalLine.X2,25)
+		Do $$$AssertEquals(TCross.HorizontalLine.Y2,0)
+		Do $$$AssertEquals(TCross.HorizontalLine.Stroke,##class(TECH.Svg.enu.Kleur).Zwart())
+		Do $$$AssertEquals("TECH.Svg.Basis.Line",TCross.VerticalLine.%ClassName(1))
+		Do $$$AssertEquals(TCross.VerticalLine.X2,12.5)
+		Do $$$AssertEquals(TCross.VerticalLine.Y2,30)
+		Do $$$AssertEquals(TCross.VerticalLine.Stroke,##class(TECH.Svg.enu.Kleur).Zwart())
+]]></Implementation>
+</Method>
+
 <Method name="AssertSvg">
 <FormalSpec>SvgObject:TECH.Svg.Basis.DomElement,VerwachteXml:%String</FormalSpec>
 <Private>1</Private>
Index: vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/DoorBoring/Test.cls.xml
===================================================================
diff -u -r60105 -r60191
--- vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/DoorBoring/Test.cls.xml	(.../Test.cls.xml)	(revision 60105)
+++ vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/DoorBoring/Test.cls.xml	(.../Test.cls.xml)	(revision 60191)
@@ -12,6 +12,15 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test invulling objecten DoorBoring">
+<Implementation><![CDATA[
+	
+		Set DoorBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.DoorBoring).%New(0,0,5,##class(TECH.Svg.enu.Kleur).Zwart())
+		
+		Do $$$AssertEquals(DoorBoring.SvgBox.Circles.Count(),1)
+]]></Implementation>
+</Method>
+
 <Method name="AssertSvg">
 <FormalSpec>SvgObject:TECH.Svg.Basis.DomElement,VerwachteXml:%String</FormalSpec>
 <Private>1</Private>
Index: vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/Zijboring/Test.cls.xml
===================================================================
diff -u -r60047 -r60191
--- vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/Zijboring/Test.cls.xml	(.../Test.cls.xml)	(revision 60047)
+++ vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/Zijboring/Test.cls.xml	(.../Test.cls.xml)	(revision 60191)
@@ -7,10 +7,17 @@
 <Implementation><![CDATA[
 	
 		Set Zijboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.ZijBoring).%New(15,15,5,5)
-		Do ..AssertSvg(Zijboring,"<svg x=""12.5"" y=""12.5"" height=""5"" width=""5"" id=""zijboring"">  <g transform=""rotate(0 2.5 2.5)"">    <line fill=""black"" x1=""0"" y1=""0"" x2=""5"" y2=""0""></line>    <line fill=""black"" x1=""2.5"" y1=""0"" x2=""2.5"" y2=""5""></line>  </g></svg>")
+		Do ..AssertSvg(Zijboring,"<svg x=""12.5"" y=""12.5"" height=""5"" width=""5"" id=""zijboring"">  <g transform=""rotate(0 2.5 2.5)"">    <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""0"" x2=""5"" y2=""0""></line>    <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""2.5"" y1=""0"" x2=""2.5"" y2=""5""></line>  </g></svg>")
 ]]></Implementation>
 </Method>
 
+<Method name="Test invulling objecten DoorBoring">
+<Implementation><![CDATA[
+		Set Zijboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.ZijBoring).%New(15,15,5,5)
+		Do $$$AssertEquals(Zijboring.SvgBox.Group.GetAt(1).TCrosss.Count(),1)
+]]></Implementation>
+</Method>
+
 <Method name="AssertSvg">
 <FormalSpec>SvgObject:TECH.Svg.Basis.DomElement,VerwachteXml:%String</FormalSpec>
 <Private>1</Private>
Index: vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/Rugboring/Test.cls.xml
===================================================================
diff -u -r60047 -r60191
--- vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/Rugboring/Test.cls.xml	(.../Test.cls.xml)	(revision 60047)
+++ vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/Rugboring/Test.cls.xml	(.../Test.cls.xml)	(revision 60191)
@@ -11,6 +11,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test invulling objecten DoorBoring">
+<Implementation><![CDATA[
+		Set Rugboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.RugBoring).%New(15,15,5,5)
+		Do $$$AssertEquals(Rugboring.SvgBox.CrossDiags.Count(),1)
+		Do $$$AssertEquals(Rugboring.SvgBox.Circles.Count(),1)
+]]></Implementation>
+</Method>
+
 <Method name="AssertSvg">
 <FormalSpec>SvgObject:TECH.Svg.Basis.DomElement,VerwachteXml:%String</FormalSpec>
 <Private>1</Private>
Index: vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossVH/Test.cls.xml
===================================================================
diff -u -r60047 -r60191
--- vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossVH/Test.cls.xml	(.../Test.cls.xml)	(revision 60047)
+++ vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossVH/Test.cls.xml	(.../Test.cls.xml)	(revision 60191)
@@ -10,6 +10,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test invulling objecten CrossVH">
+<Implementation><![CDATA[
+		Set CrossVH = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH).%New(25,30)
+		Do $$$AssertEquals("TECH.Svg.Basis.Line",CrossVH.HorizontalLine.%ClassName(1))
+		Do $$$AssertEquals(CrossVH.HorizontalLine.X2,25)
+		Do $$$AssertEquals(CrossVH.HorizontalLine.Y2,15)
+		Do $$$AssertEquals(CrossVH.HorizontalLine.Stroke,##class(TECH.Svg.enu.Kleur).Zwart())
+		Do $$$AssertEquals("TECH.Svg.Basis.Line",CrossVH.VerticalLine.%ClassName(1))
+		Do $$$AssertEquals(CrossVH.VerticalLine.X2,12.5)
+		Do $$$AssertEquals(CrossVH.VerticalLine.Y2,30)
+		Do $$$AssertEquals(CrossVH.VerticalLine.Stroke,##class(TECH.Svg.enu.Kleur).Zwart())
+]]></Implementation>
+</Method>
+
 <Method name="AssertSvg">
 <FormalSpec>SvgObject:TECH.Svg.Basis.DomElement,VerwachteXml:%String</FormalSpec>
 <Private>1</Private>