From 6ad036f0ba0c358f9053d08976a6e41c4c410981 Mon Sep 17 00:00:00 2001
From: Simon Schmutzler <s.schmutzler@schoenenberger.de>
Date: Wed, 21 Feb 2024 13:24:23 +0100
Subject: [PATCH] =?UTF-8?q?Berechnung=20der=20F=C3=B6rderer=20wird=20nun?=
 =?UTF-8?q?=20korrekt=20abgeschlossen;=20H=C3=B6hen=20werden=20von=20angeb?=
 =?UTF-8?q?undenen=20Kreiseln=20=C3=BCbernommen;=20Neukalkulation=20nach?=
 =?UTF-8?q?=20=C3=BCbernahme=20einer=20H=C3=B6he=20noch=20nicht=20funktion?=
 =?UTF-8?q?sf=C3=A4hig?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 444 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 436 insertions(+), 8 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index a8bcf2b..b9ffdbf 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="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-02-20T16:00:53" LanguageVersion="2014.1.3.627" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-02-21T12:52:22" 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">
@@ -60,7 +60,7 @@
 					<FIELD Id="RDK:302575" Name="n_Sep" Type="integer" />
 					<FIELD Id="RDK:302576" Name="n_Scan" Type="integer" />
 				</TYPE>
-				<TYPE Id="RDK:18116690" Name="FoerdererType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:18116690" Name="FoerdererType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18116683" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:18116696" Name="Typ" Type="string" />
@@ -5597,6 +5597,177 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<EXP><![CDATA[$=$x_verhaeltnis > 1]]></EXP>
 								</VALUECONDITION>
 								<GROUP Id="RDK:18150162" SubType="Then">
+									<ACTION_CALL Id="RDK:18205263" 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$Delta_hf]]></EXP>
+										</PAR>
+										<PAR Name="ParentId" />
+										<PAR Name="Label">
+											<EXP><![CDATA[$C$Förderhöhe]]></EXP>
+										</PAR>
+										<PAR Name="Field">
+											<EXP><![CDATA[$C$Delta_hf]]></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" />
+										<PAR Name="Hidden" />
+										<PAR Name="ROnly">
+											<EXP><![CDATA[$C$True]]></EXP>
+										</PAR>
+										<PAR Name="Disabled" />
+										<PAR Name="Pressed" />
+										<PAR Name="AutoCommit" />
+										<PAR Name="ValidateFail">
+											<EXP><![CDATA[$=$False]]></EXP>
+										</PAR>
+										<PAR Name="ValidateMsg" />
+										<PAR Name="DataSource" />
+										<PAR Name="Options" />
+									</ACTION_CALL>
+									<ACTION_CALL Id="RDK:18216869" 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$Delta_hs]]></EXP>
+										</PAR>
+										<PAR Name="ParentId" />
+										<PAR Name="Label">
+											<EXP><![CDATA[$C$Höhenunterschied Gefällestrecke]]></EXP>
+										</PAR>
+										<PAR Name="Field">
+											<EXP><![CDATA[$C$Delta_hs]]></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" />
+										<PAR Name="Hidden" />
+										<PAR Name="ROnly">
+											<EXP><![CDATA[$=$True]]></EXP>
+										</PAR>
+										<PAR Name="Disabled" />
+										<PAR Name="Pressed" />
+										<PAR Name="AutoCommit" />
+										<PAR Name="ValidateFail">
+											<EXP><![CDATA[$=$False]]></EXP>
+										</PAR>
+										<PAR Name="ValidateMsg" />
+										<PAR Name="DataSource" />
+										<PAR Name="Options" />
+									</ACTION_CALL>
+									<ACTION_CALL Id="RDK:18216875" 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$projizierte Länge der 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" />
+										<PAR Name="Hidden" />
+										<PAR Name="ROnly">
+											<EXP><![CDATA[$C$True]]></EXP>
+										</PAR>
+										<PAR Name="Disabled" />
+										<PAR Name="Pressed" />
+										<PAR Name="AutoCommit" />
+										<PAR Name="ValidateFail">
+											<EXP><![CDATA[$=$False]]></EXP>
+										</PAR>
+										<PAR Name="ValidateMsg" />
+										<PAR Name="DataSource" />
+										<PAR Name="Options" />
+									</ACTION_CALL>
 									<SET Id="RDK:18172282" VarRef="Shape_Prototype.FoerdererDefinition.Delta_hf">
 										<EXP><![CDATA[$=$Tan(DegToRad(winkel_f))*L1/x_verhaeltnis]]></EXP>
 										<PAR Name="AdvancedOptions" />
@@ -5613,7 +5784,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<EXP><![CDATA[$=$L1-L1/x_verhaeltnis]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
-									<GROUP Id="RDK:18154601" Name="Write Properties" SubType="Generic">
+									<GROUP Id="RDK:18154601" Name="Write Properties" SubType="Generic" Suppressed="True">
 										<SET Id="RDK:18154599" VarRef="i">
 											<EXP><![CDATA[$=$IndexOfByFieldValue(ShapeList, "id", Shape_Prototype.id)]]></EXP>
 											<PAR Name="AdvancedOptions" />
@@ -5686,9 +5857,10 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 											<PAR Name="includeInBOM" />
 										</SET_STRUCT>
 									</GROUP>
+									<EXIT_PROCESS Id="RDK:18197934" BreakType="4" ExitStatus="0" />
 								</GROUP>
 								<GROUP Id="RDK:18150163" SubType="Else">
-									<ACTION_CALL Id="RDK:18150191" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
+									<ACTION_CALL Id="RDK:18150191" Name="RDEngineering_MsgBox" Suppressed="True" DesignTimeRemark="{Text}">
 										<PAR Name="RDLibraryName">
 											<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
 										</PAR>
@@ -5707,6 +5879,195 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 											<EXP><![CDATA[$V$]]></EXP>
 										</PAR>
 									</ACTION_CALL>
+									<SET Id="RDK:18213805" VarRef="Shape_Prototype.FoerdererDefinition.Delta_hf">
+										<EXP><![CDATA[$=$]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<SET Id="RDK:18216857" VarRef="Shape_Prototype.FoerdererDefinition.Delta_hs">
+										<EXP><![CDATA[$=$]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<SET Id="RDK:18216861" VarRef="Shape_Prototype.FoerdererDefinition.L_s">
+										<EXP><![CDATA[$=$]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<SET Id="RDK:18216859" VarRef="Shape_Prototype.FoerdererDefinition.Delta_h">
+										<EXP><![CDATA[$=$HoeheOben-HoeheUnten]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<ACTION_CALL Id="RDK:18202819" 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$Delta_hf]]></EXP>
+										</PAR>
+										<PAR Name="ParentId" />
+										<PAR Name="Label">
+											<EXP><![CDATA[$C$Förderhöhe]]></EXP>
+										</PAR>
+										<PAR Name="Field">
+											<EXP><![CDATA[$C$Delta_hf]]></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" />
+										<PAR Name="Hidden" />
+										<PAR Name="ROnly">
+											<EXP><![CDATA[$C$True]]></EXP>
+										</PAR>
+										<PAR Name="Disabled" />
+										<PAR Name="Pressed" />
+										<PAR Name="AutoCommit" />
+										<PAR Name="ValidateFail">
+											<EXP><![CDATA[$=$True]]></EXP>
+										</PAR>
+										<PAR Name="ValidateMsg">
+											<EXP><![CDATA[$C$Achtung, das Verhältnis Förderlänge und Höhendifferenz ist zu groß.]]></EXP>
+										</PAR>
+										<PAR Name="DataSource" />
+										<PAR Name="Options" />
+									</ACTION_CALL>
+									<ACTION_CALL Id="RDK:18216863" 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$Delta_hs]]></EXP>
+										</PAR>
+										<PAR Name="ParentId" />
+										<PAR Name="Label">
+											<EXP><![CDATA[$C$Höhenunterschied Gefällestrecke]]></EXP>
+										</PAR>
+										<PAR Name="Field">
+											<EXP><![CDATA[$C$Delta_hs]]></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" />
+										<PAR Name="Hidden" />
+										<PAR Name="ROnly">
+											<EXP><![CDATA[$=$True]]></EXP>
+										</PAR>
+										<PAR Name="Disabled" />
+										<PAR Name="Pressed" />
+										<PAR Name="AutoCommit" />
+										<PAR Name="ValidateFail">
+											<EXP><![CDATA[$=$True]]></EXP>
+										</PAR>
+										<PAR Name="ValidateMsg" />
+										<PAR Name="DataSource" />
+										<PAR Name="Options" />
+									</ACTION_CALL>
+									<ACTION_CALL Id="RDK:18216867" 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$projizierte Länge der 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" />
+										<PAR Name="Hidden" />
+										<PAR Name="ROnly">
+											<EXP><![CDATA[$C$True]]></EXP>
+										</PAR>
+										<PAR Name="Disabled" />
+										<PAR Name="Pressed" />
+										<PAR Name="AutoCommit" />
+										<PAR Name="ValidateFail">
+											<EXP><![CDATA[$=$True]]></EXP>
+										</PAR>
+										<PAR Name="ValidateMsg" />
+										<PAR Name="DataSource" />
+										<PAR Name="Options" />
+									</ACTION_CALL>
 									<EXIT_PROCESS Id="RDK:18150177" BreakType="4" ExitStatus="0" />
 								</GROUP>
 							</IFTHENELSE>
@@ -8058,7 +8419,9 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 									<PAR Name="y" />
 									<PAR Name="z" />
 									<PAR Name="width" />
-									<PAR Name="height" />
+									<PAR Name="height">
+										<EXP><![CDATA[$=$Shape_Prototype.FoerdererDefinition.L1]]></EXP>
+									</PAR>
 									<PAR Name="depth" />
 									<PAR Name="rotation" />
 									<PAR Name="text" />
@@ -8096,7 +8459,7 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 									<PAR Name="includeInBOM" />
 								</SET_STRUCT>
 							</GROUP>
-							<GROUP Id="RDK:18116642" Name="Gefaellestrecke HoeheOben OR HoeheUnten was changed" SubType="Generic" DesignTimeNotes="20231005 -1-&#xD;&#xA;&#xD;&#xA;Inherit height to direct Shaps and set others to Gelb (except Kreisel Groups).">
+							<GROUP Id="RDK:18116642" Name="Gefaellestrecke HoeheOben OR HoeheUnten was changed" SubType="Generic" Suppressed="True" DesignTimeNotes="20231005 -1-&#xD;&#xA;&#xD;&#xA;Inherit height to direct Shaps and set others to Gelb (except Kreisel Groups).">
 								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$ShapeList["id=" + Shape_Prototype.id].GefaelleDefinition.HoeheOben <> Shape_Prototype.GefaelleDefinition.HoeheOben]]></EXP>
 								</VALUECONDITION>
@@ -10862,6 +11225,33 @@ me.x
 							<PAR Name="Options" />
 						</CALLFUNCTION>
 					</CASEGROUP>
+					<CASEGROUP Id="RDK:18221764" CaseType="0">
+						<EXP><![CDATA[$C$Foerderer]]></EXP>
+						<CALLFUNCTION Id="RDK:18221762">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$AddWeiche]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$Param.Input]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+						<CALLFUNCTION Id="RDK:18221763">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$SetHeightOnConnect]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$Param.Input]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+					</CASEGROUP>
 					<CASEGROUP Id="RDK:1653223" CaseType="0">
 						<EXP><![CDATA[$C$BTMTBeladung]]></EXP>
 						<SET Id="RDK:1653200" VarRef="OriginalRatation">
@@ -11706,12 +12096,50 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						</IFTHENELSE>
 					</GROUP>
 				</IFTHENELSE>
+				<IFTHENELSE Id="RDK:18226064">
+					<VALUECONDITION Value="true">
+						<EXP><![CDATA[$=$ShapeList["id="+shapeId].family="Foerderer"]]></EXP>
+					</VALUECONDITION>
+					<GROUP Id="RDK:18226063" SubType="Then">
+						<IFTHENELSE Id="RDK:18226062">
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$label="Oben"]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:18226059" SubType="Then">
+								<SET Id="RDK:18226058" VarRef="ShapeList[&quot;id=&quot;+shapeId].FoerdererDefinition.HoeheOben">
+									<EXP><![CDATA[$=$hoehe]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+							<GROUP Id="RDK:18226061" SubType="Else">
+								<SET Id="RDK:18226060" VarRef="ShapeList[&quot;id=&quot;+shapeId].FoerdererDefinition.HoeheUnten">
+									<EXP><![CDATA[$=$hoehe]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+						</IFTHENELSE>
+						<SET Id="RDK:18234011" VarRef="Shape_Prototype">
+							<EXP><![CDATA[$=$ShapeList["id="+shapeId]]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<CALLFUNCTION Id="RDK:18232786">
+							<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>
 			</FUNCTION>
 			<FUNCTION Id="RDK:1698052" Name="SetHeightOnConnect" InputTypeName="Editor2DEventArgumentsTypeList">
 				<GROUP Id="RDK:1698060" Name="Filter" SubType="Generic" DesignTimeNotes="(ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].family=&quot;Gefaellestrecke&quot; And  (ShapeList[&quot;id=&quot;+Param.Input[1].shapeID].Rotationsklasse=&quot;Rotationsobjekt&quot;and IsTagInString(Param.Input[1].connectionPointID, &quot;defcp&quot;)))  &#xA;Or &#xA;(ShapeList[&quot;id=&quot;+Param.Input[1].shapeID].family=&quot;Gefaellestrecke&quot; And  (ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].Rotationsklasse=&quot;Rotationsobjekt&quot; and IsTagInString(Param.Input[0].connectionPointID, &quot;defcp&quot;)))  &#xA;">
 					<VALUECONDITION Value="true">
-						<EXP><![CDATA[$=$(ShapeList["id="+Param.Input[0].shapeID].family="Kreisel" and ShapeList["id="+Param.Input[1].shapeID].family="Gefaellestrecke") or
-(ShapeList["id="+Param.Input[1].shapeID].family="Kreisel" and ShapeList["id="+Param.Input[0].shapeID].family="Gefaellestrecke")]]></EXP>
+						<EXP><![CDATA[$=$(ShapeList["id="+Param.Input[0].shapeID].family="Kreisel" and (ShapeList["id="+Param.Input[1].shapeID].family="Gefaellestrecke") or ShapeList["id="+Param.Input[1].shapeID].family="Foerderer") or
+(ShapeList["id="+Param.Input[1].shapeID].family="Kreisel" and (ShapeList["id="+Param.Input[0].shapeID].family="Gefaellestrecke") or (ShapeList["id="+Param.Input[0].shapeID].family="Foerderer"))]]></EXP>
 					</VALUECONDITION>
 					<GROUP Id="RDK:1772339" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
 						<VAR Id="RDK:1772341" Name="item_0" Type="Editor2DShapeType" />