Index: APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur.cls.xml
===================================================================
diff -u -r59511 -r59706
--- APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur.cls.xml	(.../Kaderdeur.cls.xml)	(revision 59511)
+++ APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur.cls.xml	(.../Kaderdeur.cls.xml)	(revision 59706)
@@ -1,134 +1,214 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.Halux.PPS.ALUFrees.Svg.Kaderdeur">
-<Super>TECH.Svg.Basis.DomElement</Super>
+<Super>TECH.RegisteredObject,TECH.Svg.Basis.DomElement</Super>
 
-<Property name="Rects">
-<Type>TECH.Svg.Basis.Rect</Type>
-<Collection>list</Collection>
-<Parameter name="XMLNAME" value="rect"/>
-<Parameter name="XMLPROJECTION" value="ELEMENT"/>
-</Property>
+<UDLText name="T">
+<Content><![CDATA[
+/*Property KaderdeurObject as Prod.GADef.KaderDeur;
+*/
+]]></Content>
+</UDLText>
 
-<Property name="Circles">
-<Type>TECH.Svg.Basis.Circle</Type>
-<Collection>list</Collection>
-<Parameter name="XMLNAME" value="circle"/>
-<Parameter name="XMLPROJECTION" value="ELEMENT"/>
+<Property name="Beslag">
+<Type>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagLijst</Type>
+<Collection>array</Collection>
 </Property>
 
-<Property name="Lines">
-<Type>TECH.Svg.Basis.Line</Type>
-<Collection>list</Collection>
-<Parameter name="XMLNAME" value="line"/>
-<Parameter name="XMLPROJECTION" value="ELEMENT"/>
+<Property name="Boringen">
+<Type>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.Boringen</Type>
+<Collection>array</Collection>
 </Property>
 
-<Property name="Paths">
-<Type>TECH.Svg.Basis.Path</Type>
-<Collection>list</Collection>
-<Parameter name="XMLNAME" value="path"/>
-<Parameter name="XMLPROJECTION" value="ELEMENT"/>
+<Property name="Breedte">
+<Type>%Library.Float</Type>
+<Parameter name="SCALE" value="1"/>
 </Property>
 
-<Property name="Texts">
-<Type>TECH.Svg.Basis.Text</Type>
-<Collection>list</Collection>
-<Parameter name="XMLNAME" value="text"/>
-<Parameter name="XMLPROJECTION" value="ELEMENT"/>
+<Property name="Hoogte">
+<Type>%Library.Float</Type>
+<Parameter name="SCALE" value="1"/>
 </Property>
 
-<Property name="CrossDiags">
-<Type>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag</Type>
-<Collection>list</Collection>
-<Parameter name="XMLNAME" value="crossdiag"/>
-<Parameter name="XMLPROJECTION" value="ELEMENT"/>
+<Property name="KADConversieUtils">
+<Type>APPS.Halux.PPS.ALUFrees.KADConversie.Utils</Type>
 </Property>
 
-<Property name="CrossVHs">
-<Type>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH</Type>
-<Collection>list</Collection>
-<Parameter name="XMLNAME" value="crossvh"/>
-<Parameter name="XMLPROJECTION" value="ELEMENT"/>
-</Property>
+<Method name="%OnNew">
+<FormalSpec>initvalue:%CacheString</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..KADConversieUtils = ##class(APPS.Halux.PPS.ALUFrees.KADConversie.Utils).%New()
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
 
-<Property name="TCrosss">
-<Type>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross</Type>
-<Collection>list</Collection>
-<Parameter name="XMLNAME" value="tcross"/>
-<Parameter name="XMLPROJECTION" value="ELEMENT"/>
-</Property>
-
-<Property name="Transform">
-<Type>%String</Type>
-<Parameter name="XMLNAME" value="transform"/>
-</Property>
-
-<Property name="X">
-<Type>%Integer</Type>
-<Parameter name="XMLNAME" value="x"/>
-<Parameter name="XMLPROJECTION" value="ATTRIBUTE"/>
-</Property>
-
-<Property name="Y">
-<Type>%Integer</Type>
-<Parameter name="XMLNAME" value="y"/>
-<Parameter name="XMLPROJECTION" value="ATTRIBUTE"/>
-</Property>
-
-<Property name="Height">
-<Type>%Integer</Type>
-<Parameter name="XMLNAME" value="height"/>
-<Parameter name="XMLPROJECTION" value="ATTRIBUTE"/>
-</Property>
-
-<Property name="Width">
-<Type>%Integer</Type>
-<Parameter name="XMLNAME" value="width"/>
-<Parameter name="XMLPROJECTION" value="ATTRIBUTE"/>
-</Property>
-
-<Property name="ID">
-<Type>%String</Type>
-<Parameter name="XMLNAME" value="id"/>
-<Parameter name="XMLPROJECTION" value="ATTRIBUTE"/>
-</Property>
-
 <Method name="GenereerSvg">
+<FormalSpec>KaderdeurObject:Prod.GADef.KaderDeur</FormalSpec>
 <Implementation><![CDATA[
-	
-	Set Group = ##class(TECH.Svg.Basis.Group).%New()
-	Set Circle = ##class(TECH.Svg.Basis.Circle).%New(15,35,1)
-	Set Rect = ##class(TECH.Svg.Basis.Rect).%New(0,0,150,105)
-	Do Group.VoegToeElement(Rect)
-	Do Group.VoegToeElement(Circle)
-	
-	Set Boringen = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.Boringen).%New()
-	Set DoorBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.DoorBoring).%New(15,15,5,5)
-	Set Puntboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.PuntBoring).%New(15,15,5,5)
-	Set Rugboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.RugBoring).%New(15,15,5,5)
-	Set Zijboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.ZijBoring).%New(15,15,5,5)
-	Do Boringen.VoegToeElement(DoorBoring)
-	Do Boringen.VoegToeElement(Puntboring)
-	Do Boringen.VoegToeElement(Rugboring)
-	Do Boringen.VoegToeElement(Zijboring)
-	
-	
-	
-	
+	;Set ..KaderdeurObject = KaderdeurObject
+	#dim Breedte As %Integer = KaderdeurObject.Breedte
+	#dim Hoogte As %Integer = KaderdeurObject.Hoogte
+	#dim SvgBox As TECH.Svg.Basis.SvgBox = ##class(TECH.Svg.Basis.SvgBox).%New(0,0,Hoogte,Breedte)
+ 	; #Dim KadVertaler As Prod.GADef.KadVertaler=##class(Prod.GADef.KadVertaler).%New("N")
+  	; Do ##class(Tools.Wlip).%New(133).ObjToXML(KaderdeurObject.ProductieWijze)
+  	Do ##class(Tools.Wlip).%New(133).String("uit")
+  	
+   ;kader v/d kaderdeur
+  	#dim KaderGroup =##class(TECH.Svg.Basis.Group).%New()
+  	If (KaderdeurObject.Toepassing.ItemID ="GL") { 
+	  	Set KaderGroup = ..VulTweeRects(KaderdeurObject, Breedte, Hoogte)
+  	} ElseIf (KaderdeurObject.ProductieWijzeGetObjectId()="LPR") {
+	  	#dim ProfPlaats As %String = KaderdeurObject.Onderdelen.GetNext("")
+	  	#dim LosOffset1 As %Integer = KaderdeurObject.ProfType.Breedte
+		If (ProfPlaats = "PR") {
+			Set LosOffset1 =(Breedte\1)-((Breedte-(2*LosOffset1))\1+(LosOffset1))
+		} ElseIf (ProfPlaats = "PO") {
+			Set LosOffset1 =(Breedte\1)-((Breedte-(2*LosOffset1))\1+(LosOffset1))
+		}
+		#dim ProfielHoogte As %Decimal = Hoogte - (LosOffset1 *2)
+		#dim ProfielBreedte As %Decimal = Breedte - (LosOffset1 *2)
+		Set CX=$S(ProfPlaats="PR":Breedte\1, 1:0)   ; Rechtse profiel : Corner is Rechts-Boven
+ 		Set CY=$S(ProfPlaats="PO":Hoogte\1, 1:0)    ; Onderste profiel : Corner is Links-Onder de 
+ 		
+		;Groep aanmaken met 3 rechthoeken
+		Set KaderGroup = ..VulDrieRects(KaderdeurObject, Breedte, Hoogte, 1)
+		;Path aanmaken v/h profiel en toevoegen aan de kadergroep
+		#Dim KDProf As TECH.Svg.Basis.Path = ..LosProfiel(Breedte, Hoogte, LosOffset1,ProfPlaats)
+		Do KaderGroup.VoegToeElement(KDProf)
+		
+	} Else {
+		;Groep aanmaken met 3 rechthoeken
+		Set KaderGroup = ..VulDrieRects(KaderdeurObject, Breedte, Hoogte)
+	}
+	Do SvgBox.VoegToeElement(KaderGroup)
+  	If (KaderdeurObject.Toepassing.ItemID = "GL") {
+  		#dim KaderVerbinder = KaderdeurObject.ProfType.Hoek
+  	}
+  	
 	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(Boringen)
+	Do FileWriter.WriteXML(SvgBox)
 	Do FileWriter.Close()
 	w "het bestand is weggeschreven"	
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 	}
+	Quit
 ]]></Implementation>
 </Method>
 
+<Method name="LosProfiel">
+<FormalSpec>Breedte:%Integer,Lengte:%Integer,LosOffset:%Integer,ProfPlaats:%String</FormalSpec>
+<Implementation><![CDATA[
+	#dim LeftTopInner as TECH.Svg.Basis.Path.Coordinates = ##class(TECH.Svg.Basis.Path.Coordinates).%New(LosOffset,LosOffset)
+	#dim RightTopInner as TECH.Svg.Basis.Path.Coordinates = ##class(TECH.Svg.Basis.Path.Coordinates).%New(Breedte - LosOffset,LosOffset)
+	#dim LeftBottomInner as TECH.Svg.Basis.Path.Coordinates = ##class(TECH.Svg.Basis.Path.Coordinates).%New(LosOffset,Lengte-LosOffset)
+	#dim RightBottomInner as TECH.Svg.Basis.Path.Coordinates =##class(TECH.Svg.Basis.Path.Coordinates).%New(Breedte-LosOffset, Lengte-LosOffset)
+	
+	#dim LeftTopOuter as TECH.Svg.Basis.Path.Coordinates = ##class(TECH.Svg.Basis.Path.Coordinates).%New(0,0)
+	#dim RightTopOuter as TECH.Svg.Basis.Path.Coordinates = ##class(TECH.Svg.Basis.Path.Coordinates).%New(Breedte,0)
+	#dim LeftBottomOuter as TECH.Svg.Basis.Path.Coordinates = ##class(TECH.Svg.Basis.Path.Coordinates).%New(0, Lengte)
+	#dim RightBottomOuter as TECH.Svg.Basis.Path.Coordinates =##class(TECH.Svg.Basis.Path.Coordinates).%New(Breedte, Lengte)
+	
+	#dim CoordinatesList As %ListOfObjects = ##class(%ListOfObjects).%New()
+	#dim Path As TECH.Svg.Basis.Path
+	
+	If (ProfPlaats="PL") {
+		Do CoordinatesList.Insert(LeftTopInner)
+		Do CoordinatesList.Insert(LeftTopOuter)
+		Do CoordinatesList.Insert(LeftBottomOuter)
+		Do CoordinatesList.Insert(LeftBottomInner)
+		Set Path = ##class(TECH.Svg.Basis.Path).%New(CoordinatesList)
+	}
+		If (ProfPlaats="PB") {
+		Do CoordinatesList.Insert(LeftTopInner)
+		Do CoordinatesList.Insert(LeftTopOuter)
+		Do CoordinatesList.Insert(RightTopOuter)
+		Do CoordinatesList.Insert(RightTopInner)
+		Set Path = ##class(TECH.Svg.Basis.Path).%New(CoordinatesList)
+	}
+		If (ProfPlaats="PR") {
+		Do CoordinatesList.Insert(RightTopInner)
+		Do CoordinatesList.Insert(RightTopOuter)
+		Do CoordinatesList.Insert(RightBottomOuter)
+		Do CoordinatesList.Insert(RightBottomInner)
+		Set Path = ##class(TECH.Svg.Basis.Path).%New(CoordinatesList)
+	}
+		If (ProfPlaats="PO") {
+		Do CoordinatesList.Insert(RightBottomInner)
+		Do CoordinatesList.Insert(RightBottomOuter)
+		Do CoordinatesList.Insert(LeftBottomOuter)
+		Do CoordinatesList.Insert(LeftBottomInner)
+		Set Path = ##class(TECH.Svg.Basis.Path).%New(CoordinatesList)
+	}
+	
+		Do Path.SetFill("#F0F0F0")
+		Do Path.SetStroke("black",2)
+		Do Path.SetOpacity(0.5)
+	Quit Path
+]]></Implementation>
+</Method>
+
+<Method name="VulDrieRects">
+<FormalSpec>KaderdeurObject:Prod.GADef.KaderDeur,Breedte:%Integer,Hoogte:%Integer,Los:%Boolean=0</FormalSpec>
+<Implementation><![CDATA[
+		#dim KaderOffset As %Integer
+		#dim FillS As %String
+		#dim BorderS As %String
+		#dim KaderGroup =##class(TECH.Svg.Basis.Group).%New()
+		Do KaderGroup.VoegToeID("kader")
+		;Outer Rectangle
+		Set KDOuter = ##class(TECH.Svg.Basis.Rect).%New(0,0,Breedte\1,Hoogte\1)
+		Do KaderdeurObject.ProfType.XMLVectorTussenRand(KaderdeurObject.Vulling.Vulling, .KaderOffset, .BorderS, .FillS)
+		Set KDMiddle = ##class(TECH.Svg.Basis.Rect).%New((0+KaderOffset\1),(0+KaderOffset\1),(Breedte-(2*KaderOffset)\1),(Hoogte-(2*KaderOffset)))
+		Set KaderOffset = KaderdeurObject.ProfType.Breedte
+		Set KDInner = ##class(TECH.Svg.Basis.Rect).%New((0+KaderOffset\1),(0+KaderOffset\1),(Breedte-(2*KaderOffset)\1),(Hoogte-(2*KaderOffset)))
+		Do KaderdeurObject.ProfType.XMLVectorTussenRand(KaderdeurObject.Vulling.Vulling, KaderOffset, BorderS, FillS)
+		;als het geen losprofiel is vul je kleuren in, anders zet je alles in stippelijn. 
+		If (Los = 0){
+		Do KDOuter.SetFill(##class(TECH.Svg.enu.Kleur).Grijs())
+		Do KDMiddle.SetFill(##class(TECH.Svg.enu.Kleur).DonkerGroen())
+		Do KDMiddle.SetOpacity($S(FillS="T":0, FillS="S":1, 1:FillS))
+		Do KDMiddle.SetStrokeDashArray($S(BorderS="LD":"2",BorderS="D":"1",1:"none"))
+		Do KDInner.SetFill($S($$$HasLength(KaderdeurObject.Vulling.Vulling):##class(TECH.Svg.enu.Kleur).LichtGrijs(),1:##class(TECH.Svg.enu.Kleur).Wit()))
+		}Else {
+			Do KDOuter.SetStroke("black",,"2")
+			Do KDOuter.SetFill()
+			Do KDMiddle.SetStroke("black",,"2")
+			Do KDMiddle.SetFill()
+			Do KDInner.SetStroke("black",,"2")
+			Do KDInner.SetFill()
+		}
+		Do KaderGroup.VoegToeElement(KDOuter)
+		Do KaderGroup.VoegToeElement(KDMiddle)
+		Do KaderGroup.VoegToeElement(KDInner)
+		
+		Quit KaderGroup
+]]></Implementation>
+</Method>
+
+<Method name="VulTweeRects">
+<FormalSpec>KaderdeurObject:Prod.GADef.KaderDeur,Breedte:%Integer,Hoogte:%Integer</FormalSpec>
+<Implementation><![CDATA[
+		#dim KaderGroup =##class(TECH.Svg.Basis.Group).%New()
+  		Do KaderGroup.VoegToeID("kader")
+	  	#dim GlasOffset As %Integer = KaderdeurObject.AfstandRandVoorVulling()
+	  	Set KDOuter = ##class(TECH.Svg.Basis.Rect).%New(0,0,Breedte,Hoogte)
+	  	Do KDOuter.SetFill(##class(TECH.Svg.enu.Kleur).Grijs())
+	  	Set KDInner =##class(TECH.Svg.Basis.Rect).%New(0,0,Breedte-(2*GlasOffset),Hoogte-(2*GlasOffset))
+	  	Do KDInner.SetFill(##class(TECH.Svg.enu.Kleur).LichtGroen())
+  		Do KaderGroup.VoegToeElement(KDOuter)
+  		Do KaderGroup.VoegToeElement(KDInner)
+]]></Implementation>
+</Method>
+
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <Data name="DomElementState">
@@ -192,6 +272,24 @@
 <Value name="20">
 <Value>ID</Value>
 </Value>
+<Value name="21">
+<Value>Beslag</Value>
+</Value>
+<Value name="22">
+<Value>Boringen</Value>
+</Value>
+<Value name="23">
+<Value>Breedte</Value>
+</Value>
+<Value name="24">
+<Value>Hoogte</Value>
+</Value>
+<Value name="25">
+<Value>KADConversieUtils</Value>
+</Value>
+<Value name="26">
+<Value>KleurEnu</Value>
+</Value>
 </Data>
 </Storage>
 </Class>