From 2776480eb32022080fda894adacbd995c07951f2 Mon Sep 17 00:00:00 2001
From: mistangl <m.stangl@schoenenberger.de>
Date: Wed, 14 Aug 2024 17:16:24 +0200
Subject: [PATCH] =?UTF-8?q?Winkel=20und=20H=C3=B6henberechnung=20anders,?=
 =?UTF-8?q?=20wenn=20H0=20>=20H1=20bei=20der=20Gef=C3=A4llestrecke?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 47 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 15 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 371a63c..411090c 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -1,10 +1,10 @@
 <?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-08-13T16:57:46" LanguageVersion="2014.1.3.686" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-08-14T16:03:18" LanguageVersion="2014.1.3.686" />
 	<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">
-				<TYPE Id="RDK:313478" Name="SSGConnectionPoint" Expanded="True" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:313478" Name="SSGConnectionPoint" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:609117" Name="id" Type="string" />
 					<FIELD Id="RDK:313462" Name="x_M" Type="double" />
@@ -25,7 +25,7 @@
 					<FIELD Id="RDK:20734834" Name="direction_x" Type="double" DesignTimeRemark="1 if direction posititve x-axis, -1 if is negative x-axis, 0 if it is in y-direction" />
 					<FIELD Id="RDK:20734836" Name="direction_y" Type="double" DesignTimeRemark="1 if direction posititve y-axis, -1 if is negative y-axis, 0 if it is in x-direction" />
 				</TYPE>
-				<TYPE Id="RDK:26388" Name="KreiselType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:26388" Name="KreiselType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:95024" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:26389" Name="AbstandMS" Type="double" />
@@ -272,7 +272,7 @@
 					<FIELD Id="RDK:1013892" Name="userFilter" Type="string" />
 					<FIELD Id="RDK:1013893" Name="styleTags" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:1013942" Name="Editor2DShapeType" Expanded="True" SubType="structure" InheritTypeName="SSG_ShapeType">
+				<TYPE Id="RDK:1013942" Name="Editor2DShapeType" SubType="structure" InheritTypeName="SSG_ShapeType">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:1013895" Name="source" Type="string" />
 					<FIELD Id="RDK:1013896" Name="sourceLibrary" Type="string" />
@@ -816,7 +816,7 @@
 				</TYPE>
 			</GROUP>
 			<GROUP Id="RDK:18753242" Name="SE EXPORT" SubType="TypeSet" IncludeDate="0">
-				<TYPE Id="RDK:18946335" Name="SEExportParamType" Expanded="True" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:18946335" Name="SEExportParamType" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18946341" Name="key" Type="string" />
 					<FIELD Id="RDK:18946343" Name="value" Type="double" />
@@ -13654,15 +13654,6 @@ ShapeTotalLength
 me.x
 ))-(Shape_Prototype.KreiselDefinition.Durchmesser/2)]]></EXP>
 											</PAR>
-											<PAR Name="id" />
-											<PAR Name="x_M" />
-											<PAR Name="x" />
-											<PAR Name="y" />
-											<PAR Name="z" />
-											<PAR Name="direction" />
-											<PAR Name="linkClass" />
-											<PAR Name="label" />
-											<PAR Name="aktiv" />
 										</EXEC_ON_VALUES>
 									</GROUP>
 								</GROUP>
@@ -17592,6 +17583,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						<VAR Id="RDK:20782867" Name="Part" Type="string" />
 						<VAR Id="RDK:18931684" Name="LevelOfDetail" Type="string" />
 						<VAR Id="RDK:18760947" Name="Destination" Type="string" />
+						<VAR Id="RDK:20801347" Name="winkel" Type="double" />
 						<VAR Id="RDK:18950416" Name="Par" Type="SEExportParamType" />
 						<VAR Id="RDK:18951794" Name="Par1" Type="SEExportParamType" />
 						<VAR Id="RDK:18950424" Name="Par2" Type="SEExportParamType" />
@@ -17696,6 +17688,31 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<EXP><![CDATA[$=$ShapeItem.y]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
+								<IFTHENELSE Id="RDK:20801331">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.HoeheUnten  > ShapeItem.GefaelleDefinition.HoeheOben]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:20801328" SubType="Then">
+										<SET Id="RDK:20801343" VarRef="SE_Item.Z">
+											<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.HoeheUnten - (ShapeItem.GefaelleDefinition.HoeheUnten - ShapeItem.GefaelleDefinition.HoeheOben)/2 ]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:20801349" VarRef="winkel">
+											<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.winkel*-1]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+									</GROUP>
+									<GROUP Id="RDK:20801330" SubType="Else">
+										<SET Id="RDK:20801345" VarRef="SE_Item.Z">
+											<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.HoeheUnten + (ShapeItem.GefaelleDefinition.HoeheOben - ShapeItem.GefaelleDefinition.HoeheUnten)/2 ]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:20801351" VarRef="winkel">
+											<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.winkel]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+									</GROUP>
+								</IFTHENELSE>
 								<SET Id="RDK:18931672" VarRef="SE_Item.Z">
 									<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.HoeheUnten + (ShapeItem.GefaelleDefinition.HoeheOben - ShapeItem.GefaelleDefinition.HoeheUnten)/2 ]]></EXP>
 									<PAR Name="AdvancedOptions" />
@@ -17732,7 +17749,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<SET Id="RDK:18951810" VarRef="Par2.value">
-									<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.winkel]]></EXP>
+									<EXP><![CDATA[$=$winkel]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<LIST_ADD Id="RDK:18951814" ListRef="SE_Item.toSetParameters">