From e676711273ffb7a93d71a4e94103519637bdc6b4 Mon Sep 17 00:00:00 2001
From: Yuelin Wang <y.wang@schoenenberger.de>
Date: Fri, 19 Apr 2024 13:18:57 +0200
Subject: [PATCH] =?UTF-8?q?Kurv=20einf=C3=BCgen=20ist=20m=C3=B6glich,=20Ku?=
 =?UTF-8?q?rve=20verlinken=20muss=20weitergebaut=20werden.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SSG/shapes/props/s_Kurve_rechts_90.txt    |  14 +-
 MAIN_SSG.rdx                                  | 553 ++++++++++++++----
 2 files changed, 434 insertions(+), 133 deletions(-)

diff --git a/Editor2DLibrary/SSG/shapes/props/s_Kurve_rechts_90.txt b/Editor2DLibrary/SSG/shapes/props/s_Kurve_rechts_90.txt
index d1e8f97..66a8aa4 100644
--- a/Editor2DLibrary/SSG/shapes/props/s_Kurve_rechts_90.txt
+++ b/Editor2DLibrary/SSG/shapes/props/s_Kurve_rechts_90.txt
@@ -7,11 +7,11 @@
   "srcSVG": "SSG/shapes/svg/s_Kurve_rechts_90.xml",
   "width": 1511.811,
   "height": 1511.811,
-  "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(BACKGROUND)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)",
+  "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)",
   "connectionPoints": [
     {
       "id": "cp1",
-      "x": 1511.811,
+      "x": 1000.0,
       "y": 0.0,
       "z": 0.0,
       "xMin": "",
@@ -23,15 +23,15 @@
       "zMin": "",
       "zMax": "",
       "zStep": "",
-      "direction": 0.0,
+      "direction": 90.0,
       "linkClass": "Gefaellestrecke",
       "label": "Unten",
       "isDimension": true
     },
     {
       "id": "cp2",
-      "x": 1511.811,
-      "y": 1511.811,
+      "x": 1000.0,
+      "y": 1000.0,
       "z": 0.0,
       "xMin": "",
       "xMax": "",
@@ -42,11 +42,11 @@
       "zMin": "",
       "zMax": "",
       "zStep": "",
-      "direction": 0.0,
+      "direction": 180.0,
       "linkClass": "Gefaellestrecke",
       "label": "Oben",
       "isDimension": true
     }
   ],
-  "eventClass": "OnInserted,OnPasted,OnLinked"
+  "eventClass": "OnInserted,OnPasted,OnLinked,OnDoubleclick"
 }
\ No newline at end of file
diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index c3adbd9..40b2b5b 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="y.wang [ANGEBOT-NB02]" ModDate="2024-04-18T14:57:23" LanguageVersion="2014.1.3.635" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="y.wang [ANGEBOT-NB02]" ModDate="2024-04-19T13:06:12" 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">
@@ -17,7 +17,7 @@
 					<FIELD Id="RDK:313476" Name="label" Type="string" />
 					<FIELD Id="RDK:721671" Name="aktiv" Type="boolean" />
 				</TYPE>
-				<TYPE Id="RDK:26388" Name="KreiselType" SubType="structure">
+				<TYPE Id="RDK:26388" Name="KreiselType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:95024" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:26389" Name="AbstandMS" Type="double" />
@@ -64,7 +64,7 @@
 					<FIELD Id="RDK:302575" Name="n_Sep" Type="integer" />
 					<FIELD Id="RDK:302576" Name="n_Scan" Type="integer" />
 				</TYPE>
-				<TYPE Id="RDK:18732236" Name="StreckeType" SubType="structure">
+				<TYPE Id="RDK:18732236" Name="StreckeType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18732225" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:18732226" Name="L1" Type="double" />
@@ -101,7 +101,7 @@
 					<FIELD Id="RDK:973716" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:973714" Name="Weichenart" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:1652525" Name="BTMTBeladungType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:1652525" Name="BTMTBeladungType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:1652521" Name="AbstandMS" Type="double" Suppressed="True" />
 					<FIELD Id="RDK:1652522" Name="Hoehe" Type="double" />
@@ -109,7 +109,7 @@
 					<FIELD Id="RDK:1657744" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:1652524" Name="Durchmesser" Type="double" Suppressed="True" />
 				</TYPE>
-				<TYPE Id="RDK:16525251" Name="BTMTEntladungType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:16525251" Name="BTMTEntladungType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:16525221" Name="Hoehe" Type="double" />
 					<FIELD Id="RDK:16525231" Name="Drehung" Type="integer" DesignTimeNotes="1= im Uhrzeigersinn=rechts&#xD;&#xA;-1= Gegen Uhrzeigersinn=links" />
@@ -129,12 +129,13 @@
 					<FIELD Id="RDK:1652536" Name="BTMTBeladungDefinition" Type="BTMTBeladungType" />
 					<FIELD Id="RDK:16525361" Name="BTMTEntladungDefinition" Type="BTMTEntladungType" />
 				</TYPE>
-				<TYPE Id="RDK:18530527" Name="SSG_ShapeType_limit" SubType="structure">
+				<TYPE Id="RDK:18530527" Name="SSG_ShapeType_limit" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18530520" Name="KreiselDefinition" Type="KreiselType" />
 					<FIELD Id="RDK:18530521" Name="EckradDefinition" Type="EckradType" />
 					<FIELD Id="RDK:18530522" Name="GefaelleDefinition" Type="GefaelleType" />
 					<FIELD Id="RDK:18530523" Name="FoerdererDefinition" Type="FoerdererType" />
+					<FIELD Id="RDK:18732357" Name="StreckeDefinition" Type="StreckeType" />
 				</TYPE>
 				<TYPE Id="RDK:1783792" Name="SSGParameter" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
@@ -144,7 +145,7 @@
 					<FIELD Id="RDK:1783800" Name="Int" Type="integer" />
 					<FIELD Id="RDK:1783798" Name="Boo" Type="boolean" />
 				</TYPE>
-				<TYPE Id="RDK:18530545" Name="SSG_Limits" SubType="structure">
+				<TYPE Id="RDK:18530545" Name="SSG_Limits" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18530548" Name="Kreisel_top" Type="KreiselType" />
 					<FIELD Id="RDK:18530546" Name="Kreisel_bot" Type="KreiselType" />
@@ -152,6 +153,8 @@
 					<FIELD Id="RDK:18530552" Name="Eckrad_bot" Type="EckradType" />
 					<FIELD Id="RDK:18530556" Name="Gefaelle_top" Type="GefaelleType" />
 					<FIELD Id="RDK:18530554" Name="Gefaelle_bot" Type="GefaelleType" />
+					<FIELD Id="RDK:18732359" Name="Strecke_top" Type="StreckeType" />
+					<FIELD Id="RDK:18732361" Name="Strecke_bot" Type="StreckeType" />
 					<FIELD Id="RDK:18530558" Name="Foerderer_auf_top" Type="FoerdererType" />
 					<FIELD Id="RDK:18530560" Name="Foerderer_auf_bot" Type="FoerdererType" />
 					<FIELD Id="RDK:18598081" Name="Foerderer_ab_top" Type="FoerdererType" />
@@ -754,14 +757,18 @@
 					<FIELD Id="RDK:952180" Name="Anzahl der Rampen" Type="string" />
 					<FIELD Id="RDK:1065211" Name="Höhe in m" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:903598" Name="GefaellestreckeMerkmaleType" SubType="structure">
+				<TYPE Id="RDK:903598" Name="GefaellestreckeMerkmaleType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:903599" Name="Anzahl Zusatzseparatoren" Type="string" />
 					<FIELD Id="RDK:18131152" Name="Gesamtanzahl Separatoren" Type="string" />
 					<FIELD Id="RDK:903600" Name="Länge in Meter" Type="string" />
 					<FIELD Id="RDK:1674242" Name="Anzahl der Scanner" Type="integer" />
 				</TYPE>
-				<TYPE Id="RDK:18111807" Name="FoerdererMerkmaleType" SubType="structure">
+				<TYPE Id="RDK:18732296" Name="StreckeMerkmaleType" Expanded="True" SubType="structure">
+					<TYPE_VALUES />
+					<FIELD Id="RDK:18732294" Name="Länge in Meter" Type="string" />
+				</TYPE>
+				<TYPE Id="RDK:18111807" Name="FoerdererMerkmaleType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18131140" Name="Höhe ETF oben in Meter" Type="string" />
 					<FIELD Id="RDK:18131142" Name="Höhe ETF unten in Meter" Type="string" />
@@ -810,7 +817,7 @@
 				<FIELD Id="RDK:1345489" Name="NewHoeheUnten" Type="double" />
 				<FIELD Id="RDK:1370529" Name="Text" Type="string" />
 			</TYPE>
-			<TYPE Id="RDK:1529401" Name="IndirectConnGefaellestreckeType" SubType="structure" HasArrayType="True" DesignTimeNotes="20231011 -1-">
+			<TYPE Id="RDK:1529401" Name="IndirectConnGefaellestreckeType" Expanded="True" SubType="structure" HasArrayType="True" DesignTimeNotes="20231011 -1-">
 				<TYPE_VALUES />
 				<FIELD Id="RDK:1529402" Name="Id" Type="string" />
 				<FIELD Id="RDK:1529403" Name="Cp" Type="string" />
@@ -877,6 +884,7 @@
 				<VAR Id="RDK:1810765" Name="Render_BTMTBeladung" Type="MUIPanelType[]" />
 				<VAR Id="RDK:18107651" Name="Render_BTMTEntladung" Type="MUIPanelType[]" />
 				<VAR Id="RDK:397368" Name="Render_Gefaelle" Type="MUIPanelType[]" />
+				<VAR Id="RDK:18732363" Name="Render_Strecke" Type="MUIPanelType[]" />
 				<VAR Id="RDK:18119699" Name="Render_Foerderer" Type="MUIPanelType[]" />
 				<VAR Id="RDK:973744" Name="Render_Weiche" Type="MUIPanelType[]" />
 				<VAR Id="RDK:532690" Name="Render_CP" Type="MUIPanelType[]" />
@@ -965,11 +973,13 @@
 			<VAR Id="RDK:1710591" Name="cp" Type="string" DesignTimeRemark="Generated by RD" />
 			<VAR Id="RDK:1711732" Name="cp_gfs" Type="string" DesignTimeRemark="Generated by RD" />
 			<VAR Id="RDK:1712885" Name="gefaellestrecke" Type="Editor2DShapeType" DesignTimeRemark="Generated by RD" />
+			<VAR Id="RDK:18732365" Name="strecke" Type="Editor2DShapeType" />
 			<VAR Id="RDK:18115984" Name="foerderer" Type="Editor2DShapeType" />
 			<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:1783790" Name="stringList" Type="string" DesignTimeRemark="Generated by RD" />
 			<VAR Id="RDK:18295767" Name="L_s" Type="string" Suppressed="True" DesignTimeRemark="Generated by RD" />
+			<VAR Id="RDK:18732561" Name="kreiselhoehe" Type="string" DesignTimeRemark="Generated by RD" />
 		</GROUP>
 		<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
 			<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
@@ -3739,6 +3749,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
+										<PAR Name="StreckeDefinition" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -3896,6 +3907,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
+										<PAR Name="StreckeDefinition" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -4210,6 +4222,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
+										<PAR Name="StreckeDefinition" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -4367,6 +4380,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
+										<PAR Name="StreckeDefinition" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -5338,6 +5352,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							<PAR Name="pinned" />
 							<PAR Name="selected" />
 							<PAR Name="includeInBOM" />
+							<PAR Name="StreckeDefinition" />
 						</EXEC_ON_VALUES>
 						<FOREACHLOOP Id="RDK:1007456" ItemVarRef="PolyLineShapeItem" ByRefMode="True">
 							<PAR Name="ArrayValueExp">
@@ -5551,6 +5566,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<PAR Name="BTMTBeladungDefinition" />
 								<PAR Name="BTMTEntladungDefinition" />
 								<PAR Name="FoerdererDefinition" />
+								<PAR Name="StreckeDefinition" />
 							</SET_STRUCT>
 						</FOREACHLOOP>
 					</FUNCTION>
@@ -6208,6 +6224,9 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 						<CASEGROUP Id="RDK:18591707" CaseType="0">
 							<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
 						</CASEGROUP>
+						<CASEGROUP Id="RDK:18732369" CaseType="0">
+							<EXP><![CDATA[$C$Strecke]]></EXP>
+						</CASEGROUP>
 						<CASEGROUP Id="RDK:18591709" CaseType="0">
 							<EXP><![CDATA[$C$Foerderer]]></EXP>
 							<IFTHENELSE Id="RDK:18591713">
@@ -9695,6 +9714,114 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 						</CASEGROUP>
 					</SELECTCASE>
 				</FUNCTION>
+				<FUNCTION Id="RDK:18732414" Name="StreckeUI">
+					<ACTION_CALL Id="RDK:18732395" Name="RDEngineering_ModernUIRender">
+						<PAR Name="RDLibraryName">
+							<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+						</PAR>
+						<PAR Name="RenderList">
+							<EXP><![CDATA[$=$Render_Strecke]]></EXP>
+						</PAR>
+						<PAR Name="BindingMode">
+							<EXP><![CDATA[$C$0]]></EXP>
+						</PAR>
+						<PAR Name="InputData">
+							<EXP><![CDATA[$=$Shape_Prototype.StreckeDefinition]]></EXP>
+						</PAR>
+						<PAR Name="CSSStyle" />
+						<PAR Name="RDActionTimeOut" />
+						<PAR Name="ButtonPressed">
+							<EXP><![CDATA[$V$Button]]></EXP>
+						</PAR>
+						<PAR Name="FieldAffected">
+							<EXP><![CDATA[$V$FieldAffected]]></EXP>
+						</PAR>
+						<PAR Name="IndexAffected">
+							<EXP><![CDATA[$V$IndexAffected]]></EXP>
+						</PAR>
+						<PAR Name="EventData">
+							<EXP><![CDATA[$V$EventData]]></EXP>
+						</PAR>
+						<PAR Name="Options" />
+						<PAR Name="ProfileName" />
+					</ACTION_CALL>
+					<SELECTCASE Id="RDK:18732413">
+						<EXP><![CDATA[$=$Button]]></EXP>
+						<CASEGROUP Id="RDK:18732406" CaseType="0">
+							<EXP><![CDATA[$C$OK]]></EXP>
+							<GROUP Id="RDK:18732401" Name="Write Properties" SubType="Generic">
+								<SET Id="RDK:18732398" VarRef="Shape_Prototype.height">
+									<EXP><![CDATA[$=$Shape_Prototype.StreckeDefinition.L1]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<CALLFUNCTION Id="RDK:18732399">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$CreatePrototype_Strecke]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+								<CALLFUNCTION Id="RDK:18732400">
+									<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:18732404" Name="Strecke 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>
+								</VALUECONDITION>
+								<VALUECONDITION Value="true">
+									<EXP><![CDATA[$=$ShapeList["id=" + Shape_Prototype.id].GefaelleDefinition.HoeheUnten <> Shape_Prototype.GefaelleDefinition.HoeheUnten]]></EXP>
+								</VALUECONDITION>
+								<SET_STRUCT Id="RDK:18732402" VarRef="InheritHeightData" ClearAll="True">
+									<PAR Name="ParentIndex">
+										<EXP><![CDATA[$=$i]]></EXP>
+									</PAR>
+									<PAR Name="NewHoehe" />
+									<PAR Name="NewHoeheOben">
+										<EXP><![CDATA[$=$Shape_Prototype.StreckeDefinition.HoeheOben]]></EXP>
+									</PAR>
+									<PAR Name="NewHoeheUnten">
+										<EXP><![CDATA[$=$Shape_Prototype.StreckeDefinition.HoeheUnten]]></EXP>
+									</PAR>
+									<PAR Name="Text">
+										<EXP><![CDATA[$C$^]]></EXP>
+									</PAR>
+								</SET_STRUCT>
+								<CALLFUNCTION Id="RDK:18732403">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$InheritHeight]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$InheritHeightData]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+							</GROUP>
+							<EXIT_PROCESS Id="RDK:18732405" BreakType="3" ExitStatus="0" />
+						</CASEGROUP>
+						<CASEGROUP Id="RDK:18732412" CaseType="0">
+							<EXP><![CDATA[$C$CLOSEPOPUP]]></EXP>
+							<EXIT_PROCESS Id="RDK:18732411" BreakType="3" ExitStatus="0" />
+						</CASEGROUP>
+					</SELECTCASE>
+				</FUNCTION>
 				<FUNCTION Id="RDK:18116648" Name="FoerdererUI">
 					<GROUP Id="RDK:18139659" Name="Update Controls" SubType="Generic" />
 					<ACTION_CALL Id="RDK:18116636" Name="RDEngineering_ModernUIRender">
@@ -11085,6 +11212,54 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 							</ACTION_CALL>
 						</GROUP>
 					</CASEGROUP>
+					<CASEGROUP Id="RDK:18732210" CaseType="0">
+						<EXP><![CDATA[$C$Strecke]]></EXP>
+						<GROUP Id="RDK:18732204" Name="UI" SubType="Generic">
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Param.Input[0].class<>"OnPasted"]]></EXP>
+							</VALUECONDITION>
+							<SET Id="RDK:18732203" VarRef="Shape_Prototype.StreckeDefinition">
+								<EXP><![CDATA[$=$StreckeData_defaults]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</GROUP>
+						<SET Id="RDK:18732205" VarRef="Shape_Prototype.Rotationsklasse">
+							<EXP><![CDATA[$C$Rotationsobjekt]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:18732206" VarRef="Shape_Prototype.layer">
+							<EXP><![CDATA[$C$Strecke]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:18732207" VarRef="Shape_Prototype.StreckeDefinition.Beschreibung">
+							<EXP><![CDATA[$=$Shape_Prototype.name]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<CALLFUNCTION Id="RDK:18732208">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$CreatePrototype_Strecke]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+						<CALLFUNCTION Id="RDK:18732209">
+							<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>
+					</CASEGROUP>
 					<CASEGROUP Id="RDK:18116664" CaseType="0">
 						<EXP><![CDATA[$C$Foerderer]]></EXP>
 						<GROUP Id="RDK:18410178" Name="UI" SubType="Generic">
@@ -11254,54 +11429,6 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 							<PAR Name="Options" />
 						</CALLFUNCTION>
 					</CASEGROUP>
-					<CASEGROUP Id="RDK:18732210" CaseType="0">
-						<EXP><![CDATA[$C$Strecke]]></EXP>
-						<GROUP Id="RDK:18732204" Name="UI" SubType="Generic">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$Param.Input[0].class<>"OnPasted"]]></EXP>
-							</VALUECONDITION>
-							<SET Id="RDK:18732203" VarRef="Shape_Prototype.StreckeDefinition">
-								<EXP><![CDATA[$=$StreckeData_defaults]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-						</GROUP>
-						<SET Id="RDK:18732205" VarRef="Shape_Prototype.Rotationsklasse" Suppressed="True">
-							<EXP><![CDATA[$C$Rotationsobjekt]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:18732206" VarRef="Shape_Prototype.layer">
-							<EXP><![CDATA[$C$Strecke]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:18732207" VarRef="Shape_Prototype.StreckeDefinition.Beschreibung">
-							<EXP><![CDATA[$=$Shape_Prototype.name]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<CALLFUNCTION Id="RDK:18732208">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$CreatePrototype_Strecke]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
-						<CALLFUNCTION Id="RDK:18732209">
-							<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>
-					</CASEGROUP>
 					<CASEGROUP Id="RDK:18107690" CaseType="0">
 						<EXP><![CDATA[$C$BTMTEntladung]]></EXP>
 						<GROUP Id="RDK:18410186" Name="UI" SubType="Generic">
@@ -12829,21 +12956,117 @@ me.x
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:1606858" CaseType="0">
 						<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
-						<CALLFUNCTION Id="RDK:1608528">
+						<IFTHENELSE Id="RDK:18735202">
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Kreisel"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Kreisel"]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:18735222" SubType="Then">
+								<CALLFUNCTION Id="RDK:1608528">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$AddWeiche]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$Param.Input]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+								<CALLFUNCTION Id="RDK:1698067">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$SetHeightOnConnect]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$Param.Input]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$RückgabeListe]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+								<IFTHENELSE Id="RDK:18397881">
+									<VALUECONDITION Value="false">
+										<EXP><![CDATA[$=$IsEmpty(RückgabeListe)]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:18397897" SubType="Then">
+										<SET Id="RDK:18399135" VarRef="shape_id">
+											<EXP><![CDATA[$=$RückgabeListe["key=ShapeId"].Str]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<IFTHENELSE Id="RDK:18535115">
+											<VALUECONDITION Value="true" Oper="OR">
+												<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Gefaellestrecke"]]></EXP>
+											</VALUECONDITION>
+											<VALUECONDITION Value="true">
+												<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Gefaellestrecke"]]></EXP>
+											</VALUECONDITION>
+											<GROUP Id="RDK:18535114" SubType="Then">
+												<IFTHENELSE Id="RDK:18535113">
+													<VALUECONDITION Value="true">
+														<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Gefaellestrecke"]]></EXP>
+													</VALUECONDITION>
+													<GROUP Id="RDK:18535110" SubType="Then">
+														<CALLFUNCTION Id="RDK:18535109">
+															<PAR Name="FuncName">
+																<EXP><![CDATA[$C$Check_LH_fits_gefaelle]]></EXP>
+															</PAR>
+															<PAR Name="InputExp">
+																<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
+															</PAR>
+															<PAR Name="ResultRef">
+																<EXP><![CDATA[$V$]]></EXP>
+															</PAR>
+															<PAR Name="Options" />
+														</CALLFUNCTION>
+													</GROUP>
+													<GROUP Id="RDK:18535112" SubType="Else">
+														<CALLFUNCTION Id="RDK:18535111">
+															<PAR Name="FuncName">
+																<EXP><![CDATA[$C$Check_LH_fits_gefaelle]]></EXP>
+															</PAR>
+															<PAR Name="InputExp">
+																<EXP><![CDATA[$=$Param.Input[1].shapeID]]></EXP>
+															</PAR>
+															<PAR Name="ResultRef">
+																<EXP><![CDATA[$V$]]></EXP>
+															</PAR>
+															<PAR Name="Options" />
+														</CALLFUNCTION>
+													</GROUP>
+												</IFTHENELSE>
+											</GROUP>
+										</IFTHENELSE>
+									</GROUP>
+								</IFTHENELSE>
+							</GROUP>
+							<GROUP Id="RDK:18737218" SubType="Else">
+								<ACTION_CALL Id="RDK:18737222" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
+									<PAR Name="RDLibraryName">
+										<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+									</PAR>
+									<PAR Name="MsgText">
+										<EXP><![CDATA[$C$Die zwei Shapes können nicht verbunden werden.]]></EXP>
+									</PAR>
+									<PAR Name="MsgStyle" />
+									<PAR Name="BtnLayout" />
+									<PAR Name="MsgCaption" />
+									<PAR Name="BaloonType" />
+									<PAR Name="BtnPressed">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+								</ACTION_CALL>
+							</GROUP>
+						</IFTHENELSE>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:18732456" CaseType="0">
+						<EXP><![CDATA[$C$Strecke]]></EXP>
+						<CALLFUNCTION Id="RDK:18732445">
 							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$AddWeiche]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$Param.Input]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
-						<CALLFUNCTION Id="RDK:1698067">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$SetHeightOnConnect]]></EXP>
+								<EXP><![CDATA[$C$SetHeightOfStreckeOnConnect]]></EXP>
 							</PAR>
 							<PAR Name="InputExp">
 								<EXP><![CDATA[$=$Param.Input]]></EXP>
@@ -12853,60 +13076,6 @@ me.x
 							</PAR>
 							<PAR Name="Options" />
 						</CALLFUNCTION>
-						<IFTHENELSE Id="RDK:18397881">
-							<VALUECONDITION Value="false">
-								<EXP><![CDATA[$=$IsEmpty(RückgabeListe)]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:18397897" SubType="Then">
-								<SET Id="RDK:18399135" VarRef="shape_id">
-									<EXP><![CDATA[$=$RückgabeListe["key=ShapeId"].Str]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<IFTHENELSE Id="RDK:18535115">
-									<VALUECONDITION Value="true" Oper="OR">
-										<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Gefaellestrecke"]]></EXP>
-									</VALUECONDITION>
-									<VALUECONDITION Value="true">
-										<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Gefaellestrecke"]]></EXP>
-									</VALUECONDITION>
-									<GROUP Id="RDK:18535114" SubType="Then">
-										<IFTHENELSE Id="RDK:18535113">
-											<VALUECONDITION Value="true">
-												<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Gefaellestrecke"]]></EXP>
-											</VALUECONDITION>
-											<GROUP Id="RDK:18535110" SubType="Then">
-												<CALLFUNCTION Id="RDK:18535109">
-													<PAR Name="FuncName">
-														<EXP><![CDATA[$C$Check_LH_fits_gefaelle]]></EXP>
-													</PAR>
-													<PAR Name="InputExp">
-														<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
-													</PAR>
-													<PAR Name="ResultRef">
-														<EXP><![CDATA[$V$]]></EXP>
-													</PAR>
-													<PAR Name="Options" />
-												</CALLFUNCTION>
-											</GROUP>
-											<GROUP Id="RDK:18535112" SubType="Else">
-												<CALLFUNCTION Id="RDK:18535111">
-													<PAR Name="FuncName">
-														<EXP><![CDATA[$C$Check_LH_fits_gefaelle]]></EXP>
-													</PAR>
-													<PAR Name="InputExp">
-														<EXP><![CDATA[$=$Param.Input[1].shapeID]]></EXP>
-													</PAR>
-													<PAR Name="ResultRef">
-														<EXP><![CDATA[$V$]]></EXP>
-													</PAR>
-													<PAR Name="Options" />
-												</CALLFUNCTION>
-											</GROUP>
-										</IFTHENELSE>
-									</GROUP>
-								</IFTHENELSE>
-							</GROUP>
-						</IFTHENELSE>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:18221764" CaseType="0">
 						<EXP><![CDATA[$C$Foerderer]]></EXP>
@@ -13927,6 +14096,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<PAR Name="pinned" />
 								<PAR Name="selected" />
 								<PAR Name="includeInBOM" />
+								<PAR Name="StreckeDefinition" />
 							</SET_STRUCT>
 							<ACTION_CALL Id="RDK:1589028" Name="RDEngineering_E2DLinkShapes">
 								<PAR Name="RDLibraryName">
@@ -14365,6 +14535,137 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<PAR Name="AdvancedOptions" />
 				</SET>
 			</FUNCTION>
+			<FUNCTION Id="RDK:18732540" Name="SetHeightOfStreckeOnConnect" InputTypeName="Editor2DEventArgumentsTypeList" ResultTypeName="SSGParameter[]">
+				<GROUP Id="RDK:18732536" 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="Gefaellestrecke" and ShapeList["id="+Param.Input[1].shapeID].family="Strecke") or
+(ShapeList["id="+Param.Input[1].shapeID].family="Gefaellestrecke" and ShapeList["id="+Param.Input[0].shapeID].family="Strecke")]]></EXP>
+					</VALUECONDITION>
+					<GROUP Id="RDK:18732508" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
+						<VAR Id="RDK:18732500" Name="item_0" Type="Editor2DShapeType" />
+						<VAR Id="RDK:18732501" Name="item_1" Type="Editor2DShapeType" />
+						<VAR Id="RDK:18732502" Name="cpId" Type="string" />
+						<VAR Id="RDK:18732503" Name="cp_gefaellestrecke" Type="SSGConnectionPoint" />
+						<VAR Id="RDK:18732563" Name="streckenhoehe" Type="double" />
+						<VAR Id="RDK:18732504" Name="sto" Type="double" />
+						<VAR Id="RDK:18732565" Name="stu" Type="double" />
+						<VAR Id="RDK:18732505" Name="jsonValues" Type="string" />
+						<VAR Id="RDK:18732506" Name="UebergabeListe" Type="SSGParameter[]" />
+					</GROUP>
+					<SET Id="RDK:18732509" VarRef="item_0">
+						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID]]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<SET Id="RDK:18732510" VarRef="item_1">
+						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID]]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<IFTHENELSE Id="RDK:18732533">
+						<VALUECONDITION Value="true">
+							<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Gefaellestrecke"]]></EXP>
+						</VALUECONDITION>
+						<GROUP Id="RDK:18732521" SubType="Then">
+							<COMMENTS Id="RDK:18732511" DesignTimeRemark="//Gefällestrecke Index == 1" />
+							<SET Id="RDK:18732512" VarRef="cpId">
+								<EXP><![CDATA[$=$Param.Input[1].connectionPointID]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+							<SET Id="RDK:18732513" VarRef="sto">
+								<EXP><![CDATA[$=$item_0.GefaellestreckeDefinition.HoeheOben]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+							<SET Id="RDK:18732567" VarRef="stu">
+								<EXP><![CDATA[$=$item_0.GefaellestreckeDefinition.HoeheUnten]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+							<SET Id="RDK:18732514" 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:18732515" 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:18732516" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+								<PAR Name="Key">
+									<EXP><![CDATA[$C$Hoehe]]></EXP>
+								</PAR>
+								<PAR Name="Str" />
+								<PAR Name="Dbl">
+									<EXP><![CDATA[$=$streckenhoehe]]></EXP>
+								</PAR>
+								<PAR Name="Int" />
+								<PAR Name="Boo" />
+							</SET_STRUCT>
+							<SET_STRUCT Id="RDK:18732517" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+								<PAR Name="Key">
+									<EXP><![CDATA[$C$ShapeId]]></EXP>
+								</PAR>
+								<PAR Name="Str">
+									<EXP><![CDATA[$=$item_1.id]]></EXP>
+								</PAR>
+								<PAR Name="Dbl" />
+								<PAR Name="Int" />
+								<PAR Name="Boo" />
+							</SET_STRUCT>
+							<CALLFUNCTION Id="RDK:18732518">
+								<PAR Name="FuncName">
+									<EXP><![CDATA[$C$SetStreckeHeight]]></EXP>
+								</PAR>
+								<PAR Name="InputExp">
+									<EXP><![CDATA[$=$UebergabeListe]]></EXP>
+								</PAR>
+								<PAR Name="ResultRef">
+									<EXP><![CDATA[$V$]]></EXP>
+								</PAR>
+								<PAR Name="Options" />
+							</CALLFUNCTION>
+						</GROUP>
+						<GROUP Id="RDK:18732532" SubType="Else">
+							<COMMENTS Id="RDK:18732522" DesignTimeRemark="//Gefällestrecke Index == 0" />
+							<SET Id="RDK:18732523" VarRef="cpId">
+								<EXP><![CDATA[$=$Param.Input[0].connectionPointID]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+							<SET Id="RDK:18732524" VarRef="streckenhoehe">
+								<EXP><![CDATA[$=$item_1.StreckeDefinition.Hoehe]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+							<CALLFUNCTION Id="RDK:18732529">
+								<PAR Name="FuncName">
+									<EXP><![CDATA[$C$SetStreckeHeight]]></EXP>
+								</PAR>
+								<PAR Name="InputExp">
+									<EXP><![CDATA[$=$UebergabeListe]]></EXP>
+								</PAR>
+								<PAR Name="ResultRef">
+									<EXP><![CDATA[$V$]]></EXP>
+								</PAR>
+								<PAR Name="Options" />
+							</CALLFUNCTION>
+						</GROUP>
+					</IFTHENELSE>
+					<SET Id="RDK:18732534" VarRef="Param.Result">
+						<EXP><![CDATA[$=$RueckgabeListe]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<EXIT_PROCESS Id="RDK:18732535" BreakType="4" ExitStatus="0" />
+				</GROUP>
+				<GROUP Id="RDK:18732538" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
+					<VAR Id="RDK:18732537" Name="RueckgabeListe" Type="SSGParameter[]" />
+				</GROUP>
+				<SET Id="RDK:18732539" VarRef="Param.Result">
+					<EXP><![CDATA[$=$RueckgabeListe]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+			</FUNCTION>
 			<FUNCTION Id="RDK:18598214" Name="InitSystemLimits">
 				<GROUP Id="RDK:18598216" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
 					<VAR Id="RDK:18598117" Name="jsonfilepath" Type="string">