From 12f2b2a8436353693433bc37c0ff3c4c763fb8f7 Mon Sep 17 00:00:00 2001
From: mistangl <m.stangl@schoenenberger.de>
Date: Wed, 26 Jun 2024 12:45:52 +0200
Subject: [PATCH] =?UTF-8?q?Eckrad=20und=20Gef=C3=A4llestrecke=20im=20Creat?=
 =?UTF-8?q?e/UpdateShape=20mit=20der=20H=C3=B6he=20versehen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index cbfcd93..66fcafe 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="dre [NBDELP3561-04C]" ModDate="2024-06-25T17:15:07" LanguageVersion="2014.1.3.676" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-06-26T12:44:11" LanguageVersion="2014.1.3.674" />
 	<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">
@@ -3603,6 +3603,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="GefaelleDefinition">
 											<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition]]></EXP>
 										</PAR>
+										<PAR Name="StreckeDefinition" />
 										<PAR Name="FoerdererDefinition" />
 										<PAR Name="WeicheDefinition" />
 										<PAR Name="BTMTBeladungDefinition" />
@@ -3622,7 +3623,9 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="description" />
 										<PAR Name="x" />
 										<PAR Name="y" />
-										<PAR Name="z" />
+										<PAR Name="z">
+											<EXP><![CDATA[$=$Shape_Prototype.EckradDefinition.Hoehe]]></EXP>
+										</PAR>
 										<PAR Name="width">
 											<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.width, "mm", 96)]]></EXP>
 										</PAR>
@@ -3668,7 +3671,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
-										<PAR Name="StreckeDefinition" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -3779,7 +3781,9 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="description" />
 										<PAR Name="x" />
 										<PAR Name="y" />
-										<PAR Name="z" />
+										<PAR Name="z">
+											<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheUnten + (Shape_Prototype.GefaelleDefinition.HoeheOben - Shape_Prototype.GefaelleDefinition.HoeheUnten)/2 ]]></EXP>
+										</PAR>
 										<PAR Name="width">
 											<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.width, "mm", 96)]]></EXP>
 										</PAR>
@@ -6490,7 +6494,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<PAR Name="AdvancedOptions" />
 							</SET>
 							<IFTHENELSE Id="RDK:18729636">
-								<VALUECONDITION Value="true">
+								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$-Delta_h/foerdererData.L1=Tan(alpha_s)]]></EXP>
 								</VALUECONDITION>
 								<GROUP Id="RDK:18729637" SubType="Then">