From 02fef64e5b744a921e7ceb6eb81ab9aa9c57f7f9 Mon Sep 17 00:00:00 2001
From: mistangl <m.stangl@schoenenberger.de>
Date: Mon, 4 Nov 2024 18:39:34 +0100
Subject: [PATCH] =?UTF-8?q?H=C3=B6hendifferenz=20bei=20einer=20Kurve=20wir?=
 =?UTF-8?q?d=20je=20nach=20Winkel=2030=20oder=2060=20Grad=20mal=201/3=20bz?=
 =?UTF-8?q?w.=202/3=20der=2090=20Grad=20Kurve=20genommen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 87 +++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 65 insertions(+), 22 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 466a8b6..9d80202 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-04T17:50:54" LanguageVersion="2014.1.3.699" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-11-04T18:38:27" 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">
@@ -802,10 +802,14 @@
 				<TYPE Id="RDK:18732296" Name="KurveMerkmaleType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18732294" Name="Länge in Meter" Type="string" />
+					<FIELD Id="RDK:22010909" Name="Rechtskurve" Type="boolean" />
+					<FIELD Id="RDK:22010915" Name="Kurvenwinkel" Type="double" />
 				</TYPE>
 				<TYPE Id="RDK:21693243" Name="KurveFoerdererMerkmaleType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:21693241" Name="Länge in Meter" Type="string" />
+					<FIELD Id="RDK:22010911" Name="Rechtskurve" Type="boolean" />
+					<FIELD Id="RDK:22010913" Name="Kurvenwinkel" Type="double" />
 				</TYPE>
 				<TYPE Id="RDK:18111807" Name="FoerdererMerkmaleType" SubType="structure">
 					<TYPE_VALUES />
@@ -14987,7 +14991,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							<EXP><![CDATA[$C$Strecke]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SET Id="RDK:21692091" VarRef="Shape_Prototype.KurveDefinition.Beschreibung">
+						<SET Id="RDK:21692091" VarRef="Shape_Prototype.KurveFoerdererDefinition.Beschreibung">
 							<EXP><![CDATA[$=$Shape_Prototype.name]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
@@ -19478,17 +19482,14 @@ me.x
 								</GROUP>
 								<GROUP Id="RDK:19251784" Name="Merkmale" SubType="Generic">
 									<SET_STRUCT Id="RDK:19251782" VarRef="KurveMerkmale" ClearAll="True">
-										<PAR Name="Anzahl Zusatzseparatoren">
-											<EXP><![CDATA[$=$0]]></EXP>
-										</PAR>
-										<PAR Name="Gesamtanzahl Separatoren">
-											<EXP><![CDATA[$=$0]]></EXP>
-										</PAR>
 										<PAR Name="Länge in Meter">
-											<EXP><![CDATA[$=$KurveData_defaults.L1]]></EXP>
+											<EXP><![CDATA[$=$ShapeItem.KurveDefinition.L1]]></EXP>
 										</PAR>
-										<PAR Name="Anzahl der Scanner">
-											<EXP><![CDATA[$=$0]]></EXP>
+										<PAR Name="Rechtskurve">
+											<EXP><![CDATA[$=$ShapeItem.KurveDefinition.isRechts]]></EXP>
+										</PAR>
+										<PAR Name="Kurvenwinkel">
+											<EXP><![CDATA[$=$ShapeItem.KurveDefinition.KurvenWinkel]]></EXP>
 										</PAR>
 									</SET_STRUCT>
 									<SET Id="RDK:19251783" VarRef="CSV_Item.Merkmale">
@@ -19530,22 +19531,19 @@ me.x
 									</CALLFUNCTION>
 								</GROUP>
 								<GROUP Id="RDK:21692307" Name="Merkmale" SubType="Generic">
-									<SET_STRUCT Id="RDK:21692305" VarRef="KurveMerkmale" ClearAll="True">
-										<PAR Name="Anzahl Zusatzseparatoren">
-											<EXP><![CDATA[$=$0]]></EXP>
-										</PAR>
-										<PAR Name="Gesamtanzahl Separatoren">
-											<EXP><![CDATA[$=$0]]></EXP>
-										</PAR>
+									<SET_STRUCT Id="RDK:21692305" VarRef="KurveFoerdererMerkmale" ClearAll="True">
 										<PAR Name="Länge in Meter">
-											<EXP><![CDATA[$=$KurveFoerdererData_defaults.L1]]></EXP>
+											<EXP><![CDATA[$=$ShapeItem.KurveFoerdererDefinition.L1]]></EXP>
 										</PAR>
-										<PAR Name="Anzahl der Scanner">
-											<EXP><![CDATA[$=$0]]></EXP>
+										<PAR Name="Rechtskurve">
+											<EXP><![CDATA[$=$ShapeItem.KurveFoerdererDefinition.isRechts]]></EXP>
+										</PAR>
+										<PAR Name="Kurvenwinkel">
+											<EXP><![CDATA[$=$ShapeItem.KurveFoerdererDefinition.KurvenWinkel]]></EXP>
 										</PAR>
 									</SET_STRUCT>
 									<SET Id="RDK:21692306" VarRef="CSV_Item.Merkmale">
-										<EXP><![CDATA[$=$ToJSON(KurveMerkmale)]]></EXP>
+										<EXP><![CDATA[$=$ToJSON(KurveFoerdererMerkmale)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
@@ -21780,6 +21778,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="AdvancedOptions" />
 						</SET>
 					</VAR>
+					<VAR Id="RDK:22015146" Name="delta_h" Type="double" />
 				</GROUP>
 				<SELECTCASE Id="RDK:21920392">
 					<EXP><![CDATA[$=$shape_item.family]]></EXP>
@@ -21871,6 +21870,28 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<EXP><![CDATA[$=$hoehe + KurveData_defaults.Delta_h]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
+								<IFTHENELSE Id="RDK:22015136">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$ShapeList["id="+shapeId].KurveDefinition.KurvenWinkel < 31]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:22015137" SubType="Then">
+										<SET Id="RDK:22015154" VarRef="ShapeList[&quot;id=&quot;+shapeId].KurveDefinition.H_Anfang">
+											<EXP><![CDATA[$=$hoehe + Round(KurveData_defaults.Delta_h/3, 1)]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+									</GROUP>
+								</IFTHENELSE>
+								<IFTHENELSE Id="RDK:22015164">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$ShapeList["id="+shapeId].KurveDefinition.KurvenWinkel < 61]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:22015163" SubType="Then">
+										<SET Id="RDK:22015162" VarRef="ShapeList[&quot;id=&quot;+shapeId].KurveDefinition.H_Anfang">
+											<EXP><![CDATA[$=$hoehe + Round(KurveData_defaults.Delta_h*2/3, 1)]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+									</GROUP>
+								</IFTHENELSE>
 							</GROUP>
 							<GROUP Id="RDK:21920372" SubType="Else">
 								<SET Id="RDK:21920370" VarRef="ShapeList[&quot;id=&quot;+shapeId].KurveDefinition.H_Anfang">
@@ -21881,6 +21902,28 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<EXP><![CDATA[$=$hoehe - KurveData_defaults.Delta_h]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
+								<IFTHENELSE Id="RDK:22015178">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$ShapeList["id="+shapeId].KurveDefinition.KurvenWinkel < 31]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:22015177" SubType="Then">
+										<SET Id="RDK:22015176" VarRef="ShapeList[&quot;id=&quot;+shapeId].KurveDefinition.H_Anfang">
+											<EXP><![CDATA[$=$hoehe - Round(KurveData_defaults.Delta_h/3,1)]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+									</GROUP>
+								</IFTHENELSE>
+								<IFTHENELSE Id="RDK:22015190">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$ShapeList["id="+shapeId].KurveDefinition.KurvenWinkel < 61]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:22015189" SubType="Then">
+										<SET Id="RDK:22015188" VarRef="ShapeList[&quot;id=&quot;+shapeId].KurveDefinition.H_Anfang">
+											<EXP><![CDATA[$=$hoehe - Round(KurveData_defaults.Delta_h*2/3,1)]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+									</GROUP>
+								</IFTHENELSE>
 							</GROUP>
 						</IFTHENELSE>
 						<COMMENTS Id="RDK:21940035" DesignTimeRemark="Setze den Zustand erst einmal auf ok, nachdem die Höhe definiert ist" />