From 4b67b45a18538f6252e19c07876f67fa975707dd Mon Sep 17 00:00:00 2001
From: Yuelin Wang <y.wang@schoenenberger.de>
Date: Wed, 12 Nov 2025 12:41:24 +0100
Subject: [PATCH] =?UTF-8?q?Die=20Funtktionen=20f=C3=BCr=20GF=20sind=20ange?=
 =?UTF-8?q?passt,=20L1=20kann=20L=5Fth=20=C3=BCbernehmen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 492 +++++++++++++++++++++++++++++++++------------------
 1 file changed, 321 insertions(+), 171 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 73d8175..0e43b9c 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="2025-10-23T15:53:27" LanguageVersion="2014.1.3.712" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="y.wang [ANGEBOT-NB02]" ModDate="2025-11-12T12:01:36" LanguageVersion="2014.1.3.712" />
 	<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">
@@ -60,7 +60,7 @@
 					<FIELD Id="RDK:1520421" Name="Drehung" Type="integer" DesignTimeNotes="1= im Uhrzeigersinn=rechts&#xD;&#xA;-1= Gegen Uhrzeigersinn=links" />
 					<FIELD Id="RDK:1520424" Name="Durchmesser" Type="double" />
 				</TYPE>
-				<TYPE Id="RDK:302581" Name="GefaelleType" SubType="structure">
+				<TYPE Id="RDK:302581" Name="GefaelleType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:302571" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:880709" Name="L1" Type="double" />
@@ -71,6 +71,7 @@
 					<FIELD Id="RDK:20543121" Name="FesteL1" Type="boolean" />
 					<FIELD Id="RDK:22608407" Name="H1gtH0" Type="integer" />
 					<FIELD Id="RDK:302573" Name="HoeheOben" Type="double" />
+					<FIELD Id="RDK:26481247" Name="FesteL_th" Type="boolean" />
 					<FIELD Id="RDK:22582208" Name="FesteH1" Type="boolean" />
 					<FIELD Id="RDK:302583" Name="HoeheUnten" Type="double" />
 					<FIELD Id="RDK:22582206" Name="FesteH0" Type="boolean" />
@@ -155,7 +156,7 @@
 					<FIELD Id="RDK:18530488" Name="LH_fits" Type="boolean" DesignTimeRemark="True wenn Länge L1 und L_th zueinander passen und damit zur Höhendifferenz" />
 					<FIELD Id="RDK:18530602" Name="LH_toleranz" Type="double" DesignTimeRemark="Toleranz in mm für den Längenunterschied, bei dem eine Differenz akzeptiert wird" />
 				</TYPE>
-				<TYPE Id="RDK:22028969" Name="VarioFoerdererType" SubType="structure">
+				<TYPE Id="RDK:22028969" Name="VarioFoerdererType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:22028956" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:22038424" Name="Typ" Type="string" DesignTimeRemark="Auf, Ab oder Horizontal" />
@@ -186,7 +187,7 @@
 					<FIELD Id="RDK:973716" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:973714" Name="Weichenart" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:23017103" Name="OFGeradeType" SubType="structure">
+				<TYPE Id="RDK:23017103" Name="OFGeradeType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:23017087" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:24227748" Name="Sivasnr" Type="string" />
@@ -11958,6 +11959,8 @@ SSGConnectionPoint.x_M
 							<VAR Id="RDK:23155502" Name="winkel" Type="double" />
 							<VAR Id="RDK:23155641" Name="FesteH1" Type="boolean" />
 							<VAR Id="RDK:23155725" Name="FesteH0" Type="boolean" />
+							<VAR Id="RDK:26481258" Name="FesteL_th" Type="boolean" />
+							<VAR Id="RDK:26484407" Name="FesteL1" Type="boolean" />
 							<VAR Id="RDK:23155672" Name="L1" Type="double" />
 							<VAR Id="RDK:21069328" Name="L_th" Type="double" />
 							<VAR Id="RDK:23159239" Name="LH_toleranz" Type="double" />
@@ -12001,6 +12004,10 @@ SSGConnectionPoint.x_M
 										<EXP><![CDATA[$=$shape_item.GefaelleDefinition.FesteH1]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
+									<SET Id="RDK:26481260" VarRef="FesteL_th">
+										<EXP><![CDATA[$=$shape_item.GefaelleDefinition.FesteL_th]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
 									<IFTHENELSE Id="RDK:22915898">
 										<VALUECONDITION Value="true">
 											<EXP><![CDATA[$=$HoeheOben=HoeheUnten]]></EXP>
@@ -12097,7 +12104,7 @@ SSGConnectionPoint.x_M
 									<VAR Id="RDK:23155720" Name="text" Type="string" />
 									<VAR Id="RDK:23155722" Name="z" Type="double" />
 								</GROUP>
-								<IFTHENELSE Id="RDK:22744528">
+								<IFTHENELSE Id="RDK:22744528" DesignTimeRemark="HöheOben UND HöheUnten haben Werte und sind fixiert">
 									<VALUECONDITION Value="true">
 										<EXP><![CDATA[$=$FesteH1]]></EXP>
 									</VALUECONDITION>
@@ -12109,62 +12116,110 @@ SSGConnectionPoint.x_M
 											<EXP><![CDATA[$=$Abs(HoeheOben-HoeheUnten)]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
+										<IFTHENELSE Id="RDK:26481385" DesignTimeRemark="Winkel-&gt; Lth übernimmt">
+											<VALUECONDITION Value="true">
+												<EXP><![CDATA[$=$FesteL_th]]></EXP>
+											</VALUECONDITION>
+											<GROUP Id="RDK:26481384" SubType="Then" DesignTimeRemark="Länge übernimmt.">
+												<SET Id="RDK:26481383" VarRef="L1">
+													<EXP><![CDATA[$=$L_th]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
+											</GROUP>
+										</IFTHENELSE>
+										<IFTHENELSE Id="RDK:26481397">
+											<VALUECONDITION Value="true">
+												<EXP><![CDATA[$=$FesteL1]]></EXP>
+											</VALUECONDITION>
+											<GROUP Id="RDK:26481396" SubType="Then" DesignTimeRemark="Länge ist auch Fixiert -&gt; Winkel">
+												<SET Id="RDK:26481395" VarRef="shape_item.GefaelleDefinition.winkel">
+													<EXP><![CDATA[$=$Round(RadToDeg(ATAN(Abs(HoeheOben-HoeheUnten)/L1)),0)]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
+											</GROUP>
+										</IFTHENELSE>
 									</GROUP>
 									<GROUP Id="RDK:22744530" SubType="Else">
 										<SET Id="RDK:26481178" VarRef="H_th">
 											<EXP><![CDATA[$=$Abs(Round(L1*Tan(DegToRad(winkel)),2))]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
-										<IFTHENELSE Id="RDK:26481192" DesignTimeRemark="Bestimme die Höhe oben und unten, je nach Wunsch grösser/kleiner einer Höhe">
-											<VALUECONDITION Value="true">
+										<IFTHENELSE Id="RDK:26481316" DesignTimeRemark="Es gibt zwei Höhenangaben, aber keine ist fest gegeben: Winkel und Länge zählen">
+											<VALUECONDITION Value="false">
 												<EXP><![CDATA[$=$FesteH1]]></EXP>
 											</VALUECONDITION>
 											<VALUECONDITION Value="false">
 												<EXP><![CDATA[$=$FesteH0]]></EXP>
 											</VALUECONDITION>
-											<GROUP Id="RDK:26481184" SubType="Then">
-												<IFTHENELSE Id="RDK:26481183">
+											<GROUP Id="RDK:26481299" SubType="Then">
+												<IFTHENELSE Id="RDK:26481330" DesignTimeRemark="Winkel-&gt; Lth übernimmt">
 													<VALUECONDITION Value="true">
-														<EXP><![CDATA[$=$H1gtH0=1]]></EXP>
+														<EXP><![CDATA[$=$FesteL_th]]></EXP>
 													</VALUECONDITION>
-													<GROUP Id="RDK:26481180" SubType="Then">
-														<SET Id="RDK:26481179" VarRef="HoeheUnten">
-															<EXP><![CDATA[$=$HoeheOben+Round(H_th,0)]]></EXP>
+													<GROUP Id="RDK:26481331" SubType="Then" DesignTimeRemark="Länge übernimmt.">
+														<SET Id="RDK:26481298" VarRef="L1">
+															<EXP><![CDATA[$=$L_th]]></EXP>
 															<PAR Name="AdvancedOptions" />
 														</SET>
 													</GROUP>
-													<GROUP Id="RDK:26481182" SubType="Else">
-														<SET Id="RDK:26481181" VarRef="HoeheUnten">
-															<EXP><![CDATA[$=$HoeheOben-Round(H_th,0)]]></EXP>
+												</IFTHENELSE>
+												<IFTHENELSE Id="RDK:26481339">
+													<VALUECONDITION Value="true">
+														<EXP><![CDATA[$=$FesteL1]]></EXP>
+													</VALUECONDITION>
+													<GROUP Id="RDK:26481340" SubType="Then" DesignTimeRemark="Länge ist auch Fixiert -&gt; Winkel">
+														<SET Id="RDK:26481338" VarRef="shape_item.GefaelleDefinition.winkel">
+															<EXP><![CDATA[$=$Round(RadToDeg(ATAN(Abs(HoeheOben-HoeheUnten)/L1)),0)]]></EXP>
 															<PAR Name="AdvancedOptions" />
 														</SET>
 													</GROUP>
 												</IFTHENELSE>
 											</GROUP>
-										</IFTHENELSE>
-										<IFTHENELSE Id="RDK:26481230" DesignTimeRemark="Bestimme die Höhe oben und unten, je nach Wunsch grösser/kleiner einer Höhe">
-											<VALUECONDITION Value="false">
-												<EXP><![CDATA[$=$FesteH1]]></EXP>
-											</VALUECONDITION>
-											<VALUECONDITION Value="true">
-												<EXP><![CDATA[$=$FesteH0]]></EXP>
-											</VALUECONDITION>
-											<GROUP Id="RDK:26481223" SubType="Then">
-												<IFTHENELSE Id="RDK:26481222">
+											<GROUP Id="RDK:26481315" SubType="Else">
+												<IFTHENELSE Id="RDK:26481307" DesignTimeRemark="Bestimme die Höhe oben und unten, je nach Wunsch grösser/kleiner einer Höhe">
 													<VALUECONDITION Value="true">
-														<EXP><![CDATA[$=$H1gtH0=1]]></EXP>
+														<EXP><![CDATA[$=$FesteH1]]></EXP>
 													</VALUECONDITION>
-													<GROUP Id="RDK:26481219" SubType="Then">
-														<SET Id="RDK:26481224" VarRef="HoeheOben">
-															<EXP><![CDATA[$=$HoeheUnten-Round(H_th,0)]]></EXP>
-															<PAR Name="AdvancedOptions" />
-														</SET>
+													<VALUECONDITION Value="false">
+														<EXP><![CDATA[$=$FesteH0]]></EXP>
+													</VALUECONDITION>
+													<GROUP Id="RDK:26481306" SubType="Then">
+														<IFTHENELSE Id="RDK:26481305">
+															<VALUECONDITION Value="true">
+																<EXP><![CDATA[$=$H1gtH0=1]]></EXP>
+															</VALUECONDITION>
+															<GROUP Id="RDK:26481302" SubType="Then">
+																<SET Id="RDK:26481301" VarRef="HoeheUnten">
+																	<EXP><![CDATA[$=$HoeheOben+Round(H_th,0)]]></EXP>
+																	<PAR Name="AdvancedOptions" />
+																</SET>
+															</GROUP>
+															<GROUP Id="RDK:26481304" SubType="Else">
+																<SET Id="RDK:26481303" VarRef="HoeheUnten">
+																	<EXP><![CDATA[$=$HoeheOben-Round(H_th,0)]]></EXP>
+																	<PAR Name="AdvancedOptions" />
+																</SET>
+															</GROUP>
+														</IFTHENELSE>
 													</GROUP>
-													<GROUP Id="RDK:26481221" SubType="Else">
-														<SET Id="RDK:26481226" VarRef="HoeheOben">
-															<EXP><![CDATA[$=$HoeheUnten+Round(H_th,0)]]></EXP>
-															<PAR Name="AdvancedOptions" />
-														</SET>
+													<GROUP Id="RDK:26481320" SubType="Else">
+														<IFTHENELSE Id="RDK:26481312">
+															<VALUECONDITION Value="true">
+																<EXP><![CDATA[$=$H1gtH0=1]]></EXP>
+															</VALUECONDITION>
+															<GROUP Id="RDK:26481309" SubType="Then">
+																<SET Id="RDK:26481308" VarRef="HoeheOben">
+																	<EXP><![CDATA[$=$HoeheUnten-Round(H_th,0)]]></EXP>
+																	<PAR Name="AdvancedOptions" />
+																</SET>
+															</GROUP>
+															<GROUP Id="RDK:26481311" SubType="Else">
+																<SET Id="RDK:26481310" VarRef="HoeheOben">
+																	<EXP><![CDATA[$=$HoeheUnten+Round(H_th,0)]]></EXP>
+																	<PAR Name="AdvancedOptions" />
+																</SET>
+															</GROUP>
+														</IFTHENELSE>
 													</GROUP>
 												</IFTHENELSE>
 											</GROUP>
@@ -12190,27 +12245,56 @@ SSGConnectionPoint.x_M
 								</SET>
 								<IFTHENELSE Id="RDK:21902123">
 									<VALUECONDITION Value="true">
-										<EXP><![CDATA[$=$HoeheOben>HoeheUnten]]></EXP>
+										<EXP><![CDATA[$=$HoeheOben=HoeheUnten]]></EXP>
 									</VALUECONDITION>
 									<GROUP Id="RDK:21902124" SubType="Then">
-										<SET Id="RDK:21902137" VarRef="text">
-											<EXP><![CDATA[$=$"↓"]]></EXP>
+										<SET Id="RDK:21902137" VarRef="H_th">
+											<EXP><![CDATA[$=$0]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
-										<SET Id="RDK:22732262" VarRef="H1gtH0">
-											<EXP><![CDATA[$=$-1]]></EXP>
+										<SET Id="RDK:26481370" VarRef="text">
+											<EXP><![CDATA[$=$"O"]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:26481372" VarRef="LH_fits">
+											<EXP><![CDATA[$=$False]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:26481374" VarRef="H1gtH0">
+											<EXP><![CDATA[$=$]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:22732262" VarRef="L_th">
+											<EXP><![CDATA[$=$L1]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
 									</GROUP>
 									<GROUP Id="RDK:21902125" SubType="Else">
-										<SET Id="RDK:21902117" VarRef="text" DesignTimeTip="↓">
-											<EXP><![CDATA[$=$"↑"]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-										<SET Id="RDK:22732264" VarRef="H1gtH0">
-											<EXP><![CDATA[$=$1]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
+										<IFTHENELSE Id="RDK:26481362">
+											<VALUECONDITION Value="true">
+												<EXP><![CDATA[$=$HoeheOben>HoeheUnten]]></EXP>
+											</VALUECONDITION>
+											<GROUP Id="RDK:26481358" SubType="Then">
+												<SET Id="RDK:26481356" VarRef="text">
+													<EXP><![CDATA[$=$"↓"]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
+												<SET Id="RDK:26481357" VarRef="H1gtH0">
+													<EXP><![CDATA[$=$-1]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
+											</GROUP>
+											<GROUP Id="RDK:26481361" SubType="Else">
+												<SET Id="RDK:26481359" VarRef="text" DesignTimeTip="↓">
+													<EXP><![CDATA[$=$"↑"]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
+												<SET Id="RDK:26481360" VarRef="H1gtH0">
+													<EXP><![CDATA[$=$1]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
+											</GROUP>
+										</IFTHENELSE>
 									</GROUP>
 								</IFTHENELSE>
 								<GROUP Id="RDK:23155612" Name="LocalToShapeItem" SubType="Generic">
@@ -12303,6 +12387,7 @@ SSGConnectionPoint.x_M
 							<VAR Id="RDK:23134099" Name="LH_Fits" Type="boolean" />
 							<VAR Id="RDK:23134310" Name="FesteH0" Type="boolean" />
 							<VAR Id="RDK:23168890" Name="FesteL1" Type="boolean" />
+							<VAR Id="RDK:26481412" Name="FesteL_th" Type="boolean" />
 							<VAR Id="RDK:23134312" Name="FesteH1" Type="boolean" />
 						</GROUP>
 						<GROUP Id="RDK:23134356" Name="TransferFromPrototype" SubType="Generic">
@@ -12322,6 +12407,10 @@ SSGConnectionPoint.x_M
 										<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.LH_toleranz]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
+									<SET Id="RDK:26494245" VarRef="L_th">
+										<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.L_th]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
 									<SET Id="RDK:23134292" VarRef="winkel">
 										<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.winkel]]></EXP>
 										<PAR Name="AdvancedOptions" />
@@ -12342,6 +12431,10 @@ SSGConnectionPoint.x_M
 										<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteL1]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
+									<SET Id="RDK:26481414" VarRef="FesteL_th">
+										<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteL_th]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
 									<SET Id="RDK:23134341" VarRef="H1gtH0">
 										<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.H1gtH0]]></EXP>
 										<PAR Name="AdvancedOptions" />
@@ -12768,6 +12861,17 @@ SSGConnectionPoint.x_M
 													<EXP><![CDATA[$=$Abs(HoeheOben-HoeheUnten)]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
+												<IFTHENELSE Id="RDK:26481429" DesignTimeRemark="Winkel-&gt; Lth übernimmt">
+													<VALUECONDITION Value="true">
+														<EXP><![CDATA[$=$FesteL_th]]></EXP>
+													</VALUECONDITION>
+													<GROUP Id="RDK:26481426" SubType="Then">
+														<SET Id="RDK:26481427" VarRef="L1">
+															<EXP><![CDATA[$=$L_th]]></EXP>
+															<PAR Name="AdvancedOptions" />
+														</SET>
+													</GROUP>
+												</IFTHENELSE>
 												<IFTHENELSE Id="RDK:23134038" DesignTimeRemark="Länge ist auch Fixiert -&gt; Winkel">
 													<VALUECONDITION Value="true">
 														<EXP><![CDATA[$=$FesteL1]]></EXP>
@@ -12778,131 +12882,111 @@ SSGConnectionPoint.x_M
 															<PAR Name="AdvancedOptions" />
 														</SET>
 													</GROUP>
-													<GROUP Id="RDK:23472885" SubType="Else" DesignTimeRemark="Winkel definiert -&gt; Länge">
-														<SET Id="RDK:23472894" VarRef="L1">
-															<EXP><![CDATA[$=$Round(Abs(HoeheOben-HoeheUnten)/Tan(DegToRad(winkel)),0)]]></EXP>
-															<PAR Name="AdvancedOptions" />
-														</SET>
-													</GROUP>
 												</IFTHENELSE>
 											</GROUP>
-										</IFTHENELSE>
-										<IFTHENELSE Id="RDK:23697502" DesignTimeRemark="Es gibt zwei Höhenangaben, aber keine ist fest gegeben: Winkel und Länge zählen">
-											<VALUECONDITION Value="false">
-												<EXP><![CDATA[$=$FesteH1]]></EXP>
-											</VALUECONDITION>
-											<VALUECONDITION Value="false">
-												<EXP><![CDATA[$=$FesteH0]]></EXP>
-											</VALUECONDITION>
-											<GROUP Id="RDK:23697495" SubType="Then">
-												<SET Id="RDK:23714148" VarRef="H_th">
-													<EXP><![CDATA[$=$Abs(Round(L1*Tan(DegToRad(winkel)),2))]]></EXP>
-													<PAR Name="AdvancedOptions" />
-												</SET>
-												<IFTHENELSE Id="RDK:26462490">
-													<VALUECONDITION Value="true">
-														<EXP><![CDATA[$=$H1gtH0=1]]></EXP>
-													</VALUECONDITION>
-													<GROUP Id="RDK:26462487" SubType="Then">
-														<SET Id="RDK:26462486" VarRef="HoeheOben">
-															<EXP><![CDATA[$=$HoeheUnten-Round(H_th,0)]]></EXP>
-															<PAR Name="AdvancedOptions" />
-														</SET>
-													</GROUP>
-													<GROUP Id="RDK:26462489" SubType="Else">
-														<SET Id="RDK:26462488" VarRef="HoeheOben">
-															<EXP><![CDATA[$=$HoeheUnten+Round(H_th,0)]]></EXP>
-															<PAR Name="AdvancedOptions" />
-														</SET>
-													</GROUP>
-												</IFTHENELSE>
-												<IFTHENELSE Id="RDK:23134057" DesignTimeRemark="Nur Länge ist fixiert, ">
-													<VALUECONDITION Value="true">
-														<EXP><![CDATA[$=$FesteL1]]></EXP>
-													</VALUECONDITION>
-													<GROUP Id="RDK:23134056" SubType="Then" DesignTimeRemark="Höhen sind bestimmt aber nicht fix -&gt; winkel">
-														<SET Id="RDK:23697358" VarRef="winkel">
-															<EXP><![CDATA[$=$Round(RadToDeg(ATAN(Abs(HoeheOben-HoeheUnten)/L1)),1)]]></EXP>
-															<PAR Name="AdvancedOptions" />
-														</SET>
-													</GROUP>
-													<GROUP Id="RDK:23472757" SubType="Else" DesignTimeRemark="Winkel definiert -&gt; Länge">
-														<SET Id="RDK:23697362" VarRef="L_th">
-															<EXP><![CDATA[$=$Abs(Round(Abs(HoeheOben-HoeheUnten)/Tan(DegToRad(winkel)),0))]]></EXP>
-															<PAR Name="AdvancedOptions" />
-														</SET>
-														<SET Id="RDK:23472761" VarRef="L1" Suppressed="True">
-															<EXP><![CDATA[$=$Round(Abs(HoeheOben-HoeheUnten)/Tan(DegToRad(winkel)),0)]]></EXP>
-															<PAR Name="AdvancedOptions" />
-														</SET>
-													</GROUP>
-												</IFTHENELSE>
-											</GROUP>
-											<GROUP Id="RDK:26450670" SubType="Else">
-												<IFTHENELSE Id="RDK:23134048" DesignTimeRemark="Bestimme die Höhe oben und unten, je nach Wunsch grösser/kleiner einer Höhe">
-													<VALUECONDITION Value="true">
+											<GROUP Id="RDK:26481438" SubType="Else">
+												<IFTHENELSE Id="RDK:23697502" DesignTimeRemark="Es gibt zwei Höhenangaben, aber keine ist fest gegeben: Winkel und Länge zählen">
+													<VALUECONDITION Value="false">
 														<EXP><![CDATA[$=$FesteH1]]></EXP>
 													</VALUECONDITION>
 													<VALUECONDITION Value="false">
 														<EXP><![CDATA[$=$FesteH0]]></EXP>
 													</VALUECONDITION>
-													<GROUP Id="RDK:23134047" SubType="Then">
-														<SET Id="RDK:23714135" VarRef="H_th">
+													<GROUP Id="RDK:23697495" SubType="Then">
+														<SET Id="RDK:23714148" VarRef="H_th">
 															<EXP><![CDATA[$=$Abs(Round(L1*Tan(DegToRad(winkel)),2))]]></EXP>
 															<PAR Name="AdvancedOptions" />
 														</SET>
-														<IFTHENELSE Id="RDK:26459522">
+														<IFTHENELSE Id="RDK:26481450" DesignTimeRemark="Winkel-&gt; Lth übernimmt">
 															<VALUECONDITION Value="true">
-																<EXP><![CDATA[$=$H1gtH0=1]]></EXP>
+																<EXP><![CDATA[$=$FesteL_th]]></EXP>
 															</VALUECONDITION>
-															<GROUP Id="RDK:26459519" SubType="Then">
-																<SET Id="RDK:26459518" VarRef="HoeheUnten">
-																	<EXP><![CDATA[$=$HoeheOben+Round(H_th,0)]]></EXP>
+															<GROUP Id="RDK:26481449" SubType="Then">
+																<SET Id="RDK:26481448" VarRef="L1">
+																	<EXP><![CDATA[$=$L_th]]></EXP>
 																	<PAR Name="AdvancedOptions" />
 																</SET>
 															</GROUP>
-															<GROUP Id="RDK:26459521" SubType="Else">
-																<SET Id="RDK:26459520" VarRef="HoeheUnten">
-																	<EXP><![CDATA[$=$HoeheOben-Round(H_th,0)]]></EXP>
+														</IFTHENELSE>
+														<IFTHENELSE Id="RDK:23134057" DesignTimeRemark="Nur Länge ist fixiert, ">
+															<VALUECONDITION Value="true">
+																<EXP><![CDATA[$=$FesteL1]]></EXP>
+															</VALUECONDITION>
+															<GROUP Id="RDK:23134056" SubType="Then" DesignTimeRemark="Höhen sind bestimmt aber nicht fix -&gt; winkel">
+																<SET Id="RDK:23697358" VarRef="winkel">
+																	<EXP><![CDATA[$=$Round(RadToDeg(ATAN(Abs(HoeheOben-HoeheUnten)/L1)),1)]]></EXP>
 																	<PAR Name="AdvancedOptions" />
 																</SET>
 															</GROUP>
 														</IFTHENELSE>
 													</GROUP>
-													<GROUP Id="RDK:23472751" SubType="Else">
-														<SET Id="RDK:23714143" VarRef="H_th">
-															<EXP><![CDATA[$=$Abs(Round(L1*Tan(DegToRad(winkel)),2))]]></EXP>
-															<PAR Name="AdvancedOptions" />
-														</SET>
-														<IFTHENELSE Id="RDK:23134053">
+													<GROUP Id="RDK:26450670" SubType="Else">
+														<IFTHENELSE Id="RDK:23134048" DesignTimeRemark="Bestimme die Höhe oben und unten, je nach Wunsch grösser/kleiner einer Höhe">
 															<VALUECONDITION Value="true">
-																<EXP><![CDATA[$=$H1gtH0=1]]></EXP>
+																<EXP><![CDATA[$=$FesteH1]]></EXP>
 															</VALUECONDITION>
-															<GROUP Id="RDK:23134050" SubType="Then">
-																<SET Id="RDK:23134049" VarRef="HoeheOben">
-																	<EXP><![CDATA[$=$HoeheUnten-Round(H_th,0)]]></EXP>
+															<VALUECONDITION Value="false">
+																<EXP><![CDATA[$=$FesteH0]]></EXP>
+															</VALUECONDITION>
+															<GROUP Id="RDK:23134047" SubType="Then">
+																<SET Id="RDK:23714135" VarRef="H_th">
+																	<EXP><![CDATA[$=$Abs(Round(L1*Tan(DegToRad(winkel)),2))]]></EXP>
 																	<PAR Name="AdvancedOptions" />
 																</SET>
+																<IFTHENELSE Id="RDK:26459522">
+																	<VALUECONDITION Value="true">
+																		<EXP><![CDATA[$=$H1gtH0=1]]></EXP>
+																	</VALUECONDITION>
+																	<GROUP Id="RDK:26459519" SubType="Then">
+																		<SET Id="RDK:26459518" VarRef="HoeheUnten">
+																			<EXP><![CDATA[$=$HoeheOben+Round(H_th,0)]]></EXP>
+																			<PAR Name="AdvancedOptions" />
+																		</SET>
+																	</GROUP>
+																	<GROUP Id="RDK:26459521" SubType="Else">
+																		<SET Id="RDK:26459520" VarRef="HoeheUnten">
+																			<EXP><![CDATA[$=$HoeheOben-Round(H_th,0)]]></EXP>
+																			<PAR Name="AdvancedOptions" />
+																		</SET>
+																	</GROUP>
+																</IFTHENELSE>
 															</GROUP>
-															<GROUP Id="RDK:23134052" SubType="Else">
-																<SET Id="RDK:23134051" VarRef="HoeheOben">
-																	<EXP><![CDATA[$=$HoeheUnten+Round(H_th,0)]]></EXP>
+															<GROUP Id="RDK:23472751" SubType="Else">
+																<SET Id="RDK:23714143" VarRef="H_th">
+																	<EXP><![CDATA[$=$Abs(Round(L1*Tan(DegToRad(winkel)),2))]]></EXP>
 																	<PAR Name="AdvancedOptions" />
 																</SET>
+																<IFTHENELSE Id="RDK:23134053">
+																	<VALUECONDITION Value="true">
+																		<EXP><![CDATA[$=$H1gtH0=1]]></EXP>
+																	</VALUECONDITION>
+																	<GROUP Id="RDK:23134050" SubType="Then">
+																		<SET Id="RDK:23134049" VarRef="HoeheOben">
+																			<EXP><![CDATA[$=$HoeheUnten-Round(H_th,0)]]></EXP>
+																			<PAR Name="AdvancedOptions" />
+																		</SET>
+																	</GROUP>
+																	<GROUP Id="RDK:23134052" SubType="Else">
+																		<SET Id="RDK:23134051" VarRef="HoeheOben">
+																			<EXP><![CDATA[$=$HoeheUnten+Round(H_th,0)]]></EXP>
+																			<PAR Name="AdvancedOptions" />
+																		</SET>
+																	</GROUP>
+																</IFTHENELSE>
 															</GROUP>
 														</IFTHENELSE>
 													</GROUP>
 												</IFTHENELSE>
 											</GROUP>
 										</IFTHENELSE>
-										<SET Id="RDK:23134033" VarRef="winkel_th">
-											<EXP><![CDATA[$=$Round(RadToDeg(ATAN(Abs(HoeheOben-HoeheUnten)/L1)),1)]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
 										<SET Id="RDK:23134031" VarRef="L_th">
 											<EXP><![CDATA[$=$Round(Abs(HoeheOben-HoeheUnten)/Tan(DegToRad(winkel)),0)]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
+										<SET Id="RDK:23134033" VarRef="winkel_th">
+											<EXP><![CDATA[$=$Round(RadToDeg(ATAN(Abs(HoeheOben-HoeheUnten)/L1)),1)]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
 									</GROUP>
 								</IFTHENELSE>
 							</GROUP>
@@ -27414,36 +27498,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					</SELECTCASE>
 				</FUNCTION>
 				<FUNCTION Id="RDK:314271" Name="GefaelleStreckeUI">
-					<ACTION_CALL Id="RDK:397364" Name="RDEngineering_ModernUIRender">
-						<PAR Name="RDLibraryName">
-							<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
-						</PAR>
-						<PAR Name="RenderList">
-							<EXP><![CDATA[$=$Render_Gefaelle]]></EXP>
-						</PAR>
-						<PAR Name="BindingMode">
-							<EXP><![CDATA[$C$0]]></EXP>
-						</PAR>
-						<PAR Name="InputData">
-							<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition]]></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>
 					<ACTION_CALL Id="RDK:26406389" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}" DesignTimeTip="cp2 top point" DesignTimeNotes="20231005 -1-&#xD;&#xA;Read only changed&#xD;&#xA;&#xD;&#xA;20230928 -1-&#xD;&#xA;Label changed&#xD;&#xA;&#xD;&#xA;20241001 -1-&#xD;&#xA;set H0 and H1 to Read only &#xD;&#xA;">
 						<PAR Name="RDLibraryName">
 							<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
@@ -27553,7 +27607,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<EXP><![CDATA[$=$]]></EXP>
 						</PAR>
 						<PAR Name="ROnly">
-							<EXP><![CDATA[$C$Shape_Prototype.Gefaelledefinition.FesteH1]]></EXP>
+							<EXP><![CDATA[$=$Shape_Prototype.Gefaelledefinition.FesteH1]]></EXP>
 						</PAR>
 						<PAR Name="Disabled" />
 						<PAR Name="Pressed" />
@@ -27566,6 +27620,36 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						<PAR Name="Options" />
 						<PAR Name="WebviewSubType" />
 					</ACTION_CALL>
+					<ACTION_CALL Id="RDK:397364" Name="RDEngineering_ModernUIRender">
+						<PAR Name="RDLibraryName">
+							<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+						</PAR>
+						<PAR Name="RenderList">
+							<EXP><![CDATA[$=$Render_Gefaelle]]></EXP>
+						</PAR>
+						<PAR Name="BindingMode">
+							<EXP><![CDATA[$C$0]]></EXP>
+						</PAR>
+						<PAR Name="InputData">
+							<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition]]></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:847699">
 						<EXP><![CDATA[$=$Button]]></EXP>
 						<CASEGROUP Id="RDK:847705" CaseType="0">
@@ -28144,9 +28228,12 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<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="FesteL_th"]]></EXP>
+								</VALUECONDITION>
 								<COMMENTS Id="RDK:18348402" DesignTimeRemark="Änderung von Winkel und Länge" />
 								<CALLFUNCTION Id="RDK:18348398">
 									<PAR Name="FuncName">
@@ -55592,7 +55679,7 @@ me.x
 							<PAR Name="Tooltip" />
 							<PAR Name="Styles" />
 							<PAR Name="Classes">
-								<EXP><![CDATA[$C$col-6]]></EXP>
+								<EXP><![CDATA[$C$col-5]]></EXP>
 							</PAR>
 							<PAR Name="Rules" />
 							<PAR Name="Image" />
@@ -55617,6 +55704,7 @@ me.x
 							<PAR Name="ValidateMsg" />
 							<PAR Name="DataSource" />
 							<PAR Name="Options" />
+							<PAR Name="WebviewSubType" />
 						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:20543119" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 							<PAR Name="RDLibraryName">
@@ -55676,6 +55764,7 @@ me.x
 							<PAR Name="Options">
 								<EXP><![CDATA[$C$(SINGLESELECT)]]></EXP>
 							</PAR>
+							<PAR Name="WebviewSubType" />
 						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:18539546" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}" DesignTimeNotes="20231005 -1-&#xD;&#xA;Read only changed&#xD;&#xA;&#xD;&#xA;20230928 -1-&#xD;&#xA;Label changed">
 							<PAR Name="RDLibraryName">
@@ -55729,6 +55818,67 @@ me.x
 							<PAR Name="ValidateMsg" />
 							<PAR Name="DataSource" />
 							<PAR Name="Options" />
+							<PAR Name="WebviewSubType" />
+						</ACTION_CALL>
+						<ACTION_CALL Id="RDK:26481245" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
+							<PAR Name="RDLibraryName">
+								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+							</PAR>
+							<PAR Name="RenderList">
+								<EXP><![CDATA[$=$Render_Gefaelle]]></EXP>
+							</PAR>
+							<PAR Name="PanelName">
+								<EXP><![CDATA[$C$0]]></EXP>
+							</PAR>
+							<PAR Name="CustomPanel" />
+							<PAR Name="ActionType">
+								<EXP><![CDATA[$C$0]]></EXP>
+							</PAR>
+							<PAR Name="Id">
+								<EXP><![CDATA[$C$FesteL_th]]></EXP>
+							</PAR>
+							<PAR Name="ParentId" />
+							<PAR Name="Label">
+								<EXP><![CDATA[$C$übernimmt]]></EXP>
+							</PAR>
+							<PAR Name="Field">
+								<EXP><![CDATA[$C$FesteL_th]]></EXP>
+							</PAR>
+							<PAR Name="Value" />
+							<PAR Name="Uom" />
+							<PAR Name="Tooltip" />
+							<PAR Name="Styles" />
+							<PAR Name="Classes">
+								<EXP><![CDATA[$C$col-1]]></EXP>
+							</PAR>
+							<PAR Name="Rules" />
+							<PAR Name="Image" />
+							<PAR Name="ControlType">
+								<EXP><![CDATA[$C$checkbox]]></EXP>
+							</PAR>
+							<PAR Name="ButtonSubType" />
+							<PAR Name="DropdownSubType" />
+							<PAR Name="TextboxSubType" />
+							<PAR Name="Action" />
+							<PAR Name="Required">
+								<EXP><![CDATA[$C$True]]></EXP>
+							</PAR>
+							<PAR Name="Hidden" />
+							<PAR Name="ROnly">
+								<EXP><![CDATA[$=$]]></EXP>
+							</PAR>
+							<PAR Name="Disabled" />
+							<PAR Name="Pressed" />
+							<PAR Name="AutoCommit">
+								<EXP><![CDATA[$=$True]]></EXP>
+							</PAR>
+							<PAR Name="ValidateFail" />
+							<PAR Name="ValidateMsg" />
+							<PAR Name="DataSource" />
+							<PAR Name="Options">
+								<EXP><![CDATA[$C$(SINGLESELECT)]]></EXP>
+							</PAR>
+							<PAR Name="WebviewSubType" />
 						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:837490" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}" DesignTimeTip="cp2 top point" DesignTimeNotes="20231005 -1-&#xD;&#xA;Read only changed&#xD;&#xA;&#xD;&#xA;20230928 -1-&#xD;&#xA;Label changed&#xD;&#xA;&#xD;&#xA;20241001 -1-&#xD;&#xA;set H0 and H1 to Read only &#xD;&#xA;">
 							<PAR Name="RDLibraryName">