From d5b2b1508a0d327db009961d2144018128e39413 Mon Sep 17 00:00:00 2001
From: Simon Schmutzler <s.schmutzler@schoenenberger.de>
Date: Tue, 5 Mar 2024 08:08:38 +0100
Subject: [PATCH] =?UTF-8?q?Gef=C3=A4llestrecke=20Richtig/Falsch=20svg/xml?=
 =?UTF-8?q?=20hinzugef=C3=BCgt;=20Bei=20=C3=9Cbereinstimmen=20von=20L?=
 =?UTF-8?q?=C3=A4nge=20aus=20Winkel=20und=20H=C3=B6hendifferenz=20mit=20L?=
 =?UTF-8?q?=C3=A4nge=20des=20Shapes=20wird=20Gef=C3=A4llestrecke=20gr?=
 =?UTF-8?q?=C3=BCn,=20sonst=20rot?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SSG/shapes/svg/Gefaellestrecke_Falsch.xml |  11 +
 .../shapes/svg/Gefaellestrecke_Richtig.xml    |  11 +
 MAIN_SSG.rdx                                  | 286 +++++++++++++++++-
 3 files changed, 294 insertions(+), 14 deletions(-)
 create mode 100644 Editor2DLibrary/SSG/shapes/svg/Gefaellestrecke_Falsch.xml
 create mode 100644 Editor2DLibrary/SSG/shapes/svg/Gefaellestrecke_Richtig.xml

diff --git a/Editor2DLibrary/SSG/shapes/svg/Gefaellestrecke_Falsch.xml b/Editor2DLibrary/SSG/shapes/svg/Gefaellestrecke_Falsch.xml
new file mode 100644
index 0000000..ec2e3e4
--- /dev/null
+++ b/Editor2DLibrary/SSG/shapes/svg/Gefaellestrecke_Falsch.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+  <g transform="rotate(0)">
+    <svg viewBox="0 0 26.45833 264.58333" preserveAspectRatio="none" position="absolute" overflow="visible">
+      <defs />
+      <g transform="translate(0,-13.203638)">
+        <path style="opacity:0.94;fill:none;stroke:#f44336;stroke-opacity:1" d="M 13.65157,13.203638 V 277.78696" stroke-width="1px" />
+      </g>
+    </svg>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/Editor2DLibrary/SSG/shapes/svg/Gefaellestrecke_Richtig.xml b/Editor2DLibrary/SSG/shapes/svg/Gefaellestrecke_Richtig.xml
new file mode 100644
index 0000000..d4b6827
--- /dev/null
+++ b/Editor2DLibrary/SSG/shapes/svg/Gefaellestrecke_Richtig.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+  <g transform="rotate(0)">
+    <svg viewBox="0 0 26.45833 264.58333" preserveAspectRatio="none" position="absolute" overflow="visible">
+      <defs />
+      <g transform="translate(0,-13.203638)">
+        <path style="opacity:0.94;fill:none;stroke:#00ff00;stroke-opacity:1" d="M 13.65157,13.203638 V 277.78696" stroke-width="1px" />
+      </g>
+    </svg>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 1e12526..39aae83 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PROCESS Id="RDK:0001" Name="MAIN_SSG" ModernUI="True" Options="(GITSAVEMODE)(NOUPDATEINCLUDEFILES)" Expanded="True">
-	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-03-04T11:03:20" LanguageVersion="2014.1.3.627" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-03-04T12:45:33" LanguageVersion="2014.1.3.627" />
 	<GROUP Id="RDK:0002" Name="Declarations" SubType="Declarations" Expanded="True">
 		<GROUP Id="RDK:0003" Name="Types" SubType="TypeSet" IncludeDate="0">
 			<GROUP Id="RDK:26387" Name="SSG_Group" SubType="TypeSet" IncludeDate="0">
@@ -50,7 +50,7 @@
 					<FIELD Id="RDK:1520421" Name="Drehung" Type="integer" DesignTimeNotes="1= im Uhrzeigersinn=rechts&#xD;&#xA;-1= Gegen Uhrzeigersinn=links" />
 					<FIELD Id="RDK:1520424" Name="Durchmesser" Type="double" />
 				</TYPE>
-				<TYPE Id="RDK:302581" Name="GefaelleType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:302581" Name="GefaelleType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:302571" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:880709" Name="L1" Type="double" />
@@ -3129,6 +3129,59 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 							<PAR Name="eventHandlers" />
 						</SET_STRUCT>
 					</FUNCTION>
+					<FUNCTION Id="RDK:18550444" Name="CreatePrototype_Gefaellestrecke">
+						<GROUP Id="RDK:18550440" Name="Local Variables" SubType="VarSet" IncludeDate="0" />
+						<COMMENTS Id="RDK:18550441" DesignTimeRemark="Angle definition in GS2D" DesignTimeNotes="           0&#xD;&#xA;            |&#xD;&#xA;270 &lt;-------&gt;90&#xD;&#xA;            |&#xD;&#xA;          180&#xD;&#xA;" />
+						<SET Id="RDK:18550442" VarRef="Property_Prototype">
+							<EXP><![CDATA[$=$Shape_Prototype]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET_STRUCT Id="RDK:18550443" VarRef="Property_Prototype">
+							<PAR Name="id" />
+							<PAR Name="name" />
+							<PAR Name="family" />
+							<PAR Name="description" />
+							<PAR Name="text" />
+							<PAR Name="shapeMode" />
+							<PAR Name="icon" />
+							<PAR Name="iconBig" />
+							<PAR Name="image" />
+							<PAR Name="srcSVG" />
+							<PAR Name="src3D" />
+							<PAR Name="srcTexture3D" />
+							<PAR Name="width">
+								<EXP><![CDATA[$=$ConvertToPixel(Property_Prototype.width, "mm", 96)]]></EXP>
+							</PAR>
+							<PAR Name="height">
+								<EXP><![CDATA[$=$ConvertToPixel(Property_Prototype.height, "mm", 96)]]></EXP>
+							</PAR>
+							<PAR Name="depth">
+								<EXP><![CDATA[$=$ConvertToPixel(Property_Prototype.depth, "mm", 96)]]></EXP>
+							</PAR>
+							<PAR Name="behaviour" />
+							<PAR Name="help" />
+							<PAR Name="eventClass" />
+							<PAR Name="linkClass" />
+							<PAR Name="collisionClass" />
+							<PAR Name="containerClass" />
+							<PAR Name="snapClass" />
+							<PAR Name="color" />
+							<PAR Name="colorOpacity" />
+							<PAR Name="lineColor" />
+							<PAR Name="lineColorOpacity" />
+							<PAR Name="color3D" />
+							<PAR Name="colorOpacity3D" />
+							<PAR Name="lineColor3D" />
+							<PAR Name="lineColorOpacity3D" />
+							<PAR Name="custom" />
+							<PAR Name="connectionPoints" />
+							<PAR Name="group2dShapes" />
+							<PAR Name="group2dConnectors" />
+							<PAR Name="group3d" />
+							<PAR Name="eventHandler" />
+							<PAR Name="eventHandlers" />
+						</SET_STRUCT>
+					</FUNCTION>
 					<FUNCTION Id="RDK:439270" Name="Create/Update Shape">
 						<GROUP Id="RDK:439268" Name="Local Variables" SubType="VarSet" IncludeDate="0">
 							<VAR Id="RDK:439269" Name="ID" Type="string" />
@@ -3235,8 +3288,10 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										</PAR>
 										<PAR Name="EckradDefinition" />
 										<PAR Name="GefaelleDefinition" />
+										<PAR Name="FoerdererDefinition" />
 										<PAR Name="WeicheDefinition" />
 										<PAR Name="BTMTBeladungDefinition" />
+										<PAR Name="BTMTEntladungDefinition" />
 										<PAR Name="source">
 											<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
 										</PAR>
@@ -3298,8 +3353,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
-										<PAR Name="FoerdererDefinition" />
-										<PAR Name="BTMTEntladungDefinition" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -3391,7 +3444,9 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="IDCounter" />
 										<PAR Name="KreiselDefinition" />
 										<PAR Name="EckradDefinition" />
-										<PAR Name="GefaelleDefinition" />
+										<PAR Name="GefaelleDefinition">
+											<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition]]></EXP>
+										</PAR>
 										<PAR Name="FoerdererDefinition" />
 										<PAR Name="WeicheDefinition" />
 										<PAR Name="BTMTBeladungDefinition" />
@@ -3460,6 +3515,163 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
+							<CASEGROUP Id="RDK:18547253" CaseType="0">
+								<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
+								<GROUP Id="RDK:18547246" Name="Gefaellestrecke in der Library anlegen" SubType="Generic">
+									<SET Id="RDK:18547244" VarRef="Property_Prototype.eventClass">
+										<EXP><![CDATA[$C$OnDoubleclick,OnInserted,OnLinked,OnPasted]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<ACTION_CALL Id="RDK:18547245" Name="RDEngineering_E2DManageShape">
+										<PAR Name="RDLibraryName">
+											<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+										</PAR>
+										<PAR Name="e2dMode">
+											<EXP><![CDATA[$C$0]]></EXP>
+										</PAR>
+										<PAR Name="libraryID">
+											<EXP><![CDATA[$=$GS2DLibraryName]]></EXP>
+										</PAR>
+										<PAR Name="operType">
+											<EXP><![CDATA[$C$2]]></EXP>
+										</PAR>
+										<PAR Name="shpId">
+											<EXP><![CDATA[$=$Property_Prototype.id]]></EXP>
+										</PAR>
+										<PAR Name="catId">
+											<EXP><![CDATA[$C$c_Session]]></EXP>
+										</PAR>
+										<PAR Name="shpItemId" />
+										<PAR Name="shpItem">
+											<EXP><![CDATA[$=$Property_Prototype]]></EXP>
+										</PAR>
+										<PAR Name="shpItemList">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="shpList">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="outShapeIdList">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="Options">
+											<EXP><![CDATA[$C$(OVERWRITE)]]></EXP>
+										</PAR>
+									</ACTION_CALL>
+								</GROUP>
+								<GROUP Id="RDK:18547252" Name="Gefaellestrecke platzieren" SubType="Generic">
+									<COMMENTS Id="RDK:18547247" DesignTimeRemark="pixel in mm" />
+									<COMMENTS Id="RDK:18547248" DesignTimeRemark="Shape in ShapeList wird gedreht" />
+									<ACTION_CALL Id="RDK:18547249" Name="RDEngineering_E2DManageShape">
+										<PAR Name="RDLibraryName">
+											<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+										</PAR>
+										<PAR Name="e2dMode">
+											<EXP><![CDATA[$C$0]]></EXP>
+										</PAR>
+										<PAR Name="libraryID">
+											<EXP><![CDATA[$=$GS2DLibraryName]]></EXP>
+										</PAR>
+										<PAR Name="operType">
+											<EXP><![CDATA[$C$0]]></EXP>
+										</PAR>
+										<PAR Name="shpId">
+											<EXP><![CDATA[$=$ID]]></EXP>
+										</PAR>
+										<PAR Name="catId">
+											<EXP><![CDATA[$C$c_Session]]></EXP>
+										</PAR>
+										<PAR Name="shpItemId" />
+										<PAR Name="shpItem">
+											<EXP><![CDATA[$=$Shape_Prototype]]></EXP>
+										</PAR>
+										<PAR Name="shpItemList">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="shpList">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="outShapeIdList">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="Options" />
+									</ACTION_CALL>
+									<COMMENTS Id="RDK:18547250" Bookmarked="True" DesignTimeRemark="Inherit Rotation" />
+									<SET_STRUCT Id="RDK:18547251" VarRef="Shape_Prototype" ListRef="ShapeList" Options="$=$&quot;(REPLACEIDX=&quot;+i+&quot;)&quot;" Bookmarked="True" DesignTimeNotes="Shape.depth*Inch/DPI&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Shape_Prototype.KreiselDefinition.OrientierungHV&#xD;&#xA;IIF(Shape_Prototype.KreiselDefinition.OrientierungHV&lt;&gt;Shape_Prototype.rotation,Shape_Prototype.rotation,Shape_Prototype.KreiselDefinition.OrientierungHV)">
+										<PAR Name="SivasNummer" />
+										<PAR Name="Rotationsklasse" />
+										<PAR Name="IDCounter" />
+										<PAR Name="KreiselDefinition" />
+										<PAR Name="EckradDefinition" />
+										<PAR Name="GefaelleDefinition" />
+										<PAR Name="FoerdererDefinition" />
+										<PAR Name="WeicheDefinition" />
+										<PAR Name="BTMTBeladungDefinition" />
+										<PAR Name="BTMTEntladungDefinition" />
+										<PAR Name="source">
+											<EXP><![CDATA[$=$IIF(Shape_Prototype.GefaelleDefinition.LH_fits=True,"Gefaellestrecke_Richtig","Gefaellestrecke_Falsch")]]></EXP>
+										</PAR>
+										<PAR Name="sourceLibrary">
+											<EXP><![CDATA[$=$GS2DLibraryName]]></EXP>
+										</PAR>
+										<PAR Name="signature" />
+										<PAR Name="id">
+											<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+										</PAR>
+										<PAR Name="name" />
+										<PAR Name="family" />
+										<PAR Name="description" />
+										<PAR Name="x" />
+										<PAR Name="y" />
+										<PAR Name="z" />
+										<PAR Name="width">
+											<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.width, "mm", 96)]]></EXP>
+										</PAR>
+										<PAR Name="height">
+											<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.height, "mm", 96)]]></EXP>
+										</PAR>
+										<PAR Name="depth">
+											<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.depth, "mm", 96)]]></EXP>
+										</PAR>
+										<PAR Name="rotation">
+											<EXP><![CDATA[$=$Shape_Prototype.rotation]]></EXP>
+										</PAR>
+										<PAR Name="text" />
+										<PAR Name="behaviour" />
+										<PAR Name="datadump" />
+										<PAR Name="path" />
+										<PAR Name="ctrl1x" />
+										<PAR Name="ctrl1y" />
+										<PAR Name="ctrl2x" />
+										<PAR Name="ctrl2y" />
+										<PAR Name="shapeFromId" />
+										<PAR Name="shapeFromPointIndex" />
+										<PAR Name="shapeToId" />
+										<PAR Name="shapeToPointIndex" />
+										<PAR Name="dimStack" />
+										<PAR Name="dimType" />
+										<PAR Name="dimDriving" />
+										<PAR Name="dimValue" />
+										<PAR Name="color" />
+										<PAR Name="colorOpacity" />
+										<PAR Name="color3D" />
+										<PAR Name="colorOpacity3D" />
+										<PAR Name="lineWidth" />
+										<PAR Name="lineColor" />
+										<PAR Name="lineOpacity" />
+										<PAR Name="lineColor3D" />
+										<PAR Name="lineOpacity3D" />
+										<PAR Name="links" />
+										<PAR Name="group" />
+										<PAR Name="layer" />
+										<PAR Name="connectionPoints" />
+										<PAR Name="modified" />
+										<PAR Name="pinned" />
+										<PAR Name="selected" />
+										<PAR Name="includeInBOM" />
+									</SET_STRUCT>
+								</GROUP>
+							</CASEGROUP>
 							<CASEGROUP Id="RDK:1653130" CaseType="0">
 								<EXP><![CDATA[$C$BTMTBeladung]]></EXP>
 								<GROUP Id="RDK:1653123" Name="BTMTBeladung in der Library anlegen" SubType="Generic">
@@ -3706,6 +3918,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="KreiselDefinition" />
 										<PAR Name="EckradDefinition" />
 										<PAR Name="GefaelleDefinition" />
+										<PAR Name="FoerdererDefinition" />
 										<PAR Name="WeicheDefinition" />
 										<PAR Name="BTMTBeladungDefinition" />
 										<PAR Name="BTMTEntladungDefinition" />
@@ -7557,6 +7770,15 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 									<PAR Name="aktiv">
 										<EXP><![CDATA[$=$IIF(me.x_M<=(Shape_Prototype.KreiselDefinition.AbstandMS-Shape_Prototype.KreiselDefinition.d_min),TRUE,FALSE)]]></EXP>
 									</PAR>
+									<PAR Name="id" />
+									<PAR Name="x_M" />
+									<PAR Name="x_S" />
+									<PAR Name="x" />
+									<PAR Name="y" />
+									<PAR Name="z" />
+									<PAR Name="direction" />
+									<PAR Name="linkClass" />
+									<PAR Name="label" />
 								</EXEC_ON_VALUES>
 								<EXEC_ON_VALUES Id="RDK:812298" VarRef="Shape_Prototype.KreiselDefinition.S_Strecke">
 									<PAR Name="aktiv">
@@ -8565,11 +8787,11 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 						<CASEGROUP Id="RDK:847705" CaseType="0">
 							<EXP><![CDATA[$C$OK]]></EXP>
 							<GROUP Id="RDK:915665" Name="Write Properties" SubType="Generic">
-								<SET Id="RDK:916177" VarRef="i">
+								<SET Id="RDK:916177" VarRef="i" Suppressed="True">
 									<EXP><![CDATA[$=$IndexOfByFieldValue(ShapeList, "id", Shape_Prototype.id)]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
-								<SET_STRUCT Id="RDK:916174" VarRef="Shape_Prototype" ListRef="ShapeList" Options="$=$&quot;(REPLACEIDX=&quot;+i+&quot;)&quot;" DesignTimeNotes="Shape.depth*Inch/DPI">
+								<SET_STRUCT Id="RDK:916174" VarRef="Shape_Prototype" ListRef="ShapeList" Options="$=$&quot;(REPLACEIDX=&quot;+i+&quot;)&quot;" Suppressed="True" DesignTimeNotes="Shape.depth*Inch/DPI">
 									<PAR Name="SivasNummer" />
 									<PAR Name="Rotationsklasse" />
 									<PAR Name="IDCounter" />
@@ -8638,6 +8860,34 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 									<PAR Name="selected" />
 									<PAR Name="includeInBOM" />
 								</SET_STRUCT>
+								<SET Id="RDK:18556791" VarRef="Shape_Prototype.height">
+									<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.L1]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<CALLFUNCTION Id="RDK:18547260">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$CreatePrototype_Gefaellestrecke]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+								<CALLFUNCTION Id="RDK:18550446">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$Create/Update Shape]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
 							</GROUP>
 							<GROUP Id="RDK:1332808" Name="Gefaellestrecke HoeheOben OR HoeheUnten was changed" SubType="Generic" DesignTimeNotes="20231005 -1-&#xD;&#xA;&#xD;&#xA;Inherit height to direct Shaps and set others to Gelb (except Kreisel Groups).">
 								<VALUECONDITION Value="true" Oper="OR">
@@ -8682,6 +8932,9 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$FieldAffected="winkel"]]></EXP>
 								</VALUECONDITION>
+								<VALUECONDITION Value="true">
+									<EXP><![CDATA[$=$FieldAffected="L1"]]></EXP>
+								</VALUECONDITION>
 								<COMMENTS Id="RDK:18348402" DesignTimeRemark="Shape_Prototype.GefaelleDefinition.winkel" />
 								<CALLFUNCTION Id="RDK:18348398">
 									<PAR Name="FuncName">
@@ -12839,6 +13092,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<PAR Name="pinned" />
 								<PAR Name="selected" />
 								<PAR Name="includeInBOM" />
+								<PAR Name="IDCounter" />
+								<PAR Name="FoerdererDefinition" />
+								<PAR Name="BTMTBeladungDefinition" />
+								<PAR Name="BTMTEntladungDefinition" />
 							</SET_STRUCT>
 							<ACTION_CALL Id="RDK:1589028" Name="RDEngineering_E2DLinkShapes">
 								<PAR Name="RDLibraryName">
@@ -13029,7 +13286,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
 				<GROUP Id="RDK:18547162" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
 					<VAR Id="RDK:18547159" Name="L_th" Type="double" />
 					<VAR Id="RDK:18547160" Name="H_th" Type="double" />
-					<VAR Id="RDK:18547161" Name="shape_item" Type="Editor2DShapeType" />
 				</GROUP>
 				<IFTHENELSE Id="RDK:18376614">
 					<VALUECONDITION Value="true">
@@ -13049,23 +13305,23 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					</GROUP>
 					<GROUP Id="RDK:18547227" SubType="Else">
 						<SET Id="RDK:18547221" VarRef="L_th">
-							<EXP><![CDATA[$=$(Shape_Prototype.GefaelleDefinition.HoeheOben-Shape_Prototype.GefaelleDefinition.HoeheUnten)/Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel))]]></EXP>
+							<EXP><![CDATA[$=$Abs(Round((Shape_Prototype.GefaelleDefinition.HoeheOben-Shape_Prototype.GefaelleDefinition.HoeheUnten)/Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel)),0))]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<SET Id="RDK:18547222" VarRef="H_th">
-							<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel))]]></EXP>
+							<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel)),0))]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<SET Id="RDK:18547223" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
-							<EXP><![CDATA[$=$Abs(Round(L_th, 0))]]></EXP>
+							<EXP><![CDATA[$=$L_th]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<SET Id="RDK:18547224" VarRef="Shape_Prototype.GefaelleDefinition.H_th">
-							<EXP><![CDATA[$=$Abs(Round(H_th, 0))]]></EXP>
+							<EXP><![CDATA[$=$H_th]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<SET Id="RDK:18547225" VarRef="Shape_Prototype.GefaelleDefinition.LH_fits">
-							<EXP><![CDATA[$=$IIF(Abs(shape_item.GefaelleDefinition.L1-L_th)<shape_item.GefaelleDefinition.LH_toleranz,True,False)]]></EXP>
+							<EXP><![CDATA[$=$IIF(Abs(Shape_Prototype.GefaelleDefinition.L1-L_th)<Shape_Prototype.GefaelleDefinition.LH_toleranz,True,False)]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 					</GROUP>
@@ -15517,7 +15773,9 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="ROnly" />
 							<PAR Name="Disabled" />
 							<PAR Name="Pressed" />
-							<PAR Name="AutoCommit" />
+							<PAR Name="AutoCommit">
+								<EXP><![CDATA[$C$True]]></EXP>
+							</PAR>
 							<PAR Name="ValidateFail" />
 							<PAR Name="ValidateMsg" />
 							<PAR Name="DataSource" />