Index: Prod/GADef/emKadBeslag.cls.xml =================================================================== diff -u -r55029 -r55030 --- Prod/GADef/emKadBeslag.cls.xml (.../emKadBeslag.cls.xml) (revision 55029) +++ Prod/GADef/emKadBeslag.cls.xml (.../emKadBeslag.cls.xml) (revision 55030) @@ -367,7 +367,7 @@ #define CalcOpdekY ##class(Prod.GADef.emKadBeslag).GetOpdekFromPos(Pos, %this.Beslag.ConstructAfm.GetAt("OFFSOPDEKY"), %this.WandDikte) #define CalcVoegY ##class(Prod.GADef.emKadBeslag).GetVoegFromPos(Pos, %this.Beslag.ConstructAfm.GetAt("OFFSOPDEKY")) - New Key,emBeslagPos,Pos,BType,param1,param2,KadVertaler,VertaalKey,TekstAlignering + New Key,emBeslagPos,Pos,BType,param1,param2,KadVertaler,VertaalKey,TekstAlignering,OpdekY Set KadVertaler=##class(Prod.GADef.KadVertaler).%New(Taal) Do BEGINTAG^XMLWRITE(DevObj,"BESLAG",KadVertaler.VertaalXmlLabelAttribute("Beslag")) @@ -416,8 +416,12 @@ . If (BType="KC")||(BType="KH")||((BType?1"G"1U)&&(%this.Beslag.ConstructAfm.IsDefined("OFFSOPDEKY"))) Do .. ; Opdek Bovenkant Klapdeur OF Opdek Zijkant schuifdeur .. Do TAGWRITE^XMLWRITE(DevObj,"OPDEKY",$$$CalcOpdekY,"UNIT=""mm""",KadVertaler.VertaalXmlLabelAttribute("lblBeslag_Opdek")) - . Else If (BType?1(1"HZ",1"HL",1"HKX",1"HKT")) Do - .. ; Opdek Bovenkant Aventos HS + . Else If (BType="HKX") Do + .. ; Opdek Bovenkant Aventos HK-XS + .. Set OpdekY = ##class(Prod.GADef.emKadBeslag).GetOpdekFromPos(Pos, %this.Beslag.ConstructAfm.GetAt("OFFSOPDEKY") + ..GeefExtraOffsetAventosHKXS(), 0) + .. Do TAGWRITE^XMLWRITE(DevObj,"OPDEKY",OpdekY,"UNIT=""mm""",KadVertaler.VertaalXmlLabelAttribute("lblBeslag_Opdek")) + . Else If (BType?1(1"HZ",1"HL",1"HKT")) Do + .. ; Opdek Bovenkant Aventos HS, HL en HK-TOP .. Do TAGWRITE^XMLWRITE(DevObj,"OPDEKY",$$$CalcOpdekY,"UNIT=""mm""",KadVertaler.VertaalXmlLabelAttribute("lblBeslag_Opdek")) . Else If (BType="HK") Do .. ; Voeg Bovenkant Aventos HK