Index: vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardKaderdeurMetKaderdeurboringEnSpecialeBoring/Vandaag.txt
===================================================================
diff -u
--- vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardKaderdeurMetKaderdeurboringEnSpecialeBoring/Vandaag.txt	(revision 0)
+++ vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardKaderdeurMetKaderdeurboringEnSpecialeBoring/Vandaag.txt	(revision 61539)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg x="0" y="0" height="800" width="470">
+  <g id="kader">
+    <rect fill="#F0F0F0" stroke="black" stroke-width="1" stroke-dasharray="none" x="0" y="0" width="470" height="800"></rect>
+    <rect fill="rgb(180,209,184)" stroke="black" stroke-width="1" stroke-dasharray="none" x="8" y="8" width="454" height="784"></rect>
+    <rect fill="white" stroke="black" stroke-width="1" stroke-dasharray="none" x="50" y="50" width="370" height="700"></rect>
+  </g>
+  <g id="VerbindersGroep">
+    <g transform="translate(0 800) rotate(270)" id="Verbinder links onder">
+      <circle fill="black" cx="39" cy="19" r="3"></circle>
+      <circle fill="black" cx="19" cy="39" r="3"></circle>
+      <path fill="#A0A0A0" opacity=".5" d="M1 1 L61 1 L61 1 L61 41 L41 41 L41 61 L1 61z"></path>
+    </g>
+    <g transform="translate(470 800) rotate(180)" id="Verbinder rechts onder">
+      <circle fill="black" cx="39" cy="19" r="3"></circle>
+      <circle fill="black" cx="19" cy="39" r="3"></circle>
+      <path fill="#A0A0A0" opacity=".5" d="M1 1 L61 1 L61 1 L61 41 L41 41 L41 61 L1 61z"></path>
+    </g>
+    <g transform="translate(470 0) rotate(90)" id="Verbinder rechts boven">
+      <circle fill="black" cx="39" cy="19" r="3"></circle>
+      <circle fill="black" cx="19" cy="39" r="3"></circle>
+      <path fill="#A0A0A0" opacity=".5" d="M1 1 L61 1 L61 1 L61 41 L41 41 L41 61 L1 61z"></path>
+    </g>
+    <g transform="translate(0 0) rotate(0)" id="Verbinder links boven">
+      <circle fill="black" cx="39" cy="19" r="3"></circle>
+      <circle fill="black" cx="19" cy="39" r="3"></circle>
+      <path fill="#A0A0A0" opacity=".5" d="M1 1 L61 1 L61 1 L61 41 L41 41 L41 61 L1 61z"></path>
+    </g>
+  </g>
+  <g id="schuine hoeken">
+    <line stroke="black" stroke-width="1" stroke-dasharray="none" x1="0" y1="0" x2="50" y2="50"></line>
+    <line stroke="black" stroke-width="1" stroke-dasharray="none" x1="470" y1="0" x2="420" y2="50"></line>
+    <line stroke="black" stroke-width="1" stroke-dasharray="none" x1="0" y1="800" x2="50" y2="750"></line>
+    <line stroke="black" stroke-width="1" stroke-dasharray="none" x1="470" y1="800" x2="420" y2="750"></line>
+  </g>
+  <svg id="Beslagen">
+  </svg>
+  <svg id="Boringen">
+    <svg x="-5" y="-5" height="10" width="10" id="specialeBoring">
+      <line stroke="black" stroke-width="1" stroke-dasharray="none" x1="0" y1="5" x2="10" y2="5"></line>
+      <line stroke="black" stroke-width="1" stroke-dasharray="none" x1="5" y1="0" x2="5" y2="10"></line>
+    </svg>
+  </svg>
+</svg>
\ No newline at end of file
Index: vhUnitTest/End2End/Svg/Kaderdeur/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/End2End/Svg/Kaderdeur/Test.cls.xml	(revision 0)
+++ vhUnitTest/End2End/Svg/Kaderdeur/Test.cls.xml	(revision 61539)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.End2End.Svg.Kaderdeur.Test">
+<Super>vhUnitTest.End2End.Svg.Kaderdeur.TestBase</Super>
+
+<Method name="Test: Standaardlade">
+<Implementation><![CDATA[
+	#dim Kaderdeur As Prod.GADef.KaderDeur = ##class(vhTest.Utils.APPS.Halux.PPS.ALUFrees.Svg.Kaderdeur).StandaardKaderdeur()
+		
+	Do ..AssertBestanden(Kaderdeur)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Standaard Kaderdeur Met KaderdeurBoring">
+<Implementation><![CDATA[
+	#dim Kaderdeur As Prod.GADef.KaderDeur = ##class(vhTest.Utils.APPS.Halux.PPS.ALUFrees.Svg.Kaderdeur).StandaardKaderdeurMetKaderdeurBoring()
+		
+	Do ..AssertBestanden(Kaderdeur)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Standaard Kaderdeur Met KaderdeurBoring en Zijboring">
+<Implementation><![CDATA[
+	#dim Kaderdeur As Prod.GADef.KaderDeur = ##class(vhTest.Utils.APPS.Halux.PPS.ALUFrees.Svg.Kaderdeur).StandaardKaderdeurMetKaderdeurBoringZijboring()
+		
+	Do ..AssertBestanden(Kaderdeur)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Standaard Kaderdeur Met KaderdeurBoring en Speciale boring">
+<Implementation><![CDATA[
+	#dim Kaderdeur As Prod.GADef.KaderDeur = ##class(vhTest.Utils.APPS.Halux.PPS.ALUFrees.Svg.Kaderdeur).StandaardKaderdeurMetKaderdeurBoringSpecialeboring()
+		
+	Do ..AssertBestanden(Kaderdeur)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardKaderdeurMetKaderdeurboringEnZijboring/Vandaag.txt
===================================================================
diff -u
--- vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardKaderdeurMetKaderdeurboringEnZijboring/Vandaag.txt	(revision 0)
+++ vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardKaderdeurMetKaderdeurboringEnZijboring/Vandaag.txt	(revision 61539)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg x="0" y="0" height="800" width="470">
+  <g id="kader">
+    <rect fill="#F0F0F0" stroke="black" stroke-width="1" stroke-dasharray="none" x="0" y="0" width="470" height="800"></rect>
+    <rect fill="rgb(180,209,184)" stroke="black" stroke-width="1" stroke-dasharray="none" x="8" y="8" width="454" height="784"></rect>
+    <rect fill="white" stroke="black" stroke-width="1" stroke-dasharray="none" x="50" y="50" width="370" height="700"></rect>
+  </g>
+  <g id="VerbindersGroep">
+    <g transform="translate(0 800) rotate(270)" id="Verbinder links onder">
+      <circle fill="black" cx="39" cy="19" r="3"></circle>
+      <circle fill="black" cx="19" cy="39" r="3"></circle>
+      <path fill="#A0A0A0" opacity=".5" d="M1 1 L61 1 L61 1 L61 41 L41 41 L41 61 L1 61z"></path>
+    </g>
+    <g transform="translate(470 800) rotate(180)" id="Verbinder rechts onder">
+      <circle fill="black" cx="39" cy="19" r="3"></circle>
+      <circle fill="black" cx="19" cy="39" r="3"></circle>
+      <path fill="#A0A0A0" opacity=".5" d="M1 1 L61 1 L61 1 L61 41 L41 41 L41 61 L1 61z"></path>
+    </g>
+    <g transform="translate(470 0) rotate(90)" id="Verbinder rechts boven">
+      <circle fill="black" cx="39" cy="19" r="3"></circle>
+      <circle fill="black" cx="19" cy="39" r="3"></circle>
+      <path fill="#A0A0A0" opacity=".5" d="M1 1 L61 1 L61 1 L61 41 L41 41 L41 61 L1 61z"></path>
+    </g>
+    <g transform="translate(0 0) rotate(0)" id="Verbinder links boven">
+      <circle fill="black" cx="39" cy="19" r="3"></circle>
+      <circle fill="black" cx="19" cy="39" r="3"></circle>
+      <path fill="#A0A0A0" opacity=".5" d="M1 1 L61 1 L61 1 L61 41 L41 41 L41 61 L1 61z"></path>
+    </g>
+  </g>
+  <g id="schuine hoeken">
+    <line stroke="black" stroke-width="1" stroke-dasharray="none" x1="0" y1="0" x2="50" y2="50"></line>
+    <line stroke="black" stroke-width="1" stroke-dasharray="none" x1="470" y1="0" x2="420" y2="50"></line>
+    <line stroke="black" stroke-width="1" stroke-dasharray="none" x1="0" y1="800" x2="50" y2="750"></line>
+    <line stroke="black" stroke-width="1" stroke-dasharray="none" x1="470" y1="800" x2="420" y2="750"></line>
+  </g>
+  <svg id="Beslagen">
+  </svg>
+  <svg id="Boringen">
+    <svg x="153" y="468" height="10" width="10" id="zijboring">
+      <g transform="rotate(0 5 5)">
+        <line stroke="black" stroke-width="1" stroke-dasharray="none" x1="0" y1="0" x2="10" y2="0"></line>
+        <line stroke="black" stroke-width="1" stroke-dasharray="none" x1="5" y1="0" x2="5" y2="10"></line>
+      </g>
+    </svg>
+  </svg>
+</svg>
\ No newline at end of file
Index: vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardKaderdeurMetKaderdeurboring/Vandaag.txt
===================================================================
diff -u
--- vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardKaderdeurMetKaderdeurboring/Vandaag.txt	(revision 0)
+++ vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardKaderdeurMetKaderdeurboring/Vandaag.txt	(revision 61539)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg x="0" y="0" height="800" width="470">
+  <g id="kader">
+    <rect fill="#F0F0F0" stroke="black" stroke-width="1" stroke-dasharray="none" x="0" y="0" width="470" height="800"></rect>
+    <rect fill="rgb(180,209,184)" stroke="black" stroke-width="1" stroke-dasharray="none" x="8" y="8" width="454" height="784"></rect>
+    <rect fill="white" stroke="black" stroke-width="1" stroke-dasharray="none" x="50" y="50" width="370" height="700"></rect>
+  </g>
+  <g id="VerbindersGroep">
+    <g transform="translate(0 800) rotate(270)" id="Verbinder links onder">
+      <circle fill="black" cx="39" cy="19" r="3"></circle>
+      <circle fill="black" cx="19" cy="39" r="3"></circle>
+      <path fill="#A0A0A0" opacity=".5" d="M1 1 L61 1 L61 1 L61 41 L41 41 L41 61 L1 61z"></path>
+    </g>
+    <g transform="translate(470 800) rotate(180)" id="Verbinder rechts onder">
+      <circle fill="black" cx="39" cy="19" r="3"></circle>
+      <circle fill="black" cx="19" cy="39" r="3"></circle>
+      <path fill="#A0A0A0" opacity=".5" d="M1 1 L61 1 L61 1 L61 41 L41 41 L41 61 L1 61z"></path>
+    </g>
+    <g transform="translate(470 0) rotate(90)" id="Verbinder rechts boven">
+      <circle fill="black" cx="39" cy="19" r="3"></circle>
+      <circle fill="black" cx="19" cy="39" r="3"></circle>
+      <path fill="#A0A0A0" opacity=".5" d="M1 1 L61 1 L61 1 L61 41 L41 41 L41 61 L1 61z"></path>
+    </g>
+    <g transform="translate(0 0) rotate(0)" id="Verbinder links boven">
+      <circle fill="black" cx="39" cy="19" r="3"></circle>
+      <circle fill="black" cx="19" cy="39" r="3"></circle>
+      <path fill="#A0A0A0" opacity=".5" d="M1 1 L61 1 L61 1 L61 41 L41 41 L41 61 L1 61z"></path>
+    </g>
+  </g>
+  <g id="schuine hoeken">
+    <line stroke="black" stroke-width="1" stroke-dasharray="none" x1="0" y1="0" x2="50" y2="50"></line>
+    <line stroke="black" stroke-width="1" stroke-dasharray="none" x1="470" y1="0" x2="420" y2="50"></line>
+    <line stroke="black" stroke-width="1" stroke-dasharray="none" x1="0" y1="800" x2="50" y2="750"></line>
+    <line stroke="black" stroke-width="1" stroke-dasharray="none" x1="470" y1="800" x2="420" y2="750"></line>
+  </g>
+  <svg id="Beslagen">
+  </svg>
+  <svg id="Boringen">
+    <svg x="154.5" y="469.5" height="7" width="7" id="doorboring">
+      <circle fill="black" cx="3.5" cy="3.5" r="3.5"></circle>
+    </svg>
+  </svg>
+</svg>
\ No newline at end of file
Index: vhUnitTest/End2End/Svg/Kaderdeur/TestBase.cls.xml
===================================================================
diff -u
--- vhUnitTest/End2End/Svg/Kaderdeur/TestBase.cls.xml	(revision 0)
+++ vhUnitTest/End2End/Svg/Kaderdeur/TestBase.cls.xml	(revision 61539)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.End2End.Svg.Kaderdeur.TestBase">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="BestandLocatie">
+<Type>TECH.String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	set ..BestandLocatie = ..GeefBestandLocatie()
+]]></Implementation>
+</Method>
+
+<Method name="GeefBestandLocatie">
+<FormalSpec>SubPath:TECH.String=..LopendeTestMethode</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#Dim BestandLocatie As %String = ##class(vhUnitTest.Utils).Directory($classname())
+	
+	set:SubPath[" " SubPath = ##class(TECH.StringUtils).UpperCamelCase(SubPath)
+	Set:($$$Not(SubPath = "")) BestandLocatie = ##class(TECH.File).RemoveIllegalCharacters(##class(TECH.Files).AppendSubPath(BestandLocatie,SubPath))
+
+	Quit BestandLocatie
+]]></Implementation>
+</Method>
+
+<Method name="AssertBestanden">
+<FormalSpec>Kaderdeur:Prod.GADef.KaderDeur,Datum:%Date=""</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	do ..GenereerSvgBestand(Kaderdeur, Datum)
+	do $$$AssertCorrectGemaakteBestanden(..BestandLocatie)
+]]></Implementation>
+</Method>
+
+<Method name="GenereerSvgBestand">
+<FormalSpec>Kaderdeur:Prod.GADef.KaderDeur,Datum:%Date="",BestandNaamPrefix:%String=""</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set DateTime = ##class(TECH.DateTime).%New()
+
+	#dim BestandNaam As TECH.String
+	If Datum'="" {
+		Set BestandNaam = $$EXTDATE^vhLib.DataTypes(Datum,"DSN")
+	} Else {
+	
+		Set BestandNaam = "Vandaag"
+		Set Datum = DateTime.CurrentDate()
+	}
+
+	#dim BestandVolledigeNaam As %String = ##class(TECH.Files).AppendFile(..BestandLocatie,BestandNaamPrefix_BestandNaam_".txt")
+	Set KaderdeurGenerator = ##class(APPS.Halux.PPS.ALUFrees.Svg.Kaderdeur).%New()
+	Do ##class(Tools.Wlip).%New(238).String(BestandVolledigeNaam)	
+	Do ##class(Tools.Wlip).%New(238).ObjToText(Kaderdeur)
+	
+	Do KaderdeurGenerator.GenereerSvg(Kaderdeur)
+	Do KaderdeurGenerator.WriteSvgToFile(KaderdeurGenerator.SvgBox, BestandVolledigeNaam)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur.cls.xml
===================================================================
diff -u -r61337 -r61539
--- APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur.cls.xml	(.../Kaderdeur.cls.xml)	(revision 61337)
+++ APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur.cls.xml	(.../Kaderdeur.cls.xml)	(revision 61539)
@@ -78,11 +78,31 @@
   	Do ..MaakBoringen(KaderdeurObject)
   	;Schuine hoeken
   	Do ..MaakSchuineHoeken(KaderdeurObject)
-  	Do ..WriteFile(..SvgBox)
+  
 	Quit
 ]]></Implementation>
 </Method>
 
+<Method name="WriteSvgToFile">
+<FormalSpec>SvgBox:TECH.Svg.Basis.SvgBox,Locatie:%String=""</FormalSpec>
+<Implementation><![CDATA[
+	#dim DoelLocatie As %String
+	Try {
+		If (Locatie ="") {
+			Set DoelLocatie = "D:\CacheExport\2010v2\DEV1\test2.xml"
+		} Else {
+			Set DoelLocatie = Locatie	
+		}
+		#dim FileWriter As TECH.File.FileWriter = ##class(TECH.Context).Instance().GeefFileAPI().GeefFileWriter()
+		Do FileWriter.Open(DoelLocatie)
+		Do FileWriter.WriteXML(SvgBox)
+		Do FileWriter.Close()	
+	} Catch {
+		#dim Exception As TECH.ExceptionHandler = ##class(TECH.ExceptionHandler).Catch()
+	}
+]]></Implementation>
+</Method>
+
 <Method name="MaakKader">
 <FormalSpec>KaderdeurObject:Prod.GADef.KaderDeur</FormalSpec>
 <Implementation><![CDATA[
@@ -162,21 +182,6 @@
   	}
 ]]></Implementation>
 </Method>
-
-<Method name="WriteFile">
-<FormalSpec>SvgBox:TECH.Svg.Basis.SvgBox</FormalSpec>
-<Implementation><![CDATA[
-	Try {
-		#dim DoelLocatie As %String = "D:\CacheExport\2010v2\DEV1\test2.xml"
-		#dim FileWriter As TECH.File.FileWriter = ##class(TECH.Context).Instance().GeefFileAPI().GeefFileWriter()
-		Do FileWriter.Open(DoelLocatie)
-		Do FileWriter.WriteXML(SvgBox)
-		Do FileWriter.Close()	
-	} Catch {
-		#dim Exception As TECH.ExceptionHandler = ##class(TECH.ExceptionHandler).Catch()
-	}
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardlade/Vandaag.txt
===================================================================
diff -u
--- vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardlade/Vandaag.txt	(revision 0)
+++ vhTestFiles/UnitTests/End2End.Svg.Kaderdeur/Test/TestStandaardlade/Vandaag.txt	(revision 61539)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg x="0" y="0" height="800" width="470">
+  <g id="kader">
+    <rect fill="#F0F0F0" stroke="black" stroke-width="1" stroke-dasharray="none" x="0" y="0" width="470" height="800"></rect>
+    <rect fill="rgb(180,209,184)" stroke="black" stroke-width="1" stroke-dasharray="none" x="8" y="8" width="454" height="784"></rect>
+    <rect fill="white" stroke="black" stroke-width="1" stroke-dasharray="none" x="50" y="50" width="370" height="700"></rect>
+  </g>
+  <g id="VerbindersGroep">
+    <g transform="translate(0 800) rotate(270)" id="Verbinder links onder">
+      <circle fill="black" cx="39" cy="19" r="3"></circle>
+      <circle fill="black" cx="19" cy="39" r="3"></circle>
+      <path fill="#A0A0A0" opacity=".5" d="M1 1 L61 1 L61 1 L61 41 L41 41 L41 61 L1 61z"></path>
+    </g>
+    <g transform="translate(470 800) rotate(180)" id="Verbinder rechts onder">
+      <circle fill="black" cx="39" cy="19" r="3"></circle>
+      <circle fill="black" cx="19" cy="39" r="3"></circle>
+      <path fill="#A0A0A0" opacity=".5" d="M1 1 L61 1 L61 1 L61 41 L41 41 L41 61 L1 61z"></path>
+    </g>
+    <g transform="translate(470 0) rotate(90)" id="Verbinder rechts boven">
+      <circle fill="black" cx="39" cy="19" r="3"></circle>
+      <circle fill="black" cx="19" cy="39" r="3"></circle>
+      <path fill="#A0A0A0" opacity=".5" d="M1 1 L61 1 L61 1 L61 41 L41 41 L41 61 L1 61z"></path>
+    </g>
+    <g transform="translate(0 0) rotate(0)" id="Verbinder links boven">
+      <circle fill="black" cx="39" cy="19" r="3"></circle>
+      <circle fill="black" cx="19" cy="39" r="3"></circle>
+      <path fill="#A0A0A0" opacity=".5" d="M1 1 L61 1 L61 1 L61 41 L41 41 L41 61 L1 61z"></path>
+    </g>
+  </g>
+  <g id="schuine hoeken">
+    <line stroke="black" stroke-width="1" stroke-dasharray="none" x1="0" y1="0" x2="50" y2="50"></line>
+    <line stroke="black" stroke-width="1" stroke-dasharray="none" x1="470" y1="0" x2="420" y2="50"></line>
+    <line stroke="black" stroke-width="1" stroke-dasharray="none" x1="0" y1="800" x2="50" y2="750"></line>
+    <line stroke="black" stroke-width="1" stroke-dasharray="none" x1="470" y1="800" x2="420" y2="750"></line>
+  </g>
+  <svg id="Beslagen">
+  </svg>
+  <svg id="Boringen">
+  </svg>
+</svg>
\ No newline at end of file