From 5a4eb67291594a740eba2ce50830fb3f6dc57da4 Mon Sep 17 00:00:00 2001
From: Simon Hensch <s.hensch@schoenenberger.de>
Date: Thu, 23 Oct 2025 07:33:48 +0200
Subject: [PATCH] =?UTF-8?q?Revert=20"Default=20Offsets=20f=C3=BCr=20Ein-?=
 =?UTF-8?q?=20und=20AUsschleuselement=20hinzugef=C3=BCgt.=20Nur=20zum=20Te?=
 =?UTF-8?q?sten,=20reale=20Werte=20folgen=20in=20neuem=20Commit"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 23ffe308cf1a7b80dd679cddd830ccdc7b8b7f18.
---
 .../SSG/Init/objekteigenschaften_ILS.json     |  8 +--
 MAIN_SSG.rdx                                  | 59 +++----------------
 2 files changed, 12 insertions(+), 55 deletions(-)

diff --git a/Editor2DLibrary/SSG/Init/objekteigenschaften_ILS.json b/Editor2DLibrary/SSG/Init/objekteigenschaften_ILS.json
index 3c28a76..c43571a 100644
--- a/Editor2DLibrary/SSG/Init/objekteigenschaften_ILS.json
+++ b/Editor2DLibrary/SSG/Init/objekteigenschaften_ILS.json
@@ -2,13 +2,13 @@
     "comment": "Die folgenden Einträge werden in Verbindung mit Förderern und/oder Gefällestrecken verwendet. Im Programm werden die Summen der Werte delta_h (Einschleuselement) und delta_h(Ausschleuselement) als L_SEA und/oder H_SEA (index S=Strecke) bzw. L_FEA und/oder H_FEA (index F=Förderer) verwendet.",
     "Einschleuselement":{
         "comment": "Höhen- und Längendifferenz zwischen Laufprofil des Kreisels und Ende einer angebundenen Gefällestrecke in Millimetern",
-        "delta_h_": 111.87,
-        "delta_s_": 411.07
+        "delta_h": 0,
+        "delta_s": 0
     },
     "Ausschleuselement":{
         "comment": "Höhen- und Längendifferenz zwischen Laufprofil des Kreisels und Ende einer angebundenen Gefällestrecke in Millimetern",
-        "delta_h_": 66.28,
-        "delta_s_": 354.78
+        "delta_h": 0,
+        "delta_s": 0
     },
     "Einschleusung_Kreiselkopf":{
         "comment": "Höhen- und Längendifferenz zwischen Kreiselkopf des Kreisels und Ende einer angebundenen Gefällestrecke in Millimetern",
diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 54ebdc7..47bd6ef 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PROCESS Id="RDK:0001" Name="MAIN_SSG" ModernUI="True" Options="(GITSAVEMODE)(NOUPDATEINCLUDEFILES)" Expanded="True">
-<<<<<<< Updated upstream
 	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2025-10-22T16:42:27" LanguageVersion="2014.1.3.712" />
-=======
-	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.hensch [ANGEBOT-NB06]" ModDate="2025-10-22T16:40:32" LanguageVersion="2014.1.3.712" />
->>>>>>> Stashed changes
 	<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">
@@ -1425,7 +1421,6 @@
 			<VAR Id="RDK:23222557" Name="OFBogenData" Type="OFBogenType[]" DesignTimeRemark="Dropdown Liste aller Bögen im Interface" />
 			<VAR Id="RDK:23222658" Name="OFWeichenData" Type="OFWeicheType[]" DesignTimeRemark="Dropdown Liste aller Weichen im Interface" />
 			<VAR Id="RDK:23747696" Name="TEFBogenData" Type="TEFBogenType[]" DesignTimeRemark="Liste aller TEF Bögen" />
-			<VAR Id="RDK:26345099" Name="S_FEA" Type="double" DesignTimeRemark="Generated by RD" />
 		</GROUP>
 		<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
 			<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
@@ -15901,7 +15896,6 @@ SSGConnectionPoint.x_M
 									<PAR Name="ValidateMsg" />
 									<PAR Name="DataSource" />
 									<PAR Name="Options" />
-									<PAR Name="WebviewSubType" />
 								</ACTION_CALL>
 								<ACTION_CALL Id="RDK:24796549" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 									<PAR Name="RDLibraryName">
@@ -15961,7 +15955,6 @@ SSGConnectionPoint.x_M
 									<PAR Name="ValidateMsg" />
 									<PAR Name="DataSource" />
 									<PAR Name="Options" />
-									<PAR Name="WebviewSubType" />
 								</ACTION_CALL>
 								<ACTION_CALL Id="RDK:24796551" 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">
@@ -16019,7 +16012,6 @@ SSGConnectionPoint.x_M
 									<PAR Name="ValidateMsg" />
 									<PAR Name="DataSource" />
 									<PAR Name="Options" />
-									<PAR Name="WebviewSubType" />
 								</ACTION_CALL>
 								<ACTION_CALL Id="RDK:24796553" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 									<PAR Name="RDLibraryName">
@@ -16079,7 +16071,6 @@ SSGConnectionPoint.x_M
 									<PAR Name="Options">
 										<EXP><![CDATA[$C$(RANGE=0,5,0.1)]]></EXP>
 									</PAR>
-									<PAR Name="WebviewSubType" />
 								</ACTION_CALL>
 								<SET Id="RDK:24796508" VarRef="Shape_Prototype.VarioFoerdererDefinition.H_th">
 									<EXP><![CDATA[$=$Round(VarioFoerdererData.H_th, 0)]]></EXP>
@@ -16094,7 +16085,7 @@ SSGConnectionPoint.x_M
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<SET Id="RDK:25634828" VarRef="Shape_Prototype.VarioFoerdererDefinition.L_th">
-									<EXP><![CDATA[$=$Round(VarioFoerdererData.L_th, 0)]]></EXP>
+									<EXP><![CDATA[$=$]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<SET Id="RDK:24796513" VarRef="Shape_Prototype.VarioFoerdererDefinition.LH_fits" DesignTimeRemark="LH_fits == True, in Ordnung">
@@ -16462,13 +16453,13 @@ SSGConnectionPoint.x_M
 							<VAR Id="RDK:24801600" Name="L_GF" Type="double" DesignTimeRemark="Gesamt Strecke" />
 							<VAR Id="RDK:24801602" Name="H_SEA" Type="double" DesignTimeRemark="Höhendifferenze Ein-/Ausschleuselement der Strecke">
 								<SET Id="RDK:24801601" VarRef="Me">
-									<EXP><![CDATA[$=$0]]></EXP>
+									<EXP><![CDATA[$=$ILS_Attributes_data.Einschleuselement_delta_h + ILS_Attributes_data.Ausschleuselement_delta_h]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</VAR>
 							<VAR Id="RDK:24801604" Name="L_SEA" Type="double" DesignTimeRemark="Längendifferenz Ein-/Ausschleuselement der Strecke">
 								<SET Id="RDK:24801603" VarRef="Me">
-									<EXP><![CDATA[$=$0]]></EXP>
+									<EXP><![CDATA[$=$ILS_Attributes_data.Einschleuselement_delta_s+ ILS_Attributes_data.Ausschleuselement_delta_s]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</VAR>
@@ -16492,36 +16483,6 @@ SSGConnectionPoint.x_M
 								</SET>
 							</VAR>
 						</GROUP>
-						<IFTHENELSE Id="RDK:26345030">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$VarioFoerdererData.FesteH0]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:26345054" SubType="Then">
-								<SET Id="RDK:26345067" VarRef="H_FEA">
-									<EXP><![CDATA[$=$-1 * ILS_Attributes_data.Ausschleuselement_delta_h]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:26345084" VarRef="L_FEA">
-									<EXP><![CDATA[$=$ILS_Attributes_data.Ausschleuselement_delta_s]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-						</IFTHENELSE>
-						<IFTHENELSE Id="RDK:26345094">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$VarioFoerdererData.FesteH1]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:26345093" SubType="Then">
-								<SET Id="RDK:26345091" VarRef="H_SEA">
-									<EXP><![CDATA[$=$ILS_Attributes_data.Einschleuselement_delta_h]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:26345092" VarRef="L_SEA">
-									<EXP><![CDATA[$=$ILS_Attributes_data.Einschleuselement_delta_s]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-						</IFTHENELSE>
 						<IFTHENELSE Id="RDK:24801615">
 							<VALUECONDITION Value="true" Oper="OR">
 								<EXP><![CDATA[$=$IsEmpty(VarioFoerdererData.H_Anfang)]]></EXP>
@@ -16620,7 +16581,7 @@ SSGConnectionPoint.x_M
 							</GROUP>
 							<GROUP Id="RDK:24801646" SubType="Else">
 								<SET Id="RDK:24801619" VarRef="Delta_h">
-									<EXP><![CDATA[$=$Abs(VarioFoerdererData.H_Anfang-VarioFoerdererData.H_Ende)]]></EXP>
+									<EXP><![CDATA[$=$IIF(VarioFoerdererData.H_Ende>VarioFoerdererData.H_Anfang, VarioFoerdererData.H_Ende-VarioFoerdererData.H_Anfang, VarioFoerdererData.H_Anfang-VarioFoerdererData.H_Ende)]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<IFTHENELSE Id="RDK:24801623">
@@ -16664,11 +16625,11 @@ SSGConnectionPoint.x_M
 										</SET>
 									</GROUP>
 									<GROUP Id="RDK:24801627" SubType="Else">
-										<SET Id="RDK:24801626" VarRef="L_VF">
-											<EXP><![CDATA[$=$(Delta_h+Tan(alpha_s)*VarioFoerdererData.L1-Tan(alpha_s)*L_SEA+H_SEA+Tan(-alpha_f)*L_FEA-H_FEA)/(Tan(alpha_s)+Tan(-alpha_f))]]></EXP>
+										<SET Id="RDK:24801626" VarRef="L_VF" Suppressed="True">
+											<EXP><![CDATA[$=$(Delta_h-Tan(alpha_s)*VarioFoerdererData.L1-Tan(alpha_s)*L_SEA+H_SEA+Tan(alpha_f)*L_FEA+H_FEA)/(Tan(alpha_f)-Tan(alpha_s))]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
-										<EXIT_PROCESS Id="RDK:25003734" Suppressed="True" BreakType="4" ExitStatus="0" />
+										<EXIT_PROCESS Id="RDK:25003734" BreakType="4" ExitStatus="0" />
 									</GROUP>
 								</IFTHENELSE>
 								<SET Id="RDK:24801629" VarRef="x_verhaeltnis">
@@ -16700,10 +16661,6 @@ SSGConnectionPoint.x_M
 											<EXP><![CDATA[$=$True]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
-										<SET Id="RDK:26368704" VarRef="Param.Result.L_th">
-											<EXP><![CDATA[$=$Round(L_GF, 2) + Round(L_VF, 2)]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
 									</GROUP>
 									<GROUP Id="RDK:24801644" SubType="Else">
 										<SET Id="RDK:24801638" VarRef="Param.Result">
@@ -19205,7 +19162,7 @@ SSGConnectionPoint.x_M
 										</ACTION_CALL>
 									</GROUP>
 									<GROUP Id="RDK:22304083" SubType="Else">
-										<IFTHENELSE Id="RDK:22071918" Suppressed="True">
+										<IFTHENELSE Id="RDK:22071918">
 											<VALUECONDITION Value="true">
 												<EXP><![CDATA[$=$shape_item.VarioFoerdererDefinition.H_Anfang>shape_item.VarioFoerdererDefinition.H_Ende]]></EXP>
 											</VALUECONDITION>