From e806ccd673a0279999a3d001ba762fb8bbea8316 Mon Sep 17 00:00:00 2001
From: mistangl <m.stangl@schoenenberger.de>
Date: Mon, 4 Nov 2024 15:58:47 +0100
Subject: [PATCH] =?UTF-8?q?R=C3=BCckgabeparameter=20Richtung=20aus=20GetHe?=
 =?UTF-8?q?ight=20entfernt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 200 +++++++--------------------------------------------
 1 file changed, 25 insertions(+), 175 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index d417182..442abc6 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-04T15:33:05" LanguageVersion="2014.1.3.699" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-11-04T15:58:03" 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">
@@ -17059,9 +17059,12 @@ me.x
 							<VALUECONDITION Value="true" Oper="OR">
 								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Kurve"]]></EXP>
 							</VALUECONDITION>
-							<VALUECONDITION Value="true">
+							<VALUECONDITION Value="true" Oper="OR">
 								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="KurveFoerderer"]]></EXP>
 							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Kreisel"]]></EXP>
+							</VALUECONDITION>
 							<GROUP Id="RDK:21692160" SubType="Then">
 								<CALLFUNCTION Id="RDK:21692159">
 									<PAR Name="FuncName">
@@ -23655,6 +23658,20 @@ ShapeList["id="+Param.Input[1].shapeID].name
 				</SET>
 				<SELECTCASE Id="RDK:18741918">
 					<EXP><![CDATA[$=$item.family]]></EXP>
+					<CASEGROUP Id="RDK:21998842" CaseType="0">
+						<EXP><![CDATA[$C$Kreisel]]></EXP>
+						<SET Id="RDK:21998841" VarRef="hoehe">
+							<EXP><![CDATA[$=$item.KreiselDefinition.Hoehe]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:21998846" CaseType="0">
+						<EXP><![CDATA[$C$Eckrad]]></EXP>
+						<SET Id="RDK:21998845" VarRef="hoehe">
+							<EXP><![CDATA[$=$item.EckradDefinition.Hoehe]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</CASEGROUP>
 					<CASEGROUP Id="RDK:18741919" CaseType="0">
 						<EXP><![CDATA[$C$Kurve]]></EXP>
 						<SET Id="RDK:18827171" VarRef="h1">
@@ -23700,55 +23717,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<EXP><![CDATA[$=$item.GefaelleDefinition.HoeheUnten]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<IFTHENELSE Id="RDK:20622273">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$h1>h2]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:20622274" SubType="Then" DesignTimeRemark="richtung=1, von cp1 nach cp2 abfallen">
-								<SET Id="RDK:20622279" VarRef="richtung">
-									<EXP><![CDATA[$=$1]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-							<GROUP Id="RDK:20622275" SubType="Else" DesignTimeRemark="richtung=0, von cp2 nach cp1 abfallen">
-								<SET Id="RDK:20622281" VarRef="richtung">
-									<EXP><![CDATA[$=$0]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-						</IFTHENELSE>
-						<IFTHENELSE Id="RDK:18912104" Suppressed="True" DesignTimeNotes="Abfrage ob das definiert ist, sollte ausserhalb dieser Funktion für eine Entscheidung stattfinden. Die Funktion selbst soll nur die enthaltenen Höhen zurück geben">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$item.GefaelleDefinition.LH_fits]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:18912101" SubType="Then" />
-							<GROUP Id="RDK:18912103" SubType="Else">
-								<COMMENTS Id="RDK:21041036" DesignTimeRemark="//Gefällehoehe sind nicht definiert." />
-								<ACTION_CALL Id="RDK:21041038" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
-									<PAR Name="RDLibraryName">
-										<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
-									</PAR>
-									<PAR Name="MsgText">
-										<EXP><![CDATA[$C$Hoehe der Gefällestrecke sind nicht definiert.]]></EXP>
-									</PAR>
-									<PAR Name="MsgStyle">
-										<EXP><![CDATA[$C$-1]]></EXP>
-									</PAR>
-									<PAR Name="BtnLayout">
-										<EXP><![CDATA[$C$-1]]></EXP>
-									</PAR>
-									<PAR Name="MsgCaption" />
-									<PAR Name="BaloonType" />
-									<PAR Name="BtnPressed">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-								</ACTION_CALL>
-								<SET Id="RDK:21041040" VarRef="hoehe">
-									<EXP><![CDATA[$=$0]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-						</IFTHENELSE>
 						<IFTHENELSE Id="RDK:18827185">
 							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$cpId="cp1"]]></EXP>
@@ -23777,58 +23745,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<EXP><![CDATA[$=$item.FoerdererDefinition.H_0]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<IFTHENELSE Id="RDK:21040993">
-							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$h1>h2 and item.FoerdererDefinition.Richtung=0]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$h1<h2 and item.FoerdererDefinition.Richtung=1]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:21041005" SubType="Then" DesignTimeRemark="richtung=1, von cp1 nach cp2 abfallen/aufsteigen">
-								<SET Id="RDK:21041028" VarRef="richtung">
-									<EXP><![CDATA[$=$1]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-							<GROUP Id="RDK:21041032" SubType="Else" DesignTimeRemark="richtung=0, von cp2 nach cp1 abfallen/ aufsteigen">
-								<SET Id="RDK:21041031" VarRef="richtung">
-									<EXP><![CDATA[$=$0]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-						</IFTHENELSE>
-						<IFTHENELSE Id="RDK:18928848" Suppressed="True" DesignTimeNotes="Abfrage ob das definiert ist, sollte ausserhalb dieser Funktion für eine Entscheidung stattfinden. Die Funktion selbst soll nur die enthaltenen Höhen zurück geben">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$item.FoerdererDefinition.LH_fits]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:18928841" SubType="Then" />
-							<GROUP Id="RDK:18928847" SubType="Else">
-								<COMMENTS Id="RDK:18928861" DesignTimeRemark="//Foerdererhoehe sind nicht definiert." />
-								<ACTION_CALL Id="RDK:18928865" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
-									<PAR Name="RDLibraryName">
-										<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
-									</PAR>
-									<PAR Name="MsgText">
-										<EXP><![CDATA[$C$Hoehe des Foedereres sind nicht definiert.]]></EXP>
-									</PAR>
-									<PAR Name="MsgStyle">
-										<EXP><![CDATA[$C$-1]]></EXP>
-									</PAR>
-									<PAR Name="BtnLayout">
-										<EXP><![CDATA[$C$-1]]></EXP>
-									</PAR>
-									<PAR Name="MsgCaption" />
-									<PAR Name="BaloonType" />
-									<PAR Name="BtnPressed">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-								</ACTION_CALL>
-								<SET Id="RDK:18928859" VarRef="hoehe">
-									<EXP><![CDATA[$=$0]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-						</IFTHENELSE>
 						<IFTHENELSE Id="RDK:18928840">
 							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$cpId="cp1"]]></EXP>
@@ -23860,8 +23776,12 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="MsgText">
 								<EXP><![CDATA[$C$Dieses Element zum Auslesen der Höhe ist noch nicht implementiert]]></EXP>
 							</PAR>
-							<PAR Name="MsgStyle" />
-							<PAR Name="BtnLayout" />
+							<PAR Name="MsgStyle">
+								<EXP><![CDATA[$C$-1]]></EXP>
+							</PAR>
+							<PAR Name="BtnLayout">
+								<EXP><![CDATA[$C$-1]]></EXP>
+							</PAR>
 							<PAR Name="MsgCaption" />
 							<PAR Name="BaloonType" />
 							<PAR Name="BtnPressed">
@@ -23882,80 +23802,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<PAR Name="Int" />
 					<PAR Name="Boo" />
 				</SET_STRUCT>
-				<SET_STRUCT Id="RDK:20622283" VarRef="SSGParameter" ClearAll="True" ListRef="RueckgabeListe">
-					<PAR Name="Key">
-						<EXP><![CDATA[$C$Richtung]]></EXP>
-					</PAR>
-					<PAR Name="StrArr" />
-					<PAR Name="Str" />
-					<PAR Name="Dbl">
-						<EXP><![CDATA[$=$richtung]]></EXP>
-					</PAR>
-					<PAR Name="Int" />
-					<PAR Name="Boo" />
-				</SET_STRUCT>
 				<SET Id="RDK:18850809" VarRef="Param.Result">
 					<EXP><![CDATA[$=$RueckgabeListe]]></EXP>
 					<PAR Name="AdvancedOptions" />
 				</SET>
-				<SELECTCASE Id="RDK:18827126" Suppressed="True">
-					<EXP><![CDATA[$=$item.family]]></EXP>
-					<CASEGROUP Id="RDK:18827115" CaseType="0">
-						<EXP><![CDATA[$C$Kreisel]]></EXP>
-						<SET Id="RDK:18827114" VarRef="hoehe">
-							<EXP><![CDATA[$=$item.KreiselDefinition.Hoehe]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-					</CASEGROUP>
-					<CASEGROUP Id="RDK:18827119" CaseType="0">
-						<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
-						<SET Id="RDK:18827116" VarRef="hoehe_oben">
-							<EXP><![CDATA[$=$item.GefaelleDefinition.HoeheOben]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:18827117" VarRef="hoehe_unten">
-							<EXP><![CDATA[$=$item.GefaelleDefinition.HoeheUnten]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:18827118" VarRef="hoehe">
-							<EXP><![CDATA[$=$IIF(hoehe_oben<0.001, hoehe_unten, hoehe_oben)]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-					</CASEGROUP>
-					<CASEGROUP Id="RDK:18827123" CaseType="0">
-						<EXP><![CDATA[$C$Foerderer]]></EXP>
-						<SET Id="RDK:18827120" VarRef="hoehe_oben">
-							<EXP><![CDATA[$=$item.FoerdererDefinition.H_1]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:18827121" VarRef="hoehe_unten">
-							<EXP><![CDATA[$=$item.FoerdererDefinition.H_0]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:18827122" VarRef="hoehe">
-							<EXP><![CDATA[$=$IIF(hoehe_oben<0.001, StrToDbl(hoehe_unten), StrToDbl(hoehe_oben))]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-					</CASEGROUP>
-					<CASEGROUP Id="RDK:18827125" CaseType="1">
-						<EXP />
-						<ACTION_CALL Id="RDK:18827124" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
-							<PAR Name="RDLibraryName">
-								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
-							</PAR>
-							<PAR Name="MsgText">
-								<EXP><![CDATA[$C$Dieses Element zum Auslesen der Höhe ist noch nicht implementiert]]></EXP>
-							</PAR>
-							<PAR Name="MsgStyle" />
-							<PAR Name="BtnLayout" />
-							<PAR Name="MsgCaption" />
-							<PAR Name="BaloonType" />
-							<PAR Name="BtnPressed">
-								<EXP><![CDATA[$V$]]></EXP>
-							</PAR>
-						</ACTION_CALL>
-					</CASEGROUP>
-				</SELECTCASE>
 			</FUNCTION>
 			<FUNCTION Id="RDK:18598214" Name="InitSystemLimits">
 				<GROUP Id="RDK:18598216" Name="LocalVariables" SubType="VarSet" IncludeDate="0">