From 3ab020fb646e07c5a16f7eb25d9348b708bd3735 Mon Sep 17 00:00:00 2001
From: Simon Schmutzler <s.schmutzler@schoenenberger.de>
Date: Mon, 28 Oct 2024 17:15:29 +0100
Subject: [PATCH] =?UTF-8?q?Gef=C3=A4llestrecke=20und=20F=C3=B6rderer=20zei?=
 =?UTF-8?q?gen=20initialen=20Status=20mit=20'O';=20Berechnung=20der=20F?=
 =?UTF-8?q?=C3=B6rder=20bzw=20Gef=C3=A4llerichtung=20und=20anzeige=20mit?=
 =?UTF-8?q?=20Pfeil;=20Berechnung=20der=20H=C3=B6hen=20innerhalb=20einer?=
 =?UTF-8?q?=20Strecke?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SSG/shapes/props/s_Foerderer.txt          |  2 +-
 .../SSG/shapes/props/s_Gefaellestrecke.txt    |  2 +-
 Editor2DLibrary/SSG/shapes/settings.txt       |  2 +-
 MAIN_SSG.rdx                                  | 63 +++++++++++++++----
 4 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/Editor2DLibrary/SSG/shapes/props/s_Foerderer.txt b/Editor2DLibrary/SSG/shapes/props/s_Foerderer.txt
index 84b4f0c..a973827 100644
--- a/Editor2DLibrary/SSG/shapes/props/s_Foerderer.txt
+++ b/Editor2DLibrary/SSG/shapes/props/s_Foerderer.txt
@@ -6,7 +6,7 @@
   "icon": "SSG/shapes/img/Foerderer_32.png",
   "iconBig": "SSG/shapes/img/Foerderer_64.png",
   "srcSVG": "SSG/shapes/svg/s_Foerderer.xml",
-  "text": "^",
+  "text": "O",
   "width": 377.9528,
   "height": 6047.2441,
   "depth": 755.9055,
diff --git a/Editor2DLibrary/SSG/shapes/props/s_Gefaellestrecke.txt b/Editor2DLibrary/SSG/shapes/props/s_Gefaellestrecke.txt
index 770218e..c2f681c 100644
--- a/Editor2DLibrary/SSG/shapes/props/s_Gefaellestrecke.txt
+++ b/Editor2DLibrary/SSG/shapes/props/s_Gefaellestrecke.txt
@@ -6,7 +6,7 @@
   "iconBig": "SSG/shapes/img/Gefaellestrecke.png",
   "srcSVG": "SSG/shapes/svg/s_Gefaellestrecke.xml",
   "src3D": "SSG/shapes/obj/s_Gefaellestrecke.stl",
-  "text": "^",
+  "text": "O",
   "width": 1625.1969,
   "height": 6047.2441,
   "depth": 340.1575,
diff --git a/Editor2DLibrary/SSG/shapes/settings.txt b/Editor2DLibrary/SSG/shapes/settings.txt
index afba196..442e40f 100644
--- a/Editor2DLibrary/SSG/shapes/settings.txt
+++ b/Editor2DLibrary/SSG/shapes/settings.txt
@@ -1 +1 @@
-{"categories":{"c_ILS":{"expanded":true},"c_Kreiselmodule":{"expanded":true},"c_Zusatzmodul":{"expanded":true},"c_Foerderer":{"expanded":true},"c_Kurven":{"expanded":true},"c10":{"expanded":false},"c_Background":{"expanded":false},"c_Parts":{"expanded":false},"c_Session":{"expanded":false}},"shapes":{}}
\ No newline at end of file
+{"categories":{"c_ILS":{"expanded":true},"c_Kreiselmodule":{"expanded":false},"c_Zusatzmodul":{"expanded":false},"c_Foerderer":{"expanded":false},"c_Kurven":{"expanded":false},"c10":{"expanded":false},"c_Background":{"expanded":false},"c_Parts":{"expanded":false},"c_Session":{"expanded":false}},"shapes":{}}
\ No newline at end of file
diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index eacefcb..a6025e7 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-28T12:30:13" LanguageVersion="2014.1.3.699" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-10-28T17:03:14" 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">
@@ -1022,6 +1022,7 @@
 			<VAR Id="RDK:1007444" Name="Point2D" Type="Point2D" />
 			<VAR Id="RDK:1519830" Name="SessionZip" Type="string" />
 			<VAR Id="RDK:20857929" Name="groupStrings" Type="string[]" DesignTimeRemark="Enthält ; separtiert alle Strings, damit die Gruppen beschrieben werden können. a;b;c wäre z.B. eine Gruppe aus den Objekten a, b und c" />
+			<VAR Id="RDK:21866637" Name="cps_verbunden" Type="string" DesignTimeRemark="Generated by RD" />
 		</GROUP>
 		<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
 			<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
@@ -20992,6 +20993,14 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						<EXP><![CDATA[$=$shape_item.family = "Gefaellestrecke"]]></EXP>
 					</VALUECONDITION>
 					<GROUP Id="RDK:21069340" SubType="Then">
+						<SET Id="RDK:21902113" VarRef="shape_item.GefaelleDefinition.LH_fits">
+							<EXP><![CDATA[$=$False]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:21902115" VarRef="shape_item.text">
+							<EXP><![CDATA[$C$O]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 						<SET Id="RDK:21069339" VarRef="Param.Result">
 							<EXP><![CDATA[$C$False]]></EXP>
 							<PAR Name="AdvancedOptions" />
@@ -21016,7 +21025,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<SET Id="RDK:21069360" VarRef="shape_item.GefaelleDefinition.H_th">
-							<EXP><![CDATA[$=$Abs(Round(H_th, 0))]]></EXP>
+							<EXP><![CDATA[$=$]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<SET Id="RDK:21069361" VarRef="shape_item.GefaelleDefinition.winkel_th">
@@ -21031,6 +21040,23 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<EXP><![CDATA[$=$shape_item.GefaelleDefinition.LH_fits]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
+						<IFTHENELSE Id="RDK:21902123">
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$shape_item.GefaelleDefinition.HoeheOben>shape_item.GefaelleDefinition.HoeheUnten]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:21902124" SubType="Then">
+								<SET Id="RDK:21902137" VarRef="shape_item.text">
+									<EXP><![CDATA[$=$IIF(shape_item.GefaelleDefinition.LH_fits, "↓", "O")]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+							<GROUP Id="RDK:21902125" SubType="Else">
+								<SET Id="RDK:21902117" VarRef="shape_item.text" DesignTimeTip="↓">
+									<EXP><![CDATA[$=$IIF(shape_item.GefaelleDefinition.LH_fits, "↑", "O")]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+						</IFTHENELSE>
 						<SET Id="RDK:21211830" VarRef="shape_item.z">
 							<EXP><![CDATA[$=$shape_item.GefaelleDefinition.HoeheOben/2 + shape_item.GefaelleDefinition.HoeheUnten/2]]></EXP>
 							<PAR Name="AdvancedOptions" />
@@ -21155,6 +21181,23 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<EXP><![CDATA[$=$IIF(Abs(Shape_Prototype.GefaelleDefinition.L1-L_th)<Shape_Prototype.GefaelleDefinition.LH_toleranz,True,False)]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
+						<IFTHENELSE Id="RDK:21911224">
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheOben>Shape_Prototype.GefaelleDefinition.HoeheUnten]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:21911221" SubType="Then">
+								<SET Id="RDK:21911220" VarRef="Shape_Prototype.text">
+									<EXP><![CDATA[$=$IIF(Shape_Prototype.GefaelleDefinition.LH_fits, "↓", "O")]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+							<GROUP Id="RDK:21911223" SubType="Else">
+								<SET Id="RDK:21911222" VarRef="Shape_Prototype.text" DesignTimeTip="↓">
+									<EXP><![CDATA[$=$IIF(Shape_Prototype.GefaelleDefinition.LH_fits, "↑", "O")]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+						</IFTHENELSE>
 					</GROUP>
 				</IFTHENELSE>
 			</FUNCTION>
@@ -21818,7 +21861,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						<EXP><![CDATA[$=$Count(previous) > 0]]></EXP>
 					</VALUECONDITION>
 					<GROUP Id="RDK:21543316" SubType="Then">
-						<SET_STRUCT Id="RDK:21543313" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+						<SET_STRUCT Id="RDK:21543313" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeCps">
 							<PAR Name="Key">
 								<EXP><![CDATA[$C$shapeId]]></EXP>
 							</PAR>
@@ -21830,31 +21873,27 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="Int" />
 							<PAR Name="Boo" />
 						</SET_STRUCT>
-						<SET Id="RDK:21827701" VarRef="splitarr" Suppressed="True">
-							<EXP><![CDATA[$=$ListReverse(splitStr(lineStr, ";"))]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
 						<SET_STRUCT Id="RDK:21827689" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeCps">
 							<PAR Name="Key">
 								<EXP><![CDATA[$C$shape_ids]]></EXP>
 							</PAR>
 							<PAR Name="StrArr">
-								<EXP><![CDATA[$=$previous]]></EXP>
+								<EXP><![CDATA[$=$ListReverse(previous)]]></EXP>
 							</PAR>
 							<PAR Name="Str" />
 							<PAR Name="Dbl" />
 							<PAR Name="Int" />
 							<PAR Name="Boo" />
 						</SET_STRUCT>
-						<CALLFUNCTION Id="RDK:21543315">
+						<CALLFUNCTION Id="RDK:21895146" DesignTimeRemark="setzt alle Höhen von Kurven neu ausgehende vom gegebenen Shape, bis man an eine Gefällestrecke oder einen Förderer gelangt">
 							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$GetCpsOfConnectedShapes]]></EXP>
+								<EXP><![CDATA[$C$SetHeightsChain]]></EXP>
 							</PAR>
 							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$UebergabeListe]]></EXP>
+								<EXP><![CDATA[$=$UebergabeCps]]></EXP>
 							</PAR>
 							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$cps_verbunden]]></EXP>
+								<EXP><![CDATA[$V$]]></EXP>
 							</PAR>
 							<PAR Name="Options" />
 						</CALLFUNCTION>