From 137de181d7793f2c5f4d3eee346ded37a674bb35 Mon Sep 17 00:00:00 2001
From: Simon Schmutzler <s.schmutzler@schoenenberger.de>
Date: Mon, 19 Feb 2024 17:44:31 +0100
Subject: [PATCH] =?UTF-8?q?F=C3=B6rderer=20berechnung=20Doku=20angepasst;?=
 =?UTF-8?q?=20UI=20und=20Berechnungen=20im=20RDC=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Doku/Berechnung-foerderer-Längen.md |   9 +
 MAIN_SSG.rdx                        | 670 ++++++++++++++++++++++++----
 2 files changed, 592 insertions(+), 87 deletions(-)

diff --git a/Doku/Berechnung-foerderer-Längen.md b/Doku/Berechnung-foerderer-Längen.md
index a24fdc4..95d9cc3 100644
--- a/Doku/Berechnung-foerderer-Längen.md
+++ b/Doku/Berechnung-foerderer-Längen.md
@@ -72,3 +72,12 @@ $$
 - \Delta_{H_F} aus [1]
 - und L_S aus [5]
 
+$$
+\frac{tan(\alpha_F) + tan(\alpha_S)}{\frac{H_1 - H_0}{L_1} + tan(\alpha_S)} \geq 1
+$$
+$$
+{tan(\alpha_F) + tan(\alpha_S)} \geq {\frac{H_1 - H_0}{L_1} + tan(\alpha_S)}
+$$
+$$
+{tan(\alpha_F)} \geq {\frac{H_1 - H_0}{L_1}}
+$$
\ No newline at end of file
diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 05b7f6c..16913be 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -1,10 +1,10 @@
 <?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="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-02-13T16:41:36" LanguageVersion="2014.1.3.627" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-02-19T17:37:19" LanguageVersion="2014.1.3.627" />
 	<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">
-				<TYPE Id="RDK:313478" Name="SSGConnectionPoint" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:313478" Name="SSGConnectionPoint" Expanded="True" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:609117" Name="id" Type="string" />
 					<FIELD Id="RDK:313462" Name="x_M" Type="double" />
@@ -17,7 +17,7 @@
 					<FIELD Id="RDK:313476" Name="label" Type="string" />
 					<FIELD Id="RDK:721671" Name="aktiv" Type="boolean" />
 				</TYPE>
-				<TYPE Id="RDK:26388" Name="KreiselType" SubType="structure">
+				<TYPE Id="RDK:26388" Name="KreiselType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:95024" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:26389" Name="AbstandMS" Type="double" />
@@ -65,11 +65,14 @@
 					<FIELD Id="RDK:18116683" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:18116696" Name="Typ" Type="string" />
 					<FIELD Id="RDK:18116684" Name="L1" Type="double" />
-					<FIELD Id="RDK:18116685" Name="winkel" Type="integer" />
+					<FIELD Id="RDK:18129305" Name="L_s" Type="double" />
+					<FIELD Id="RDK:18116685" Name="winkel_f" Type="integer" />
+					<FIELD Id="RDK:18129301" Name="winkel_s" Type="integer" />
 					<FIELD Id="RDK:18116686" Name="HoeheOben" Type="double" />
 					<FIELD Id="RDK:18116692" Name="HoeheFoerdererAnfang" Type="double" />
 					<FIELD Id="RDK:18116687" Name="HoeheFoerdererEnde" Type="double" />
 					<FIELD Id="RDK:18116694" Name="HoeheUnten" Type="double" />
+					<FIELD Id="RDK:18129303" Name="Delta_h" Type="double" />
 					<FIELD Id="RDK:18116688" Name="n_Sep" Type="integer" />
 					<FIELD Id="RDK:18116689" Name="n_Scan" Type="integer" />
 				</TYPE>
@@ -92,7 +95,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" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:79642" Name="SSG_ShapeType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:79643" Name="SivasNummer" Type="string" />
 					<FIELD Id="RDK:1561689" Name="Rotationsklasse" Type="string" />
@@ -105,7 +108,7 @@
 					<FIELD Id="RDK:1652536" Name="BTMTBeladungDefinition" Type="BTMTBeladungType" />
 					<FIELD Id="RDK:16525361" Name="BTMTEntladungDefinition" Type="BTMTEntladungType" />
 				</TYPE>
-				<TYPE Id="RDK:1783792" Name="SSGParameter" Expanded="True" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:1783792" Name="SSGParameter" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:1783794" Name="Key" Type="string" />
 					<FIELD Id="RDK:1789531" Name="Str" Type="string" />
@@ -283,7 +286,7 @@
 					<UI_INPUT_SUPPORT />
 					<TYPE_VALUES />
 				</TYPE>
-				<TYPE Id="RDK:1013994" Name="Editor2DShapePropertyType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:1013994" Name="Editor2DShapePropertyType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:1013957" Name="id" Type="string" DesignTimeRemark="REQUIRED" />
 					<FIELD Id="RDK:1013958" Name="name" Type="string" DesignTimeRemark="REQUIRED" />
@@ -393,7 +396,7 @@
 					<UI_INPUT_SUPPORT />
 					<TYPE_VALUES />
 				</TYPE>
-				<TYPE Id="RDK:1014046" Name="Editor2DParameterType" Expanded="True" SubType="structure" DesignTimeNotes="{&#xD;&#xA;&quot;name&quot;:&quot;p1&quot;,&#xD;&#xA;&quot;value&quot;:&quot;v1&quot;&#xD;&#xA;}">
+				<TYPE Id="RDK:1014046" Name="Editor2DParameterType" SubType="structure" DesignTimeNotes="{&#xD;&#xA;&quot;name&quot;:&quot;p1&quot;,&#xD;&#xA;&quot;value&quot;:&quot;v1&quot;&#xD;&#xA;}">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:1014044" Name="name" Type="string" />
 					<FIELD Id="RDK:1014045" Name="value" Type="string" />
@@ -710,13 +713,19 @@
 				</TYPE>
 				<TYPE Id="RDK:903598" Name="GefaellestreckeMerkmaleType" SubType="structure">
 					<TYPE_VALUES />
-					<FIELD Id="RDK:903599" Name="Anzahl der Zusatzseparatoren" Type="string" />
+					<FIELD Id="RDK:903599" Name="Anzahl Zusatzseparatoren" Type="string" />
+					<FIELD Id="RDK:18131152" Name="Gesamtanzahl Separatoren" Type="string" />
 					<FIELD Id="RDK:903600" Name="Länge in Meter" Type="string" />
 					<FIELD Id="RDK:1674242" Name="Anzahl der Scanner" Type="integer" />
 				</TYPE>
 				<TYPE Id="RDK:18111807" Name="FoerdererMerkmaleType" SubType="structure">
 					<TYPE_VALUES />
-					<FIELD Id="RDK:18111805" Name="Länge in Meter" Type="string" />
+					<FIELD Id="RDK:18131140" Name="Höhe oben" Type="string" />
+					<FIELD Id="RDK:18131142" Name="Höhe unten" Type="string" />
+					<FIELD Id="RDK:18131144" Name="Gesamtlänge Gefällestrecke" Type="string" />
+					<FIELD Id="RDK:18131146" Name="Anzahl Zusatzseparatoren" Type="string" />
+					<FIELD Id="RDK:18131150" Name="Gesamtanzahl Separatoren" Type="string" />
+					<FIELD Id="RDK:18131148" Name="Anzahl Scanner" Type="string" />
 				</TYPE>
 				<TYPE Id="RDK:973721" Name="WeicheMerkmaleType" SubType="structure">
 					<TYPE_VALUES />
@@ -740,7 +749,7 @@
 				<FIELD Id="RDK:1007391" Name="X" Type="double" />
 				<FIELD Id="RDK:1007392" Name="Y" Type="double" />
 			</TYPE>
-			<TYPE Id="RDK:1007741" Name="SSY_Shapes" Expanded="True" SubType="structure" HasArrayType="True">
+			<TYPE Id="RDK:1007741" Name="SSY_Shapes" SubType="structure" HasArrayType="True">
 				<TYPE_VALUES />
 				<FIELD Id="RDK:1007735" Name="name" Type="string" />
 				<FIELD Id="RDK:1007736" Name="ShapeID" Type="string" />
@@ -3456,6 +3465,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="KreiselDefinition" />
 										<PAR Name="EckradDefinition" />
 										<PAR Name="GefaelleDefinition" />
+										<PAR Name="FoerdererDefinition" />
 										<PAR Name="WeicheDefinition" />
 										<PAR Name="BTMTBeladungDefinition" />
 										<PAR Name="BTMTEntladungDefinition" />
@@ -3520,7 +3530,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
-										<PAR Name="FoerdererDefinition" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -4226,6 +4235,120 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							</SELECTCASE>
 						</FOREACHLOOP>
 					</FUNCTION>
+					<FUNCTION Id="RDK:18146462" Name="Calculate Foerderer">
+						<GROUP Id="RDK:18150158" Name="Local Variables" SubType="VarSet" IncludeDate="0">
+							<VAR Id="RDK:18150159" Name="x_verhaeltnis" Type="double" DesignTimeRemark="Verhältnis von Förderstrecke und Gesamtlänge" />
+							<VAR Id="RDK:18150198" Name="winkel_f" Type="double" DesignTimeRemark="Winkel von Förderstrecke" />
+							<VAR Id="RDK:18150200" Name="winkel_s" Type="double" DesignTimeRemark="Winkel von Gefällestrecke" />
+							<VAR Id="RDK:18150242" Name="L1" Type="double" DesignTimeRemark="Gesamtlänge" />
+							<VAR Id="RDK:18150246" Name="HoeheOben" Type="double" DesignTimeRemark="Höhe am oberen Anschlusspunkt" />
+							<VAR Id="RDK:18150248" Name="HoeheUnten" Type="double" DesignTimeRemark="Höhe am unteren Anschlusspunkt" />
+						</GROUP>
+						<COMMENTS Id="RDK:18146464" DesignTimeRemark="Shape_Prototype.FoerdererDefinition.L1" />
+						<SET Id="RDK:18150201" VarRef="winkel_s">
+							<EXP><![CDATA[$=$Shape_Prototype.FoerdererDefinition.winkel_s]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:18150203" VarRef="winkel_f">
+							<EXP><![CDATA[$=$Shape_Prototype.FoerdererDefinition.winkel_f]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:18150244" VarRef="L1">
+							<EXP><![CDATA[$=$Shape_Prototype.FoerdererDefinition.L1]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:18150250" VarRef="HoeheOben">
+							<EXP><![CDATA[$=$Shape_Prototype.FoerdererDefinition.HoeheOben]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:18150252" VarRef="HoeheUnten">
+							<EXP><![CDATA[$=$Shape_Prototype.FoerdererDefinition.HoeheUnten]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<IFTHENELSE Id="RDK:18150192">
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$winkel_s < -89]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$winkel_s > 89]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$winkel_f < -89]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$winkel_f > 89]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$L1 < 0]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:18150193" SubType="Then">
+								<ACTION_CALL Id="RDK:18150230" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
+									<PAR Name="RDLibraryName">
+										<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+									</PAR>
+									<PAR Name="MsgText">
+										<EXP><![CDATA[$C$Die Winkel dürfen 90 Grad nicht überschreiten und die Gesamtlänge des Elements muss positiv sein.]]></EXP>
+									</PAR>
+									<PAR Name="MsgStyle" />
+									<PAR Name="BtnLayout" />
+									<PAR Name="MsgCaption" />
+									<PAR Name="BaloonType" />
+									<PAR Name="BtnPressed">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+								</ACTION_CALL>
+								<EXIT_PROCESS Id="RDK:18150232" BreakType="4" ExitStatus="0" />
+							</GROUP>
+							<GROUP Id="RDK:18150194" SubType="Else">
+								<SET Id="RDK:18150160" VarRef="x_verhaeltnis">
+									<EXP><![CDATA[$=$(Tan(winkel_f)+Tan(winkel_s))/((HoeheOben-HoeheUnten)/L1+Tan(winkel_s))]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<IFTHENELSE Id="RDK:18150161">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$x_verhaeltnis > 1]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:18150162" SubType="Then">
+										<SET_STRUCT Id="RDK:18150172" VarRef="Shape_Prototype.FoerdererDefinition" ClearAll="True">
+											<PAR Name="Beschreibung" />
+											<PAR Name="Typ" />
+											<PAR Name="L1" />
+											<PAR Name="L_s" />
+											<PAR Name="winkel_f" />
+											<PAR Name="winkel_s" />
+											<PAR Name="HoeheOben" />
+											<PAR Name="HoeheFoerdererAnfang" />
+											<PAR Name="HoeheFoerdererEnde" />
+											<PAR Name="HoeheUnten" />
+											<PAR Name="Delta_h">
+												<EXP><![CDATA[$=$Tan(winkel_f)*L1*x_verhaeltnis]]></EXP>
+											</PAR>
+											<PAR Name="n_Sep" />
+											<PAR Name="n_Scan" />
+										</SET_STRUCT>
+									</GROUP>
+									<GROUP Id="RDK:18150163" SubType="Else">
+										<ACTION_CALL Id="RDK:18150191" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
+											<PAR Name="RDLibraryName">
+												<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+											</PAR>
+											<PAR Name="MsgText">
+												<EXP><![CDATA[$C$Das Verhältnis Förderlänge und Höhendifferenz ist zu groß]]></EXP>
+											</PAR>
+											<PAR Name="MsgStyle" />
+											<PAR Name="BtnLayout" />
+											<PAR Name="MsgCaption" />
+											<PAR Name="BaloonType" />
+											<PAR Name="BtnPressed">
+												<EXP><![CDATA[$V$]]></EXP>
+											</PAR>
+										</ACTION_CALL>
+										<EXIT_PROCESS Id="RDK:18150177" BreakType="4" ExitStatus="0" />
+									</GROUP>
+								</IFTHENELSE>
+							</GROUP>
+						</IFTHENELSE>
+					</FUNCTION>
 					<FUNCTION Id="RDK:260964" Name="CollectLinkedShapes" InputTypeName="string[]">
 						<GROUP Id="RDK:281649" Name="Local Variables" SubType="VarSet" IncludeDate="0">
 							<VAR Id="RDK:508461" Name="ID" Type="string" DesignTimeRemark="Generated by RD" />
@@ -6621,11 +6744,29 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 									<EXP><![CDATA[$=$FieldAffected="AbstandMS"]]></EXP>
 								</VALUECONDITION>
 								<EXEC_ON_VALUES Id="RDK:812296" VarRef="Shape_Prototype.KreiselDefinition.M_Strecke">
+									<PAR Name="id" />
+									<PAR Name="x_M" />
+									<PAR Name="x_S" />
+									<PAR Name="x" />
+									<PAR Name="y" />
+									<PAR Name="z" />
+									<PAR Name="direction" />
+									<PAR Name="linkClass" />
+									<PAR Name="label" />
 									<PAR Name="aktiv">
 										<EXP><![CDATA[$=$IIF(me.x_M<=(Shape_Prototype.KreiselDefinition.AbstandMS-Shape_Prototype.KreiselDefinition.d_min),TRUE,FALSE)]]></EXP>
 									</PAR>
 								</EXEC_ON_VALUES>
 								<EXEC_ON_VALUES Id="RDK:812298" VarRef="Shape_Prototype.KreiselDefinition.S_Strecke">
+									<PAR Name="id" />
+									<PAR Name="x_M" />
+									<PAR Name="x_S" />
+									<PAR Name="x" />
+									<PAR Name="y" />
+									<PAR Name="z" />
+									<PAR Name="direction" />
+									<PAR Name="linkClass" />
+									<PAR Name="label" />
 									<PAR Name="aktiv">
 										<EXP><![CDATA[$=$IIF(me.x_S<=(Shape_Prototype.KreiselDefinition.AbstandMS-Shape_Prototype.KreiselDefinition.d_min),TRUE,FALSE)]]></EXP>
 									</PAR>
@@ -7749,7 +7890,8 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 						</CASEGROUP>
 					</SELECTCASE>
 				</FUNCTION>
-				<FUNCTION Id="RDK:18116648" Name="FoerdererStreckeUI">
+				<FUNCTION Id="RDK:18116648" Name="FoerdererUI">
+					<GROUP Id="RDK:18139659" Name="Update Controls" SubType="Generic" />
 					<ACTION_CALL Id="RDK:18116636" Name="RDEngineering_ModernUIRender">
 						<PAR Name="RDLibraryName">
 							<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
@@ -7896,6 +8038,54 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 							</GROUP>
 							<EXIT_PROCESS Id="RDK:18116643" BreakType="3" ExitStatus="0" />
 						</CASEGROUP>
+						<CASEGROUP Id="RDK:18143956" CaseType="0">
+							<EXP><![CDATA[$C$AUTOCOMMIT]]></EXP>
+							<GROUP Id="RDK:18143950" Name="Group" SubType="Generic">
+								<VALUECONDITION Value="true" Oper="OR">
+									<EXP><![CDATA[$=$FieldAffected="L1"]]></EXP>
+								</VALUECONDITION>
+								<VALUECONDITION Value="true" Oper="OR">
+									<EXP><![CDATA[$=$FieldAffected = "HoeheUnten"]]></EXP>
+								</VALUECONDITION>
+								<VALUECONDITION Value="true" Oper="OR">
+									<EXP><![CDATA[$=$FieldAffected="HoeheOben"]]></EXP>
+								</VALUECONDITION>
+								<VALUECONDITION Value="true" Oper="OR">
+									<EXP><![CDATA[$=$FieldAffected="winkel_s"]]></EXP>
+								</VALUECONDITION>
+								<VALUECONDITION Value="true">
+									<EXP><![CDATA[$=$FieldAffected="winkel_f"]]></EXP>
+								</VALUECONDITION>
+								<COMMENTS Id="RDK:18142722" DesignTimeRemark="Shape_Prototype.FoerdererDefinition.L1" />
+								<CALLFUNCTION Id="RDK:18146467">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$Calculate Foerderer]]></EXP>
+									</PAR>
+									<PAR Name="InputExp" />
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+							</GROUP>
+							<IFTHENELSE Id="RDK:18143955">
+								<VALUECONDITION Value="true">
+									<EXP><![CDATA[$=$Shape_Prototype.KreiselDefinition.Typ="Standard"]]></EXP>
+								</VALUECONDITION>
+								<GROUP Id="RDK:18143952" SubType="Then">
+									<SET Id="RDK:18143951" VarRef="Shape_Prototype.KreiselDefinition.n_Rampen">
+										<EXP><![CDATA[$C$0]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+								</GROUP>
+								<GROUP Id="RDK:18143954" SubType="Else">
+									<SET Id="RDK:18143953" VarRef="Shape_Prototype.KreiselDefinition.n_Rampen">
+										<EXP><![CDATA[$C$2]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+								</GROUP>
+							</IFTHENELSE>
+						</CASEGROUP>
 						<CASEGROUP Id="RDK:18116646" CaseType="0">
 							<EXP><![CDATA[$C$CLOSEPOPUP]]></EXP>
 							<EXIT_PROCESS Id="RDK:18116645" BreakType="3" ExitStatus="0" />
@@ -7988,7 +8178,9 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 						<PAR Name="PopupStyle" />
 						<PAR Name="Process" />
 						<PAR Name="RunTimeRemark" />
-						<PAR Name="WaitForInput" />
+						<PAR Name="WaitForInput">
+							<EXP><![CDATA[$C$true]]></EXP>
+						</PAR>
 						<PAR Name="RDActionTimeOut" />
 						<PAR Name="WebResourcePath" />
 						<PAR Name="ImgTop" />
@@ -7997,7 +8189,7 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 						<PAR Name="ImgRight" />
 						<PAR Name="CSSStyle" />
 						<PAR Name="ButtonsMode">
-							<EXP><![CDATA[$C$-1]]></EXP>
+							<EXP><![CDATA[$C$0]]></EXP>
 						</PAR>
 						<PAR Name="ButtonList" />
 						<PAR Name="ButtonImgs" />
@@ -9069,6 +9261,9 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<GROUP Id="RDK:18116663" Name="UI" SubType="Generic">
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Param.Input[0].class<>"OnPasted"]]></EXP>
+							</VALUECONDITION>
 							<ACTION_CALL Id="RDK:18116659" Name="RDEngineering_RemoteRedirect" DesignTimeRemark="{Action Mode} {Url}" DesignTimeNotes="(CLOSEBUTTON)(TITLE=TITOLO DEL POP UP)(TITLECOLOR=#000000)(TITLEBACKCOLOR=RED)(STARTPOSITION=bottom)(NOPADDING)(DRAGGABLE)">
 								<PAR Name="RDLibraryName">
 									<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
@@ -9117,7 +9312,7 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 							<WHILELOOP Id="RDK:18116661">
 								<CALLFUNCTION Id="RDK:18116660">
 									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$FoerdererStreckeUI]]></EXP>
+										<EXP><![CDATA[$C$FoerdererUI]]></EXP>
 									</PAR>
 									<PAR Name="InputExp" />
 									<PAR Name="ResultRef">
@@ -9646,6 +9841,111 @@ me.x
 									</ACTION_CALL>
 								</GROUP>
 							</CASEGROUP>
+							<CASEGROUP Id="RDK:18131166" CaseType="0">
+								<EXP><![CDATA[$C$Foerderer]]></EXP>
+								<GROUP Id="RDK:18131165" Name="UI" SubType="Generic">
+									<ACTION_CALL Id="RDK:18131161" Name="RDEngineering_RemoteRedirect" DesignTimeRemark="{Action Mode} {Url}" DesignTimeNotes="(CLOSEBUTTON)(TITLE=TITOLO DEL POP UP)(TITLECOLOR=#000000)(TITLEBACKCOLOR=RED)(STARTPOSITION=bottom)(NOPADDING)(DRAGGABLE)">
+										<PAR Name="RDLibraryName">
+											<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+										</PAR>
+										<PAR Name="RedirectMode">
+											<EXP><![CDATA[$C$5]]></EXP>
+										</PAR>
+										<PAR Name="Url" />
+										<PAR Name="HtmlFile" />
+										<PAR Name="HtmlData" />
+										<PAR Name="JsCode" />
+										<PAR Name="JsResult">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="CssSource" />
+										<PAR Name="PopupName" />
+										<PAR Name="PopupStyle" />
+										<PAR Name="Process" />
+										<PAR Name="RunTimeRemark" />
+										<PAR Name="WaitForInput">
+											<EXP><![CDATA[$C$true]]></EXP>
+										</PAR>
+										<PAR Name="RDActionTimeOut" />
+										<PAR Name="WebResourcePath" />
+										<PAR Name="ImgTop" />
+										<PAR Name="ImgBottom" />
+										<PAR Name="ImgLeft" />
+										<PAR Name="ImgRight" />
+										<PAR Name="CSSStyle" />
+										<PAR Name="ButtonsMode">
+											<EXP><![CDATA[$C$0]]></EXP>
+										</PAR>
+										<PAR Name="ButtonList" />
+										<PAR Name="ButtonImgs" />
+										<PAR Name="ButtonAction" />
+										<PAR Name="ButtonOptions" />
+										<PAR Name="ButtonDefs" />
+										<PAR Name="ButtonPressed">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="HeaderData" />
+										<PAR Name="Options">
+											<EXP><![CDATA[$=$"(CLOSEBUTTON)(TITLE="+Shape_Prototype.name+")(NOPADDING)(STARTPOSITION=bottom)"]]></EXP>
+										</PAR>
+									</ACTION_CALL>
+									<WHILELOOP Id="RDK:18131163">
+										<CALLFUNCTION Id="RDK:18131162">
+											<PAR Name="FuncName">
+												<EXP><![CDATA[$C$FoerdererUI]]></EXP>
+											</PAR>
+											<PAR Name="InputExp" />
+											<PAR Name="ResultRef">
+												<EXP><![CDATA[$V$]]></EXP>
+											</PAR>
+											<PAR Name="Options" />
+										</CALLFUNCTION>
+									</WHILELOOP>
+									<ACTION_CALL Id="RDK:18131164" Name="RDEngineering_RemoteRedirect" DesignTimeRemark="{Action Mode} {Url}">
+										<PAR Name="RDLibraryName">
+											<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+										</PAR>
+										<PAR Name="RedirectMode">
+											<EXP><![CDATA[$C$7]]></EXP>
+										</PAR>
+										<PAR Name="Url" />
+										<PAR Name="HtmlFile" />
+										<PAR Name="HtmlData" />
+										<PAR Name="JsCode" />
+										<PAR Name="JsResult">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="CssSource" />
+										<PAR Name="PopupName" />
+										<PAR Name="PopupStyle" />
+										<PAR Name="Process" />
+										<PAR Name="RunTimeRemark" />
+										<PAR Name="WaitForInput">
+											<EXP><![CDATA[$C$true]]></EXP>
+										</PAR>
+										<PAR Name="RDActionTimeOut" />
+										<PAR Name="WebResourcePath" />
+										<PAR Name="ImgTop" />
+										<PAR Name="ImgBottom" />
+										<PAR Name="ImgLeft" />
+										<PAR Name="ImgRight" />
+										<PAR Name="CSSStyle" />
+										<PAR Name="ButtonsMode">
+											<EXP><![CDATA[$C$0]]></EXP>
+										</PAR>
+										<PAR Name="ButtonList" />
+										<PAR Name="ButtonImgs" />
+										<PAR Name="ButtonAction" />
+										<PAR Name="ButtonOptions" />
+										<PAR Name="ButtonDefs" />
+										<PAR Name="ButtonPressed">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="HeaderData" />
+										<PAR Name="Options" />
+									</ACTION_CALL>
+								</GROUP>
+							</CASEGROUP>
 							<CASEGROUP Id="RDK:973728" CaseType="0" Bookmarked="True">
 								<EXP><![CDATA[$C$Weiche]]></EXP>
 								<ACTION_CALL Id="RDK:973732" Name="RDEngineering_RemoteRedirect" DesignTimeRemark="{Action Mode} {Url}" DesignTimeNotes="(CLOSEBUTTON)(TITLE=TITOLO DEL POP UP)(TITLECOLOR=#000000)(TITLEBACKCOLOR=RED)(STARTPOSITION=bottom)(NOPADDING)(DRAGGABLE)">
@@ -10606,6 +10906,7 @@ me.x
 						<VAR Id="RDK:1516843" Name="CSV_List" Type="CSVType[]" />
 						<VAR Id="RDK:1516844" Name="KreiselMerkmale" Type="KreiselMerkmaleType" />
 						<VAR Id="RDK:1516845" Name="GefaellestreckeMerkmale" Type="GefaellestreckeMerkmaleType" />
+						<VAR Id="RDK:18131115" Name="FoerdererMerkmale" Type="FoerdererMerkmaleType" />
 						<VAR Id="RDK:1516846" Name="WeicheMerkmale" Type="WeicheMerkmaleType" />
 						<VAR Id="RDK:1666873" Name="EckradMerkmale" Type="EckradMerkmaleType" />
 						<VAR Id="RDK:1668589" Name="BTMTBeladungMerkmale" Type="BTMTBeladungMerkmaleType" />
@@ -10739,7 +11040,10 @@ me.x
 								</GROUP>
 								<GROUP Id="RDK:1516879" Name="Merkmale" SubType="Generic">
 									<SET_STRUCT Id="RDK:1516877" VarRef="GefaellestreckeMerkmale" ClearAll="True">
-										<PAR Name="Anzahl der Zusatzseparatoren">
+										<PAR Name="Anzahl Zusatzseparatoren">
+											<EXP><![CDATA[$=$GefaelleData_defaults.n_Sep - ShapeItem.GefaelleDefinition.n_Sep]]></EXP>
+										</PAR>
+										<PAR Name="Gesamtanzahl Separatoren">
 											<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.n_Sep]]></EXP>
 										</PAR>
 										<PAR Name="Länge in Meter">
@@ -10761,6 +11065,65 @@ me.x
 									<PAR Name="POS_TO_ADD" />
 								</LIST_ADD>
 							</CASEGROUP>
+							<CASEGROUP Id="RDK:18131137" CaseType="0">
+								<EXP><![CDATA[$C$Foerderer]]></EXP>
+								<GROUP Id="RDK:18131128" Name="TeileArt" SubType="Generic">
+									<SET Id="RDK:18131127" VarRef="CSV_Item.TeileArt">
+										<EXP><![CDATA[$=$ToJSON("ILS 2.0 ETF")]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+								</GROUP>
+								<GROUP Id="RDK:18131130" Name="Bezeichnung" SubType="Generic">
+									<SET Id="RDK:18131129" VarRef="CSV_Item.Bezeichnung">
+										<EXP><![CDATA[$=$ToJSON(ShapeItem.FoerdererDefinition.Beschreibung)]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+								</GROUP>
+								<GROUP Id="RDK:18131132" Name="Planquadrat" SubType="Generic">
+									<CALLFUNCTION Id="RDK:18131131">
+										<PAR Name="FuncName">
+											<EXP><![CDATA[$C$GetPlanquadratPosition]]></EXP>
+										</PAR>
+										<PAR Name="InputExp" />
+										<PAR Name="ResultRef">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="Options" />
+									</CALLFUNCTION>
+								</GROUP>
+								<GROUP Id="RDK:18131135" Name="Merkmale" SubType="Generic">
+									<SET_STRUCT Id="RDK:18131133" VarRef="FoerdererMerkmale" ClearAll="True">
+										<PAR Name="Höhe oben">
+											<EXP><![CDATA[$=$ShapeItem.FoerdererDefinition.HoeheOben]]></EXP>
+										</PAR>
+										<PAR Name="Höhe unten">
+											<EXP><![CDATA[$=$ShapeItem.FoerdererDefinition.HoeheUnten]]></EXP>
+										</PAR>
+										<PAR Name="Gesamtlänge Gefällestrecke">
+											<EXP><![CDATA[$=$ShapeItem.FoerdererDefinition.L_s]]></EXP>
+										</PAR>
+										<PAR Name="Anzahl Zusatzseparatoren">
+											<EXP><![CDATA[$=$FoerdererData_defaults.n_Sep - ShapeItem.FoerdererDefinition.n_Sep]]></EXP>
+										</PAR>
+										<PAR Name="Gesamtanzahl Separatoren">
+											<EXP><![CDATA[$=$ShapeItem.FoerdererDefinition.n_Sep]]></EXP>
+										</PAR>
+										<PAR Name="Anzahl Scanner">
+											<EXP><![CDATA[$=$ShapeItem.FoerdererDefinition.n_Scan]]></EXP>
+										</PAR>
+									</SET_STRUCT>
+									<SET Id="RDK:18131134" VarRef="CSV_Item.Merkmale">
+										<EXP><![CDATA[$=$ToJSON(FoerdererMerkmale)]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+								</GROUP>
+								<LIST_ADD Id="RDK:18131136" ListRef="CSV_List">
+									<PAR Name="VALUE_TO_ADD">
+										<EXP><![CDATA[$=$CSV_Item]]></EXP>
+									</PAR>
+									<PAR Name="POS_TO_ADD" />
+								</LIST_ADD>
+							</CASEGROUP>
 							<CASEGROUP Id="RDK:1516892" CaseType="0">
 								<EXP><![CDATA[$C$Weiche]]></EXP>
 								<GROUP Id="RDK:1516883" Name="TeileArt" SubType="Generic">
@@ -12289,7 +12652,9 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<PAR Name="ROnly" />
 								<PAR Name="Disabled" />
 								<PAR Name="Pressed" />
-								<PAR Name="AutoCommit" />
+								<PAR Name="AutoCommit">
+									<EXP><![CDATA[$C$True]]></EXP>
+								</PAR>
 								<PAR Name="ValidateFail" />
 								<PAR Name="ValidateMsg" />
 								<PAR Name="DataSource" />
@@ -13919,7 +14284,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="RenderStatus" />
 							<PAR Name="Options" />
 						</ACTION_CALL>
-						<ACTION_CALL Id="RDK:18120317" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
+						<ACTION_CALL Id="RDK:18120318" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 							<PAR Name="RDLibraryName">
 								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
 							</PAR>
@@ -13934,14 +14299,14 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<EXP><![CDATA[$C$0]]></EXP>
 							</PAR>
 							<PAR Name="Id">
-								<EXP><![CDATA[$C$winkel]]></EXP>
+								<EXP><![CDATA[$C$winkel_f]]></EXP>
 							</PAR>
 							<PAR Name="ParentId" />
 							<PAR Name="Label">
-								<EXP><![CDATA[$C$Neigungswinkel]]></EXP>
+								<EXP><![CDATA[$C$Winkel Förderer [°]]]></EXP>
 							</PAR>
 							<PAR Name="Field">
-								<EXP><![CDATA[$C$winkel]]></EXP>
+								<EXP><![CDATA[$C$winkel_f]]></EXP>
 							</PAR>
 							<PAR Name="Value" />
 							<PAR Name="Uom" />
@@ -13953,11 +14318,72 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="Rules" />
 							<PAR Name="Image" />
 							<PAR Name="ControlType">
-								<EXP><![CDATA[$C$slider]]></EXP>
+								<EXP><![CDATA[$C$textbox]]></EXP>
 							</PAR>
 							<PAR Name="ButtonSubType" />
 							<PAR Name="DropdownSubType" />
-							<PAR Name="TextboxSubType" />
+							<PAR Name="TextboxSubType">
+								<EXP><![CDATA[$C$STANDARD]]></EXP>
+							</PAR>
+							<PAR Name="Action" />
+							<PAR Name="Required">
+								<EXP><![CDATA[$C$True]]></EXP>
+							</PAR>
+							<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:18129310" 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_Foerderer]]></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_s]]></EXP>
+							</PAR>
+							<PAR Name="ParentId" />
+							<PAR Name="Label">
+								<EXP><![CDATA[$C$Winkel Strecke [°]]]></EXP>
+							</PAR>
+							<PAR Name="Field">
+								<EXP><![CDATA[$C$winkel_s]]></EXP>
+							</PAR>
+							<PAR Name="Value" />
+							<PAR Name="Uom" />
+							<PAR Name="Tooltip" />
+							<PAR Name="Styles" />
+							<PAR Name="Classes">
+								<EXP><![CDATA[$C$col-6]]></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">
 								<EXP><![CDATA[$C$True]]></EXP>
@@ -13966,15 +14392,15 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="ROnly" />
 							<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">
-								<EXP><![CDATA[$C$(RANGE=0,5,1)]]></EXP>
-							</PAR>
+							<PAR Name="Options" />
 						</ACTION_CALL>
-						<ACTION_CALL Id="RDK:18120318" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
+						<ACTION_CALL Id="RDK:18129308" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 							<PAR Name="RDLibraryName">
 								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
 							</PAR>
@@ -13993,7 +14419,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 aus Förderer und Strecke]]></EXP>
 							</PAR>
 							<PAR Name="Field">
 								<EXP><![CDATA[$C$L1]]></EXP>
@@ -14012,7 +14438,66 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</PAR>
 							<PAR Name="ButtonSubType" />
 							<PAR Name="DropdownSubType" />
-							<PAR Name="TextboxSubType" />
+							<PAR Name="TextboxSubType">
+								<EXP><![CDATA[$C$STANDARD]]></EXP>
+							</PAR>
+							<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" />
+						</ACTION_CALL>
+						<ACTION_CALL Id="RDK:18129312" 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_Foerderer]]></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_s]]></EXP>
+							</PAR>
+							<PAR Name="ParentId" />
+							<PAR Name="Label">
+								<EXP><![CDATA[$C$Länge Gefällestrecke]]></EXP>
+							</PAR>
+							<PAR Name="Field">
+								<EXP><![CDATA[$C$L_s]]></EXP>
+							</PAR>
+							<PAR Name="Value" />
+							<PAR Name="Uom" />
+							<PAR Name="Tooltip" />
+							<PAR Name="Styles" />
+							<PAR Name="Classes">
+								<EXP><![CDATA[$C$col-6]]></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">
 								<EXP><![CDATA[$C$True]]></EXP>
@@ -14129,57 +14614,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="DataSource" />
 							<PAR Name="Options" />
 						</ACTION_CALL>
-						<ACTION_CALL Id="RDK:18120321" 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">
-							<PAR Name="RDLibraryName">
-								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
-							</PAR>
-							<PAR Name="RenderList">
-								<EXP><![CDATA[$=$Render_Foerderer]]></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$HoeheOben]]></EXP>
-							</PAR>
-							<PAR Name="ParentId" />
-							<PAR Name="Label">
-								<EXP><![CDATA[$C$H1]]></EXP>
-							</PAR>
-							<PAR Name="Field">
-								<EXP><![CDATA[$C$HoeheOben]]></EXP>
-							</PAR>
-							<PAR Name="Value" />
-							<PAR Name="Uom" />
-							<PAR Name="Tooltip" />
-							<PAR Name="Styles" />
-							<PAR Name="Classes">
-								<EXP><![CDATA[$C$col-3]]></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" />
-							<PAR Name="ValidateFail" />
-							<PAR Name="ValidateMsg" />
-							<PAR Name="DataSource" />
-							<PAR Name="Options" />
-						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:18120322" 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">
 							<PAR Name="RDLibraryName">
 								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
@@ -14199,7 +14633,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</PAR>
 							<PAR Name="ParentId" />
 							<PAR Name="Label">
-								<EXP><![CDATA[$C$h0]]></EXP>
+								<EXP><![CDATA[$C$H0 - Unterer Höhenwert]]></EXP>
 							</PAR>
 							<PAR Name="Field">
 								<EXP><![CDATA[$C$HoeheUnten]]></EXP>
@@ -14225,7 +14659,62 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="ROnly" />
 							<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:18120321" 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">
+							<PAR Name="RDLibraryName">
+								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+							</PAR>
+							<PAR Name="RenderList">
+								<EXP><![CDATA[$=$Render_Foerderer]]></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$HoeheOben]]></EXP>
+							</PAR>
+							<PAR Name="ParentId" />
+							<PAR Name="Label">
+								<EXP><![CDATA[$C$H1 - Oberer Höhenwert]]></EXP>
+							</PAR>
+							<PAR Name="Field">
+								<EXP><![CDATA[$C$HoeheOben]]></EXP>
+							</PAR>
+							<PAR Name="Value" />
+							<PAR Name="Uom" />
+							<PAR Name="Tooltip" />
+							<PAR Name="Styles" />
+							<PAR Name="Classes">
+								<EXP><![CDATA[$C$col-3]]></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" />
@@ -14250,7 +14739,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</PAR>
 							<PAR Name="ParentId" />
 							<PAR Name="Label">
-								<EXP><![CDATA[$C$hfa]]></EXP>
+								<EXP><![CDATA[$C$hfa - Höhe Beginn Förderer]]></EXP>
 							</PAR>
 							<PAR Name="Field">
 								<EXP><![CDATA[$C$HoeheFoerdererAnfang]]></EXP>
@@ -14301,7 +14790,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</PAR>
 							<PAR Name="ParentId" />
 							<PAR Name="Label">
-								<EXP><![CDATA[$C$hfe]]></EXP>
+								<EXP><![CDATA[$C$hfe - Höhe Ende Förderer]]></EXP>
 							</PAR>
 							<PAR Name="Field">
 								<EXP><![CDATA[$C$HoeheFoerdererEnde]]></EXP>
@@ -14864,13 +15353,20 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<PAR Name="L1">
 						<EXP><![CDATA[$C$4100]]></EXP>
 					</PAR>
-					<PAR Name="winkel">
+					<PAR Name="L_s">
+						<EXP><![CDATA[$C$0]]></EXP>
+					</PAR>
+					<PAR Name="winkel_f">
 						<EXP><![CDATA[$C$30]]></EXP>
 					</PAR>
+					<PAR Name="winkel_s">
+						<EXP><![CDATA[$C$3]]></EXP>
+					</PAR>
 					<PAR Name="HoeheOben" />
 					<PAR Name="HoeheFoerdererAnfang" />
 					<PAR Name="HoeheFoerdererEnde" />
 					<PAR Name="HoeheUnten" />
+					<PAR Name="Delta_h" />
 					<PAR Name="n_Sep">
 						<EXP><![CDATA[$C$1]]></EXP>
 					</PAR>