Index: APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur/HoekverbinderToevoeger.cls.xml
===================================================================
diff -u -r60123 -r60210
--- APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur/HoekverbinderToevoeger.cls.xml	(.../HoekverbinderToevoeger.cls.xml)	(revision 60123)
+++ APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur/HoekverbinderToevoeger.cls.xml	(.../HoekverbinderToevoeger.cls.xml)	(revision 60210)
@@ -18,6 +18,7 @@
 <Method name="VulVerbinders">
 <FormalSpec>Breedte:%Integer,Hoogte:%Integer,HoekId:%Integer,ProfPlaats:%String</FormalSpec>
 <Implementation><![CDATA[
+	Set CoordinatesService = ##class(TECH.Svg.Services.CoordinatesService).%New()
 	Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
 	Set CoordinatesList = ##class(%ListOfObjects).%New()
 	Set StartVerbinder =1
@@ -26,36 +27,13 @@
 		Set LengteVerbinder = 41
 		Set XCirkel =39
 		Set YCirkel = 19 
-		Set LeftTopBreed = BasisElementFactory.MaakCoordinaat(StartVerbinder,StartVerbinder)
-		Set RightTopBreed = BasisElementFactory.MaakCoordinaat(BreedteVerbinder,StartVerbinder)
-		Set RightInnerBottomBreed = BasisElementFactory.MaakCoordinaat(BreedteVerbinder,LengteVerbinder)
-		Set InnerBreed = BasisElementFactory.MaakCoordinaat(LengteVerbinder,LengteVerbinder)
-		Set LeftInnerBottomBreed = BasisElementFactory.MaakCoordinaat(LengteVerbinder,BreedteVerbinder)
-		Set LeftBottomBreed = BasisElementFactory.MaakCoordinaat(StartVerbinder,BreedteVerbinder)
-		Do CoordinatesList.Insert(LeftTopBreed)
-		Do CoordinatesList.Insert(RightTopBreed)
-		Do CoordinatesList.Insert(RightInnerBottomBreed)
-		Do CoordinatesList.Insert(InnerBreed)
-		Do CoordinatesList.Insert(LeftInnerBottomBreed)
-		Do CoordinatesList.Insert(LeftBottomBreed)
-	
+		Set CoordinatesList = CoordinatesService.MaakCoordinatenLijstVanPunten(StartVerbinder,StartVerbinder,BreedteVerbinder,StartVerbinder,BreedteVerbinder,StartVerbinder,BreedteVerbinder,LengteVerbinder,LengteVerbinder,LengteVerbinder,LengteVerbinder,BreedteVerbinder,StartVerbinder,BreedteVerbinder)
 	} ElseIf (HoekId=1){
 		Set BreedteVerbinder = 43
 		Set LengteVerbinder = 17
 		Set XCirkel = 23
 		Set YCirkel = 6 
-		Set LeftTopSmal = BasisElementFactory.MaakCoordinaat(StartVerbinder,StartVerbinder)
-		Set RightTopSmal = BasisElementFactory.MaakCoordinaat(BreedteVerbinder,StartVerbinder)
-		Set RightInnerBottomSmal = BasisElementFactory.MaakCoordinaat(BreedteVerbinder,LengteVerbinder)
-		Set InnerSmal= BasisElementFactory.MaakCoordinaat(LengteVerbinder,LengteVerbinder)
-		Set LeftInnerBottomSmal= BasisElementFactory.MaakCoordinaat(LengteVerbinder,BreedteVerbinder)
-		Set LeftBottomSmal = BasisElementFactory.MaakCoordinaat(StartVerbinder,BreedteVerbinder)
-		Do CoordinatesList.Insert(LeftTopSmal)
-		Do CoordinatesList.Insert(RightTopSmal)
-		Do CoordinatesList.Insert(RightInnerBottomSmal)
-		Do CoordinatesList.Insert(InnerSmal)
-		Do CoordinatesList.Insert(LeftInnerBottomSmal)
-		Do CoordinatesList.Insert(LeftBottomSmal)
+		Set CoordinatesList = CoordinatesService.MaakCoordinatenLijstVanPunten(StartVerbinder,StartVerbinder,BreedteVerbinder,StartVerbinder,BreedteVerbinder,StartVerbinder,BreedteVerbinder,LengteVerbinder,LengteVerbinder,LengteVerbinder,LengteVerbinder,BreedteVerbinder,StartVerbinder,BreedteVerbinder)
 	}
 	set VerbinderGroup =##class(TECH.Svg.Basis.Group).%New()
 	Set VerbinderLinksBoven = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Hoekverbinder).%New()
Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml
===================================================================
diff -u -r60208 -r60210
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml	(.../BeslagBoringSpecialeVorm.cls.xml)	(revision 60208)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml	(.../BeslagBoringSpecialeVorm.cls.xml)	(revision 60210)
@@ -18,13 +18,13 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>BasisElementFactory:TECH.Svg.BasisElementFactory,CoordinatesService:TECH.Svg.Services.CoordinatesService</FormalSpec>
+<FormalSpec>BasisElementFactory:TECH.Svg.BasisElementFactory,CoordinatesService:TECH.Svg.Services.CoordinatesService,SvgBox:TECH.Svg.Basis.SvgBox</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..SvgBox = ##class(TECH.Svg.Basis.SvgBox).%New()
+	Set ..SvgBox = $$$Inject(SvgBox, ##class(TECH.Svg.Basis.SvgBox).%New())
 	Set ..BasisElementFactory = $$$Inject(BasisElementFactory, ##class(TECH.Svg.BasisElementFactory).%New())
 	Set ..CoordinatesService = $$$Inject(CoordinatesService, ##class(TECH.Svg.Services.CoordinatesService).%New())
 	Quit $$$OK
@@ -52,17 +52,15 @@
 	#dim CoordinatesList As %ListOfObjects
 	If (Rotation = 0) {
 		Set CoordinatesList =  ..CoordinatesService.MaakCoordinatenLijstVanPunten(Breedte-Offset,Lengte-(Diameter\2),Diameter,Diameter,Offset,P2,Offset,P1)
-		Set Path = ..BasisElementFactory.MaakPath(CoordinatesList,1)
 	}ElseIf (Rotation = 90) {
 		Set CoordinatesList =  ..CoordinatesService.MaakCoordinatenLijstVanPunten(Lengte-(Diameter\2), Breedte-Offset,Diameter,Diameter,P1,Offset,P2,Offset)
-		Set Path = ..BasisElementFactory.MaakPath(CoordinatesList,1)
 	}ElseIf (Rotation = 180) {
 		Set CoordinatesList =  ..CoordinatesService.MaakCoordinatenLijstVanPunten(Breedte-Offset,Lengte-(Diameter\2),Diameter,Diameter,OffsetOpposite,P1,OffsetOpposite,P2)
-		Set Path = ..BasisElementFactory.MaakPath(CoordinatesList,1)
 	}ElseIf (Rotation = 270) {
 		Set CoordinatesList =  ..CoordinatesService.MaakCoordinatenLijstVanPunten(Lengte-(Diameter\2), Breedte-Offset,Diameter,Diameter,P2,OffsetOpposite,P1,OffsetOpposite)
-		Set Path = ..BasisElementFactory.MaakPath(CoordinatesList,1)
+		
 	}
+	#dim Path As TECH.Svg.Basis.Path = ..BasisElementFactory.MaakPath(CoordinatesList,1)
 	Do ..SvgBox.VoegToeElement(Path)
 ]]></Implementation>
 </Method>