Index: vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm/MaakBoringSpecialeVorm/Test.cls.xml
===================================================================
diff -u -r61917 -r61923
--- vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm/MaakBoringSpecialeVorm/Test.cls.xml	(.../Test.cls.xml)	(revision 61917)
+++ vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm/MaakBoringSpecialeVorm/Test.cls.xml	(.../Test.cls.xml)	(revision 61923)
@@ -7,13 +7,13 @@
 <Implementation><![CDATA[
 	Set CoordinatesList = ##class(%ListOfObjects).%New()
 	Set CoordinatesServiceMock = ##class(vhTest.Mock.TECH.Svg.Services.CoordinatesService).%New()
-	Do CoordinatesServiceMock.VerwachtMethodCall("MaakCoordinatenLijstVanPunten",350,275,0,225,350,175).ExactAantalKeer(1).DanReturn(CoordinatesList)
-	#dim Path as TECH.Svg.Basis.Path = ##class(TECH.Svg.BasisElementFactory).%New().MaakPath(CoordinatesList,0)
+	Do CoordinatesServiceMock.VerwachtMethodCall("MaakCoordinatenLijstVanPunten", 350, 275, 0, 225, 350, 175).ExactAantalKeer(1).DanReturn(CoordinatesList)
+	#dim Path as TECH.Svg.Basis.Path = ##class(TECH.Svg.BasisElementFactory).%New().MaakPath(CoordinatesList, 0)
 	Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
 	Do BasisElementFactoryMock.VerwachtMethodCall("MaakPathHalveCirkel", CoordinatesList,1).DanReturn(Path)
 	Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New(BasisElementFactoryMock, CoordinatesServiceMock)
 		
-	Do BeslagBoringSpecialeVorm.MaakBoringSpecialeVorm("SD30",350,450,0)
+	Do BeslagBoringSpecialeVorm.MaakBoringSpecialeVorm("SD30", 350, 450, 0)
 	
 	Do CoordinatesServiceMock.Verifieer()
 	Do BasisElementFactoryMock.Verifieer()
@@ -25,13 +25,13 @@
 <Implementation><![CDATA[
 	Set CoordinatesList = ##class(%ListOfObjects).%New()
 	Set CoordinatesServiceMock = ##class(vhTest.Mock.TECH.Svg.Services.CoordinatesService).%New()
-	Do CoordinatesServiceMock.VerwachtMethodCall("MaakCoordinatenLijstVanPunten",175,350,225,0,275,350).ExactAantalKeer(1).DanReturn(CoordinatesList)
-	#dim Path as TECH.Svg.Basis.Path = ##class(TECH.Svg.BasisElementFactory).%New().MaakPath(CoordinatesList,0)
+	Do CoordinatesServiceMock.VerwachtMethodCall("MaakCoordinatenLijstVanPunten", 175, 350, 225, 0, 275, 350).ExactAantalKeer(1).DanReturn(CoordinatesList)
+	#dim Path as TECH.Svg.Basis.Path = ##class(TECH.Svg.BasisElementFactory).%New().MaakPath(CoordinatesList, 0)
 	Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
 	Do BasisElementFactoryMock.VerwachtMethodCall("MaakPathHalveCirkel", CoordinatesList,1).DanReturn(Path)
 	Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New(BasisElementFactoryMock, CoordinatesServiceMock)
 		
-	Do BeslagBoringSpecialeVorm.MaakBoringSpecialeVorm("SD30",350,450,90)
+	Do BeslagBoringSpecialeVorm.MaakBoringSpecialeVorm("SD30", 350, 450, 90)
 	
 	Do CoordinatesServiceMock.Verifieer()
 	Do BasisElementFactoryMock.Verifieer()
@@ -45,13 +45,13 @@
 <Implementation><![CDATA[
 	Set CoordinatesList = ##class(%ListOfObjects).%New()
 	Set CoordinatesServiceMock = ##class(vhTest.Mock.TECH.Svg.Services.CoordinatesService).%New()
-	Do CoordinatesServiceMock.VerwachtMethodCall("MaakCoordinatenLijstVanPunten",0,275,350,225,0,175).ExactAantalKeer(1).DanReturn(CoordinatesList)
-	#dim Path as TECH.Svg.Basis.Path = ##class(TECH.Svg.BasisElementFactory).%New().MaakPath(CoordinatesList,0)
+	Do CoordinatesServiceMock.VerwachtMethodCall("MaakCoordinatenLijstVanPunten",0, 275, 350, 225, 0, 175).ExactAantalKeer(1).DanReturn(CoordinatesList)
+	#dim Path as TECH.Svg.Basis.Path = ##class(TECH.Svg.BasisElementFactory).%New().MaakPath(CoordinatesList, 0)
 	Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
 	Do BasisElementFactoryMock.VerwachtMethodCall("MaakPathHalveCirkel", CoordinatesList,1).DanReturn(Path)
 	Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New(BasisElementFactoryMock, CoordinatesServiceMock)
 	
-	Do BeslagBoringSpecialeVorm.MaakBoringSpecialeVorm("SD30",350,450,180)
+	Do BeslagBoringSpecialeVorm.MaakBoringSpecialeVorm("SD30", 350, 450, 180)
 
 	Do CoordinatesServiceMock.Verifieer()
 	Do BasisElementFactoryMock.Verifieer()
@@ -63,13 +63,13 @@
 <Implementation><![CDATA[
 	Set CoordinatesList = ##class(%ListOfObjects).%New()
 	Set CoordinatesServiceMock = ##class(vhTest.Mock.TECH.Svg.Services.CoordinatesService).%New()
-	Do CoordinatesServiceMock.VerwachtMethodCall("MaakCoordinatenLijstVanPunten",175,0,225,350,275,0).ExactAantalKeer(1).DanReturn(CoordinatesList)
-	#dim Path as TECH.Svg.Basis.Path = ##class(TECH.Svg.BasisElementFactory).%New().MaakPath(CoordinatesList,0)
+	Do CoordinatesServiceMock.VerwachtMethodCall("MaakCoordinatenLijstVanPunten", 175, 0, 225, 350, 275, 0).ExactAantalKeer(1).DanReturn(CoordinatesList)
+	#dim Path as TECH.Svg.Basis.Path = ##class(TECH.Svg.BasisElementFactory).%New().MaakPath(CoordinatesList, 0)
 	Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
 	Do BasisElementFactoryMock.VerwachtMethodCall("MaakPathHalveCirkel", CoordinatesList,1).DanReturn(Path)
 	Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New(BasisElementFactoryMock, CoordinatesServiceMock)
 	
-	Do BeslagBoringSpecialeVorm.MaakBoringSpecialeVorm("SD30",350,450,270)
+	Do BeslagBoringSpecialeVorm.MaakBoringSpecialeVorm("SD30", 350, 450, 270)
 
 	Do CoordinatesServiceMock.Verifieer()
 	Do BasisElementFactoryMock.Verifieer()
@@ -81,50 +81,50 @@
 <Implementation><![CDATA[
 	Set CoordinatesList = ##class(%ListOfObjects).%New()
 	Set CoordinatesServiceMock = ##class(vhTest.Mock.TECH.Svg.Services.CoordinatesService).%New()
-	Do CoordinatesServiceMock.VerwachtMethodCall("MaakCoordinatenLijstVanPunten",350,275,0,225,350,175).ExactAantalKeer(1).DanReturn(CoordinatesList)
-	#dim Path as TECH.Svg.Basis.Path = ##class(TECH.Svg.BasisElementFactory).%New().MaakPath(CoordinatesList,0)
+	Do CoordinatesServiceMock.VerwachtMethodCall("MaakCoordinatenLijstVanPunten", 350, 275, 0, 225, 350, 175).ExactAantalKeer(1).DanReturn(CoordinatesList)
+	#dim Path as TECH.Svg.Basis.Path = ##class(TECH.Svg.BasisElementFactory).%New().MaakPath(CoordinatesList, 0)
 	Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
 	Do BasisElementFactoryMock.VerwachtMethodCall("MaakPathHalveCirkel", CoordinatesList,1).DanReturn(Path)
 	Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New(BasisElementFactoryMock, CoordinatesServiceMock)
 		
-	Do BeslagBoringSpecialeVorm.MaakBoringSpecialeVorm("SD35",350,450,0)
+	Do BeslagBoringSpecialeVorm.MaakBoringSpecialeVorm("SD35", 350, 450, 0)
 	
 	Do CoordinatesServiceMock.Verifieer()
 	Do BasisElementFactoryMock.Verifieer()
-	Do $$$AssertEquals(BeslagBoringSpecialeVorm.SvgBox.Paths.Count(),1)
+	Do $$$AssertEquals(BeslagBoringSpecialeVorm.SvgBox.Paths.Count(), 1)
 ]]></Implementation>
 </Method>
 
 <Method name="Test KAD">
 <Implementation><![CDATA[
 	Set CoordinatesList = ##class(%ListOfObjects).%New()
-	#dim Rect as TECH.Svg.Basis.Rect = ##class(TECH.Svg.BasisElementFactory).%New().MaakRechthoek(1,2,3,4)
+	#dim Rect as TECH.Svg.Basis.Rect = ##class(TECH.Svg.BasisElementFactory).%New().MaakRechthoek(1, 2, 3, 4)
 	Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
-	Do BasisElementFactoryMock.VerwachtMethodCall("MaakRechthoek",334,-7,16,14).DanReturn(Rect)
+	Do BasisElementFactoryMock.VerwachtMethodCall("MaakRechthoek",-16,-7, 16, 14).DanReturn(Rect)
 	Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New(BasisElementFactoryMock)
 		
-	Do BeslagBoringSpecialeVorm.MaakBoringSpecialeVorm("KAD",350,450,0)
+	Do BeslagBoringSpecialeVorm.MaakBoringSpecialeVorm("KAD", 350, 450, 0)
 	
 	Do BasisElementFactoryMock.Verifieer()
-	Do $$$AssertEquals(BeslagBoringSpecialeVorm.SvgBox.Rects.Count(),1)
+	Do $$$AssertEquals(BeslagBoringSpecialeVorm.SvgBox.Rects.Count(), 1)
 ]]></Implementation>
 </Method>
 
 <Method name="Test REGULA_SM">
 <Implementation><![CDATA[
 	Set CoordinatesList = ##class(%ListOfObjects).%New()
 	Set CoordinatesServiceMock = ##class(vhTest.Mock.TECH.Svg.Services.CoordinatesService).%New()
-	Do CoordinatesServiceMock.VerwachtMethodCall("MaakCoordinatenLijstVanPunten",350,275,0,225,350,175).ExactAantalKeer(1).DanReturn(CoordinatesList)
-	#dim Path as TECH.Svg.Basis.Path = ##class(TECH.Svg.BasisElementFactory).%New().MaakPath(CoordinatesList,0)
+	Do CoordinatesServiceMock.VerwachtMethodCall("MaakCoordinatenLijstVanPunten", 350, 275, 0, 225, 350, 175).ExactAantalKeer(1).DanReturn(CoordinatesList)
+	#dim Path as TECH.Svg.Basis.Path = ##class(TECH.Svg.BasisElementFactory).%New().MaakPath(CoordinatesList, 0)
 	Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
 	Do BasisElementFactoryMock.VerwachtMethodCall("MaakPathHalveCirkel", CoordinatesList,1).DanReturn(Path)
 	Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New(BasisElementFactoryMock, CoordinatesServiceMock)
 		
-	Do BeslagBoringSpecialeVorm.MaakBoringSpecialeVorm("REGULA_SM",350,450,0)
+	Do BeslagBoringSpecialeVorm.MaakBoringSpecialeVorm("REGULA_SM", 350, 450, 0)
 	
 	Do CoordinatesServiceMock.Verifieer()
 	Do BasisElementFactoryMock.Verifieer()
-	Do $$$AssertEquals(BeslagBoringSpecialeVorm.SvgBox.Paths.Count(),1)
+	Do $$$AssertEquals(BeslagBoringSpecialeVorm.SvgBox.Paths.Count(), 1)
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml
===================================================================
diff -u -r61921 -r61923
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml	(.../BeslagBoringSpecialeVorm.cls.xml)	(revision 61921)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml	(.../BeslagBoringSpecialeVorm.cls.xml)	(revision 61923)
@@ -36,7 +36,7 @@
 <Implementation><![CDATA[
 	Set ..SvgBox = ##class(TECH.Svg.Basis.SvgBox).%New()
 	If (VmlId = "KAD") {
-		Do ..KadFreesRect(Breedte, YPos, Rotation)	
+		Do ..KadFreesRect(XPos, YPos, Rotation)	
 	}ElseIf (VmlId ="SD30") {
 		Do ..SD30FREES(Breedte, Lengte, Rotation)
 	}ElseIf (VmlId ="SD35") {
@@ -69,14 +69,18 @@
 <Method name="KadFreesRect">
 <FormalSpec>Breedte:%Integer,Lengte:%Integer,Rotation:%Integer,FreesB:%Integer=16,FreesL:%Integer=14,XPos:%Integer=0</FormalSpec>
 <Implementation><![CDATA[
+	If (XPos=0) {
+		Set XPos = Breedte
+	}
+	
 	Set FreesL = FreesL\2*2
 	Set ElementToevoeger = ##class(TECH.Svg.Basis.SvgBox.ElementToevoeger).%New()
 	#dim Rechthoek As TECH.Svg.Basis.Rect
 	If (Rotation = 0) {
 		Set Rechthoek = ..BasisElementFactory.MaakRechthoek(Breedte-FreesB, Lengte - (FreesL/2), FreesB, FreesL)
 	}
 	If (Rotation = 90) {
-		Set Rechthoek = ..BasisElementFactory.MaakRechthoek(XPos - (FreesL/2), Breedte-FreesB, FreesL, FreesB)
+		Set Rechthoek = ..BasisElementFactory.MaakRechthoek(XPos - (FreesL/2), Lengte-FreesB, FreesL, FreesB)
 	}
 	If (Rotation = 180) {
 		Set Rechthoek = ..BasisElementFactory.MaakRechthoek(0, Lengte - (FreesL/2), FreesB, FreesL)