From a86ebc1320983da60ef790d960f0c0a10a3575fc Mon Sep 17 00:00:00 2001
From: Yuelin Wang <y.wang@schoenenberger.de>
Date: Mon, 27 Jan 2025 15:53:47 +0100
Subject: [PATCH] =?UTF-8?q?die=20Parameter=20FesteH0=20und=20Feste=20H1=20?=
 =?UTF-8?q?in=20der=20Funktion=20CalculateGef=C3=A4llestrecke=20sowie=20in?=
 =?UTF-8?q?=20der=20Funktion=20CalcGFTheoritischeL=C3=A4nge=5FPrototype=20?=
 =?UTF-8?q?wurden=20an=20das=20ge=C3=A4nderte=20Interface=20angepasst.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 487 +++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 372 insertions(+), 115 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 616c38c..4e09aa0 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="m.stangl [ENTW-NB08]" ModDate="2025-01-23T17:32:25" LanguageVersion="2014.1.3.699" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="y.wang [ANGEBOT-NB02]" ModDate="2025-01-27T15:45:26" LanguageVersion="2014.1.3.698" />
 	<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">
@@ -160,7 +160,7 @@
 					<FIELD Id="RDK:16525231" Name="Drehung" Type="integer" DesignTimeNotes="1= im Uhrzeigersinn=rechts&#xD;&#xA;-1= Gegen Uhrzeigersinn=links" />
 					<FIELD Id="RDK:16577441" Name="Beschreibung" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:79642" Name="SSG_ShapeType" SubType="structure">
+				<TYPE Id="RDK:79642" Name="SSG_ShapeType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:79643" Name="SivasNummer" Type="string" />
 					<FIELD Id="RDK:1561689" Name="Rotationsklasse" Type="string" />
@@ -14902,9 +14902,12 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$FieldAffected="L1"]]></EXP>
 								</VALUECONDITION>
-								<VALUECONDITION Value="true">
+								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$FieldAffected="FesteL1"]]></EXP>
 								</VALUECONDITION>
+								<VALUECONDITION Value="true">
+									<EXP><![CDATA[$=$FieldAffected="H1gtH0"]]></EXP>
+								</VALUECONDITION>
 								<COMMENTS Id="RDK:18348402" DesignTimeRemark="Änderung von Winkel und Länge" />
 								<CALLFUNCTION Id="RDK:18348398">
 									<PAR Name="FuncName">
@@ -14927,7 +14930,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<EXP><![CDATA[$=$FieldAffected="FesteH1"]]></EXP>
 								</VALUECONDITION>
 								<COMMENTS Id="RDK:22674980" DesignTimeRemark="Änderung des fixiert Hakens der Höhe rechts oder links" />
-								<CALLFUNCTION Id="RDK:22674975">
+								<CALLFUNCTION Id="RDK:22674975" Suppressed="True">
 									<PAR Name="FuncName">
 										<EXP><![CDATA[$C$CheckFixHeights_Prototype]]></EXP>
 									</PAR>
@@ -14939,6 +14942,18 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									</PAR>
 									<PAR Name="Options" />
 								</CALLFUNCTION>
+								<CALLFUNCTION Id="RDK:22786305">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$Calculate Gefaellestrecke]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
 							</GROUP>
 							<GROUP Id="RDK:21224910" Name="Group" SubType="Generic">
 								<VALUECONDITION Value="true" Oper="OR">
@@ -20568,6 +20583,18 @@ me.x
 							<EXP><![CDATA[$=$False]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
+						<SET Id="RDK:22885642" VarRef="ShapeList[&quot;id=&quot;+id0].GefaelleDefinition.FesteH1" DesignTimeRemark="Wenn Unlinked erfolgt, wird der Flag istfixiert auf false gesetzt.">
+							<EXP><![CDATA[$=$False]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:22885644" VarRef="ShapeList[&quot;id=&quot;+id0].GefaelleDefinition.FesteH0" DesignTimeRemark="Wenn Unlinked erfolgt, wird der Flag istfixiert auf false gesetzt.">
+							<EXP><![CDATA[$=$False]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:22885646" VarRef="ShapeList[&quot;id=&quot;+id0].GefaelleDefinition.FesteL1" DesignTimeRemark="Wenn Unlinked erfolgt, wird der Flag istfixiert auf false gesetzt.">
+							<EXP><![CDATA[$=$False]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:19961131" CaseType="0">
 						<EXP><![CDATA[$C$Kurve]]></EXP>
@@ -25186,6 +25213,32 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<EXP><![CDATA[$=$ShapeList["id="+Param.Input]]]></EXP>
 					<PAR Name="AdvancedOptions" />
 				</SET>
+				<IFTHENELSE Id="RDK:22915898">
+					<VALUECONDITION Value="true">
+						<EXP><![CDATA[$=$shape_item.GefaelleDefinition.HoeheOben=shape_item.GefaelleDefinition.HoeheUnten]]></EXP>
+					</VALUECONDITION>
+					<GROUP Id="RDK:22915910" SubType="Then">
+						<ACTION_CALL Id="RDK:22825593" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
+							<PAR Name="RDLibraryName">
+								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+							</PAR>
+							<PAR Name="MsgText">
+								<EXP><![CDATA[$C$H1 und H0 sind gleich, bitte überprüfen!]]></EXP>
+							</PAR>
+							<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">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+						</ACTION_CALL>
+					</GROUP>
+				</IFTHENELSE>
 				<IFTHENELSE Id="RDK:21069368">
 					<VALUECONDITION Value="true" Oper="OR">
 						<EXP><![CDATA[$=$IsEmpty(shape_item.GefaelleDefinition.HoeheOben)]]></EXP>
@@ -25214,17 +25267,33 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						</SET>
 					</GROUP>
 					<GROUP Id="RDK:21069367" SubType="Else">
+						<IFTHENELSE Id="RDK:22744528">
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$shape_item.GefaelleDefinition.FesteH1]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$shape_item.GefaelleDefinition.FesteH0]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:22744529" SubType="Then">
+								<SET Id="RDK:22744546" VarRef="H_th">
+									<EXP><![CDATA[$=$Abs(shape_item.GefaelleDefinition.HoeheOben-shape_item.GefaelleDefinition.HoeheUnten)]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+							<GROUP Id="RDK:22744530" SubType="Else">
+								<SET Id="RDK:21069357" VarRef="H_th">
+									<EXP><![CDATA[$=$shape_item.GefaelleDefinition.L1*Tan(DegToRad(shape_item.GefaelleDefinition.winkel))]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+						</IFTHENELSE>
 						<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:21069357" VarRef="H_th">
-							<EXP><![CDATA[$=$shape_item.GefaelleDefinition.L1*Tan(DegToRad(shape_item.GefaelleDefinition.winkel))]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
 						<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>
+							<EXP><![CDATA[$=$Round(RadToDeg(ATAN(Abs(shape_item.GefaelleDefinition.HoeheOben-shape_item.GefaelleDefinition.HoeheUnten)/shape_item.GefaelleDefinition.L1)),0)]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<SET Id="RDK:21069359" VarRef="shape_item.GefaelleDefinition.L_th">
@@ -25256,12 +25325,20 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<EXP><![CDATA[$=$IIF(shape_item.GefaelleDefinition.LH_fits, "↓", "O")]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
+								<SET Id="RDK:22732262" VarRef="shape_item.GefaelleDefinition.H1gtH0">
+									<EXP><![CDATA[$=$-1]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 							</GROUP>
 							<GROUP Id="RDK:21902125" SubType="Else">
 								<SET Id="RDK:21902117" VarRef="shape_item.text" DesignTimeTip="↓">
 									<EXP><![CDATA[$=$IIF(shape_item.GefaelleDefinition.LH_fits, "↑", "O")]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
+								<SET Id="RDK:22732264" VarRef="shape_item.GefaelleDefinition.H1gtH0">
+									<EXP><![CDATA[$=$1]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 							</GROUP>
 						</IFTHENELSE>
 						<SET Id="RDK:21211830" VarRef="shape_item.z">
@@ -25441,151 +25518,319 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						<EXIT_PROCESS Id="RDK:18376609" BreakType="4" ExitStatus="0" />
 					</GROUP>
 					<GROUP Id="RDK:18547227" SubType="Else">
-						<SET Id="RDK:18547221" VarRef="L_th">
-							<EXP><![CDATA[$=$Abs(Round((Shape_Prototype.GefaelleDefinition.HoeheOben-Shape_Prototype.GefaelleDefinition.HoeheUnten)/Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel)),0))]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:18547223" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
-							<EXP><![CDATA[$=$L_th]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:19871465" VarRef="winkel_th">
-							<EXP><![CDATA[$=$Round(RadToDeg(ATAN(Abs(Shape_Prototype.GefaelleDefinition.HoeheOben-Shape_Prototype.GefaelleDefinition.HoeheUnten)/Shape_Prototype.GefaelleDefinition.L1)),1)]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<IFTHENELSE Id="RDK:20572212">
+						<IFTHENELSE Id="RDK:22825576">
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteL1]]></EXP>
+								<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheOben=Shape_Prototype.GefaelleDefinition.HoeheUnten]]></EXP>
 							</VALUECONDITION>
-							<GROUP Id="RDK:20572209" SubType="Then">
-								<IFTHENELSE Id="RDK:20658807">
+							<GROUP Id="RDK:22825572" SubType="Then">
+								<SET Id="RDK:22825587" VarRef="Shape_Prototype.GefaelleDefinition.H_th">
+									<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:22825589" VarRef="Shape_Prototype.text">
+									<EXP><![CDATA[$=$"O"]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:22825591" VarRef="Shape_Prototype.GefaelleDefinition.LH_fits">
+									<EXP><![CDATA[$=$False]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:22825571" VarRef="Shape_Prototype.GefaelleDefinition.H1gtH0">
+									<EXP><![CDATA[$=$]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<ACTION_CALL Id="RDK:22915912" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
+									<PAR Name="RDLibraryName">
+										<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+									</PAR>
+									<PAR Name="MsgText">
+										<EXP><![CDATA[$C$H1 und H0 sind gleich, bitte überprüfen!]]></EXP>
+									</PAR>
+									<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">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+								</ACTION_CALL>
+							</GROUP>
+							<GROUP Id="RDK:22825575" SubType="Else">
+								<SET Id="RDK:18547221" VarRef="L_th">
+									<EXP><![CDATA[$=$Round(Abs(Shape_Prototype.GefaelleDefinition.HoeheOben-Shape_Prototype.GefaelleDefinition.HoeheUnten)/Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel)),0)]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:18547223" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
+									<EXP><![CDATA[$=$L_th]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:19871465" VarRef="winkel_th">
+									<EXP><![CDATA[$=$Round(RadToDeg(ATAN(Abs(Shape_Prototype.GefaelleDefinition.HoeheOben-Shape_Prototype.GefaelleDefinition.HoeheUnten)/Shape_Prototype.GefaelleDefinition.L1)),1)]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<IFTHENELSE Id="RDK:22825635">
 									<VALUECONDITION Value="true">
-										<EXP><![CDATA[$=$winkel_th=0]]></EXP>
+										<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteH1]]></EXP>
 									</VALUECONDITION>
-									<GROUP Id="RDK:20658808" SubType="Then">
-										<SET Id="RDK:20658813" VarRef="winkel_th">
-											<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.winkel]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-										<SET Id="RDK:20658815" VarRef="H_th">
-											<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(winkel_th)),0))]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-										<SET Id="RDK:20658819" VarRef="L_th">
-											<EXP><![CDATA[$=$Abs(Round((H_th)/Tan(DegToRad(winkel_th)),0))]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-										<SET Id="RDK:20658821" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
-											<EXP><![CDATA[$=$L_th]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-										<SET Id="RDK:20667604" VarRef="Shape_Prototype.GefaelleDefinition.winkel_th">
-											<EXP><![CDATA[$=$winkel_th]]></EXP>
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteH0]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:22825639" SubType="Then">
+										<SET Id="RDK:22825645" VarRef="H_th">
+											<EXP><![CDATA[$=$Abs(Shape_Prototype.GefaelleDefinition.HoeheOben-Shape_Prototype.GefaelleDefinition.HoeheUnten)]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
+										<IFTHENELSE Id="RDK:22825647">
+											<VALUECONDITION Value="true">
+												<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteL1]]></EXP>
+											</VALUECONDITION>
+											<GROUP Id="RDK:22825650" SubType="Then">
+												<SET Id="RDK:22825653" VarRef="Shape_Prototype.GefaelleDefinition.winkel">
+													<EXP><![CDATA[$=$winkel_th]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
+												<SET Id="RDK:22825657" VarRef="L_th">
+													<EXP><![CDATA[$=$Round(Abs(Shape_Prototype.GefaelleDefinition.HoeheOben-Shape_Prototype.GefaelleDefinition.HoeheUnten)/Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel)),0)]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
+											</GROUP>
+										</IFTHENELSE>
 									</GROUP>
-									<GROUP Id="RDK:20658809" SubType="Else">
-										<IFTHENELSE Id="RDK:22586313">
-											<VALUECONDITION Value="true" Oper="OR">
-												<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheOben > 0 and Shape_Prototype.GefaelleDefinition.HoeheUnten = 0 ]]></EXP>
+									<GROUP Id="RDK:22825640" SubType="Else">
+										<SET Id="RDK:22825618" VarRef="H_th">
+											<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel)),0))]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<IFTHENELSE Id="RDK:22825804">
+											<VALUECONDITION Value="true">
+												<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteL1]]></EXP>
 											</VALUECONDITION>
-											<VALUECONDITION Value="true" Oper="OR">
-												<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheUnten > 0 and Shape_Prototype.GefaelleDefinition.HoeheOben = 0 ]]></EXP>
+											<GROUP Id="RDK:22825813" SubType="Then">
+												<IFTHENELSE Id="RDK:22825668">
+													<VALUECONDITION Value="true">
+														<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteH1]]></EXP>
+													</VALUECONDITION>
+													<VALUECONDITION Value="false">
+														<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteH0]]></EXP>
+													</VALUECONDITION>
+													<GROUP Id="RDK:22825783" SubType="Then">
+														<IFTHENELSE Id="RDK:22844676">
+															<VALUECONDITION Value="true">
+																<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.H1gtH0=1]]></EXP>
+															</VALUECONDITION>
+															<GROUP Id="RDK:22844688" SubType="Then">
+																<SET Id="RDK:22844691" VarRef="Shape_Prototype.GefaelleDefinition.HoeheUnten">
+																	<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheOben+H_th]]></EXP>
+																	<PAR Name="AdvancedOptions" />
+																</SET>
+															</GROUP>
+															<GROUP Id="RDK:22844689" SubType="Else">
+																<SET Id="RDK:22825722" VarRef="Shape_Prototype.GefaelleDefinition.HoeheUnten">
+																	<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheOben-H_th]]></EXP>
+																	<PAR Name="AdvancedOptions" />
+																</SET>
+															</GROUP>
+														</IFTHENELSE>
+													</GROUP>
+												</IFTHENELSE>
+												<IFTHENELSE Id="RDK:22825839">
+													<VALUECONDITION Value="true">
+														<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteH0]]></EXP>
+													</VALUECONDITION>
+													<VALUECONDITION Value="false">
+														<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteH1]]></EXP>
+													</VALUECONDITION>
+													<GROUP Id="RDK:22825838" SubType="Then">
+														<IFTHENELSE Id="RDK:22844701">
+															<VALUECONDITION Value="true">
+																<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.H1gtH0=1]]></EXP>
+															</VALUECONDITION>
+															<GROUP Id="RDK:22844698" SubType="Then">
+																<SET Id="RDK:22825724" VarRef="Shape_Prototype.GefaelleDefinition.HoeheOben">
+																	<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheUnten-H_th]]></EXP>
+																	<PAR Name="AdvancedOptions" />
+																</SET>
+															</GROUP>
+															<GROUP Id="RDK:22844700" SubType="Else">
+																<SET Id="RDK:22844705" VarRef="Shape_Prototype.GefaelleDefinition.HoeheOben">
+																	<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheUnten-H_th]]></EXP>
+																	<PAR Name="AdvancedOptions" />
+																</SET>
+															</GROUP>
+														</IFTHENELSE>
+													</GROUP>
+												</IFTHENELSE>
+											</GROUP>
+										</IFTHENELSE>
+									</GROUP>
+								</IFTHENELSE>
+								<SET Id="RDK:22825620" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
+									<EXP><![CDATA[$=$L_th]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:22825622" VarRef="Shape_Prototype.GefaelleDefinition.winkel_th">
+									<EXP><![CDATA[$=$winkel_th]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:22825624" VarRef="Shape_Prototype.GefaelleDefinition.H_th">
+									<EXP><![CDATA[$=$H_th]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<IFTHENELSE Id="RDK:20572212" Suppressed="True">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteL1]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:20572209" SubType="Then">
+										<IFTHENELSE Id="RDK:20658807">
+											<VALUECONDITION Value="true">
+												<EXP><![CDATA[$=$winkel_th=0]]></EXP>
 											</VALUECONDITION>
-											<GROUP Id="RDK:22586346" SubType="Then">
-												<SET Id="RDK:20572216" VarRef="Shape_Prototype.GefaelleDefinition.winkel_th">
+											<GROUP Id="RDK:20658808" SubType="Then">
+												<SET Id="RDK:20658813" VarRef="winkel_th">
 													<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.winkel]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
-												<SET Id="RDK:22586361" VarRef="H_th">
-													<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel_th)),0))]]></EXP>
+												<SET Id="RDK:20658815" VarRef="H_th">
+													<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(winkel_th)),0))]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
-												<SET Id="RDK:22589618" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
-													<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.L1]]></EXP>
+												<SET Id="RDK:20658819" VarRef="L_th">
+													<EXP><![CDATA[$=$Abs(Round((H_th)/Tan(DegToRad(winkel_th)),0))]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
-												<IFTHENELSE Id="RDK:22622938">
+												<SET Id="RDK:20658821" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
+													<EXP><![CDATA[$=$L_th]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
+												<SET Id="RDK:20667604" VarRef="Shape_Prototype.GefaelleDefinition.winkel_th">
+													<EXP><![CDATA[$=$winkel_th]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
+											</GROUP>
+											<GROUP Id="RDK:20658809" SubType="Else">
+												<IFTHENELSE Id="RDK:22586313">
 													<VALUECONDITION Value="true" Oper="OR">
 														<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheOben > 0 and Shape_Prototype.GefaelleDefinition.HoeheUnten = 0 ]]></EXP>
 													</VALUECONDITION>
 													<VALUECONDITION Value="true" Oper="OR">
 														<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheUnten > 0 and Shape_Prototype.GefaelleDefinition.HoeheOben = 0 ]]></EXP>
 													</VALUECONDITION>
-													<GROUP Id="RDK:22622945" SubType="Then">
-														<SET Id="RDK:22622948" VarRef="Shape_Prototype.GefaelleDefinition.HoeheUnten">
-															<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheOben-H_th]]></EXP>
+													<GROUP Id="RDK:22586346" SubType="Then">
+														<SET Id="RDK:20572216" VarRef="Shape_Prototype.GefaelleDefinition.winkel_th">
+															<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.winkel]]></EXP>
 															<PAR Name="AdvancedOptions" />
 														</SET>
+														<SET Id="RDK:22586361" VarRef="H_th">
+															<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel_th)),0))]]></EXP>
+															<PAR Name="AdvancedOptions" />
+														</SET>
+														<SET Id="RDK:22589618" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
+															<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.L1]]></EXP>
+															<PAR Name="AdvancedOptions" />
+														</SET>
+														<IFTHENELSE Id="RDK:22622938">
+															<VALUECONDITION Value="true" Oper="OR">
+																<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheOben > 0 and Shape_Prototype.GefaelleDefinition.HoeheUnten = 0 ]]></EXP>
+															</VALUECONDITION>
+															<VALUECONDITION Value="true" Oper="OR">
+																<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheUnten > 0 and Shape_Prototype.GefaelleDefinition.HoeheOben = 0 ]]></EXP>
+															</VALUECONDITION>
+															<GROUP Id="RDK:22622945" SubType="Then">
+																<SET Id="RDK:22622948" VarRef="Shape_Prototype.GefaelleDefinition.HoeheUnten">
+																	<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheOben-H_th]]></EXP>
+																	<PAR Name="AdvancedOptions" />
+																</SET>
+															</GROUP>
+															<GROUP Id="RDK:22622946" SubType="Else">
+																<SET Id="RDK:22622950" VarRef="Shape_Prototype.GefaelleDefinition.HoeheOben">
+																	<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheUnten-H_th]]></EXP>
+																	<PAR Name="AdvancedOptions" />
+																</SET>
+															</GROUP>
+														</IFTHENELSE>
 													</GROUP>
-													<GROUP Id="RDK:22622946" SubType="Else">
-														<SET Id="RDK:22622950" VarRef="Shape_Prototype.GefaelleDefinition.HoeheOben">
-															<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheUnten-H_th]]></EXP>
+													<GROUP Id="RDK:22586350" SubType="Else">
+														<SET Id="RDK:22586341" VarRef="Shape_Prototype.GefaelleDefinition.winkel_th">
+															<EXP><![CDATA[$=$winkel_th]]></EXP>
+															<PAR Name="AdvancedOptions" />
+														</SET>
+														<SET Id="RDK:20590479" VarRef="H_th">
+															<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel_th)),0))]]></EXP>
+															<PAR Name="AdvancedOptions" />
+														</SET>
+														<SET Id="RDK:19879521" VarRef="Shape_Prototype.GefaelleDefinition.winkel">
+															<EXP><![CDATA[$=$Round(winkel_th,1)]]></EXP>
+															<PAR Name="AdvancedOptions" />
+														</SET>
+														<SET Id="RDK:20636495" VarRef="L_th">
+															<EXP><![CDATA[$=$Abs(Round((Shape_Prototype.GefaelleDefinition.HoeheOben-Shape_Prototype.GefaelleDefinition.HoeheUnten)/Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel_th)),0))]]></EXP>
+															<PAR Name="AdvancedOptions" />
+														</SET>
+														<SET Id="RDK:20646626" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
+															<EXP><![CDATA[$=$L_th]]></EXP>
 															<PAR Name="AdvancedOptions" />
 														</SET>
 													</GROUP>
 												</IFTHENELSE>
 											</GROUP>
-											<GROUP Id="RDK:22586350" SubType="Else">
-												<SET Id="RDK:22586341" VarRef="Shape_Prototype.GefaelleDefinition.winkel_th">
-													<EXP><![CDATA[$=$winkel_th]]></EXP>
+										</IFTHENELSE>
+									</GROUP>
+									<GROUP Id="RDK:20572211" SubType="Else">
+										<IFTHENELSE Id="RDK:22758468">
+											<VALUECONDITION Value="true">
+												<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteH1]]></EXP>
+											</VALUECONDITION>
+											<VALUECONDITION Value="true">
+												<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteH0]]></EXP>
+											</VALUECONDITION>
+											<GROUP Id="RDK:22758465" SubType="Then">
+												<SET Id="RDK:22758464" VarRef="H_th">
+													<EXP><![CDATA[$=$Abs(Shape_Prototype.GefaelleDefinition.HoeheOben-Shape_Prototype.GefaelleDefinition.HoeheUnten)]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
-												<SET Id="RDK:20590479" VarRef="H_th">
-													<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel_th)),0))]]></EXP>
-													<PAR Name="AdvancedOptions" />
-												</SET>
-												<SET Id="RDK:19879521" VarRef="Shape_Prototype.GefaelleDefinition.winkel">
-													<EXP><![CDATA[$=$Round(winkel_th,1)]]></EXP>
-													<PAR Name="AdvancedOptions" />
-												</SET>
-												<SET Id="RDK:20636495" VarRef="L_th">
-													<EXP><![CDATA[$=$Abs(Round((Shape_Prototype.GefaelleDefinition.HoeheOben-Shape_Prototype.GefaelleDefinition.HoeheUnten)/Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel_th)),0))]]></EXP>
-													<PAR Name="AdvancedOptions" />
-												</SET>
-												<SET Id="RDK:20646626" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
-													<EXP><![CDATA[$=$L_th]]></EXP>
+											</GROUP>
+											<GROUP Id="RDK:22758467" SubType="Else">
+												<SET Id="RDK:18547222" VarRef="H_th">
+													<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel))]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
 											</GROUP>
 										</IFTHENELSE>
 									</GROUP>
 								</IFTHENELSE>
-							</GROUP>
-							<GROUP Id="RDK:20572211" SubType="Else">
-								<SET Id="RDK:18547222" VarRef="H_th">
-									<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel)),0))]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:20564764" VarRef="Shape_Prototype.GefaelleDefinition.winkel_th">
-									<EXP><![CDATA[$=$winkel_th]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-						</IFTHENELSE>
-						<SET Id="RDK:18547224" VarRef="Shape_Prototype.GefaelleDefinition.H_th">
-							<EXP><![CDATA[$=$H_th]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:18547225" VarRef="Shape_Prototype.GefaelleDefinition.LH_fits">
-							<EXP><![CDATA[$=$IIF(Abs(Shape_Prototype.GefaelleDefinition.L1-L_th)<Shape_Prototype.GefaelleDefinition.LH_toleranz,True,False)]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<IFTHENELSE Id="RDK:21911224">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheOben>Shape_Prototype.GefaelleDefinition.HoeheUnten]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:21911221" SubType="Then">
-								<SET Id="RDK:21911220" VarRef="Shape_Prototype.text">
-									<EXP><![CDATA[$=$IIF(Shape_Prototype.GefaelleDefinition.LH_fits, "↓", "O")]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-							<GROUP Id="RDK:21911223" SubType="Else">
-								<SET Id="RDK:21911222" VarRef="Shape_Prototype.text" DesignTimeTip="↓">
-									<EXP><![CDATA[$=$IIF(Shape_Prototype.GefaelleDefinition.LH_fits, "↑", "O")]]></EXP>
+								<SET Id="RDK:18547225" VarRef="Shape_Prototype.GefaelleDefinition.LH_fits">
+									<EXP><![CDATA[$=$IIF(Abs(Shape_Prototype.GefaelleDefinition.L1-L_th)<Shape_Prototype.GefaelleDefinition.LH_toleranz,True,False)]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
+								<IFTHENELSE Id="RDK:21911224">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheOben>Shape_Prototype.GefaelleDefinition.HoeheUnten]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:21911221" SubType="Then">
+										<SET Id="RDK:21911220" VarRef="Shape_Prototype.text">
+											<EXP><![CDATA[$=$IIF(Shape_Prototype.GefaelleDefinition.LH_fits, "↓", "O")]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:22773187" VarRef="Shape_Prototype.GefaelleDefinition.H1gtH0">
+											<EXP><![CDATA[$=$-1]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+									</GROUP>
+									<GROUP Id="RDK:21911223" SubType="Else">
+										<SET Id="RDK:21911222" VarRef="Shape_Prototype.text" DesignTimeTip="↓">
+											<EXP><![CDATA[$=$IIF(Shape_Prototype.GefaelleDefinition.LH_fits, "↑", "O")]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:22773189" VarRef="Shape_Prototype.GefaelleDefinition.H1gtH0">
+											<EXP><![CDATA[$=$1]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+									</GROUP>
+								</IFTHENELSE>
 							</GROUP>
 						</IFTHENELSE>
 					</GROUP>
@@ -25951,7 +26196,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 										<EXIT_PROCESS Id="RDK:21382441" BreakType="4" ExitStatus="0" />
 									</GROUP>
 									<GROUP Id="RDK:21376910" SubType="Else">
-										<SET Id="RDK:21328637" VarRef="Shape_Prototype.GefaelleDefinition.L1">
+										<SET Id="RDK:21328637" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
 											<EXP><![CDATA[$=$Laenge]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
@@ -26480,12 +26725,20 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<EXP><![CDATA[$=$hoehe]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
+								<SET Id="RDK:22732244" VarRef="ShapeList[&quot;id=&quot;+shapeId].GefaelleDefinition.FesteH1">
+									<EXP><![CDATA[$=$True]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 							</GROUP>
 							<GROUP Id="RDK:21920354" SubType="Else">
 								<SET Id="RDK:21920353" VarRef="ShapeList[&quot;id=&quot;+shapeId].GefaelleDefinition.HoeheUnten">
 									<EXP><![CDATA[$=$hoehe]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
+								<SET Id="RDK:22732246" VarRef="ShapeList[&quot;id=&quot;+shapeId].GefaelleDefinition.FesteH0">
+									<EXP><![CDATA[$=$True]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 							</GROUP>
 						</IFTHENELSE>
 						<CALLFUNCTION Id="RDK:21920356">
@@ -27179,6 +27432,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								</PAR>
 								<PAR Name="Int" />
 								<PAR Name="Boo" />
+								<PAR Name="StrArr" />
 							</SET_STRUCT>
 							<SET_STRUCT Id="RDK:18792310" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
 								<PAR Name="Key">
@@ -35551,6 +35805,9 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<PAR Name="n_Scan">
 						<EXP><![CDATA[$C$0]]></EXP>
 					</PAR>
+					<PAR Name="H1gtH0" />
+					<PAR Name="FesteH1" />
+					<PAR Name="FesteH0" />
 				</SET_STRUCT>
 			</GROUP>
 			<GROUP Id="RDK:18732243" Name="Kurve" SubType="Generic">