From f53e60e77d773efc38d89da5efe9d03214cef270 Mon Sep 17 00:00:00 2001
From: Yuelin Wang <y.wang@schoenenberger.de>
Date: Thu, 16 May 2024 10:50:34 +0200
Subject: [PATCH] =?UTF-8?q?in=20der=20Function=20SetHeightOfStreckeOnConne?=
 =?UTF-8?q?ct=20wurde=20die=20H=C3=B6he=20des=20Anschlusspunktes=20=C3=BCb?=
 =?UTF-8?q?ernommen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 48 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index e7e3464..95fa399 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-05-14T13:50:00" LanguageVersion="2014.1.3.635" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="y.wang [ANGEBOT-NB02]" ModDate="2024-05-16T10:47:32" 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">
@@ -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" />
@@ -175,7 +175,7 @@
 				<FIELD Id="RDK:57858" Name="PageFormat" Type="string" />
 			</TYPE>
 			<GROUP Id="RDK:12" Name="Editor2DTypes" SubType="TypeSet" Include="Type_Editor2DTypes.rdx" IncludeDate="133382924407573122">
-				<TYPE Id="RDK:1013885" Name="Editor2DOptionType" SubType="structure">
+				<TYPE Id="RDK:1013885" Name="Editor2DOptionType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:1013818" Name="PageUnit" Type="string" DesignTimeRemark="mm | in" DesignTimeNotes="mm | in" />
 					<FIELD Id="RDK:1013819" Name="PageLanguage" Type="string" DesignTimeRemark="Language key as defined in Wizard" DesignTimeNotes="mm | in" />
@@ -3910,6 +3910,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" />
@@ -3975,7 +3976,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
-										<PAR Name="StreckeDefinition" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -9933,10 +9933,10 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 							</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>
+									<EXP><![CDATA[$=$ShapeList["id=" + Shape_Prototype.id].StreckeDefinition.HoeheOben <> Shape_Prototype.StreckeDefinition.HoeheOben]]></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].StreckeDefinition.HoeheUnten <> Shape_Prototype.StreckeDefinition.HoeheUnten]]></EXP>
 								</VALUECONDITION>
 								<SET_STRUCT Id="RDK:18732402" VarRef="InheritHeightData" ClearAll="True">
 									<PAR Name="ParentIndex">
@@ -15160,6 +15160,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									</PAR>
 									<PAR Name="Options" />
 								</CALLFUNCTION>
+								<SET Id="RDK:19138527" VarRef="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID]" Suppressed="True">
+									<EXP><![CDATA[$=$item_0]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 							</GROUP>
 							<GROUP Id="RDK:18895276" SubType="Else">
 								<SET Id="RDK:18895274" VarRef="item_0.FoerdererDefinition.H_0">
@@ -15182,6 +15186,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									</PAR>
 									<PAR Name="Options" />
 								</CALLFUNCTION>
+								<SET Id="RDK:19138529" VarRef="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID]" Suppressed="True">
+									<EXP><![CDATA[$=$item_0]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 							</GROUP>
 						</IFTHENELSE>
 					</CASEGROUP>
@@ -15256,11 +15264,19 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<EXP><![CDATA[$=$cpId="cp1"]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:18827230" SubType="Then">
-								<SET Id="RDK:18827241" VarRef="item_0.StreckeDefinition.HoeheOben">
+								<SET Id="RDK:18827241" VarRef="item_0.StreckeDefinition.HoeheOben" Suppressed="True">
 									<EXP><![CDATA[$=$hoehe]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
-								<SET Id="RDK:18827246" VarRef="item_0.StreckeDefinition.HoeheUnten">
+								<SET Id="RDK:19223114" VarRef="item_0.StreckeDefinition.HoeheUnten">
+									<EXP><![CDATA[$=$hoehe]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:19223116" VarRef="item_0.StreckeDefinition.HoeheOben">
+									<EXP><![CDATA[$=$hoehe+StreckeData_defaults.Delta_h]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:18827246" VarRef="item_0.StreckeDefinition.HoeheUnten" Suppressed="True">
 									<EXP><![CDATA[$=$hoehe-StreckeData_defaults.Delta_h]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
@@ -15566,7 +15582,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</GROUP>
 							<GROUP Id="RDK:18895306" SubType="Else">
 								<SET Id="RDK:18895305" VarRef="hoehe">
-									<EXP><![CDATA[$=$hoehe_unten]]></EXP>
+									<EXP><![CDATA[$=$hoehe_oben]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</GROUP>
@@ -15672,8 +15688,12 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<PAR Name="MsgText">
 										<EXP><![CDATA[$C$Hoehe des Foedereres sind nicht definiert.]]></EXP>
 									</PAR>
-									<PAR Name="MsgStyle" />
-									<PAR Name="BtnLayout" />
+									<PAR Name="MsgStyle">
+										<EXP><![CDATA[$C$-1]]></EXP>
+									</PAR>
+									<PAR Name="BtnLayout">
+										<EXP><![CDATA[$C$-1]]></EXP>
+									</PAR>
 									<PAR Name="MsgCaption" />
 									<PAR Name="BaloonType" />
 									<PAR Name="BtnPressed">
@@ -15974,7 +15994,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 			</FUNCTION>
 		</GROUP>
 	</GROUP>
-	<GROUP Id="RDK:0008" Name="Main Group" SubType="Generic" Expanded="True">
+	<GROUP Id="RDK:0008" Name="Main Group" SubType="Generic">
 		<COMMENTS Id="RDK:1144004" DesignTimeRemark="Process Information" DesignTimeNotes="Process Name:&#xD;&#xA;MAIN_SSG.rdx&#xD;&#xA;&#xD;&#xA;Process Requires:&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Author:&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Creation Date:&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Functionality:&#xD;&#xA;&#xD;&#xA;Changes:&#xD;&#xA;20231005 -1- \DVR&#xD;&#xA;ERK-47&#xD;&#xA;Höhenänderung Gefällestrecke (Pufferstrecke)&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;20230928 -1- \DVR&#xD;&#xA;ERK-47&#xD;&#xA;Höhenänderung Kreisel" />
 		<GROUP Id="RDK:304" Name="INIT" SubType="Generic">
 			<SET Id="RDK:318" VarRef="GS2DLibraryName">
@@ -19948,6 +19968,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<PAR Name="L1">
 						<EXP><![CDATA[$C$1601]]></EXP>
 					</PAR>
+					<PAR Name="L_th" />
 					<PAR Name="LH_fits" />
 					<PAR Name="LH_toleranz">
 						<EXP><![CDATA[$C$10]]></EXP>
@@ -19957,14 +19978,13 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					</PAR>
 					<PAR Name="HoeheOben" />
 					<PAR Name="HoeheUnten" />
+					<PAR Name="H_th" />
 					<PAR Name="n_Sep">
 						<EXP><![CDATA[$C$1]]></EXP>
 					</PAR>
 					<PAR Name="n_Scan">
 						<EXP><![CDATA[$C$0]]></EXP>
 					</PAR>
-					<PAR Name="L_th" />
-					<PAR Name="H_th" />
 				</SET_STRUCT>
 			</GROUP>
 			<GROUP Id="RDK:18732243" Name="Strecke" SubType="Generic">