From 5573ea69a13d82bbcbe3ee018cc70848b3fa72f9 Mon Sep 17 00:00:00 2001
From: Simon Schmutzler <s.schmutzler@schoenenberger.de>
Date: Mon, 10 Jun 2024 12:25:04 +0200
Subject: [PATCH] =?UTF-8?q?Aktualisierung=20der=20Berechnung=20F=C3=B6rder?=
 =?UTF-8?q?er=20um=20die=20H=C3=B6hen=20und=20L=C3=A4ngendifferenzen=20der?=
 =?UTF-8?q?=20Ein-/Ausschleusung;=20Beim=20Verbinden=20zwischen=20Kreiseln?=
 =?UTF-8?q?/Eckr=C3=A4der=20wird=20nun=20die=20H=C3=B6he=20an=20das=20neu?=
 =?UTF-8?q?=20angebundene=20Element=20=C3=BCbergeben?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SSG/Init/objekteigenschaften_ILS.json     |   1 +
 MAIN_SSG.rdx                                  | 227 ++++++++++++++++--
 2 files changed, 204 insertions(+), 24 deletions(-)

diff --git a/Editor2DLibrary/SSG/Init/objekteigenschaften_ILS.json b/Editor2DLibrary/SSG/Init/objekteigenschaften_ILS.json
index 869088a..bb23d94 100644
--- a/Editor2DLibrary/SSG/Init/objekteigenschaften_ILS.json
+++ b/Editor2DLibrary/SSG/Init/objekteigenschaften_ILS.json
@@ -1,4 +1,5 @@
 {
+    "comment": "Die folgenden Einträge werden in Verbindung mit Förderern und/oder Gefällestrecken verwendet. Im Programm werden die Summen der Werte delta_h (Einschleuselement) und delta_h(Ausschleuselement) als L_SEA und/oder H_SEA (index S=Strecke) bzw. L_FEA und/oder H_FEA (index F=Förderer) verwendet.",
     "Einschleuselement":{
         "comment": "Höhen- und Längendifferenz zwischen Laufprofil des Kreisels und Ende einer angebundenen Gefällestrecke in Millimetern",
         "delta_h": 50,
diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index aa9885b..61a36b3 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-06-07T14:46:09" LanguageVersion="2014.1.3.673" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-06-10T12:16:07" LanguageVersion="2014.1.3.673" />
 	<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">
@@ -6402,6 +6402,8 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<PAR Name="AdvancedOptions" />
 							</SET>
 						</VAR>
+						<VAR Id="RDK:19482861" Name="L_F" Type="double" DesignTimeRemark="Gesamt Förderer" />
+						<VAR Id="RDK:19482863" Name="L_S" Type="double" DesignTimeRemark="Gesamt Strecke" />
 						<VAR Id="RDK:18621906" Name="Richtung" Type="integer" DesignTimeRemark="Förderrichtung (True: h0 -&gt; h1, False: h1-&gt;h0)">
 							<SET Id="RDK:18622543" VarRef="Me">
 								<EXP><![CDATA[$=$Shape_Prototype.FoerdererDefinition.Richtung]]></EXP>
@@ -6420,6 +6422,30 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<PAR Name="AdvancedOptions" />
 							</SET>
 						</VAR>
+						<VAR Id="RDK:19482841" Name="H_SEA" Type="double" DesignTimeRemark="Höhendifferenze Ein-/Ausschleuselement der Strecke">
+							<SET Id="RDK:19482849" VarRef="Me">
+								<EXP><![CDATA[$=$SSG_Attributes_data.Einschleuselement_delta_h + SSG_Attributes_data.Ausschleuselement_delta_h]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</VAR>
+						<VAR Id="RDK:19482843" Name="L_SEA" Type="double" DesignTimeRemark="Längendifferenz Ein-/Ausschleuselement der Strecke">
+							<SET Id="RDK:19482851" VarRef="Me">
+								<EXP><![CDATA[$=$SSG_Attributes_data.Einschleuselement_delta_s+ SSG_Attributes_data.Ausschleuselement_delta_s]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</VAR>
+						<VAR Id="RDK:19482845" Name="H_FEA" Type="double" DesignTimeRemark="Höhendifferenze Ein-/Ausschleuselement des Förderers">
+							<SET Id="RDK:19482853" VarRef="Me" DesignTimeRemark="Höhen- und Längendifferenzen der Ein- und Ausschleuselemente sind aktuell in den Werten H_SEA und L_SEA zusammengeführt. Daher sind die Werte für H_FEA und L_FEA gleich Null.">
+								<EXP><![CDATA[$=$0]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</VAR>
+						<VAR Id="RDK:19482847" Name="L_FEA" Type="double" DesignTimeRemark="Höhendifferenze Ein-/Ausschleuselement des Förderers">
+							<SET Id="RDK:19482855" VarRef="Me" DesignTimeRemark="Höhen- und Längendifferenzen der Ein- und Ausschleuselemente sind aktuell in den Werten H_SEA und L_SEA zusammengeführt. Daher sind die Werte für H_FEA und L_FEA gleich Null.">
+								<EXP><![CDATA[$=$0]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</VAR>
 						<VAR Id="RDK:18587841" Name="Delta_h" Type="double" DesignTimeRemark="Differenz zwischen HoeheOben und HoeheUnten" />
 						<VAR Id="RDK:18589803" Name="valid" Type="boolean" DesignTimeRemark="Gesamtlänge">
 							<SET Id="RDK:18589804" VarRef="Me">
@@ -6721,8 +6747,16 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<EXIT_PROCESS Id="RDK:18729654" BreakType="4" ExitStatus="0" />
 								</GROUP>
 							</IFTHENELSE>
-							<SET Id="RDK:18150160" VarRef="x_verhaeltnis">
-								<EXP><![CDATA[$=$(Tan(DegToRad(winkel_f))+Tan(DegToRad(winkel_s)))/(Delta_h/L1+Tan(DegToRad(winkel_s)))]]></EXP>
+							<SET Id="RDK:19482859" VarRef="L_F">
+								<EXP><![CDATA[$=$h1-h0+Tan(winkel_s)*L1-Tan(winkel_s)*L_SEA+H_SEA+Tan(winkel_f)*L_FEA-H_FEA]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+							<SET Id="RDK:18150160" VarRef="L_S">
+								<EXP><![CDATA[$=$L1-L_F]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+							<SET Id="RDK:19482865" VarRef="x_verhaeltnis">
+								<EXP><![CDATA[$=$L1/L_F]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
 							<IFTHENELSE Id="RDK:18150161">
@@ -6873,7 +6907,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="Tooltip" />
 										<PAR Name="Styles" />
 										<PAR Name="Classes">
-											<EXP><![CDATA[$C$col-4]]></EXP>
+											<EXP><![CDATA[$C$col-2]]></EXP>
 										</PAR>
 										<PAR Name="Rules" />
 										<PAR Name="Image" />
@@ -6930,7 +6964,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="Tooltip" />
 										<PAR Name="Styles" />
 										<PAR Name="Classes">
-											<EXP><![CDATA[$C$col-4]]></EXP>
+											<EXP><![CDATA[$C$col-2]]></EXP>
 										</PAR>
 										<PAR Name="Rules" />
 										<PAR Name="Image" />
@@ -6959,11 +6993,11 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="Options" />
 									</ACTION_CALL>
 									<SET Id="RDK:18172282" VarRef="Shape_Prototype.FoerdererDefinition.Delta_hf">
-										<EXP><![CDATA[$=$Round(Tan(DegToRad(winkel_f))*L1/x_verhaeltnis, 2)]]></EXP>
+										<EXP><![CDATA[$=$Round(Tan(DegToRad(winkel_f))*(L_F-L_FEA) + H_FEA, 2)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 									<SET Id="RDK:18164344" VarRef="Shape_Prototype.FoerdererDefinition.Delta_hs">
-										<EXP><![CDATA[$=$Round(Tan(DegToRad(winkel_s))*L1*(x_verhaeltnis-1)/x_verhaeltnis, 2)]]></EXP>
+										<EXP><![CDATA[$=$Round(Tan(DegToRad(winkel_f))*(L_S-L_SEA) + H_SEA, 2)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 									<SET Id="RDK:18164346" VarRef="Shape_Prototype.FoerdererDefinition.Delta_h">
@@ -6971,11 +7005,11 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="AdvancedOptions" />
 									</SET>
 									<SET Id="RDK:18164348" VarRef="Shape_Prototype.FoerdererDefinition.L_s">
-										<EXP><![CDATA[$=$Round(L1-L1/x_verhaeltnis, 2)]]></EXP>
+										<EXP><![CDATA[$=$Round(L_S, 2)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 									<SET Id="RDK:18305537" VarRef="Shape_Prototype.FoerdererDefinition.L_f">
-										<EXP><![CDATA[$=$Round(L1/x_verhaeltnis, 2)]]></EXP>
+										<EXP><![CDATA[$=$Round(L_F, 2)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 									<SET Id="RDK:18656459" VarRef="Shape_Prototype.FoerdererDefinition.LH_fits" DesignTimeRemark="LH_fits == True, in Ordnung">
@@ -7168,7 +7202,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="Tooltip" />
 										<PAR Name="Styles" />
 										<PAR Name="Classes">
-											<EXP><![CDATA[$C$col-4]]></EXP>
+											<EXP><![CDATA[$C$col-2]]></EXP>
 										</PAR>
 										<PAR Name="Rules" />
 										<PAR Name="Image" />
@@ -15633,23 +15667,28 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<VAR Id="RDK:1772345" Name="cpId" Type="string" />
 					<VAR Id="RDK:1772347" Name="cp_kreiselpartner" Type="SSGConnectionPoint" />
 					<VAR Id="RDK:1772349" Name="kreiselhoehe" Type="double" />
+					<VAR Id="RDK:19493734" Name="zielhoehe" Type="double" />
 					<VAR Id="RDK:1782656" Name="jsonValues" Type="string" />
 					<VAR Id="RDK:1783805" Name="UebergabeListe" Type="SSGParameter[]" />
 					<VAR Id="RDK:18374136" Name="RueckgabeListe" Type="SSGParameter[]" />
 				</GROUP>
+				<SET Id="RDK:18396528" VarRef="Param.Result">
+					<EXP><![CDATA[$=$RueckgabeListe]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+				<SET Id="RDK:1707740" VarRef="item_0">
+					<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID]]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+				<SET Id="RDK:1707750" VarRef="item_1">
+					<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID]]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
 				<GROUP Id="RDK:1698060" Name="Filter" SubType="Generic" DesignTimeNotes="(ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].family=&quot;Gefaellestrecke&quot; And  (ShapeList[&quot;id=&quot;+Param.Input[1].shapeID].Rotationsklasse=&quot;Rotationsobjekt&quot;and IsTagInString(Param.Input[1].connectionPointID, &quot;defcp&quot;)))  &#xA;Or &#xA;(ShapeList[&quot;id=&quot;+Param.Input[1].shapeID].family=&quot;Gefaellestrecke&quot; And  (ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].Rotationsklasse=&quot;Rotationsobjekt&quot; and IsTagInString(Param.Input[0].connectionPointID, &quot;defcp&quot;)))  &#xA;">
 					<VALUECONDITION Value="true">
 						<EXP><![CDATA[$=$(ShapeList["id="+Param.Input[0].shapeID].family="Kreisel" and (ShapeList["id="+Param.Input[1].shapeID].family="Gefaellestrecke") or ShapeList["id="+Param.Input[1].shapeID].family="Foerderer") or
 (ShapeList["id="+Param.Input[1].shapeID].family="Kreisel" and (ShapeList["id="+Param.Input[0].shapeID].family="Gefaellestrecke") or (ShapeList["id="+Param.Input[0].shapeID].family="Foerderer"))]]></EXP>
 					</VALUECONDITION>
-					<SET Id="RDK:1707740" VarRef="item_0">
-						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID]]]></EXP>
-						<PAR Name="AdvancedOptions" />
-					</SET>
-					<SET Id="RDK:1707750" VarRef="item_1">
-						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID]]]></EXP>
-						<PAR Name="AdvancedOptions" />
-					</SET>
 					<IFTHENELSE Id="RDK:1773568">
 						<VALUECONDITION Value="true">
 							<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Kreisel"]]></EXP>
@@ -15874,10 +15913,150 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						</GROUP>
 					</IFTHENELSE>
 				</GROUP>
-				<SET Id="RDK:18396528" VarRef="Param.Result">
-					<EXP><![CDATA[$=$RueckgabeListe]]></EXP>
-					<PAR Name="AdvancedOptions" />
-				</SET>
+				<GROUP Id="RDK:19493690" Name="Filter" SubType="Generic" DesignTimeNotes="(ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].family=&quot;Gefaellestrecke&quot; And  (ShapeList[&quot;id=&quot;+Param.Input[1].shapeID].Rotationsklasse=&quot;Rotationsobjekt&quot;and IsTagInString(Param.Input[1].connectionPointID, &quot;defcp&quot;)))  &#xA;Or &#xA;(ShapeList[&quot;id=&quot;+Param.Input[1].shapeID].family=&quot;Gefaellestrecke&quot; And  (ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].Rotationsklasse=&quot;Rotationsobjekt&quot; and IsTagInString(Param.Input[0].connectionPointID, &quot;defcp&quot;)))  &#xA;">
+					<VALUECONDITION Value="true">
+						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Kreisel" and ShapeList["id="+Param.Input[1].shapeID].family="Kreisel"]]></EXP>
+					</VALUECONDITION>
+					<COMMENTS Id="RDK:19493720" DesignTimeRemark="Kreisel-Kreisel" />
+					<SET Id="RDK:19493728" VarRef="zielhoehe">
+						<EXP><![CDATA[$=$item_1.KreiselDefinition.Hoehe]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<SET Id="RDK:19493737" VarRef="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].KreiselDefinition.Hoehe">
+						<EXP><![CDATA[$=$zielhoehe]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<SET_STRUCT Id="RDK:19493739" VarRef="SSGParameter" ClearAll="True" ListRef="RueckgabeListe">
+						<PAR Name="Key">
+							<EXP><![CDATA[$C$ShapeId]]></EXP>
+						</PAR>
+						<PAR Name="Str">
+							<EXP><![CDATA[$=$item_0.id]]></EXP>
+						</PAR>
+						<PAR Name="Dbl" />
+						<PAR Name="Int" />
+						<PAR Name="Boo" />
+					</SET_STRUCT>
+					<SET_STRUCT Id="RDK:19493741" VarRef="SSGParameter" ClearAll="True" ListRef="RueckgabeListe">
+						<PAR Name="Key">
+							<EXP><![CDATA[$C$Hoehe]]></EXP>
+						</PAR>
+						<PAR Name="Str">
+							<EXP><![CDATA[$=$zielhoehe]]></EXP>
+						</PAR>
+						<PAR Name="Dbl" />
+						<PAR Name="Int" />
+						<PAR Name="Boo" />
+					</SET_STRUCT>
+				</GROUP>
+				<GROUP Id="RDK:19503898" Name="Filter" SubType="Generic" DesignTimeNotes="(ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].family=&quot;Gefaellestrecke&quot; And  (ShapeList[&quot;id=&quot;+Param.Input[1].shapeID].Rotationsklasse=&quot;Rotationsobjekt&quot;and IsTagInString(Param.Input[1].connectionPointID, &quot;defcp&quot;)))  &#xA;Or &#xA;(ShapeList[&quot;id=&quot;+Param.Input[1].shapeID].family=&quot;Gefaellestrecke&quot; And  (ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].Rotationsklasse=&quot;Rotationsobjekt&quot; and IsTagInString(Param.Input[0].connectionPointID, &quot;defcp&quot;)))  &#xA;">
+					<VALUECONDITION Value="true">
+						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Kreisel" and ShapeList["id="+Param.Input[1].shapeID].family="Eckrad"]]></EXP>
+					</VALUECONDITION>
+					<COMMENTS Id="RDK:19503893" DesignTimeRemark="Kreisel-Eckrad" />
+					<SET Id="RDK:19503894" VarRef="zielhoehe">
+						<EXP><![CDATA[$=$item_1.EckradDefinition.Hoehe]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<SET Id="RDK:19503895" VarRef="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].KreiselDefinition.Hoehe">
+						<EXP><![CDATA[$=$zielhoehe]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<SET_STRUCT Id="RDK:19503896" VarRef="SSGParameter" ClearAll="True" ListRef="RueckgabeListe">
+						<PAR Name="Key">
+							<EXP><![CDATA[$C$ShapeId]]></EXP>
+						</PAR>
+						<PAR Name="Str">
+							<EXP><![CDATA[$=$item_0.id]]></EXP>
+						</PAR>
+						<PAR Name="Dbl" />
+						<PAR Name="Int" />
+						<PAR Name="Boo" />
+					</SET_STRUCT>
+					<SET_STRUCT Id="RDK:19503897" VarRef="SSGParameter" ClearAll="True" ListRef="RueckgabeListe">
+						<PAR Name="Key">
+							<EXP><![CDATA[$C$Hoehe]]></EXP>
+						</PAR>
+						<PAR Name="Str">
+							<EXP><![CDATA[$=$zielhoehe]]></EXP>
+						</PAR>
+						<PAR Name="Dbl" />
+						<PAR Name="Int" />
+						<PAR Name="Boo" />
+					</SET_STRUCT>
+				</GROUP>
+				<GROUP Id="RDK:19503918" Name="Filter" SubType="Generic" DesignTimeNotes="(ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].family=&quot;Gefaellestrecke&quot; And  (ShapeList[&quot;id=&quot;+Param.Input[1].shapeID].Rotationsklasse=&quot;Rotationsobjekt&quot;and IsTagInString(Param.Input[1].connectionPointID, &quot;defcp&quot;)))  &#xA;Or &#xA;(ShapeList[&quot;id=&quot;+Param.Input[1].shapeID].family=&quot;Gefaellestrecke&quot; And  (ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].Rotationsklasse=&quot;Rotationsobjekt&quot; and IsTagInString(Param.Input[0].connectionPointID, &quot;defcp&quot;)))  &#xA;">
+					<VALUECONDITION Value="true">
+						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Eckrad" and ShapeList["id="+Param.Input[1].shapeID].family="Kreisel"]]></EXP>
+					</VALUECONDITION>
+					<COMMENTS Id="RDK:19503913" DesignTimeRemark="Eckrad-Kreisel" />
+					<SET Id="RDK:19503914" VarRef="zielhoehe">
+						<EXP><![CDATA[$=$item_1.KreiselDefinition.Hoehe]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<SET Id="RDK:19503915" VarRef="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].EckradDefinition.Hoehe">
+						<EXP><![CDATA[$=$zielhoehe]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<SET_STRUCT Id="RDK:19503916" VarRef="SSGParameter" ClearAll="True" ListRef="RueckgabeListe">
+						<PAR Name="Key">
+							<EXP><![CDATA[$C$ShapeId]]></EXP>
+						</PAR>
+						<PAR Name="Str">
+							<EXP><![CDATA[$=$item_0.id]]></EXP>
+						</PAR>
+						<PAR Name="Dbl" />
+						<PAR Name="Int" />
+						<PAR Name="Boo" />
+					</SET_STRUCT>
+					<SET_STRUCT Id="RDK:19503917" VarRef="SSGParameter" ClearAll="True" ListRef="RueckgabeListe">
+						<PAR Name="Key">
+							<EXP><![CDATA[$C$Hoehe]]></EXP>
+						</PAR>
+						<PAR Name="Str">
+							<EXP><![CDATA[$=$zielhoehe]]></EXP>
+						</PAR>
+						<PAR Name="Dbl" />
+						<PAR Name="Int" />
+						<PAR Name="Boo" />
+					</SET_STRUCT>
+				</GROUP>
+				<GROUP Id="RDK:19510033" Name="Filter" SubType="Generic" DesignTimeNotes="(ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].family=&quot;Gefaellestrecke&quot; And  (ShapeList[&quot;id=&quot;+Param.Input[1].shapeID].Rotationsklasse=&quot;Rotationsobjekt&quot;and IsTagInString(Param.Input[1].connectionPointID, &quot;defcp&quot;)))  &#xA;Or &#xA;(ShapeList[&quot;id=&quot;+Param.Input[1].shapeID].family=&quot;Gefaellestrecke&quot; And  (ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].Rotationsklasse=&quot;Rotationsobjekt&quot; and IsTagInString(Param.Input[0].connectionPointID, &quot;defcp&quot;)))  &#xA;">
+					<VALUECONDITION Value="true">
+						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Eckrad" and ShapeList["id="+Param.Input[1].shapeID].family="Eckrad"]]></EXP>
+					</VALUECONDITION>
+					<COMMENTS Id="RDK:19510028" DesignTimeRemark="Eckrad-Eckrad" />
+					<SET Id="RDK:19510029" VarRef="zielhoehe">
+						<EXP><![CDATA[$=$item_1.EckradDefinition.Hoehe]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<SET Id="RDK:19510030" VarRef="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].EckradDefinition.Hoehe">
+						<EXP><![CDATA[$=$zielhoehe]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<SET_STRUCT Id="RDK:19510031" VarRef="SSGParameter" ClearAll="True" ListRef="RueckgabeListe">
+						<PAR Name="Key">
+							<EXP><![CDATA[$C$ShapeId]]></EXP>
+						</PAR>
+						<PAR Name="Str">
+							<EXP><![CDATA[$=$item_0.id]]></EXP>
+						</PAR>
+						<PAR Name="Dbl" />
+						<PAR Name="Int" />
+						<PAR Name="Boo" />
+					</SET_STRUCT>
+					<SET_STRUCT Id="RDK:19510032" VarRef="SSGParameter" ClearAll="True" ListRef="RueckgabeListe">
+						<PAR Name="Key">
+							<EXP><![CDATA[$C$Hoehe]]></EXP>
+						</PAR>
+						<PAR Name="Str">
+							<EXP><![CDATA[$=$zielhoehe]]></EXP>
+						</PAR>
+						<PAR Name="Dbl" />
+						<PAR Name="Int" />
+						<PAR Name="Boo" />
+					</SET_STRUCT>
+				</GROUP>
 			</FUNCTION>
 			<FUNCTION Id="RDK:19287453" Name="SetColorOfShape" InputTypeName="SSGParameter[]" ResultTypeName="boolean">
 				<GROUP Id="RDK:19287454" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
@@ -20557,7 +20736,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="Tooltip" />
 							<PAR Name="Styles" />
 							<PAR Name="Classes">
-								<EXP><![CDATA[$C$col-3]]></EXP>
+								<EXP><![CDATA[$C$col-2]]></EXP>
 							</PAR>
 							<PAR Name="Rules" />
 							<PAR Name="Image" />
@@ -20612,7 +20791,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="Tooltip" />
 							<PAR Name="Styles" />
 							<PAR Name="Classes">
-								<EXP><![CDATA[$C$col-3]]></EXP>
+								<EXP><![CDATA[$C$col-2]]></EXP>
 							</PAR>
 							<PAR Name="Rules" />
 							<PAR Name="Image" />