From fc34e0a2f737d960f806b4d6eb991496cf765a24 Mon Sep 17 00:00:00 2001
From: Simon Schmutzler <s.schmutzler@schoenenberger.de>
Date: Fri, 26 Apr 2024 13:22:01 +0200
Subject: [PATCH] =?UTF-8?q?F=C3=B6rderer=20mit=20Eigenschaft=20Auf/Ab=20ve?=
 =?UTF-8?q?rsehen,=20connection=20point=20Bezeichnung=20auf=20H=5F0/H=5F1?=
 =?UTF-8?q?=20angepasst?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SSG/shapes/props/Foerderer_Falsch.txt     |   4 +-
 .../SSG/shapes/props/Foerderer_Richtig.txt    |   4 +-
 .../SSG/shapes/props/s_Foerderer.txt          |   4 +-
 MAIN_SSG.rdx                                  | 365 +++++++++++-------
 4 files changed, 235 insertions(+), 142 deletions(-)

diff --git a/Editor2DLibrary/SSG/shapes/props/Foerderer_Falsch.txt b/Editor2DLibrary/SSG/shapes/props/Foerderer_Falsch.txt
index 2a0fdbc..5d3845f 100644
--- a/Editor2DLibrary/SSG/shapes/props/Foerderer_Falsch.txt
+++ b/Editor2DLibrary/SSG/shapes/props/Foerderer_Falsch.txt
@@ -28,7 +28,7 @@
       "zStep": "",
       "direction": 0.0,
       "linkClass": "Gefaellestrecke",
-      "label": "Oben",
+      "label": "H_1",
       "isDimension": true
     },
     {
@@ -47,7 +47,7 @@
       "zStep": "",
       "direction": 180.0,
       "linkClass": "Gefaellestrecke",
-      "label": "Unten",
+      "label": "H_0",
       "isDimension": true
     }
   ],
diff --git a/Editor2DLibrary/SSG/shapes/props/Foerderer_Richtig.txt b/Editor2DLibrary/SSG/shapes/props/Foerderer_Richtig.txt
index 9083021..34edae4 100644
--- a/Editor2DLibrary/SSG/shapes/props/Foerderer_Richtig.txt
+++ b/Editor2DLibrary/SSG/shapes/props/Foerderer_Richtig.txt
@@ -28,7 +28,7 @@
       "zStep": "",
       "direction": 0.0,
       "linkClass": "Gefaellestrecke",
-      "label": "Oben",
+      "label": "H_1",
       "isDimension": true
     },
     {
@@ -47,7 +47,7 @@
       "zStep": "",
       "direction": 180.0,
       "linkClass": "Gefaellestrecke",
-      "label": "Unten",
+      "label": "H_0",
       "isDimension": true
     }
   ],
diff --git a/Editor2DLibrary/SSG/shapes/props/s_Foerderer.txt b/Editor2DLibrary/SSG/shapes/props/s_Foerderer.txt
index 394405d..2343a7e 100644
--- a/Editor2DLibrary/SSG/shapes/props/s_Foerderer.txt
+++ b/Editor2DLibrary/SSG/shapes/props/s_Foerderer.txt
@@ -28,7 +28,7 @@
       "zStep": "",
       "direction": 0.0,
       "linkClass": "Gefaellestrecke",
-      "label": "Oben",
+      "label": "H_1",
       "isDimension": true
     },
     {
@@ -47,7 +47,7 @@
       "zStep": "",
       "direction": 180.0,
       "linkClass": "Gefaellestrecke",
-      "label": "Unten",
+      "label": "H_0",
       "isDimension": true
     }
   ],
diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 9900834..dee47ed 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -1,10 +1,10 @@
 <?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="m.stangl [ENTW-NB08]" ModDate="2024-04-24T17:03:36" LanguageVersion="2014.1.3.635" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-04-26T12:17:02" LanguageVersion="2014.1.3.635" />
 	<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">
-				<TYPE Id="RDK:313478" Name="SSGConnectionPoint" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:313478" Name="SSGConnectionPoint" Expanded="True" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:609117" Name="id" Type="string" />
 					<FIELD Id="RDK:313462" Name="x_M" Type="double" />
@@ -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" SubType="structure">
+				<TYPE Id="RDK:302581" Name="GefaelleType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:302571" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:880709" Name="L1" Type="double" />
@@ -72,7 +72,7 @@
 					<FIELD Id="RDK:18732232" Name="HoeheUnten" Type="double" />
 					<FIELD Id="RDK:18732250" Name="Delta_h" Type="double" DesignTimeRemark="Höhendifferenz" />
 				</TYPE>
-				<TYPE Id="RDK:18116690" Name="FoerdererType" SubType="structure">
+				<TYPE Id="RDK:18116690" Name="FoerdererType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18116683" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:18116696" Name="Typ" Type="string" DesignTimeRemark="Auf oder Ab" />
@@ -82,10 +82,10 @@
 					<FIELD Id="RDK:18116685" Name="winkel_f" Type="double" DesignTimeRemark="Winkel Förderer" />
 					<FIELD Id="RDK:18129301" Name="winkel_s" Type="double" DesignTimeRemark="Winkel Gefällestrecke" />
 					<FIELD Id="RDK:18598343" Name="Richtung" Type="integer" DesignTimeRemark="Richtung des Förderers (True: h0-&gt;h1, False: h1-&gt;h0)" />
-					<FIELD Id="RDK:18116686" Name="HoeheOben" Type="double" DesignTimeRemark="Anschlusspunkt Oben" />
+					<FIELD Id="RDK:18116686" Name="H_1" Type="double" DesignTimeRemark="Anschlusspunkt Oben" />
 					<FIELD Id="RDK:18116692" Name="HoeheFoerdererAnfang" Type="double" Suppressed="True" />
 					<FIELD Id="RDK:18116687" Name="HoeheFoerdererEnde" Type="double" Suppressed="True" />
-					<FIELD Id="RDK:18116694" Name="HoeheUnten" Type="double" DesignTimeRemark="Anschlusspunkt Unten" />
+					<FIELD Id="RDK:18116694" Name="H_0" Type="double" DesignTimeRemark="Anschlusspunkt Unten" />
 					<FIELD Id="RDK:18129303" Name="Delta_h" Type="double" DesignTimeRemark="Gesamthöhendifferenz" />
 					<FIELD Id="RDK:18164331" Name="Delta_hs" Type="double" DesignTimeRemark="Höhendifferenz Gefällestrecke" />
 					<FIELD Id="RDK:18164329" Name="Delta_hf" Type="double" DesignTimeRemark="Höhendifferenz Förderer" />
@@ -819,7 +819,7 @@
 					<FIELD Id="RDK:18753213" Name="Abstand (Kreiselachse A - Kreiselachse) in mm" Type="double" />
 					<FIELD Id="RDK:18753217" Name="Höhe in mm" Type="double" />
 				</TYPE>
-				<TYPE Id="RDK:18753223" Name="GefaellestreckeSEExportType" SubType="structure">
+				<TYPE Id="RDK:18753223" Name="GefaellestreckeSEExportType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18753221" Name="Länge in mm" Type="double" />
 					<FIELD Id="RDK:18753228" Name="Alpha_Strecke" Type="double" />
@@ -871,7 +871,7 @@
 				<FIELD Id="RDK:1007739" Name="Withdraw_Start" Type="double" />
 				<FIELD Id="RDK:1007740" Name="Withdraw_End" Type="double" />
 			</TYPE>
-			<TYPE Id="RDK:1345483" Name="InheritHeightType" SubType="structure" DesignTimeNotes="20231005 -1-">
+			<TYPE Id="RDK:1345483" Name="InheritHeightType" Expanded="True" SubType="structure" DesignTimeNotes="20231005 -1-">
 				<TYPE_VALUES />
 				<FIELD Id="RDK:1345484" Name="ParentIndex" Type="integer" />
 				<FIELD Id="RDK:1345485" Name="NewHoehe" Type="double" />
@@ -1041,6 +1041,8 @@
 			<VAR Id="RDK:1732132" Name="label" Type="string" Suppressed="True" DesignTimeRemark="Generated by RD" />
 			<VAR Id="RDK:1759312" Name="cp_label" Type="string" Suppressed="True" DesignTimeRemark="Generated by RD" />
 			<VAR Id="RDK:18295767" Name="L_s" Type="string" Suppressed="True" DesignTimeRemark="Generated by RD" />
+			<VAR Id="RDK:18777657" Name="HoeheOben" Type="string" DesignTimeRemark="Generated by RD" />
+			<VAR Id="RDK:18777660" Name="HoeheUnten" Type="string" DesignTimeRemark="Generated by RD" />
 		</GROUP>
 		<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
 			<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
@@ -4377,6 +4379,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="KreiselDefinition" />
 										<PAR Name="EckradDefinition" />
 										<PAR Name="GefaelleDefinition" />
+										<PAR Name="StreckeDefinition" />
 										<PAR Name="FoerdererDefinition" />
 										<PAR Name="WeicheDefinition" />
 										<PAR Name="BTMTBeladungDefinition" />
@@ -4442,7 +4445,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
-										<PAR Name="StreckeDefinition" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -6343,15 +6345,15 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<PAR Name="AdvancedOptions" />
 							</SET>
 						</VAR>
-						<VAR Id="RDK:18150246" Name="HoeheOben" Type="double" DesignTimeRemark="Höhe am oberen Anschlusspunkt">
+						<VAR Id="RDK:18150246" Name="h1" Type="double" DesignTimeRemark="Höhe am oberen Anschlusspunkt">
 							<SET Id="RDK:18150250" VarRef="Me">
-								<EXP><![CDATA[$=$Shape_Prototype.FoerdererDefinition.HoeheOben]]></EXP>
+								<EXP><![CDATA[$=$Shape_Prototype.FoerdererDefinition.H_1]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
 						</VAR>
-						<VAR Id="RDK:18150248" Name="HoeheUnten" Type="double" DesignTimeRemark="Höhe am unteren Anschlusspunkt">
+						<VAR Id="RDK:18150248" Name="h0" Type="double" DesignTimeRemark="Höhe am unteren Anschlusspunkt">
 							<SET Id="RDK:18150252" VarRef="Me">
-								<EXP><![CDATA[$=$Shape_Prototype.FoerdererDefinition.HoeheUnten]]></EXP>
+								<EXP><![CDATA[$=$Shape_Prototype.FoerdererDefinition.H_0]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
 						</VAR>
@@ -6377,10 +6379,10 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 					</CALLFUNCTION>
 					<IFTHENELSE Id="RDK:18589770">
 						<VALUECONDITION Value="true" Oper="OR">
-							<EXP><![CDATA[$=$IsEmpty(HoeheOben)]]></EXP>
+							<EXP><![CDATA[$=$IsEmpty(h0)]]></EXP>
 						</VALUECONDITION>
 						<VALUECONDITION Value="true">
-							<EXP><![CDATA[$=$IsEmpty(HoeheUnten)]]></EXP>
+							<EXP><![CDATA[$=$IsEmpty(h1)]]></EXP>
 						</VALUECONDITION>
 						<GROUP Id="RDK:18589769" SubType="Then">
 							<IFTHENELSE Id="RDK:18646868">
@@ -6403,61 +6405,53 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							<EXIT_PROCESS Id="RDK:18589768" BreakType="4" ExitStatus="0" />
 						</GROUP>
 					</IFTHENELSE>
-					<IFTHENELSE Id="RDK:18622568">
+					<IFTHENELSE Id="RDK:18622568" DesignTimeRemark="Richtung == 1: AUF">
 						<VALUECONDITION Value="true">
 							<EXP><![CDATA[$=$Richtung=1]]></EXP>
 						</VALUECONDITION>
 						<GROUP Id="RDK:18622569" SubType="Then">
-							<IFTHENELSE Id="RDK:18635361">
+							<COMMENTS Id="RDK:18622592" DesignTimeRemark="Fördertyp: Auf" />
+							<SET Id="RDK:18622610" VarRef="Shape_Prototype.FoerdererDefinition.Typ">
+								<EXP><![CDATA[$C$Auf]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+							<IFTHENELSE Id="RDK:18635361" DesignTimeRemark="Süd -&gt; Nord">
 								<VALUECONDITION Value="true">
-									<EXP><![CDATA[$=$HoeheUnten<HoeheOben]]></EXP>
+									<EXP><![CDATA[$=$h0<h1]]></EXP>
 								</VALUECONDITION>
 								<GROUP Id="RDK:18635362" SubType="Then">
-									<COMMENTS Id="RDK:18622592" DesignTimeRemark="Fördertyp: Auf" />
-									<SET Id="RDK:18622610" VarRef="Shape_Prototype.FoerdererDefinition.Typ">
-										<EXP><![CDATA[$C$Auf]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
 									<SET Id="RDK:18635378" VarRef="Shape_Prototype.text">
 										<EXP><![CDATA[$C$↟]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
 								<GROUP Id="RDK:18635363" SubType="Else">
-									<COMMENTS Id="RDK:18635380" DesignTimeRemark="Fördertyp: Ab" />
-									<SET Id="RDK:18635382" VarRef="Shape_Prototype.FoerdererDefinition.Typ">
-										<EXP><![CDATA[$C$Ab]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
 									<SET Id="RDK:18635384" VarRef="Shape_Prototype.text">
-										<EXP><![CDATA[$C$⇞]]></EXP>
+										<EXP><![CDATA[$C$↡]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
 							</IFTHENELSE>
 						</GROUP>
 						<GROUP Id="RDK:18622570" SubType="Else">
+							<COMMENTS Id="RDK:18635400" DesignTimeRemark="Fördertyp: Ab" />
+							<SET Id="RDK:18635401" VarRef="Shape_Prototype.FoerdererDefinition.Typ">
+								<EXP><![CDATA[$C$Ab]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
 							<IFTHENELSE Id="RDK:18635404">
 								<VALUECONDITION Value="true">
-									<EXP><![CDATA[$=$HoeheUnten>HoeheOben]]></EXP>
+									<EXP><![CDATA[$=$h0<h1]]></EXP>
 								</VALUECONDITION>
 								<GROUP Id="RDK:18635399" SubType="Then">
-									<COMMENTS Id="RDK:18635396" DesignTimeRemark="Fördertyp: Auf" />
-									<SET Id="RDK:18635397" VarRef="Shape_Prototype.FoerdererDefinition.Typ">
-										<EXP><![CDATA[$C$Auf]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
+									<COMMENTS Id="RDK:18769999" DesignTimeRemark="Süd -&gt; Nord" />
 									<SET Id="RDK:18635398" VarRef="Shape_Prototype.text">
-										<EXP><![CDATA[$C$↡]]></EXP>
+										<EXP><![CDATA[$C$⇞]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
 								<GROUP Id="RDK:18635403" SubType="Else">
-									<COMMENTS Id="RDK:18635400" DesignTimeRemark="Fördertyp: Ab" />
-									<SET Id="RDK:18635401" VarRef="Shape_Prototype.FoerdererDefinition.Typ">
-										<EXP><![CDATA[$C$Ab]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
+									<COMMENTS Id="RDK:18769995" DesignTimeRemark="Nord -&gt; Süd" />
 									<SET Id="RDK:18635402" VarRef="Shape_Prototype.text">
 										<EXP><![CDATA[$C$⇟]]></EXP>
 										<PAR Name="AdvancedOptions" />
@@ -6609,10 +6603,10 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							<EXP><![CDATA[$=$L1 < 0]]></EXP>
 						</VALUECONDITION>
 						<VALUECONDITION Value="true" Oper="OR">
-							<EXP><![CDATA[$=$IsEmpty(HoeheOben)]]></EXP>
+							<EXP><![CDATA[$=$IsEmpty(h0)]]></EXP>
 						</VALUECONDITION>
 						<VALUECONDITION Value="true">
-							<EXP><![CDATA[$=$IsEmpty(HoeheUnten)]]></EXP>
+							<EXP><![CDATA[$=$IsEmpty(h1)]]></EXP>
 						</VALUECONDITION>
 						<GROUP Id="RDK:18150193" SubType="Then">
 							<ACTION_CALL Id="RDK:18150230" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
@@ -6638,7 +6632,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 						</GROUP>
 						<GROUP Id="RDK:18150194" SubType="Else">
 							<SET Id="RDK:18587843" VarRef="Delta_h">
-								<EXP><![CDATA[$=$IIF(HoeheOben>HoeheUnten, HoeheOben-HoeheUnten, HoeheUnten-HoeheOben)]]></EXP>
+								<EXP><![CDATA[$=$IIF(h1>h0, h1-h0, h0-h1)]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
 							<IFTHENELSE Id="RDK:18729636">
@@ -6972,7 +6966,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="AdvancedOptions" />
 									</SET>
 									<SET Id="RDK:18216859" VarRef="Shape_Prototype.FoerdererDefinition.Delta_h">
-										<EXP><![CDATA[$=$HoeheOben-HoeheUnten]]></EXP>
+										<EXP><![CDATA[$=$h1-h0]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 									<SET Id="RDK:18656461" VarRef="Shape_Prototype.FoerdererDefinition.LH_fits" DesignTimeRemark="LH_fits ==False, nicht in Ordnung , rot dargestellt">
@@ -7172,13 +7166,28 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 				</FUNCTION>
 				<FUNCTION Id="RDK:18462370" Name="Calculate Foerderer Data" InputTypeName="string" ResultTypeName="SSGParameter[]">
 					<GROUP Id="RDK:18462326" Name="Local Variables" SubType="VarSet" IncludeDate="0">
-						<VAR Id="RDK:18462319" Name="shape_item" Type="Editor2DShapeType" />
+						<VAR Id="RDK:18462319" Name="shape_item" Type="Editor2DShapeType">
+							<SET Id="RDK:18823521" VarRef="Me">
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input]]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</VAR>
 						<VAR Id="RDK:18462320" Name="x_verhaeltnis" Type="double" DesignTimeRemark="Verhältnis von Förderstrecke und Gesamtlänge" />
 						<VAR Id="RDK:18462321" Name="winkel_f" Type="double" DesignTimeRemark="Winkel von Förderstrecke" />
 						<VAR Id="RDK:18462322" Name="winkel_s" Type="double" DesignTimeRemark="Winkel von Gefällestrecke" />
 						<VAR Id="RDK:18462323" Name="L1" Type="double" DesignTimeRemark="Gesamtlänge" />
-						<VAR Id="RDK:18462324" Name="HoeheOben" Type="double" DesignTimeRemark="Höhe am oberen Anschlusspunkt" />
-						<VAR Id="RDK:18462325" Name="HoeheUnten" Type="double" DesignTimeRemark="Höhe am unteren Anschlusspunkt" />
+						<VAR Id="RDK:18462324" Name="h1" Type="double" DesignTimeRemark="Höhe am nördlichen Anschlusspunkt">
+							<SET Id="RDK:18777658" VarRef="Me">
+								<EXP><![CDATA[$=$StrToDbl(shape_item.FoerdererDefinition.H_1)]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</VAR>
+						<VAR Id="RDK:18462325" Name="h0" Type="double" DesignTimeRemark="Höhe am südlichen Anschlusspunkt">
+							<SET Id="RDK:18777659" VarRef="Me">
+								<EXP><![CDATA[$=$shape_item.FoerdererDefinition.H_0]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</VAR>
 						<VAR Id="RDK:18474052" Name="RueckgabeListe" Type="SSGParameter[]" />
 					</GROUP>
 					<IFTHENELSE Id="RDK:18462329">
@@ -7193,10 +7202,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							<EXIT_PROCESS Id="RDK:18462327" BreakType="4" ExitStatus="0" />
 						</GROUP>
 					</IFTHENELSE>
-					<SET Id="RDK:18462330" VarRef="shape_item">
-						<EXP><![CDATA[$=$ShapeList["id="+Param.Input]]]></EXP>
-						<PAR Name="AdvancedOptions" />
-					</SET>
 					<SET Id="RDK:18462331" VarRef="winkel_s">
 						<EXP><![CDATA[$=$shape_item.FoerdererDefinition.winkel_s]]></EXP>
 						<PAR Name="AdvancedOptions" />
@@ -7209,20 +7214,26 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 						<EXP><![CDATA[$=$shape_item.FoerdererDefinition.L1]]></EXP>
 						<PAR Name="AdvancedOptions" />
 					</SET>
-					<SET Id="RDK:18462334" VarRef="HoeheOben">
+					<SET Id="RDK:18462334" VarRef="HoeheOben" Suppressed="True">
 						<EXP><![CDATA[$=$IIF(shape_item.FoerdererDefinition.HoeheOben>shape_item.FoerdererDefinition.HoeheUnten,shape_item.FoerdererDefinition.HoeheOben,shape_item.FoerdererDefinition.HoeheUnten)]]></EXP>
 						<PAR Name="AdvancedOptions" />
 					</SET>
-					<SET Id="RDK:18462335" VarRef="HoeheUnten">
+					<SET Id="RDK:18462335" VarRef="HoeheUnten" Suppressed="True">
 						<EXP><![CDATA[$=$IIF(shape_item.FoerdererDefinition.HoeheOben>shape_item.FoerdererDefinition.HoeheUnten,shape_item.FoerdererDefinition.HoeheUnten,shape_item.FoerdererDefinition.HoeheOben)]]></EXP>
 						<PAR Name="AdvancedOptions" />
 					</SET>
 					<IFTHENELSE Id="RDK:18462338">
 						<VALUECONDITION Value="true" Oper="OR">
-							<EXP><![CDATA[$=$IsEmpty(HoeheOben)]]></EXP>
+							<EXP><![CDATA[$=$IsEmpty(h1)]]></EXP>
+						</VALUECONDITION>
+						<VALUECONDITION Value="true" Oper="OR">
+							<EXP><![CDATA[$=$IsEmpty(h0)]]></EXP>
+						</VALUECONDITION>
+						<VALUECONDITION Value="true" Oper="OR">
+							<EXP><![CDATA[$=$h1=0]]></EXP>
 						</VALUECONDITION>
 						<VALUECONDITION Value="true">
-							<EXP><![CDATA[$=$IsEmpty(HoeheUnten)]]></EXP>
+							<EXP><![CDATA[$=$h0=0]]></EXP>
 						</VALUECONDITION>
 						<GROUP Id="RDK:18462337" SubType="Then">
 							<SET Id="RDK:18474080" VarRef="Param.Result">
@@ -7249,10 +7260,16 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							<EXP><![CDATA[$=$L1 < 0]]></EXP>
 						</VALUECONDITION>
 						<VALUECONDITION Value="true" Oper="OR">
-							<EXP><![CDATA[$=$IsEmpty(HoeheOben)]]></EXP>
+							<EXP><![CDATA[$=$IsEmpty(h1)]]></EXP>
+						</VALUECONDITION>
+						<VALUECONDITION Value="true" Oper="OR">
+							<EXP><![CDATA[$=$IsEmpty(h0)]]></EXP>
+						</VALUECONDITION>
+						<VALUECONDITION Value="true" Oper="OR">
+							<EXP><![CDATA[$=$h0=0]]></EXP>
 						</VALUECONDITION>
 						<VALUECONDITION Value="true">
-							<EXP><![CDATA[$=$IsEmpty(HoeheUnten)]]></EXP>
+							<EXP><![CDATA[$=$h1=0]]></EXP>
 						</VALUECONDITION>
 						<GROUP Id="RDK:18462341" SubType="Then">
 							<ACTION_CALL Id="RDK:18462339" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
@@ -7278,7 +7295,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 						</GROUP>
 						<GROUP Id="RDK:18462368" SubType="Else">
 							<SET Id="RDK:18462342" VarRef="x_verhaeltnis">
-								<EXP><![CDATA[$=$(Tan(DegToRad(winkel_f))+Tan(DegToRad(winkel_s)))/((HoeheOben-HoeheUnten)/L1+Tan(DegToRad(winkel_s)))]]></EXP>
+								<EXP><![CDATA[$=$(Tan(DegToRad(winkel_f))+Tan(DegToRad(winkel_s)))/((h1-h0)/L1+Tan(DegToRad(winkel_s)))]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
 							<IFTHENELSE Id="RDK:18462367">
@@ -7336,7 +7353,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										</PAR>
 										<PAR Name="Str" />
 										<PAR Name="Dbl">
-											<EXP><![CDATA[$=$HoeheOben-HoeheUnten]]></EXP>
+											<EXP><![CDATA[$=$h1-h0]]></EXP>
 										</PAR>
 										<PAR Name="Int" />
 										<PAR Name="Boo" />
@@ -7430,7 +7447,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										</PAR>
 										<PAR Name="Str" />
 										<PAR Name="Dbl">
-											<EXP><![CDATA[$=$HoeheOben-HoeheUnten]]></EXP>
+											<EXP><![CDATA[$=$h1-h0]]></EXP>
 										</PAR>
 										<PAR Name="Int" />
 										<PAR Name="Boo" />
@@ -10103,10 +10120,10 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 							</GROUP>
 							<GROUP Id="RDK:18116642" 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">
-									<EXP><![CDATA[$=$ShapeList["id=" + Shape_Prototype.id].GefaelleDefinition.HoeheOben <> Shape_Prototype.GefaelleDefinition.HoeheOben]]></EXP>
+									<EXP><![CDATA[$=$ShapeList["id=" + Shape_Prototype.id].FoerdererDefinition.H_1 <> Shape_Prototype.FoerdererDefinition.H_1]]></EXP>
 								</VALUECONDITION>
 								<VALUECONDITION Value="true">
-									<EXP><![CDATA[$=$ShapeList["id=" + Shape_Prototype.id].GefaelleDefinition.HoeheUnten <> Shape_Prototype.GefaelleDefinition.HoeheUnten]]></EXP>
+									<EXP><![CDATA[$=$ShapeList["id=" + Shape_Prototype.id].FoerdererDefinition.H_0 <> Shape_Prototype.FoerdererDefinition.H_0]]></EXP>
 								</VALUECONDITION>
 								<COMMENTS Id="RDK:18664165" DesignTimeRemark="Todo: Anpassung wie Gefaellestrecken später nötig" />
 								<SET_STRUCT Id="RDK:18116640" VarRef="InheritHeightData" ClearAll="True">
@@ -10115,10 +10132,10 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 									</PAR>
 									<PAR Name="NewHoehe" />
 									<PAR Name="NewHoeheOben">
-										<EXP><![CDATA[$=$Shape_Prototype.FoerdererDefinition.HoeheOben]]></EXP>
+										<EXP><![CDATA[$=$IIF(Shape_Prototype.FoerdererDefinition.H_1>Shape_Prototype.FoerdererDefinition.H_0, Shape_Prototype.FoerdererDefinition.H_1, Shape_Prototype.FoerdererDefinition.H_0)]]></EXP>
 									</PAR>
 									<PAR Name="NewHoeheUnten">
-										<EXP><![CDATA[$=$Shape_Prototype.FoerdererDefinition.HoeheUnten]]></EXP>
+										<EXP><![CDATA[$=$IIF(Shape_Prototype.FoerdererDefinition.H_0>Shape_Prototype.FoerdererDefinition.H_1, Shape_Prototype.FoerdererDefinition.H_0, Shape_Prototype.FoerdererDefinition.H_1)]]></EXP>
 									</PAR>
 									<PAR Name="Text">
 										<EXP><![CDATA[$C$^]]></EXP>
@@ -10146,10 +10163,10 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 									<EXP><![CDATA[$=$FieldAffected="L1"]]></EXP>
 								</VALUECONDITION>
 								<VALUECONDITION Value="true" Oper="OR">
-									<EXP><![CDATA[$=$FieldAffected = "HoeheUnten"]]></EXP>
+									<EXP><![CDATA[$=$FieldAffected = "H_0"]]></EXP>
 								</VALUECONDITION>
 								<VALUECONDITION Value="true" Oper="OR">
-									<EXP><![CDATA[$=$FieldAffected="HoeheOben"]]></EXP>
+									<EXP><![CDATA[$=$FieldAffected="G_1"]]></EXP>
 								</VALUECONDITION>
 								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$FieldAffected="winkel_s"]]></EXP>
@@ -11709,6 +11726,8 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 					<PAR Name="pinned" />
 					<PAR Name="selected" />
 					<PAR Name="includeInBOM" />
+					<PAR Name="StreckeDefinition" />
+					<PAR Name="FoerdererDefinition" />
 				</EXEC_ON_VALUES>
 			</FUNCTION>
 			<FUNCTION Id="RDK:295" Name="OnEditor2DDoubleClick" InputTypeName="Editor2DEventArgumentsTypeList" Options="(TYPEFUNCTION)">
@@ -11769,6 +11788,7 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 											<PAR Name="AdvancedOptions" />
 										</SET>
 										<EXEC_ON_VALUES Id="RDK:607193" VarRef="SSGConnectionPointList" ExecMode="1" FilterExp="Not IsTagInString(me.id, &quot;defcp&quot;)" AppendTo="Shape_Prototype.KreiselDefinition.M_Strecke" DesignTimeNotes="me.linkClass=&quot;Gefaellestrecke&quot;">
+											<PAR Name="id" />
 											<PAR Name="x_M">
 												<EXP><![CDATA[$=$Call("BOXpx2mm", NewListDbl(
 ' Param 1 Gesamtlänge in mm
@@ -11778,6 +11798,14 @@ ShapeTotalLength
 me.x
 ))-(Shape_Prototype.KreiselDefinition.Durchmesser/2)]]></EXP>
 											</PAR>
+											<PAR Name="x_S" />
+											<PAR Name="x" />
+											<PAR Name="y" />
+											<PAR Name="z" />
+											<PAR Name="direction" />
+											<PAR Name="linkClass" />
+											<PAR Name="label" />
+											<PAR Name="aktiv" />
 										</EXEC_ON_VALUES>
 									</GROUP>
 									<GROUP Id="RDK:607197" Name="Spannstation" SubType="Generic">
@@ -11795,6 +11823,15 @@ ShapeTotalLength
 me.x
 ))-(Shape_Prototype.KreiselDefinition.Durchmesser/2)]]></EXP>
 											</PAR>
+											<PAR Name="id" />
+											<PAR Name="x_M" />
+											<PAR Name="x" />
+											<PAR Name="y" />
+											<PAR Name="z" />
+											<PAR Name="direction" />
+											<PAR Name="linkClass" />
+											<PAR Name="label" />
+											<PAR Name="aktiv" />
 										</EXEC_ON_VALUES>
 									</GROUP>
 								</GROUP>
@@ -13256,7 +13293,7 @@ me.x
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:18221764" CaseType="0">
 						<EXP><![CDATA[$C$Foerderer]]></EXP>
-						<CALLFUNCTION Id="RDK:18221762">
+						<CALLFUNCTION Id="RDK:18221762" Suppressed="True">
 							<PAR Name="FuncName">
 								<EXP><![CDATA[$C$AddWeiche]]></EXP>
 							</PAR>
@@ -13812,10 +13849,10 @@ me.x
 								<GROUP Id="RDK:18131135" Name="Merkmale" SubType="Generic">
 									<SET_STRUCT Id="RDK:18131133" VarRef="FoerdererMerkmale" ClearAll="True">
 										<PAR Name="Höhe ETF oben in Meter">
-											<EXP><![CDATA[$=$StrReplace((ShapeItem.FoerdererDefinition.HoeheUnten + ShapeItem.FoerdererDefinition.Delta_hf)/1000, ",", ".")]]></EXP>
+											<EXP><![CDATA[$=$StrReplace((ShapeItem.FoerdererDefinition.H_1 + ShapeItem.FoerdererDefinition.Delta_hf)/1000, ",", ".")]]></EXP>
 										</PAR>
 										<PAR Name="Höhe ETF unten in Meter">
-											<EXP><![CDATA[$=$StrReplace(ShapeItem.FoerdererDefinition.HoeheUnten/1000, ",", ".")]]></EXP>
+											<EXP><![CDATA[$=$StrReplace(ShapeItem.FoerdererDefinition.H_1/1000, ",", ".")]]></EXP>
 										</PAR>
 										<PAR Name="Delta_hf in mm">
 											<EXP><![CDATA[$=$StrReplace(ShapeItem.FoerdererDefinition.Delta_hf, ",", ".")]]></EXP>
@@ -14364,16 +14401,16 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<GROUP Id="RDK:18226063" SubType="Then">
 						<IFTHENELSE Id="RDK:18226062">
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$label="Oben"]]></EXP>
+								<EXP><![CDATA[$=$label="H_1"]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:18226059" SubType="Then">
-								<SET Id="RDK:18226058" VarRef="ShapeList[&quot;id=&quot;+shapeId].FoerdererDefinition.HoeheOben">
+								<SET Id="RDK:18226058" VarRef="ShapeList[&quot;id=&quot;+shapeId].FoerdererDefinition.H_1">
 									<EXP><![CDATA[$=$hoehe]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</GROUP>
 							<GROUP Id="RDK:18226061" SubType="Else">
-								<SET Id="RDK:18226060" VarRef="ShapeList[&quot;id=&quot;+shapeId].FoerdererDefinition.HoeheUnten">
+								<SET Id="RDK:18226060" VarRef="ShapeList[&quot;id=&quot;+shapeId].FoerdererDefinition.H_0">
 									<EXP><![CDATA[$=$hoehe]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
@@ -14515,7 +14552,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						<VAR Id="RDK:1772341" Name="item_0" Type="Editor2DShapeType" />
 						<VAR Id="RDK:1772343" Name="item_1" Type="Editor2DShapeType" />
 						<VAR Id="RDK:1772345" Name="cpId" Type="string" />
-						<VAR Id="RDK:1772347" Name="cp_gefaellestrecke" Type="SSGConnectionPoint" />
+						<VAR Id="RDK:1772347" Name="cp_kreiselpartner" Type="SSGConnectionPoint" />
 						<VAR Id="RDK:1772349" Name="kreiselhoehe" Type="double" />
 						<VAR Id="RDK:1782656" Name="jsonValues" Type="string" />
 						<VAR Id="RDK:1783805" Name="UebergabeListe" Type="SSGParameter[]" />
@@ -14543,32 +14580,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<EXP><![CDATA[$=$item_0.KreiselDefinition.Hoehe]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
-							<SET Id="RDK:1802723" VarRef="cp_gefaellestrecke" DesignTimeNotes="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].connectionPoints[&quot;cpId=&quot;+cpId]">
-								<EXP><![CDATA[$=$FromJSON(ShapeList["id="+Param.Input[1].shapeID].connectionPoints)["cpId="+cpId]]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-							<SET_STRUCT Id="RDK:1802725" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
-								<PAR Name="Key">
-									<EXP><![CDATA[$C$Label]]></EXP>
-								</PAR>
-								<PAR Name="Str">
-									<EXP><![CDATA[$=$cp_gefaellestrecke.label]]></EXP>
-								</PAR>
-								<PAR Name="Dbl" />
-								<PAR Name="Int" />
-								<PAR Name="Boo" />
-							</SET_STRUCT>
-							<SET_STRUCT Id="RDK:1802727" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
-								<PAR Name="Key">
-									<EXP><![CDATA[$C$Hoehe]]></EXP>
-								</PAR>
-								<PAR Name="Str" />
-								<PAR Name="Dbl">
-									<EXP><![CDATA[$=$kreiselhoehe]]></EXP>
-								</PAR>
-								<PAR Name="Int" />
-								<PAR Name="Boo" />
-							</SET_STRUCT>
 							<SET_STRUCT Id="RDK:1802729" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
 								<PAR Name="Key">
 									<EXP><![CDATA[$C$ShapeId]]></EXP>
@@ -14580,6 +14591,59 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<PAR Name="Int" />
 								<PAR Name="Boo" />
 							</SET_STRUCT>
+							<SET_STRUCT Id="RDK:18792318" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+								<PAR Name="Key">
+									<EXP><![CDATA[$C$Hoehe]]></EXP>
+								</PAR>
+								<PAR Name="Str" />
+								<PAR Name="Dbl">
+									<EXP><![CDATA[$=$kreiselhoehe]]></EXP>
+								</PAR>
+								<PAR Name="Int" />
+								<PAR Name="Boo" />
+							</SET_STRUCT>
+							<SELECTCASE Id="RDK:18792286">
+								<EXP><![CDATA[$=$item_1.family]]></EXP>
+								<CASEGROUP Id="RDK:18792287" CaseType="0">
+									<EXP><![CDATA[$C$Foerderer]]></EXP>
+									<SET Id="RDK:18792296" VarRef="cp_kreiselpartner" DesignTimeNotes="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].connectionPoints[&quot;cpId=&quot;+cpId]">
+										<EXP><![CDATA[$=$FromJSON(ShapeList["id="+Param.Input[1].shapeID].connectionPoints)["cpId="+cpId]]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<SET_STRUCT Id="RDK:18792298" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+										<PAR Name="Key">
+											<EXP><![CDATA[$C$Label]]></EXP>
+										</PAR>
+										<PAR Name="Str">
+											<EXP><![CDATA[$=$cp_kreiselpartner.label]]></EXP>
+										</PAR>
+										<PAR Name="Dbl" />
+										<PAR Name="Int" />
+										<PAR Name="Boo" />
+									</SET_STRUCT>
+								</CASEGROUP>
+								<CASEGROUP Id="RDK:18792292" CaseType="0">
+									<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
+									<SET Id="RDK:1802723" VarRef="cp_kreiselpartner" DesignTimeNotes="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].connectionPoints[&quot;cpId=&quot;+cpId]">
+										<EXP><![CDATA[$=$FromJSON(ShapeList["id="+Param.Input[1].shapeID].connectionPoints)["cpId="+cpId]]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<SET_STRUCT Id="RDK:1802725" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+										<PAR Name="Key">
+											<EXP><![CDATA[$C$Label]]></EXP>
+										</PAR>
+										<PAR Name="Str">
+											<EXP><![CDATA[$=$cp_kreiselpartner.label]]></EXP>
+										</PAR>
+										<PAR Name="Dbl" />
+										<PAR Name="Int" />
+										<PAR Name="Boo" />
+									</SET_STRUCT>
+								</CASEGROUP>
+								<CASEGROUP Id="RDK:18792288" CaseType="1">
+									<EXP />
+								</CASEGROUP>
+							</SELECTCASE>
 							<CALLFUNCTION Id="RDK:1802731">
 								<PAR Name="FuncName">
 									<EXP><![CDATA[$C$SetGefaellestreckeHeight]]></EXP>
@@ -14625,33 +14689,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<EXP><![CDATA[$=$item_1.KreiselDefinition.Hoehe]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
-							<SET Id="RDK:1773565" VarRef="cp_gefaellestrecke" DesignTimeNotes="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].connectionPoints[&quot;cpId=&quot;+cpId]">
-								<EXP><![CDATA[$=$FromJSON(ShapeList["id="+Param.Input[0].shapeID].connectionPoints)["cpId="+cpId]]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-							<SET_STRUCT Id="RDK:1783810" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
-								<PAR Name="Key">
-									<EXP><![CDATA[$C$Label]]></EXP>
-								</PAR>
-								<PAR Name="Str">
-									<EXP><![CDATA[$=$cp_gefaellestrecke.label]]></EXP>
-								</PAR>
-								<PAR Name="Dbl" />
-								<PAR Name="Int" />
-								<PAR Name="Boo" />
-							</SET_STRUCT>
-							<SET_STRUCT Id="RDK:1789536" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
-								<PAR Name="Key">
-									<EXP><![CDATA[$C$Hoehe]]></EXP>
-								</PAR>
-								<PAR Name="Str" />
-								<PAR Name="Dbl">
-									<EXP><![CDATA[$=$kreiselhoehe]]></EXP>
-								</PAR>
-								<PAR Name="Int" />
-								<PAR Name="Boo" />
-							</SET_STRUCT>
-							<SET_STRUCT Id="RDK:1789538" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+							<SET_STRUCT Id="RDK:18792320" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
 								<PAR Name="Key">
 									<EXP><![CDATA[$C$ShapeId]]></EXP>
 								</PAR>
@@ -14662,6 +14700,59 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<PAR Name="Int" />
 								<PAR Name="Boo" />
 							</SET_STRUCT>
+							<SET_STRUCT Id="RDK:1802727" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+								<PAR Name="Key">
+									<EXP><![CDATA[$C$Hoehe]]></EXP>
+								</PAR>
+								<PAR Name="Str" />
+								<PAR Name="Dbl">
+									<EXP><![CDATA[$=$kreiselhoehe]]></EXP>
+								</PAR>
+								<PAR Name="Int" />
+								<PAR Name="Boo" />
+							</SET_STRUCT>
+							<SELECTCASE Id="RDK:18792316">
+								<EXP><![CDATA[$=$item_0.family]]></EXP>
+								<CASEGROUP Id="RDK:18792311" CaseType="0">
+									<EXP><![CDATA[$C$Foerderer]]></EXP>
+									<SET Id="RDK:18792309" VarRef="cp_kreiselpartner" DesignTimeNotes="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].connectionPoints[&quot;cpId=&quot;+cpId]">
+										<EXP><![CDATA[$=$FromJSON(ShapeList["id="+Param.Input[0].shapeID].connectionPoints)["cpId="+cpId]]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<SET_STRUCT Id="RDK:18792310" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+										<PAR Name="Key">
+											<EXP><![CDATA[$C$Label]]></EXP>
+										</PAR>
+										<PAR Name="Str">
+											<EXP><![CDATA[$=$cp_kreiselpartner.label]]></EXP>
+										</PAR>
+										<PAR Name="Dbl" />
+										<PAR Name="Int" />
+										<PAR Name="Boo" />
+									</SET_STRUCT>
+								</CASEGROUP>
+								<CASEGROUP Id="RDK:18792314" CaseType="0">
+									<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
+									<SET Id="RDK:18792312" VarRef="cp_kreiselpartner" DesignTimeNotes="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].connectionPoints[&quot;cpId=&quot;+cpId]">
+										<EXP><![CDATA[$=$FromJSON(ShapeList["id="+Param.Input[0].shapeID].connectionPoints)["cpId="+cpId]]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<SET_STRUCT Id="RDK:18792313" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+										<PAR Name="Key">
+											<EXP><![CDATA[$C$Label]]></EXP>
+										</PAR>
+										<PAR Name="Str">
+											<EXP><![CDATA[$=$cp_kreiselpartner.label]]></EXP>
+										</PAR>
+										<PAR Name="Dbl" />
+										<PAR Name="Int" />
+										<PAR Name="Boo" />
+									</SET_STRUCT>
+								</CASEGROUP>
+								<CASEGROUP Id="RDK:18792315" CaseType="1">
+									<EXP />
+								</CASEGROUP>
+							</SELECTCASE>
 							<CALLFUNCTION Id="RDK:1773534">
 								<PAR Name="FuncName">
 									<EXP><![CDATA[$C$SetGefaellestreckeHeight]]></EXP>
@@ -17725,7 +17816,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<EXP><![CDATA[$C$1]]></EXP>
 								</PAR>
 								<PAR Name="Prompt">
-									<EXP><![CDATA[$C$H0 -> H1]]></EXP>
+									<EXP><![CDATA[$C$Auf]]></EXP>
 								</PAR>
 								<PAR Name="Image">
 									<EXP><![CDATA[$C$icon:arrow-up]]></EXP>
@@ -17735,10 +17826,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</SET_STRUCT>
 							<SET_STRUCT Id="RDK:18610423" VarRef="RichtungItem" ClearAll="True" ListRef="RichtungList">
 								<PAR Name="Value">
-									<EXP><![CDATA[$C$-1]]></EXP>
+									<EXP><![CDATA[$C$0]]></EXP>
 								</PAR>
 								<PAR Name="Prompt">
-									<EXP><![CDATA[$C$H1 -> H0]]></EXP>
+									<EXP><![CDATA[$C$Ab]]></EXP>
 								</PAR>
 								<PAR Name="Image">
 									<EXP><![CDATA[$C$icon:arrow-down]]></EXP>
@@ -18006,14 +18097,14 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<EXP><![CDATA[$C$0]]></EXP>
 							</PAR>
 							<PAR Name="Id">
-								<EXP><![CDATA[$C$HoeheUnten]]></EXP>
+								<EXP><![CDATA[$C$H_0]]></EXP>
 							</PAR>
 							<PAR Name="ParentId" />
 							<PAR Name="Label">
-								<EXP><![CDATA[$C$H0 - Unterer Höhenwert]]></EXP>
+								<EXP><![CDATA[$C$H0]]></EXP>
 							</PAR>
 							<PAR Name="Field">
-								<EXP><![CDATA[$C$HoeheUnten]]></EXP>
+								<EXP><![CDATA[$C$H_0]]></EXP>
 							</PAR>
 							<PAR Name="Value" />
 							<PAR Name="Uom" />
@@ -18059,14 +18150,14 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<EXP><![CDATA[$C$0]]></EXP>
 							</PAR>
 							<PAR Name="Id">
-								<EXP><![CDATA[$C$HoeheOben]]></EXP>
+								<EXP><![CDATA[$C$H_1]]></EXP>
 							</PAR>
 							<PAR Name="ParentId" />
 							<PAR Name="Label">
-								<EXP><![CDATA[$C$H1 - Oberer Höhenwert]]></EXP>
+								<EXP><![CDATA[$C$H1]]></EXP>
 							</PAR>
 							<PAR Name="Field">
-								<EXP><![CDATA[$C$HoeheOben]]></EXP>
+								<EXP><![CDATA[$C$H_1]]></EXP>
 							</PAR>
 							<PAR Name="Value" />
 							<PAR Name="Uom" />
@@ -19151,6 +19242,8 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<PAR Name="LH_toleranz">
 						<EXP><![CDATA[$C$10]]></EXP>
 					</PAR>
+					<PAR Name="H_1" />
+					<PAR Name="H_0" />
 				</SET_STRUCT>
 			</GROUP>
 			<GROUP Id="RDK:1007716" Name="SSG_Shapes" SubType="Generic">