From 87979f5924aa56e7c3d23fef0d3b858e6f8b9d99 Mon Sep 17 00:00:00 2001
From: Yuelin Wang <y.wang@schoenenberger.de>
Date: Thu, 7 Aug 2025 16:12:54 +0200
Subject: [PATCH] =?UTF-8?q?das=20Interface=20f=C3=BCr=20Variof=C3=B6rderer?=
 =?UTF-8?q?=20wurde=20angepasst=20und=20die=20Funtion=20der=20Calculate=20?=
 =?UTF-8?q?VF=20wurde=20ge=C3=A4ndert.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 681 +++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 555 insertions(+), 126 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 22b85ed..da80d53 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-08-01T13:25:30" LanguageVersion="2014.1.3.698" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="y.wang [ANGEBOT-NB02]" ModDate="2025-08-07T16:06:14" 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">
@@ -133,7 +133,7 @@
 					<FIELD Id="RDK:22007213" Name="KurvenRichtung" Type="string" DesignTimeRemark="rechts oder links, je nach Wahl des Nutzers" />
 					<FIELD Id="RDK:21700896" Name="isOk" Type="boolean" DesignTimeRemark="True beide Punkte angebunden sind und die Höhen der Nachbarn passen" />
 				</TYPE>
-				<TYPE Id="RDK:18116690" Name="FoerdererType" SubType="structure">
+				<TYPE Id="RDK:18116690" Name="FoerdererType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18116683" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:18116696" Name="Typ" Type="string" DesignTimeRemark="Auf oder Ab" />
@@ -161,13 +161,16 @@
 					<FIELD Id="RDK:22038424" Name="Typ" Type="string" DesignTimeRemark="Auf, Ab oder Horizontal" />
 					<FIELD Id="RDK:22029571" Name="AntriebNebenStrecke" Type="string" DesignTimeRemark="TEF Antrieb rechts oder links von der Fahrstrecke" />
 					<FIELD Id="RDK:22028957" Name="L1" Type="double" />
+					<FIELD Id="RDK:24613397" Name="L_GF" Type="double" />
 					<FIELD Id="RDK:22028958" Name="L_th" Type="double" DesignTimeRemark="Theoretische Länge berechnet aus Winkel und L1 (projizierte Länge)" />
 					<FIELD Id="RDK:22028959" Name="LH_fits" Type="boolean" DesignTimeRemark="True wenn Länge L1 und L_toleranz zueinander passen und damit zur Höhendifferenz" />
 					<FIELD Id="RDK:22028960" Name="LH_toleranz" Type="double" DesignTimeRemark="Toleranz in mm für den Längenunterschied, bei dem eine Differenz akzeptiert wird" />
 					<FIELD Id="RDK:22028962" Name="FesteL1" Type="boolean" />
+					<FIELD Id="RDK:24653989" Name="FesteL_GF" Type="boolean" />
 					<FIELD Id="RDK:22582214" Name="FesteH0" Type="boolean" />
 					<FIELD Id="RDK:22582216" Name="FesteH1" Type="boolean" />
 					<FIELD Id="RDK:22028961" Name="winkel" Type="double" />
+					<FIELD Id="RDK:24613399" Name="winkel_GF" Type="double" />
 					<FIELD Id="RDK:22028965" Name="winkel_th" Type="double" DesignTimeRemark="winkel_th berechnet aus Höhendifferenz (Abs(HoeheOben-HoeheUnten)) und L1 (projizierte Länge)" />
 					<FIELD Id="RDK:22028963" Name="H_Anfang" Type="double" />
 					<FIELD Id="RDK:22028964" Name="H_Ende" Type="double" />
@@ -31018,11 +31021,19 @@ 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.">
+						<SET Id="RDK:22885642" VarRef="ShapeList[&quot;id=&quot;+id0].GefaelleDefinition.HoeheOben" DesignTimeRemark="Wenn Unlinked erfolgt, wird der Flag istfixiert auf false gesetzt.">
+							<EXP><![CDATA[$=$0]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:24689614" 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.">
+						<SET Id="RDK:22885644" VarRef="ShapeList[&quot;id=&quot;+id0].GefaelleDefinition..HoeheUnten" DesignTimeRemark="Wenn Unlinked erfolgt, wird der Flag istfixiert auf false gesetzt.">
+							<EXP><![CDATA[$=$0]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:24689616" 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>
@@ -31058,6 +31069,26 @@ me.x
 							<EXP><![CDATA[$=$False]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
+						<SET Id="RDK:24653938" VarRef="ShapeList[&quot;id=&quot;+id0].VariofoerdererDefinition.FesteH1" DesignTimeRemark="Wenn Unlinked erfolgt, wird der Flag istfixiert auf false gesetzt.">
+							<EXP><![CDATA[$=$False]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:24689618" VarRef="ShapeList[&quot;id=&quot;+id0].VariofoerdererDefinition.H_Anfang" DesignTimeRemark="Wenn Unlinked erfolgt, wird der Flag istfixiert auf false gesetzt.">
+							<EXP><![CDATA[$=$0]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:24653940" VarRef="ShapeList[&quot;id=&quot;+id0].VariofoerdererDefinition.FesteH0" DesignTimeRemark="Wenn Unlinked erfolgt, wird der Flag istfixiert auf false gesetzt.">
+							<EXP><![CDATA[$=$False]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:24689620" VarRef="ShapeList[&quot;id=&quot;+id0].VariofoerdererDefinition.H_Ende" DesignTimeRemark="Wenn Unlinked erfolgt, wird der Flag istfixiert auf false gesetzt.">
+							<EXP><![CDATA[$=$0]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:24653942" VarRef="ShapeList[&quot;id=&quot;+id0].VariofoerdererDefinition.FesteL1" DesignTimeRemark="Wenn Unlinked erfolgt, wird der Flag istfixiert auf false gesetzt.">
+							<EXP><![CDATA[$=$False]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:19961178" CaseType="0">
 						<EXP><![CDATA[$C$BTMTBeladung]]></EXP>
@@ -37536,7 +37567,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<EXP><![CDATA[$=$False]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SET Id="RDK:22241365" VarRef="shape_item.VarioFoerdererDefinition.Typ">
+						<SET Id="RDK:22241365" VarRef="shape_item.VarioFoerdererDefinition.Typ" Suppressed="True">
 							<EXP><![CDATA[$C$Horizontal]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
@@ -37551,41 +37582,9 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					</GROUP>
 					<GROUP Id="RDK:22071921" SubType="Else">
 						<COMMENTS Id="RDK:22071905" DesignTimeRemark="Es werden die Länge, Winkel und Höhen als gegeben angsehen. Jetzt nur noch rechnen ob die Angaben passen. " />
-						<SET Id="RDK:22071906" VarRef="L_th">
-							<EXP><![CDATA[$=$(shape_item.VarioFoerdererDefinition.H_Anfang-shape_item.VarioFoerdererDefinition.H_Ende)/Tan(DegToRad(shape_item.VarioFoerdererDefinition.winkel))]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:22071907" VarRef="H_th">
-							<EXP><![CDATA[$=$shape_item.VarioFoerdererDefinition.L1*Tan(DegToRad(shape_item.VarioFoerdererDefinition.winkel))]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:22071908" VarRef="winkel_th">
-							<EXP><![CDATA[$=$Round(RadToDeg(Abs(shape_item.VarioFoerdererDefinition.H_Anfang-shape_item.VarioFoerdererDefinition.H_Ende)/shape_item.VarioFoerdererDefinition.L1),0)]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:22071909" VarRef="shape_item.VarioFoerdererDefinition.L_th">
-							<EXP><![CDATA[$=$Abs(Round(L_th, 0))]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:22071910" VarRef="shape_item.VarioFoerdererDefinition.H_th">
-							<EXP><![CDATA[$=$]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:22071911" VarRef="shape_item.VarioFoerdererDefinition.winkel_th">
-							<EXP><![CDATA[$=$winkel_th]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:22071912" VarRef="shape_item.VarioFoerdererDefinition.LH_fits">
-							<EXP><![CDATA[$=$IIF(Abs(shape_item.VarioFoerdererDefinition.L1-L_th)<shape_item.VarioFoerdererDefinition.LH_toleranz,True,False)]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:22071913" VarRef="Param.Result">
-							<EXP><![CDATA[$=$shape_item.VarioFoerdererDefinition.LH_fits]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
 						<IFTHENELSE Id="RDK:22241353">
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$shape_item.VarioFoerdererDefinition.H_Anfang-shape_item.VarioFoerdererDefinition.H_Ende < 0.01]]></EXP>
+								<EXP><![CDATA[$=$Abs(shape_item.VarioFoerdererDefinition.H_Anfang-shape_item.VarioFoerdererDefinition.H_Ende) < 0.01]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:22241349" SubType="Then">
 								<SET Id="RDK:22304085" VarRef="shape_item.text">
@@ -37596,12 +37595,124 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<EXP><![CDATA[$C$Horizontal]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
-								<SET Id="RDK:24540193" VarRef="shape_item.VarioFoerdererDefinition.winkel" Suppressed="True">
+								<SET Id="RDK:24540193" VarRef="shape_item.VarioFoerdererDefinition.winkel">
+									<EXP><![CDATA[$=$0]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:24704513" VarRef="shape_item.VarioFoerdererDefinition.FesteL_GF">
+									<EXP><![CDATA[$=$False]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:24704517" VarRef="shape_item.VarioFoerdererDefinition.winkel_GF">
+									<EXP><![CDATA[$=$0]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:24704519" VarRef="shape_item.VarioFoerdererDefinition.L_GF">
+									<EXP><![CDATA[$=$0]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:24704539" VarRef="shape_item.VarioFoerdererDefinition.L_th">
+									<EXP><![CDATA[$=$shape_item.VarioFoerdererDefinition.L1]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:24704541" VarRef="shape_item.VarioFoerdererDefinition.H_th">
 									<EXP><![CDATA[$=$0]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</GROUP>
 							<GROUP Id="RDK:22304083" SubType="Else">
+								<IFTHENELSE Id="RDK:24704477">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$shape_item.VarioFoerdererDefinition.FesteL_GF]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:24704483" SubType="Then">
+										<SET Id="RDK:24683669" VarRef="shape_item.VarioFoerdererDefinition.winkel">
+											<EXP><![CDATA[$=$Shape_Prototype.VarioFoerdererDefinition.winkel]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:24704468" VarRef="shape_item.VarioFoerdererDefinition.L_GF">
+											<EXP><![CDATA[$=$Round(Tan(DegToRad(shape_item.VarioFoerdererDefinition.winkel))*shape_item.VarioFoerdererDefinition.L1/(shape_item.VarioFoerdererDefinition.winkel+shape_item.VarioFoerdererDefinition.winkel_GF),2)]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:24704503" VarRef="L_th">
+											<EXP><![CDATA[$=$Abs(shape_item.VarioFoerdererDefinition.H_Anfang-shape_item.VarioFoerdererDefinition.H_Ende)/Tan(DegToRad(shape_item.VarioFoerdererDefinition.winkel))-shape_item.VarioFoerdererDefinition.L_GF]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:24704485" VarRef="shape_item.VarioFoerdererDefinition.L_th" Suppressed="True">
+											<EXP><![CDATA[$=$shape_item.VarioFoerdererDefinition.L1-shape_item.VarioFoerdererDefinition.L_GF]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:24704487" VarRef="&#xA;H_th">
+											<EXP><![CDATA[$=$(shape_item.VarioFoerdererDefinition.L1-shape_item.VarioFoerdererDefinition.L_GF)*Tan(DegToRad(shape_item.VarioFoerdererDefinition.winkel))]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+									</GROUP>
+									<GROUP Id="RDK:24704495" SubType="Else">
+										<SET Id="RDK:24704501" VarRef="shape_item.VarioFoerdererDefinition.winkel">
+											<EXP><![CDATA[$=$Shape_Prototype.VarioFoerdererDefinition.winkel]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:24704497" VarRef="shape_item.VarioFoerdererDefinition.winkel_GF">
+											<EXP><![CDATA[$=$0]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:24704499" VarRef="shape_item.VarioFoerdererDefinition.L_GF">
+											<EXP><![CDATA[$=$0]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:22071906" VarRef="L_th">
+											<EXP><![CDATA[$=$Abs(shape_item.VarioFoerdererDefinition.H_Anfang-shape_item.VarioFoerdererDefinition.H_Ende)/Tan(DegToRad(shape_item.VarioFoerdererDefinition.winkel))]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:22071907" VarRef="H_th">
+											<EXP><![CDATA[$=$shape_item.VarioFoerdererDefinition.L1*Tan(DegToRad(shape_item.VarioFoerdererDefinition.winkel))]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+									</GROUP>
+								</IFTHENELSE>
+								<SET Id="RDK:22071908" VarRef="winkel_th">
+									<EXP><![CDATA[$=$Round(RadToDeg(Abs(shape_item.VarioFoerdererDefinition.H_Anfang-shape_item.VarioFoerdererDefinition.H_Ende)/(shape_item.VarioFoerdererDefinition.L1-shape_item.VarioFoerdererDefinition.L_GF)),0)]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<ACTION_CALL Id="RDK:24704505" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
+									<PAR Name="RDLibraryName">
+										<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+									</PAR>
+									<PAR Name="MsgText">
+										<EXP><![CDATA[$=$IIF(winkel_th<>shape_item.VarioFoerdererDefinition.winkel,"theoretische Neigungswinkel ist: " + CStr(winkel_th),"")]]></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>
+								<SET Id="RDK:22071909" VarRef="shape_item.VarioFoerdererDefinition.L_th">
+									<EXP><![CDATA[$=$Round(L_th, 0)]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:22071910" VarRef="shape_item.VarioFoerdererDefinition.H_th">
+									<EXP><![CDATA[$=$Round(H_th,2)]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:22071911" VarRef="shape_item.VarioFoerdererDefinition.winkel_th">
+									<EXP><![CDATA[$=$winkel_th]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:22071912" VarRef="shape_item.VarioFoerdererDefinition.LH_fits">
+									<EXP><![CDATA[$=$IIF(Abs(shape_item.VarioFoerdererDefinition.L1-(L_th+shape_item.VarioFoerdererDefinition.L_GF))<shape_item.VarioFoerdererDefinition.LH_toleranz,True,False)]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:22071913" VarRef="Param.Result">
+									<EXP><![CDATA[$=$shape_item.VarioFoerdererDefinition.LH_fits]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 								<IFTHENELSE Id="RDK:22071918">
 									<VALUECONDITION Value="true">
 										<EXP><![CDATA[$=$shape_item.VarioFoerdererDefinition.H_Anfang>shape_item.VarioFoerdererDefinition.H_Ende]]></EXP>
@@ -39610,19 +39721,27 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						<EXP><![CDATA[$C$VarioFoerderer]]></EXP>
 						<IFTHENELSE Id="RDK:22071965">
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$label="cp1"]]></EXP>
+								<EXP><![CDATA[$=$label="cp2"]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:22071962" SubType="Then">
 								<SET Id="RDK:22071961" VarRef="ShapeList[&quot;id=&quot;+shapeId].VarioFoerdererDefinition.H_Anfang">
 									<EXP><![CDATA[$=$hoehe]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
+								<SET Id="RDK:24653955" VarRef="ShapeList[&quot;id=&quot;+shapeId].VarioFoerdererDefinition.FesteH0">
+									<EXP><![CDATA[$=$True]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 							</GROUP>
 							<GROUP Id="RDK:22071964" SubType="Else">
 								<SET Id="RDK:22071963" VarRef="ShapeList[&quot;id=&quot;+shapeId].VarioFoerdererDefinition.H_Ende">
 									<EXP><![CDATA[$=$hoehe]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
+								<SET Id="RDK:24653957" VarRef="ShapeList[&quot;id=&quot;+shapeId].VarioFoerdererDefinition.FesteH1">
+									<EXP><![CDATA[$=$True]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 							</GROUP>
 						</IFTHENELSE>
 						<CALLFUNCTION Id="RDK:22071966">
@@ -49866,9 +49985,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="DataSource">
 								<EXP><![CDATA[$=$VarioFoerdererWinkelList]]></EXP>
 							</PAR>
-							<PAR Name="Options">
-								<EXP><![CDATA[$C$(RANGE=0,5,0.1)]]></EXP>
-							</PAR>
+							<PAR Name="Options" />
 						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:22228354" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 							<PAR Name="RDLibraryName">
@@ -50050,7 +50167,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</PAR>
 							<PAR Name="ParentId" />
 							<PAR Name="Label">
-								<EXP><![CDATA[$C$Länge]]></EXP>
+								<EXP><![CDATA[$C$Gesamtlänge]]></EXP>
 							</PAR>
 							<PAR Name="Field">
 								<EXP><![CDATA[$C$L1]]></EXP>
@@ -50079,7 +50196,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="Disabled" />
 							<PAR Name="Pressed" />
 							<PAR Name="AutoCommit">
-								<EXP><![CDATA[$C$True]]></EXP>
+								<EXP><![CDATA[$=$True]]></EXP>
 							</PAR>
 							<PAR Name="ValidateFail" />
 							<PAR Name="ValidateMsg" />
@@ -50143,6 +50260,63 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<EXP><![CDATA[$C$(SINGLESELECT)]]></EXP>
 							</PAR>
 						</ACTION_CALL>
+						<ACTION_CALL Id="RDK:24653987" 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_VarioFoerderer]]></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_GF]]></EXP>
+							</PAR>
+							<PAR Name="ParentId" />
+							<PAR Name="Label">
+								<EXP><![CDATA[$C$berechnet mit Gefällestrecke]]></EXP>
+							</PAR>
+							<PAR Name="Field">
+								<EXP><![CDATA[$C$FesteL_GF]]></EXP>
+							</PAR>
+							<PAR Name="Value" />
+							<PAR Name="Uom" />
+							<PAR Name="Tooltip" />
+							<PAR Name="Styles" />
+							<PAR Name="Classes">
+								<EXP><![CDATA[$C$col-2]]></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" />
+							<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>
+						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:22069060" 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">
 								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
@@ -50172,7 +50346,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="Tooltip" />
 							<PAR Name="Styles" />
 							<PAR Name="Classes">
-								<EXP><![CDATA[$C$col-4]]></EXP>
+								<EXP><![CDATA[$C$col-2]]></EXP>
 							</PAR>
 							<PAR Name="Rules" />
 							<PAR Name="Image" />
@@ -50181,7 +50355,9 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</PAR>
 							<PAR Name="ButtonSubType" />
 							<PAR Name="DropdownSubType" />
-							<PAR Name="TextboxSubType" />
+							<PAR Name="TextboxSubType">
+								<EXP><![CDATA[$C$TEXTAREA]]></EXP>
+							</PAR>
 							<PAR Name="Action" />
 							<PAR Name="Required" />
 							<PAR Name="Hidden" />
@@ -50190,13 +50366,131 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</PAR>
 							<PAR Name="Disabled" />
 							<PAR Name="Pressed" />
-							<PAR Name="AutoCommit" />
+							<PAR Name="AutoCommit">
+								<EXP><![CDATA[$=$True]]></EXP>
+							</PAR>
 							<PAR Name="ValidateFail" />
 							<PAR Name="ValidateMsg" />
 							<PAR Name="DataSource" />
 							<PAR Name="Options" />
 						</ACTION_CALL>
-						<ACTION_CALL Id="RDK:22069061" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
+						<ACTION_CALL Id="RDK:24619340" 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_VarioFoerderer]]></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$L_GF]]></EXP>
+							</PAR>
+							<PAR Name="ParentId" />
+							<PAR Name="Label">
+								<EXP><![CDATA[$C$Länge der Gefällestrecke]]></EXP>
+							</PAR>
+							<PAR Name="Field">
+								<EXP><![CDATA[$C$L_GF]]></EXP>
+							</PAR>
+							<PAR Name="Value" />
+							<PAR Name="Uom" />
+							<PAR Name="Tooltip" />
+							<PAR Name="Styles">
+								<EXP><![CDATA[$C$JSON {"labelPosition":"TOP","break":false}]]></EXP>
+							</PAR>
+							<PAR Name="Classes">
+								<EXP><![CDATA[$C$col-2]]></EXP>
+							</PAR>
+							<PAR Name="Rules" />
+							<PAR Name="Image" />
+							<PAR Name="ControlType">
+								<EXP><![CDATA[$C$textbox]]></EXP>
+							</PAR>
+							<PAR Name="ButtonSubType" />
+							<PAR Name="DropdownSubType" />
+							<PAR Name="TextboxSubType">
+								<EXP><![CDATA[$C$STANDARD]]></EXP>
+							</PAR>
+							<PAR Name="Action" />
+							<PAR Name="Required" />
+							<PAR Name="Hidden" />
+							<PAR Name="ROnly">
+								<EXP><![CDATA[$C$True]]></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" />
+						</ACTION_CALL>
+						<ACTION_CALL Id="RDK:24613395" 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_VarioFoerderer]]></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$winkel_GF]]></EXP>
+							</PAR>
+							<PAR Name="ParentId" />
+							<PAR Name="Label">
+								<EXP><![CDATA[$C$Winkel der Gefällestrecke]]></EXP>
+							</PAR>
+							<PAR Name="Field">
+								<EXP><![CDATA[$C$winkel_GF]]></EXP>
+							</PAR>
+							<PAR Name="Value" />
+							<PAR Name="Uom" />
+							<PAR Name="Tooltip" />
+							<PAR Name="Styles" />
+							<PAR Name="Classes">
+								<EXP><![CDATA[$C$col-2]]></EXP>
+							</PAR>
+							<PAR Name="Rules" />
+							<PAR Name="Image" />
+							<PAR Name="ControlType">
+								<EXP><![CDATA[$C$dropdown]]></EXP>
+							</PAR>
+							<PAR Name="ButtonSubType" />
+							<PAR Name="DropdownSubType" />
+							<PAR Name="TextboxSubType" />
+							<PAR Name="Action" />
+							<PAR Name="Required">
+								<EXP><![CDATA[$=$True]]></EXP>
+							</PAR>
+							<PAR Name="Hidden" />
+							<PAR Name="ROnly" />
+							<PAR Name="Disabled" />
+							<PAR Name="Pressed" />
+							<PAR Name="AutoCommit">
+								<EXP><![CDATA[$=$True]]></EXP>
+							</PAR>
+							<PAR Name="ValidateFail" />
+							<PAR Name="ValidateMsg" />
+							<PAR Name="DataSource">
+								<EXP><![CDATA[$C${0,2,3}]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</ACTION_CALL>
+						<ACTION_CALL Id="RDK:22069061" Name="RDEngineering_ModernUIControl" Suppressed="True" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 							<PAR Name="RDLibraryName">
 								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
 							</PAR>
@@ -50225,7 +50519,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="Tooltip" />
 							<PAR Name="Styles" />
 							<PAR Name="Classes">
-								<EXP><![CDATA[$C$col-4]]></EXP>
+								<EXP><![CDATA[$C$col-2]]></EXP>
 							</PAR>
 							<PAR Name="Rules" />
 							<PAR Name="Image" />
@@ -50239,72 +50533,21 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="Required" />
 							<PAR Name="Hidden" />
 							<PAR Name="ROnly">
-								<EXP><![CDATA[$C$True]]></EXP>
+								<EXP><![CDATA[$=$True]]></EXP>
 							</PAR>
 							<PAR Name="Disabled" />
 							<PAR Name="Pressed" />
-							<PAR Name="AutoCommit" />
-							<PAR Name="ValidateFail" />
-							<PAR Name="ValidateMsg" />
-							<PAR Name="DataSource">
-								<EXP><![CDATA[$=$VarioFoerdererWinkelList]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</ACTION_CALL>
-						<ACTION_CALL Id="RDK:22069062" 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>
-							</PAR>
-							<PAR Name="RenderList">
-								<EXP><![CDATA[$=$Render_VarioFoerderer]]></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$HoeheEnde]]></EXP>
-							</PAR>
-							<PAR Name="ParentId" />
-							<PAR Name="Label">
-								<EXP><![CDATA[$C$H0]]></EXP>
-							</PAR>
-							<PAR Name="Field">
-								<EXP><![CDATA[$C$H_Ende]]></EXP>
-							</PAR>
-							<PAR Name="Value" />
-							<PAR Name="Uom" />
-							<PAR Name="Tooltip" />
-							<PAR Name="Styles" />
-							<PAR Name="Classes">
-								<EXP><![CDATA[$C$col-4]]></EXP>
-							</PAR>
-							<PAR Name="Rules" />
-							<PAR Name="Image" />
-							<PAR Name="ControlType">
-								<EXP><![CDATA[$C$textbox]]></EXP>
-							</PAR>
-							<PAR Name="ButtonSubType" />
-							<PAR Name="DropdownSubType" />
-							<PAR Name="TextboxSubType" />
-							<PAR Name="Action" />
-							<PAR Name="Required" />
-							<PAR Name="Hidden" />
-							<PAR Name="ROnly" />
-							<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="DataSource">
+								<EXP><![CDATA[$=$VarioFoerdererWinkelList]]></EXP>
+							</PAR>
 							<PAR Name="Options" />
 						</ACTION_CALL>
-						<ACTION_CALL Id="RDK:22069063" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}" DesignTimeTip="cp1 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 ">
+						<ACTION_CALL Id="RDK:22069063" 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 ">
 							<PAR Name="RDLibraryName">
 								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
 							</PAR>
@@ -50323,7 +50566,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</PAR>
 							<PAR Name="ParentId" />
 							<PAR Name="Label">
-								<EXP><![CDATA[$C$H1]]></EXP>
+								<EXP><![CDATA[$C$H0]]></EXP>
 							</PAR>
 							<PAR Name="Field">
 								<EXP><![CDATA[$C$H_Anfang]]></EXP>
@@ -50333,7 +50576,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="Tooltip" />
 							<PAR Name="Styles" />
 							<PAR Name="Classes">
-								<EXP><![CDATA[$C$col-4]]></EXP>
+								<EXP><![CDATA[$C$col-2]]></EXP>
 							</PAR>
 							<PAR Name="Rules" />
 							<PAR Name="Image" />
@@ -50344,7 +50587,9 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="DropdownSubType" />
 							<PAR Name="TextboxSubType" />
 							<PAR Name="Action" />
-							<PAR Name="Required" />
+							<PAR Name="Required">
+								<EXP><![CDATA[$=$True]]></EXP>
+							</PAR>
 							<PAR Name="Hidden" />
 							<PAR Name="ROnly" />
 							<PAR Name="Disabled" />
@@ -50357,6 +50602,175 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="DataSource" />
 							<PAR Name="Options" />
 						</ACTION_CALL>
+						<ACTION_CALL Id="RDK:24643057" 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_VarioFoerderer]]></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$FesteH0]]></EXP>
+							</PAR>
+							<PAR Name="ParentId" />
+							<PAR Name="Label">
+								<EXP><![CDATA[$C$fixiert]]></EXP>
+							</PAR>
+							<PAR Name="Field">
+								<EXP><![CDATA[$C$FesteH0]]></EXP>
+							</PAR>
+							<PAR Name="Value" />
+							<PAR Name="Uom" />
+							<PAR Name="Tooltip" />
+							<PAR Name="Styles" />
+							<PAR Name="Classes">
+								<EXP><![CDATA[$C$col-2]]></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" />
+							<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>
+						</ACTION_CALL>
+						<ACTION_CALL Id="RDK:22069062" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}" DesignTimeTip="cp1 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>
+							</PAR>
+							<PAR Name="RenderList">
+								<EXP><![CDATA[$=$Render_VarioFoerderer]]></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$HoeheEnde]]></EXP>
+							</PAR>
+							<PAR Name="ParentId" />
+							<PAR Name="Label">
+								<EXP><![CDATA[$C$H1]]></EXP>
+							</PAR>
+							<PAR Name="Field">
+								<EXP><![CDATA[$C$H_Ende]]></EXP>
+							</PAR>
+							<PAR Name="Value" />
+							<PAR Name="Uom" />
+							<PAR Name="Tooltip" />
+							<PAR Name="Styles" />
+							<PAR Name="Classes">
+								<EXP><![CDATA[$C$col-2]]></EXP>
+							</PAR>
+							<PAR Name="Rules" />
+							<PAR Name="Image" />
+							<PAR Name="ControlType">
+								<EXP><![CDATA[$C$textbox]]></EXP>
+							</PAR>
+							<PAR Name="ButtonSubType" />
+							<PAR Name="DropdownSubType" />
+							<PAR Name="TextboxSubType" />
+							<PAR Name="Action" />
+							<PAR Name="Required">
+								<EXP><![CDATA[$=$True]]></EXP>
+							</PAR>
+							<PAR Name="Hidden" />
+							<PAR Name="ROnly" />
+							<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" />
+						</ACTION_CALL>
+						<ACTION_CALL Id="RDK:24643059" 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_VarioFoerderer]]></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$FesteH1]]></EXP>
+							</PAR>
+							<PAR Name="ParentId" />
+							<PAR Name="Label">
+								<EXP><![CDATA[$C$fixiert]]></EXP>
+							</PAR>
+							<PAR Name="Field">
+								<EXP><![CDATA[$C$FesteH1]]></EXP>
+							</PAR>
+							<PAR Name="Value" />
+							<PAR Name="Uom" />
+							<PAR Name="Tooltip" />
+							<PAR Name="Styles" />
+							<PAR Name="Classes">
+								<EXP><![CDATA[$C$col-2]]></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" />
+							<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>
+						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:22069064" 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">
 								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
@@ -50404,7 +50818,9 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</PAR>
 							<PAR Name="Disabled" />
 							<PAR Name="Pressed" />
-							<PAR Name="AutoCommit" />
+							<PAR Name="AutoCommit">
+								<EXP><![CDATA[$=$True]]></EXP>
+							</PAR>
 							<PAR Name="ValidateFail" />
 							<PAR Name="ValidateMsg" />
 							<PAR Name="DataSource" />
@@ -50437,7 +50853,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<PAR Name="RenderStatus" />
 								<PAR Name="Options" />
 							</ACTION_CALL>
-							<ACTION_CALL Id="RDK:22069067" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
+							<ACTION_CALL Id="RDK:22069066" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 								<PAR Name="RDLibraryName">
 									<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
 								</PAR>
@@ -50452,15 +50868,15 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<EXP><![CDATA[$C$0]]></EXP>
 								</PAR>
 								<PAR Name="Id">
-									<EXP><![CDATA[$C$Abbrechen_Button]]></EXP>
+									<EXP><![CDATA[$C$OK_Button]]></EXP>
 								</PAR>
 								<PAR Name="ParentId" />
 								<PAR Name="Label">
-									<EXP><![CDATA[$C$Abbrechen]]></EXP>
+									<EXP><![CDATA[$C$OK]]></EXP>
 								</PAR>
 								<PAR Name="Field" />
 								<PAR Name="Value">
-									<EXP><![CDATA[$C$CLOSEPOPUP]]></EXP>
+									<EXP><![CDATA[$C$OK]]></EXP>
 								</PAR>
 								<PAR Name="Uom" />
 								<PAR Name="Tooltip" />
@@ -50488,7 +50904,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<PAR Name="DataSource" />
 								<PAR Name="Options" />
 							</ACTION_CALL>
-							<ACTION_CALL Id="RDK:22069066" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
+							<ACTION_CALL Id="RDK:22069067" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 								<PAR Name="RDLibraryName">
 									<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
 								</PAR>
@@ -50503,15 +50919,15 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<EXP><![CDATA[$C$0]]></EXP>
 								</PAR>
 								<PAR Name="Id">
-									<EXP><![CDATA[$C$OK_Button]]></EXP>
+									<EXP><![CDATA[$C$Abbrechen_Button]]></EXP>
 								</PAR>
 								<PAR Name="ParentId" />
 								<PAR Name="Label">
-									<EXP><![CDATA[$C$OK]]></EXP>
+									<EXP><![CDATA[$C$Abbrechen]]></EXP>
 								</PAR>
 								<PAR Name="Field" />
 								<PAR Name="Value">
-									<EXP><![CDATA[$C$OK]]></EXP>
+									<EXP><![CDATA[$C$CLOSEPOPUP]]></EXP>
 								</PAR>
 								<PAR Name="Uom" />
 								<PAR Name="Tooltip" />
@@ -53189,35 +53605,48 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						<EXP><![CDATA[$C$Förderer können nach oben oder unten wirken (Typ: Auf oder Ab)]]></EXP>
 					</PAR>
 					<PAR Name="Typ">
-						<EXP><![CDATA[$C$horizontal]]></EXP>
+						<EXP><![CDATA[$C$Auf]]></EXP>
 					</PAR>
 					<PAR Name="AntriebNebenStrecke">
 						<EXP><![CDATA[$C$links]]></EXP>
 					</PAR>
 					<PAR Name="L1">
-						<EXP><![CDATA[$C$2000]]></EXP>
+						<EXP><![CDATA[$C$3000]]></EXP>
+					</PAR>
+					<PAR Name="L_GF">
+						<EXP><![CDATA[$C$1500]]></EXP>
+					</PAR>
+					<PAR Name="L_th">
+						<EXP><![CDATA[$C$1500]]></EXP>
 					</PAR>
-					<PAR Name="L_th" />
 					<PAR Name="LH_fits" />
 					<PAR Name="LH_toleranz">
 						<EXP><![CDATA[$C$10]]></EXP>
 					</PAR>
 					<PAR Name="FesteL1" />
+					<PAR Name="FesteL_GF">
+						<EXP><![CDATA[$C$True]]></EXP>
+					</PAR>
+					<PAR Name="FesteH0" />
+					<PAR Name="FesteH1" />
 					<PAR Name="winkel">
-						<EXP><![CDATA[$C$24]]></EXP>
+						<EXP><![CDATA[$C$3]]></EXP>
+					</PAR>
+					<PAR Name="winkel_GF">
+						<EXP><![CDATA[$C$3]]></EXP>
 					</PAR>
 					<PAR Name="winkel_th" />
 					<PAR Name="H_Anfang" />
 					<PAR Name="H_Ende" />
-					<PAR Name="H_th" />
+					<PAR Name="H_th">
+						<EXP><![CDATA[$C$78.617]]></EXP>
+					</PAR>
 					<PAR Name="n_Sep">
 						<EXP><![CDATA[$C$1]]></EXP>
 					</PAR>
 					<PAR Name="n_Scan">
-						<EXP><![CDATA[$C$0]]></EXP>
+						<EXP><![CDATA[$C$1]]></EXP>
 					</PAR>
-					<PAR Name="FesteH0" />
-					<PAR Name="FesteH1" />
 				</SET_STRUCT>
 			</GROUP>
 			<GROUP Id="RDK:1007716" Name="SSG_Shapes" SubType="Generic">