From 6c31891f7e7a15a542db71b4a87b0bb9e94bfa68 Mon Sep 17 00:00:00 2001
From: mistangl <m.stangl@schoenenberger.de>
Date: Mon, 25 Nov 2024 18:07:09 +0100
Subject: [PATCH] =?UTF-8?q?CSV=20Export=20des=20VarioF=C3=B6rderers=20gete?=
 =?UTF-8?q?stet.=20Richtung=20horizontal,auf,=20ab=20in=20Oberfl=C3=A4che?=
 =?UTF-8?q?=20implementiert.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Doku/Berechnung-Gefällestrecke_Einlauf.md |  16 ++-
 MAIN_SSG.rdx                              | 132 ++++++++++++++++++++--
 2 files changed, 128 insertions(+), 20 deletions(-)

diff --git a/Doku/Berechnung-Gefällestrecke_Einlauf.md b/Doku/Berechnung-Gefällestrecke_Einlauf.md
index 0dc8ef1..abafc1e 100644
--- a/Doku/Berechnung-Gefällestrecke_Einlauf.md
+++ b/Doku/Berechnung-Gefällestrecke_Einlauf.md
@@ -22,23 +22,21 @@ $$
 $$
 
 $$
-  \Delta{H_F} = H_1 - H_0 + \Delta{H_S} [2]
+L_1 = L_G + L_{EA} [2]
 $$
 $$
-L_1 = L_G + L_{EA} [3]
-$$
-$$
-H_0 = H_1 + \Delta H_{EA} + \Delta H_G [4]
+H_0 = H_1 + \Delta H_{EA} + \Delta H_G [3]
 $$
 
 
-aus [1]
+aus [1] und [2] in [1]
 $$
-  \Delta{H_G} = tan(\alpha) \cdot L_G  
-              =  tan(\alpha) \cdot L_1 - L_{EA}  
+  \Delta{H_G} = tan(\alpha) \cdot L_G
+  
+              =  tan(\alpha) \cdot (L_1 - L_{EA})  
 $$
 
-aus [3]
+aus [2]
 $$
 L_G = L_1 - L_{EA} 
 $$
diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index f0b9e50..0062adf 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PROCESS Id="RDK:0001" Name="MAIN_SSG" ModernUI="True" Options="(GITSAVEMODE)(NOUPDATEINCLUDEFILES)" Expanded="True">
-	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-11-25T15:17:22" LanguageVersion="2014.1.3.699" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-11-25T18:03:38" LanguageVersion="2014.1.3.699" />
 	<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">
@@ -123,7 +123,7 @@
 				<TYPE Id="RDK:22028969" Name="VarioFoerdererType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:22028956" Name="Beschreibung" Type="string" />
-					<FIELD Id="RDK:22038424" Name="Typ" Type="string" DesignTimeRemark="Auf oder Ab" />
+					<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:22028958" Name="L_th" Type="double" DesignTimeRemark="Theoretische Länge berechnet aus Winkel und L1 (projizierte Länge)" />
@@ -1018,6 +1018,8 @@
 				<GROUP Id="RDK:22082753" Name="VarioFoerderWinkel" SubType="VarSet" IncludeDate="0">
 					<VAR Id="RDK:22082751" Name="VarioFoerdererWinkelItem" Type="DataSourceValInfo" />
 					<VAR Id="RDK:22082752" Name="VarioFoerdererWinkelList" Type="DataSourceValInfo[]" />
+					<VAR Id="RDK:22228348" Name="VarioFoerdererTypItem" Type="DataSourceValInfo" />
+					<VAR Id="RDK:22228350" Name="VarioFoerdererTypList" Type="DataSourceValInfo[]" />
 				</GROUP>
 				<GROUP Id="RDK:331223" Name="Drehung" SubType="VarSet" IncludeDate="0">
 					<VAR Id="RDK:331221" Name="DrehungItem" Type="DataSourceValInfo" />
@@ -6833,7 +6835,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<EXP><![CDATA[$=$collectedIds]]></EXP>
 									</PAR>
 									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$AngetriebenenStreckeMerkmal]]></EXP>
+										<EXP><![CDATA[$V$ASM]]></EXP>
 									</PAR>
 									<PAR Name="Options" />
 								</CALLFUNCTION>
@@ -7350,13 +7352,13 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<EXP><![CDATA[$C$VarioFoerderer]]></EXP>
 								<LIST_ADD Id="RDK:22029533" ListRef="richtungAufAbHorizontal">
 									<PAR Name="VALUE_TO_ADD">
-										<EXP><![CDATA[$=$ShapeItem.VarioFoerdererDefinition.KurvenRichtung]]></EXP>
+										<EXP><![CDATA[$=$ShapeItem.VarioFoerdererDefinition.Typ]]></EXP>
 									</PAR>
 									<PAR Name="POS_TO_ADD" />
 								</LIST_ADD>
 								<LIST_ADD Id="RDK:22029552" ListRef="längenInMeter">
 									<PAR Name="VALUE_TO_ADD">
-										<EXP><![CDATA[$=$ShapeItem.VarioFoerdererDefinition.L1/1000.]]></EXP>
+										<EXP><![CDATA[$=$ShapeItem.VarioFoerdererDefinition.L1/1000]]></EXP>
 									</PAR>
 									<PAR Name="POS_TO_ADD" />
 								</LIST_ADD>
@@ -18390,9 +18392,12 @@ me.x
 					<VALUECONDITION Value="true" Oper="OR">
 						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family = "Gefaellestrecke"]]></EXP>
 					</VALUECONDITION>
-					<VALUECONDITION Value="true">
+					<VALUECONDITION Value="true" Oper="OR">
 						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family = "KurveFoerderer"]]></EXP>
 					</VALUECONDITION>
+					<VALUECONDITION Value="true">
+						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family = "VarioFoerderer"]]></EXP>
+					</VALUECONDITION>
 					<GROUP Id="RDK:20819491" SubType="Then">
 						<IFTHENELSE Id="RDK:20819415">
 							<VALUECONDITION Value="true" Oper="OR">
@@ -18404,9 +18409,12 @@ me.x
 							<VALUECONDITION Value="true" Oper="OR">
 								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "Gefaellestrecke"]]></EXP>
 							</VALUECONDITION>
-							<VALUECONDITION Value="true">
+							<VALUECONDITION Value="true" Oper="OR">
 								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "KurveFoerderer"]]></EXP>
 							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "VarioFoerderer"]]></EXP>
+							</VALUECONDITION>
 							<GROUP Id="RDK:20819412" SubType="Then">
 								<CALLFUNCTION Id="RDK:21070867">
 									<PAR Name="FuncName">
@@ -18904,7 +18912,7 @@ me.x
 							<VALUECONDITION Value="true" Oper="OR">
 								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Kurve"]]></EXP>
 							</VALUECONDITION>
-							<VALUECONDITION Value="true">
+							<VALUECONDITION Value="true" Oper="OR">
 								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="KurveFoerderer"]]></EXP>
 							</VALUECONDITION>
 							<VALUECONDITION Value="true">
@@ -32100,6 +32108,47 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="Tags" />
 						</SET_STRUCT>
 					</GROUP>
+					<GROUP Id="RDK:22228345" Name="Foerderrichtung" SubType="Generic">
+						<SET_STRUCT Id="RDK:22228343" VarRef="VarioFoerdererTypItem" ClearAll="True" ListRef="VarioFoerdererTypList">
+							<PAR Name="Value">
+								<EXP><![CDATA[$C$Auf]]></EXP>
+							</PAR>
+							<PAR Name="Prompt">
+								<EXP><![CDATA[$C$Auf]]></EXP>
+							</PAR>
+							<PAR Name="Image">
+								<EXP><![CDATA[$C$icon:arrow-up]]></EXP>
+							</PAR>
+							<PAR Name="Tooltip" />
+							<PAR Name="Tags" />
+						</SET_STRUCT>
+						<SET_STRUCT Id="RDK:22228344" VarRef="VarioFoerdererTypItem" ClearAll="True" ListRef="VarioFoerdererTypList">
+							<PAR Name="Value">
+								<EXP><![CDATA[$C$Horizontal]]></EXP>
+							</PAR>
+							<PAR Name="Prompt">
+								<EXP><![CDATA[$C$Horizontal]]></EXP>
+							</PAR>
+							<PAR Name="Image">
+								<EXP><![CDATA[$C$icon:arrow-right]]></EXP>
+							</PAR>
+							<PAR Name="Tooltip" />
+							<PAR Name="Tags" />
+						</SET_STRUCT>
+						<SET_STRUCT Id="RDK:22228352" VarRef="VarioFoerdererTypItem" ClearAll="True" ListRef="VarioFoerdererTypList">
+							<PAR Name="Value">
+								<EXP><![CDATA[$C$Ab]]></EXP>
+							</PAR>
+							<PAR Name="Prompt">
+								<EXP><![CDATA[$C$Ab]]></EXP>
+							</PAR>
+							<PAR Name="Image">
+								<EXP><![CDATA[$C$icon:arrow-down]]></EXP>
+							</PAR>
+							<PAR Name="Tooltip" />
+							<PAR Name="Tags" />
+						</SET_STRUCT>
+					</GROUP>
 					<GROUP Id="RDK:22089648" Name="AntriebsstreckeRechtsOderLinks" SubType="Generic">
 						<SET_STRUCT Id="RDK:22089646" VarRef="PlatzierungItem" ClearAll="True" ListRef="PlatzierungVFList">
 							<PAR Name="Value">
@@ -32269,6 +32318,65 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<EXP><![CDATA[$C$(RANGE=0,5,0.1)]]></EXP>
 							</PAR>
 						</ACTION_CALL>
+						<ACTION_CALL Id="RDK:22228354" 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$Typ]]></EXP>
+							</PAR>
+							<PAR Name="ParentId" />
+							<PAR Name="Label">
+								<EXP><![CDATA[$C$Richtung]]></EXP>
+							</PAR>
+							<PAR Name="Field">
+								<EXP><![CDATA[$C$Typ]]></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[$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">
+								<EXP><![CDATA[$=$VarioFoerdererTypList]]></EXP>
+							</PAR>
+							<PAR Name="Options">
+								<EXP><![CDATA[$C$(RANGE=0,5,0.1)]]></EXP>
+							</PAR>
+						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:22069056" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 							<PAR Name="RDLibraryName">
 								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
@@ -32298,7 +32406,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-3]]></EXP>
 							</PAR>
 							<PAR Name="Rules" />
 							<PAR Name="Image" />
@@ -32349,7 +32457,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-3]]></EXP>
 							</PAR>
 							<PAR Name="Rules" />
 							<PAR Name="Image" />
@@ -33120,7 +33228,9 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<PAR Name="Beschreibung">
 						<EXP><![CDATA[$C$Förderer können nach oben oder unten wirken (Typ: Auf oder Ab)]]></EXP>
 					</PAR>
-					<PAR Name="Typ" />
+					<PAR Name="Typ">
+						<EXP><![CDATA[$C$horizontal]]></EXP>
+					</PAR>
 					<PAR Name="AntriebNebenStrecke">
 						<EXP><![CDATA[$C$links]]></EXP>
 					</PAR>