From 25be8cff07802c8449dc3aa969920d662b10ed4b Mon Sep 17 00:00:00 2001
From: mistangl <m.stangl@schoenenberger.de>
Date: Tue, 15 Oct 2024 12:48:06 +0200
Subject: [PATCH] =?UTF-8?q?H=C3=B6henberechnung=20korrgiiert.=20in=20der?=
 =?UTF-8?q?=20Oberfl=C3=A4che=20waren=20die=20Variablen=20f=C3=BCr=20die?=
 =?UTF-8?q?=20Kurve=20noch=20nicht=20korrigiert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 44 +++++++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 8782fee..28d22f2 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-10-15T11:52:15" LanguageVersion="2014.1.3.690" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-10-15T12:47:10" LanguageVersion="2014.1.3.690" />
 	<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">
@@ -76,7 +76,7 @@
 					<FIELD Id="RDK:302575" Name="n_Sep" Type="integer" />
 					<FIELD Id="RDK:302576" Name="n_Scan" Type="integer" />
 				</TYPE>
-				<TYPE Id="RDK:18732236" Name="KurveType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:18732236" Name="KurveType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18732225" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:18732226" Name="L1" Type="double" />
@@ -125,7 +125,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" />
@@ -140,7 +140,7 @@
 					<FIELD Id="RDK:16525361" Name="BTMTEntladungDefinition" Type="BTMTEntladungType" />
 					<FIELD Id="RDK:19961198" Name="isDefined" Type="boolean" />
 				</TYPE>
-				<TYPE Id="RDK:18530527" Name="SSG_ShapeType_limit" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:18530527" Name="SSG_ShapeType_limit" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18530520" Name="KreiselDefinition" Type="KreiselType" />
 					<FIELD Id="RDK:18530521" Name="EckradDefinition" Type="EckradType" />
@@ -157,7 +157,7 @@
 					<FIELD Id="RDK:1783800" Name="Int" Type="integer" />
 					<FIELD Id="RDK:1783798" Name="Boo" Type="boolean" />
 				</TYPE>
-				<TYPE Id="RDK:18530545" Name="SSG_Limits" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:18530545" Name="SSG_Limits" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18530548" Name="Kreisel_top" Type="KreiselType" />
 					<FIELD Id="RDK:18530546" Name="Kreisel_bot" Type="KreiselType" />
@@ -784,7 +784,7 @@
 					<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:18732296" Name="KurveMerkmaleType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:18732296" Name="KurveMerkmaleType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:19257152" Name="Anzahl Zusatzseparatoren" Type="string" />
 					<FIELD Id="RDK:19257154" Name="Gesamtanzahl Separatoren" Type="string" />
@@ -15871,13 +15871,13 @@ me.x
 					<PAR Name="Key">
 						<EXP><![CDATA[$C$shapeId_0]]></EXP>
 					</PAR>
+					<PAR Name="StrArr" />
 					<PAR Name="Str">
 						<EXP><![CDATA[$=$id0]]></EXP>
 					</PAR>
 					<PAR Name="Dbl" />
 					<PAR Name="Int" />
 					<PAR Name="Boo" />
-					<PAR Name="StrArr" />
 				</SET_STRUCT>
 				<SET_STRUCT Id="RDK:19653278" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
 					<PAR Name="Key">
@@ -20915,13 +20915,13 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									</VALUECONDITION>
 									<GROUP Id="RDK:21615586" SubType="Then">
 										<SET Id="RDK:21615585" VarRef="ShapeList[&quot;id=&quot;+shapeId].KurveDefinition.H_Anfang">
-											<EXP><![CDATA[$=$hoehe - KurveData_defaults.Delta_h]]></EXP>
+											<EXP><![CDATA[$=$hoehe + KurveData_defaults.Delta_h]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
 									</GROUP>
 									<GROUP Id="RDK:21615588" SubType="Else">
 										<SET Id="RDK:21615587" VarRef="ShapeList[&quot;id=&quot;+shapeId].KurveDefinition.H_Anfang">
-											<EXP><![CDATA[$=$hoehe + KurveData_defaults.Delta_h]]></EXP>
+											<EXP><![CDATA[$=$hoehe - KurveData_defaults.Delta_h]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
 									</GROUP>
@@ -20938,13 +20938,13 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									</VALUECONDITION>
 									<GROUP Id="RDK:21615606" SubType="Then">
 										<SET Id="RDK:21615605" VarRef="ShapeList[&quot;id=&quot;+shapeId].KurveDefinition.H_Ende">
-											<EXP><![CDATA[$=$hoehe + KurveData_defaults.Delta_h]]></EXP>
+											<EXP><![CDATA[$=$hoehe - KurveData_defaults.Delta_h]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
 									</GROUP>
 									<GROUP Id="RDK:21615608" SubType="Else">
 										<SET Id="RDK:21615607" VarRef="ShapeList[&quot;id=&quot;+shapeId].KurveDefinition.H_Ende">
-											<EXP><![CDATA[$=$hoehe - KurveData_defaults.Delta_h]]></EXP>
+											<EXP><![CDATA[$=$hoehe + KurveData_defaults.Delta_h]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
 									</GROUP>
@@ -22183,11 +22183,17 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<CASEGROUP Id="RDK:19602977" CaseType="0">
 						<EXP><![CDATA[$C$Kurve]]></EXP>
 						<IFTHENELSE Id="RDK:21032034">
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$ShapeList[shapeList_idx].KurveDefinition.H_Anfang >  ShapeList[shapeList_idx].KurveDefinition.H_Ende]]></EXP>
+							</VALUECONDITION>
 							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$ShapeList[shapeList_idx].KurveDefinition.H_Anfang> 0]]></EXP>
+								<EXP><![CDATA[$=$ShapeList[shapeList_idx].KurveDefinition.Richtung = "Ab"]]></EXP>
 							</VALUECONDITION>
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$ShapeList[shapeList_idx].KurveDefinition.H_Ende> 0]]></EXP>
+								<EXP><![CDATA[$=$ShapeList[shapeList_idx].KurveDefinition.H_Anfang <  ShapeList[shapeList_idx].KurveDefinition.H_Ende]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$ShapeList[shapeList_idx].KurveDefinition.Richtung = "Auf"]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:21032047" SubType="Then">
 								<CALLFUNCTION Id="RDK:21032046">
@@ -27260,14 +27266,14 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<EXP><![CDATA[$C$0]]></EXP>
 							</PAR>
 							<PAR Name="Id">
-								<EXP><![CDATA[$C$H_0]]></EXP>
+								<EXP><![CDATA[$C$H_Anfang]]></EXP>
 							</PAR>
 							<PAR Name="ParentId" />
 							<PAR Name="Label">
-								<EXP><![CDATA[$C$H0]]></EXP>
+								<EXP><![CDATA[$C$H_Anfang]]></EXP>
 							</PAR>
 							<PAR Name="Field">
-								<EXP><![CDATA[$C$H_0]]></EXP>
+								<EXP><![CDATA[$C$H_Anfang]]></EXP>
 							</PAR>
 							<PAR Name="Value" />
 							<PAR Name="Uom" />
@@ -27315,14 +27321,14 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<EXP><![CDATA[$C$0]]></EXP>
 							</PAR>
 							<PAR Name="Id">
-								<EXP><![CDATA[$C$H_1]]></EXP>
+								<EXP><![CDATA[$C$H_Ende]]></EXP>
 							</PAR>
 							<PAR Name="ParentId" />
 							<PAR Name="Label">
-								<EXP><![CDATA[$C$H1]]></EXP>
+								<EXP><![CDATA[$C$H_Ende]]></EXP>
 							</PAR>
 							<PAR Name="Field">
-								<EXP><![CDATA[$C$H_1]]></EXP>
+								<EXP><![CDATA[$C$H_Ende]]></EXP>
 							</PAR>
 							<PAR Name="Value" />
 							<PAR Name="Uom" />