From 16b26e4e59a29088da6e3dc7427bfde2372d1a76 Mon Sep 17 00:00:00 2001
From: mistangl <m.stangl@schoenenberger.de>
Date: Mon, 30 Sep 2024 18:23:16 +0200
Subject: [PATCH] =?UTF-8?q?Berechnung=20der=20zweiten=20H=C3=B6he=20von=20?=
 =?UTF-8?q?Kurve=20und=20Gef=C3=A4llestrecke=20implementiert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 338 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 310 insertions(+), 28 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 7214300..36d2e75 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-09-27T11:30:25" LanguageVersion="2014.1.3.679" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-09-30T15:43:26" LanguageVersion="2014.1.3.690" />
 	<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">
@@ -148,7 +148,7 @@
 					<FIELD Id="RDK:18530523" Name="FoerdererDefinition" Type="FoerdererType" />
 					<FIELD Id="RDK:18732357" Name="KurveDefinition" Type="KurveType" />
 				</TYPE>
-				<TYPE Id="RDK:1783792" Name="SSGParameter" Expanded="True" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:1783792" Name="SSGParameter" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:1783794" Name="Key" Type="string" />
 					<FIELD Id="RDK:21032090" Name="StrArr" Type="string[]" />
@@ -1008,7 +1008,6 @@
 			<VAR Id="RDK:1007444" Name="Point2D" Type="Point2D" />
 			<VAR Id="RDK:1519830" Name="SessionZip" Type="string" />
 			<VAR Id="RDK:20857929" Name="groupStrings" Type="string[]" DesignTimeRemark="Enthält ; separtiert alle Strings, damit die Gruppen beschrieben werden können. a;b;c wäre z.B. eine Gruppe aus den Objekten a, b und c" />
-			<VAR Id="RDK:21032106" Name="alreadyConnectedCps" Type="string" DesignTimeRemark="Generated by RD" />
 		</GROUP>
 		<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
 			<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
@@ -15674,6 +15673,7 @@ me.x
 					<PAR Name="Dbl" />
 					<PAR Name="Int" />
 					<PAR Name="Boo" />
+					<PAR Name="StrArr" />
 				</SET_STRUCT>
 				<SET_STRUCT Id="RDK:19653278" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
 					<PAR Name="Key">
@@ -15685,6 +15685,7 @@ me.x
 					<PAR Name="Dbl" />
 					<PAR Name="Int" />
 					<PAR Name="Boo" />
+					<PAR Name="StrArr" />
 				</SET_STRUCT>
 				<SELECTCASE Id="RDK:1576706">
 					<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family]]></EXP>
@@ -16564,7 +16565,7 @@ me.x
 								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "Gefaellestrecke"]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:20819412" SubType="Then">
-								<CALLFUNCTION Id="RDK:20819411" DesignTimeNotes="20231005 -1-">
+								<CALLFUNCTION Id="RDK:21070867">
 									<PAR Name="FuncName">
 										<EXP><![CDATA[$C$MergeIdsToGroup]]></EXP>
 									</PAR>
@@ -16580,6 +16581,57 @@ me.x
 						</IFTHENELSE>
 					</GROUP>
 				</IFTHENELSE>
+				<COMMENTS Id="RDK:21073064" DesignTimeRemark="Berechne die zweite Höhe der Gefällestrecke/Kurve/Förderer, wenn eine Höhe vorgegeben ist" />
+				<IFTHENELSE Id="RDK:21073054">
+					<VALUECONDITION Value="true" Oper="OR">
+						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family = "Kurve"]]></EXP>
+					</VALUECONDITION>
+					<VALUECONDITION Value="true" Oper="OR">
+						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family = "Foerderer"]]></EXP>
+					</VALUECONDITION>
+					<VALUECONDITION Value="true">
+						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family = "Gefaellestrecke"]]></EXP>
+					</VALUECONDITION>
+					<GROUP Id="RDK:21073053" SubType="Then">
+						<CALLFUNCTION Id="RDK:21073048">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$CalculateSecondHeight]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$id0]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+					</GROUP>
+				</IFTHENELSE>
+				<IFTHENELSE Id="RDK:21073052">
+					<VALUECONDITION Value="true" Oper="OR">
+						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "Kurve"]]></EXP>
+					</VALUECONDITION>
+					<VALUECONDITION Value="true" Oper="OR">
+						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "Foerderer"]]></EXP>
+					</VALUECONDITION>
+					<VALUECONDITION Value="true">
+						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "Gefaellestrecke"]]></EXP>
+					</VALUECONDITION>
+					<GROUP Id="RDK:21073051" SubType="Then">
+						<CALLFUNCTION Id="RDK:21073049">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$CalculateSecondHeight]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$id1]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+					</GROUP>
+				</IFTHENELSE>
 			</FUNCTION>
 			<FUNCTION Id="RDK:19960886" Name="OnEditor2DUnlinked" InputTypeName="Editor2DEventArgumentsTypeList" Options="(TYPEFUNCTION)">
 				<GROUP Id="RDK:20833997" Name="Local Variables" SubType="VarSet" IncludeDate="0">
@@ -17705,6 +17757,7 @@ me.x
 						<PAR Name="Dbl" />
 						<PAR Name="Int" />
 						<PAR Name="Boo" />
+						<PAR Name="StrArr" />
 					</SET_STRUCT>
 					<SET_STRUCT Id="RDK:20725725" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
 						<PAR Name="Key">
@@ -17716,6 +17769,7 @@ me.x
 						<PAR Name="Dbl" />
 						<PAR Name="Int" />
 						<PAR Name="Boo" />
+						<PAR Name="StrArr" />
 					</SET_STRUCT>
 					<CALLFUNCTION Id="RDK:20725727">
 						<PAR Name="FuncName">
@@ -19588,14 +19642,8 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					</CASEGROUP>
 				</SELECTCASE>
 			</FUNCTION>
-			<FUNCTION Id="RDK:18326311" Name="Calculate Gefaellestrecke" InputTypeName="string">
-				<COMMENTS Id="RDK:1792975" DesignTimeRemark="Wenn die theoretische Länge L_f und die Länge des Shapes L1 übereinstimmen, dann wird der Gefaelle als &quot;in Ordnung&quot; betrachtet" />
-				<GROUP Id="RDK:18329391" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
-					<VAR Id="RDK:18329384" Name="L_th" Type="double" />
-					<VAR Id="RDK:18539553" Name="H_th" Type="double" />
-					<VAR Id="RDK:19881503" Name="winkel_th" Type="double" />
-					<VAR Id="RDK:18376628" Name="shape_item" Type="Editor2DShapeType" />
-				</GROUP>
+			<FUNCTION Id="RDK:18326311" Name="CalculateSecondHeight" InputTypeName="string">
+				<COMMENTS Id="RDK:1792975" DesignTimeRemark="Berechne die zweite Höhe der Gefällestrecke/Kurve/Förderer, wenn eine Höhe vorgegeben ist" />
 				<IFTHENELSE Id="RDK:18396608">
 					<VALUECONDITION Value="true">
 						<EXP><![CDATA[$=$IsEmpty(Param.Input)]]></EXP>
@@ -19605,11 +19653,239 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					</GROUP>
 				</IFTHENELSE>
 				<COMMENTS Id="RDK:18530478" DesignTimeRemark="Param.Input" />
+				<GROUP Id="RDK:18329391" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
+					<VAR Id="RDK:18329384" Name="L_th" Type="double" />
+					<VAR Id="RDK:18539553" Name="H_th" Type="double" />
+					<VAR Id="RDK:19881503" Name="winkel_th" Type="double" />
+					<VAR Id="RDK:18376628" Name="shape_item" Type="Editor2DShapeType" />
+					<VAR Id="RDK:21050072" Name="RueckgabeListe" Type="SSGParameter[]" />
+					<VAR Id="RDK:21070814" Name="ResultListe" Type="string[]" />
+					<VAR Id="RDK:21070838" Name="cpId" Type="string" />
+				</GROUP>
 				<SET Id="RDK:18376630" VarRef="shape_item">
 					<EXP><![CDATA[$=$ShapeList["id="+Param.Input]]]></EXP>
 					<PAR Name="AdvancedOptions" />
 				</SET>
-				<IFTHENELSE Id="RDK:18330617">
+				<IFTHENELSE Id="RDK:21038333">
+					<VALUECONDITION Value="false">
+						<EXP><![CDATA[$=$Count(shape_item.links)= 1]]></EXP>
+					</VALUECONDITION>
+					<GROUP Id="RDK:21038334" SubType="Then">
+						<EXIT_PROCESS Id="RDK:21069425" BreakType="4" ExitStatus="0" />
+					</GROUP>
+				</IFTHENELSE>
+				<SELECTCASE Id="RDK:21071592">
+					<EXP><![CDATA[$=$shape_item.family]]></EXP>
+					<CASEGROUP Id="RDK:21071579" CaseType="0">
+						<EXP><![CDATA[$C$Kurve]]></EXP>
+						<IFTHENELSE Id="RDK:21071618">
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$IsEmpty(shape_item.KurveDefinition.H_0)]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$IsEmpty(shape_item.KurveDefinition.H_1)]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:21071616" SubType="Then">
+								<SET Id="RDK:21071614" VarRef="Param.Result">
+									<EXP><![CDATA[$C$False]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<EXIT_PROCESS Id="RDK:21071615" BreakType="4" ExitStatus="0" />
+							</GROUP>
+							<GROUP Id="RDK:21071617" SubType="Else" />
+						</IFTHENELSE>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:21071589" CaseType="0">
+						<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
+						<IFTHENELSE Id="RDK:18330617">
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$IsEmpty(shape_item.GefaelleDefinition.HoeheOben)]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$IsEmpty(shape_item.GefaelleDefinition.HoeheUnten)]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Abs(shape_item.GefaelleDefinition.winkel) < 0.0001]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:18330618" SubType="Then">
+								<SET Id="RDK:19474686" VarRef="Param.Result">
+									<EXP><![CDATA[$C$False]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<EXIT_PROCESS Id="RDK:21069415" BreakType="4" ExitStatus="0" />
+							</GROUP>
+							<GROUP Id="RDK:18330619" SubType="Else" />
+						</IFTHENELSE>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:21071590" CaseType="0">
+						<EXP><![CDATA[$C$Foerderer]]></EXP>
+						<IFTHENELSE Id="RDK:21071650">
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$IsEmpty(shape_item.FoerdererDefinition.H_0)]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$IsEmpty(shape_item.FoerdererDefinition.H_1)]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$Abs(shape_item.FoerdererDefinition.winkel_f) < 0.0001]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Abs(shape_item.FoerdererDefinition.winkel_s) < 0.0001]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:21071648" SubType="Then">
+								<SET Id="RDK:21071646" VarRef="Param.Result">
+									<EXP><![CDATA[$C$False]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<EXIT_PROCESS Id="RDK:21071647" BreakType="4" ExitStatus="0" />
+							</GROUP>
+							<GROUP Id="RDK:21071649" SubType="Else" />
+						</IFTHENELSE>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:21071591" CaseType="1">
+						<EXP />
+						<EXIT_PROCESS Id="RDK:21071603" BreakType="4" ExitStatus="0" />
+					</CASEGROUP>
+				</SELECTCASE>
+				<COMMENTS Id="RDK:21038320" DesignTimeRemark="Wenn die Gefällestrecke nur einseitig angebunden ist, kann man von Länge und Winkel als wahre Größe ausgehen" />
+				<SET Id="RDK:21038363" VarRef="H_th">
+					<EXP><![CDATA[$=$Tan(DegToRad(shape_item.GefaelleDefinition.winkel)) * shape_item.GefaelleDefinition.L1]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+				<COMMENTS Id="RDK:21070831" DesignTimeRemark="feststellen, welche der beiden Enden verbunden ist (oben oder unten)" />
+				<CALLFUNCTION Id="RDK:21069439">
+					<PAR Name="FuncName">
+						<EXP><![CDATA[$C$GetUsedCps]]></EXP>
+					</PAR>
+					<PAR Name="InputExp">
+						<EXP><![CDATA[$=$shape_item.id]]></EXP>
+					</PAR>
+					<PAR Name="ResultRef">
+						<EXP><![CDATA[$V$ResultListe]]></EXP>
+					</PAR>
+					<PAR Name="Options" />
+				</CALLFUNCTION>
+				<SET Id="RDK:21070834" VarRef="cpId">
+					<EXP><![CDATA[$=$ResultListe[0]]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+				<SET_STRUCT Id="RDK:21070823" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+					<PAR Name="Key">
+						<EXP><![CDATA[$C$shapeID]]></EXP>
+					</PAR>
+					<PAR Name="StrArr" />
+					<PAR Name="Str">
+						<EXP><![CDATA[$=$shape_item.id]]></EXP>
+					</PAR>
+					<PAR Name="Dbl" />
+					<PAR Name="Int" />
+					<PAR Name="Boo" />
+				</SET_STRUCT>
+				<SET_STRUCT Id="RDK:21070825" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+					<PAR Name="Key">
+						<EXP><![CDATA[$C$cpId]]></EXP>
+					</PAR>
+					<PAR Name="StrArr" />
+					<PAR Name="Str">
+						<EXP><![CDATA[$=$cpId]]></EXP>
+					</PAR>
+					<PAR Name="Dbl" />
+					<PAR Name="Int" />
+					<PAR Name="Boo" />
+				</SET_STRUCT>
+				<CALLFUNCTION Id="RDK:21050070">
+					<PAR Name="FuncName">
+						<EXP><![CDATA[$C$GetHeightOfItem]]></EXP>
+					</PAR>
+					<PAR Name="InputExp">
+						<EXP><![CDATA[$=$UebergabeListe]]></EXP>
+					</PAR>
+					<PAR Name="ResultRef">
+						<EXP><![CDATA[$V$RueckgabeListe]]></EXP>
+					</PAR>
+					<PAR Name="Options" />
+				</CALLFUNCTION>
+				<SET Id="RDK:21050074" VarRef="hoehe">
+					<EXP><![CDATA[$=$RueckgabeListe["key=Hoehe"].Dbl]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+				<COMMENTS Id="RDK:21070829" DesignTimeRemark="Zweite Höhe bestimmen." />
+				<SELECTCASE Id="RDK:21070842">
+					<EXP><![CDATA[$=$shape_item.family]]></EXP>
+					<CASEGROUP Id="RDK:21070844" CaseType="0">
+						<EXP><![CDATA[$C$Kurve]]></EXP>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:21070846" CaseType="0">
+						<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
+						<IFTHENELSE Id="RDK:21038349">
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$shape_item.GefaelleDefinition.HoeheOben > shape_item.GefaelleDefinition.HoeheUnten]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:21038350" SubType="Then">
+								<SET Id="RDK:21038345" VarRef="shape_item.GefaelleDefinition.HoeheUnten">
+									<EXP><![CDATA[$=$shape_item.GefaelleDefinition.HoeheOben - H_th]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+							<GROUP Id="RDK:21038351" SubType="Else">
+								<SET Id="RDK:21038361" VarRef="shape_item.GefaelleDefinition.HoeheOben">
+									<EXP><![CDATA[$=$shape_item.GefaelleDefinition.HoeheUnten + H_th]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+						</IFTHENELSE>
+						<SET Id="RDK:21048675" VarRef="shape_item.GefaelleDefinition.L_th">
+							<EXP><![CDATA[$=$shape_item.GefaelleDefinition.L1]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:21048677" VarRef="shape_item.GefaelleDefinition.H_th">
+							<EXP><![CDATA[$=$Abs(Round(H_th, 0))]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:21048679" VarRef="shape_item.GefaelleDefinition.winkel_th">
+							<EXP><![CDATA[$=$shape_item.GefaelleDefinition.winkel]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:21046617" VarRef="shape_item.GefaelleDefinition.LH_fits">
+							<EXP><![CDATA[$=$True]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:21070848" CaseType="0">
+						<EXP><![CDATA[$C$Foerderer]]></EXP>
+					</CASEGROUP>
+				</SELECTCASE>
+				<SET Id="RDK:18330639" VarRef="ShapeList[&quot;id=&quot;+Param.Input]">
+					<EXP><![CDATA[$=$shape_item]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+				<SET Id="RDK:19474679" VarRef="Param.Result">
+					<EXP><![CDATA[$=$True]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+			</FUNCTION>
+			<FUNCTION Id="RDK:21069369" Name="Calculate Gefaellestrecke" InputTypeName="string">
+				<COMMENTS Id="RDK:21069327" DesignTimeRemark="Wenn die theoretische Länge L_f und die Länge des Shapes L1 übereinstimmen, dann wird der Gefaelle als &quot;in Ordnung&quot; betrachtet" />
+				<GROUP Id="RDK:21069333" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
+					<VAR Id="RDK:21069328" Name="L_th" Type="double" />
+					<VAR Id="RDK:21069329" Name="H_th" Type="double" />
+					<VAR Id="RDK:21069330" Name="winkel_th" Type="double" />
+					<VAR Id="RDK:21069331" Name="shape_item" Type="Editor2DShapeType" />
+				</GROUP>
+				<IFTHENELSE Id="RDK:21069336">
+					<VALUECONDITION Value="true">
+						<EXP><![CDATA[$=$IsEmpty(Param.Input)]]></EXP>
+					</VALUECONDITION>
+					<GROUP Id="RDK:21069335" SubType="Then">
+						<EXIT_PROCESS Id="RDK:21069334" BreakType="4" ExitStatus="0" />
+					</GROUP>
+				</IFTHENELSE>
+				<COMMENTS Id="RDK:21069337" DesignTimeRemark="Param.Input" />
+				<SET Id="RDK:21069338" VarRef="shape_item">
+					<EXP><![CDATA[$=$ShapeList["id="+Param.Input]]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+				<IFTHENELSE Id="RDK:21069368">
 					<VALUECONDITION Value="true" Oper="OR">
 						<EXP><![CDATA[$=$IsEmpty(shape_item.GefaelleDefinition.HoeheOben)]]></EXP>
 					</VALUECONDITION>
@@ -19622,47 +19898,48 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<VALUECONDITION Value="false">
 						<EXP><![CDATA[$=$shape_item.family = "Gefaellestrecke"]]></EXP>
 					</VALUECONDITION>
-					<GROUP Id="RDK:18330618" SubType="Then">
-						<SET Id="RDK:19474686" VarRef="Param.Result">
+					<GROUP Id="RDK:21069340" SubType="Then">
+						<SET Id="RDK:21069339" VarRef="Param.Result">
 							<EXP><![CDATA[$C$False]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 					</GROUP>
-					<GROUP Id="RDK:18330619" SubType="Else">
-						<SET Id="RDK:18330638" VarRef="L_th">
+					<GROUP Id="RDK:21069367" SubType="Else">
+						<COMMENTS Id="RDK:21069355" DesignTimeRemark="Es werden die Länge, Winkel und Höhen als gegeben angsehen. Jetzt nur noch rechnen ob die Angaben passen. " />
+						<SET Id="RDK:21069356" VarRef="L_th">
 							<EXP><![CDATA[$=$(shape_item.GefaelleDefinition.HoeheOben-shape_item.GefaelleDefinition.HoeheUnten)/Tan(DegToRad(shape_item.GefaelleDefinition.winkel))]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SET Id="RDK:18539550" VarRef="H_th">
+						<SET Id="RDK:21069357" VarRef="H_th">
 							<EXP><![CDATA[$=$shape_item.GefaelleDefinition.L1*Tan(DegToRad(shape_item.GefaelleDefinition.winkel))]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SET Id="RDK:19871470" VarRef="winkel_th">
+						<SET Id="RDK:21069358" VarRef="winkel_th">
 							<EXP><![CDATA[$=$Round(RadToDeg(Abs(shape_item.GefaelleDefinition.HoeheOben-shape_item.GefaelleDefinition.HoeheUnten)/shape_item.GefaelleDefinition.L1),0)]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SET Id="RDK:18539548" VarRef="shape_item.GefaelleDefinition.L_th">
+						<SET Id="RDK:21069359" VarRef="shape_item.GefaelleDefinition.L_th">
 							<EXP><![CDATA[$=$Abs(Round(L_th, 0))]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SET Id="RDK:18539555" VarRef="shape_item.GefaelleDefinition.H_th">
+						<SET Id="RDK:21069360" VarRef="shape_item.GefaelleDefinition.H_th">
 							<EXP><![CDATA[$=$Abs(Round(H_th, 0))]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SET Id="RDK:19871472" VarRef="shape_item.GefaelleDefinition.winkel_th">
+						<SET Id="RDK:21069361" VarRef="shape_item.GefaelleDefinition.winkel_th">
 							<EXP><![CDATA[$=$winkel_th]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SET Id="RDK:18530611" VarRef="shape_item.GefaelleDefinition.LH_fits">
+						<SET Id="RDK:21069362" VarRef="shape_item.GefaelleDefinition.LH_fits">
 							<EXP><![CDATA[$=$IIF(Abs(shape_item.GefaelleDefinition.L1-L_th)<shape_item.GefaelleDefinition.LH_toleranz,True,False)]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SET Id="RDK:18330639" VarRef="ShapeList[&quot;id=&quot;+Param.Input]">
-							<EXP><![CDATA[$=$shape_item]]></EXP>
+						<SET Id="RDK:21069366" VarRef="Param.Result">
+							<EXP><![CDATA[$=$shape_item.GefaelleDefinition.LH_fits]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SET Id="RDK:19474679" VarRef="Param.Result">
-							<EXP><![CDATA[$=$shape_item.GefaelleDefinition.LH_fits]]></EXP>
+						<SET Id="RDK:21069365" VarRef="ShapeList[&quot;id=&quot;+Param.Input]">
+							<EXP><![CDATA[$=$shape_item]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 					</GROUP>
@@ -20289,6 +20566,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<PAR Name="Key">
 									<EXP><![CDATA[$C$Label]]></EXP>
 								</PAR>
+								<PAR Name="StrArr" />
 								<PAR Name="Str">
 									<EXP><![CDATA[$=$cps_verbunden[0]]]></EXP>
 								</PAR>
@@ -21349,6 +21627,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="Dbl" />
 							<PAR Name="Int" />
 							<PAR Name="Boo" />
+							<PAR Name="StrArr" />
 						</SET_STRUCT>
 						<SET_STRUCT Id="RDK:18827138" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
 							<PAR Name="Key">
@@ -21360,6 +21639,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="Dbl" />
 							<PAR Name="Int" />
 							<PAR Name="Boo" />
+							<PAR Name="StrArr" />
 						</SET_STRUCT>
 						<SET_STRUCT Id="RDK:18895253" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
 							<PAR Name="Key">
@@ -21373,6 +21653,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</PAR>
 							<PAR Name="Int" />
 							<PAR Name="Boo" />
+							<PAR Name="StrArr" />
 						</SET_STRUCT>
 						<CALLFUNCTION Id="RDK:18827141">
 							<PAR Name="FuncName">
@@ -21618,6 +21899,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</PAR>
 							<PAR Name="Int" />
 							<PAR Name="Boo" />
+							<PAR Name="StrArr" />
 						</SET_STRUCT>
 						<CALLFUNCTION Id="RDK:18827159">
 							<PAR Name="FuncName">
@@ -24757,7 +25039,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</PAR>
 							<PAR Name="ParentId" />
 							<PAR Name="Label">
-								<EXP><![CDATA[$C$Theoretische Neigungswinkel]]></EXP>
+								<EXP><![CDATA[$C$Theoretischer Neigungswinkel]]></EXP>
 							</PAR>
 							<PAR Name="Field">
 								<EXP><![CDATA[$C$winkel_th]]></EXP>