From 247c83ab2e49ab12ac1a1a2bfa9f3ee0a822de6c Mon Sep 17 00:00:00 2001
From: mistangl <m.stangl@schoenenberger.de>
Date: Thu, 10 Oct 2024 17:03:20 +0200
Subject: [PATCH] =?UTF-8?q?Bugfix=20bei=20der=20Erst-=20Erzeugung=20einer?=
 =?UTF-8?q?=20Gruppe.=20Reihenfolge=20bei=20GroupCreate=20war=20anders=20h?=
 =?UTF-8?q?erum.=20Weiter=20an=20ResetHeightsOfStrecke=20geschrieben,=20um?=
 =?UTF-8?q?=20die=20richtige=20H=C3=B6he=20an=20die=20Nachbarn=20weiter=20?=
 =?UTF-8?q?zu=20geben?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 238 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 225 insertions(+), 13 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 941fff4..b2af2c3 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-10-09T17:40:22" LanguageVersion="2014.1.3.690" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-10-10T17:01:50" 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">
-				<TYPE Id="RDK:313478" Name="SSGConnectionPoint" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:313478" Name="SSGConnectionPoint" Expanded="True" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:609117" Name="id" Type="string" />
 					<FIELD Id="RDK:313462" Name="x_M" Type="double" />
@@ -17,7 +17,7 @@
 					<FIELD Id="RDK:313476" Name="label" Type="string" />
 					<FIELD Id="RDK:721671" Name="aktiv" Type="boolean" />
 				</TYPE>
-				<TYPE Id="RDK:20734830" Name="SSGConnectionPointPairs" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:20734830" Name="SSGConnectionPointPairs" Expanded="True" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:20734820" Name="id1" Type="string" DesignTimeRemark="id des Connection Punktes auf Kreisel1" />
 					<FIELD Id="RDK:20734832" Name="id2" Type="string" DesignTimeRemark="id des Connection Punktes auf Kreisel1" />
@@ -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" SubType="structure">
+				<TYPE Id="RDK:26388" Name="KreiselType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:95024" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:26389" Name="AbstandMS" Type="double" />
@@ -1008,6 +1008,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:21528228" 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" />
@@ -9823,7 +9824,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										</PAR>
 										<IFTHENELSE Id="RDK:20901982" DesignTimeRemark="Ab dem gegebenen Elemente alle folgenden zurück geben">
 											<VALUECONDITION Value="true">
-												<EXP><![CDATA[$=$record = True]]></EXP>
+												<EXP><![CDATA[$=$record]]></EXP>
 											</VALUECONDITION>
 											<GROUP Id="RDK:20901981" SubType="Then">
 												<LIST_ADD Id="RDK:20902210" ListRef="Param.Result">
@@ -10330,7 +10331,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<EXP><![CDATA[$C$CreateGroup]]></EXP>
 									</PAR>
 									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$NewList(id0, id1)]]></EXP>
+										<EXP><![CDATA[$=$NewList(id1, id0)]]></EXP>
 									</PAR>
 									<PAR Name="ResultRef">
 										<EXP><![CDATA[$V$]]></EXP>
@@ -12463,7 +12464,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<PAR Name="isDefined" />
 									<PAR Name="KurveDefinition" />
 								</SET_STRUCT>
-								<SET Id="RDK:18556791" VarRef="Shape_Prototype.height">
+								<SET Id="RDK:18556791" VarRef="Shape_Prototype.height" Suppressed="True">
 									<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.L1]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
@@ -20927,12 +20928,17 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="AdvancedOptions" />
 						</SET>
 					</VAR>
-					<VAR Id="RDK:21477298" Name="label" Type="string" />
+					<VAR Id="RDK:21477298" Name="itemId" Type="string" />
 					<VAR Id="RDK:21477300" Name="hoehe" Type="double" />
 					<VAR Id="RDK:21477302" Name="shape_item" Type="Editor2DShapeType" />
 					<VAR Id="RDK:21477384" Name="inGroup" Type="boolean" />
 					<VAR Id="RDK:21477401" Name="following" Type="string[]" />
 					<VAR Id="RDK:21477403" Name="previous" Type="string[]" />
+					<VAR Id="RDK:21484300" Name="ResultListe" Type="string[]" />
+					<VAR Id="RDK:21484286" Name="UebergabeListe" Type="SSGParameter[]" />
+					<VAR Id="RDK:21517207" Name="RueckgabeListe" Type="SSGParameter[]" />
+					<VAR Id="RDK:21484298" Name="cpId" Type="string" />
+					<VAR Id="RDK:21543311" Name="cps_verbunden" Type="string[]" />
 				</GROUP>
 				<CALLFUNCTION Id="RDK:21477364">
 					<PAR Name="FuncName">
@@ -20954,6 +20960,22 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						<EXIT_PROCESS Id="RDK:21477377" BreakType="4" ExitStatus="0" />
 					</GROUP>
 				</IFTHENELSE>
+				<CALLFUNCTION Id="RDK:21484294">
+					<PAR Name="FuncName">
+						<EXP><![CDATA[$C$GetUsedCps]]></EXP>
+					</PAR>
+					<PAR Name="InputExp">
+						<EXP><![CDATA[$=$shapeId]]></EXP>
+					</PAR>
+					<PAR Name="ResultRef">
+						<EXP><![CDATA[$V$ResultListe]]></EXP>
+					</PAR>
+					<PAR Name="Options" />
+				</CALLFUNCTION>
+				<SET Id="RDK:21484296" VarRef="cpId" Suppressed="True">
+					<EXP><![CDATA[$=$ResultListe[0]]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
 				<CALLFUNCTION Id="RDK:21477397">
 					<PAR Name="FuncName">
 						<EXP><![CDATA[$C$GetFollowingIds]]></EXP>
@@ -20966,6 +20988,101 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					</PAR>
 					<PAR Name="Options" />
 				</CALLFUNCTION>
+				<IFTHENELSE Id="RDK:21528222" DesignTimeRemark="Falls es nachfolgende Elemente gibt, hol dir den Namen des Connection Points des Items dazu">
+					<VALUECONDITION Value="true">
+						<EXP><![CDATA[$=$Count(following) > 0]]></EXP>
+					</VALUECONDITION>
+					<GROUP Id="RDK:21528227" SubType="Then">
+						<SET_STRUCT Id="RDK:21528216" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+							<PAR Name="Key">
+								<EXP><![CDATA[$C$shapeId_0]]></EXP>
+							</PAR>
+							<PAR Name="StrArr" />
+							<PAR Name="Str">
+								<EXP><![CDATA[$=$shapeId]]></EXP>
+							</PAR>
+							<PAR Name="Dbl" />
+							<PAR Name="Int" />
+							<PAR Name="Boo" />
+						</SET_STRUCT>
+						<SET_STRUCT Id="RDK:21528218" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+							<PAR Name="Key">
+								<EXP><![CDATA[$C$shapeId_1]]></EXP>
+							</PAR>
+							<PAR Name="StrArr" />
+							<PAR Name="Str">
+								<EXP><![CDATA[$=$following[0]]]></EXP>
+							</PAR>
+							<PAR Name="Dbl" />
+							<PAR Name="Int" />
+							<PAR Name="Boo" />
+						</SET_STRUCT>
+						<CALLFUNCTION Id="RDK:21528214" DesignTimeRemark="hol dir den Namen des Connection Points des Items dazu">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$GetCpsOfConnectedShapes]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$UebergabeListe]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$cps_verbunden]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+						<FOREACHLOOP Id="RDK:21484263" ItemVarRef="itemId">
+							<PAR Name="ArrayValueExp">
+								<EXP><![CDATA[$=$following]]></EXP>
+							</PAR>
+							<PAR Name="ExitCondExp">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<SET Id="RDK:21525472" VarRef="UebergabeListe">
+								<EXP><![CDATA[$C$NOTHING]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+							<SET_STRUCT Id="RDK:21484288" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+								<PAR Name="Key">
+									<EXP><![CDATA[$C$shapeID]]></EXP>
+								</PAR>
+								<PAR Name="StrArr" />
+								<PAR Name="Str">
+									<EXP><![CDATA[$=$itemId]]></EXP>
+								</PAR>
+								<PAR Name="Dbl" />
+								<PAR Name="Int" />
+								<PAR Name="Boo" />
+							</SET_STRUCT>
+							<SET_STRUCT Id="RDK:21484290" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+								<PAR Name="Key">
+									<EXP><![CDATA[$C$cpId]]></EXP>
+								</PAR>
+								<PAR Name="StrArr" />
+								<PAR Name="Str">
+									<EXP><![CDATA[$=$cps_verbunden[1]]]></EXP>
+								</PAR>
+								<PAR Name="Dbl" />
+								<PAR Name="Int" />
+								<PAR Name="Boo" />
+							</SET_STRUCT>
+							<CALLFUNCTION Id="RDK:21484284">
+								<PAR Name="FuncName">
+									<EXP><![CDATA[$C$GetHeightOfItem]]></EXP>
+								</PAR>
+								<PAR Name="InputExp">
+									<EXP><![CDATA[$=$UebergabeListe]]></EXP>
+								</PAR>
+								<PAR Name="ResultRef">
+									<EXP><![CDATA[$V$RueckgabeListe]]></EXP>
+								</PAR>
+								<PAR Name="Options" />
+							</CALLFUNCTION>
+							<SET Id="RDK:21546772" VarRef="hoehe">
+								<EXP><![CDATA[$=$RueckgabeListe["key=Hoehe"].Dbl]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</FOREACHLOOP>
+					</GROUP>
+				</IFTHENELSE>
 				<CALLFUNCTION Id="RDK:21477405">
 					<PAR Name="FuncName">
 						<EXP><![CDATA[$C$GetPreviousIds]]></EXP>
@@ -20978,6 +21095,97 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					</PAR>
 					<PAR Name="Options" />
 				</CALLFUNCTION>
+				<IFTHENELSE Id="RDK:21543317" DesignTimeRemark="Falls es vorhergehende Elemente gibt">
+					<VALUECONDITION Value="true">
+						<EXP><![CDATA[$=$Count(previous) > 0]]></EXP>
+					</VALUECONDITION>
+					<GROUP Id="RDK:21543316" SubType="Then">
+						<SET_STRUCT Id="RDK:21543313" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+							<PAR Name="Key">
+								<EXP><![CDATA[$C$shapeId_0]]></EXP>
+							</PAR>
+							<PAR Name="StrArr" />
+							<PAR Name="Str">
+								<EXP><![CDATA[$=$shapeId]]></EXP>
+							</PAR>
+							<PAR Name="Dbl" />
+							<PAR Name="Int" />
+							<PAR Name="Boo" />
+						</SET_STRUCT>
+						<SET_STRUCT Id="RDK:21543314" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+							<PAR Name="Key">
+								<EXP><![CDATA[$C$shapeId_1]]></EXP>
+							</PAR>
+							<PAR Name="StrArr" />
+							<PAR Name="Str">
+								<EXP><![CDATA[$=$following[0]]]></EXP>
+							</PAR>
+							<PAR Name="Dbl" />
+							<PAR Name="Int" />
+							<PAR Name="Boo" />
+						</SET_STRUCT>
+						<CALLFUNCTION Id="RDK:21543315">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$GetCpsOfConnectedShapes]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$UebergabeListe]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$cps_verbunden]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+						<FOREACHLOOP Id="RDK:21525457" ItemVarRef="itemId">
+							<PAR Name="ArrayValueExp">
+								<EXP><![CDATA[$=$previous]]></EXP>
+							</PAR>
+							<PAR Name="ExitCondExp">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<SET_STRUCT Id="RDK:21525454" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+								<PAR Name="Key">
+									<EXP><![CDATA[$C$shapeID]]></EXP>
+								</PAR>
+								<PAR Name="StrArr" />
+								<PAR Name="Str">
+									<EXP><![CDATA[$=$itemId]]></EXP>
+								</PAR>
+								<PAR Name="Dbl" />
+								<PAR Name="Int" />
+								<PAR Name="Boo" />
+							</SET_STRUCT>
+							<SET_STRUCT Id="RDK:21543337" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+								<PAR Name="Key">
+									<EXP><![CDATA[$C$cpId]]></EXP>
+								</PAR>
+								<PAR Name="StrArr" />
+								<PAR Name="Str">
+									<EXP><![CDATA[$=$cps_verbunden[0]]]></EXP>
+								</PAR>
+								<PAR Name="Dbl" />
+								<PAR Name="Int" />
+								<PAR Name="Boo" />
+							</SET_STRUCT>
+							<CALLFUNCTION Id="RDK:21525456">
+								<PAR Name="FuncName">
+									<EXP><![CDATA[$C$GetHeightOfItem]]></EXP>
+								</PAR>
+								<PAR Name="InputExp">
+									<EXP><![CDATA[$=$UebergabeListe]]></EXP>
+								</PAR>
+								<PAR Name="ResultRef">
+									<EXP><![CDATA[$V$RueckgabeListe]]></EXP>
+								</PAR>
+								<PAR Name="Options" />
+							</CALLFUNCTION>
+							<SET Id="RDK:21546774" VarRef="hoehe">
+								<EXP><![CDATA[$=$RueckgabeListe["key=Hoehe"].Dbl]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</FOREACHLOOP>
+					</GROUP>
+				</IFTHENELSE>
 			</FUNCTION>
 			<FUNCTION Id="RDK:1698052" Name="SetHeightOnConnect" InputTypeName="SSGParameter[]" ResultTypeName="SSGParameter[]">
 				<GROUP Id="RDK:1772339" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
@@ -22186,7 +22394,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="Boo" />
 							<PAR Name="StrArr" />
 						</SET_STRUCT>
-						<SET_STRUCT Id="RDK:18895253" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+						<SET_STRUCT Id="RDK:18895253" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe" Suppressed="True">
 							<PAR Name="Key">
 								<EXP><![CDATA[$C$Hoehe]]></EXP>
 							</PAR>
@@ -22304,7 +22512,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="Int" />
 							<PAR Name="Boo" />
 						</SET_STRUCT>
-						<SET_STRUCT Id="RDK:18868849" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+						<SET_STRUCT Id="RDK:18868849" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe" Suppressed="True">
 							<PAR Name="Key">
 								<EXP><![CDATA[$C$Hoehe]]></EXP>
 							</PAR>
@@ -22316,8 +22524,9 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</PAR>
 							<PAR Name="Int" />
 							<PAR Name="Boo" />
+							<PAR Name="StrArr" />
 						</SET_STRUCT>
-						<SET_STRUCT Id="RDK:20622268" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+						<SET_STRUCT Id="RDK:20622268" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe" Suppressed="True">
 							<PAR Name="Key">
 								<EXP><![CDATA[$C$Richtung]]></EXP>
 							</PAR>
@@ -22327,6 +22536,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="Dbl" />
 							<PAR Name="Int" />
 							<PAR Name="Boo" />
+							<PAR Name="StrArr" />
 						</SET_STRUCT>
 						<CALLFUNCTION Id="RDK:18827098">
 							<PAR Name="FuncName">
@@ -22407,7 +22617,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<EXP><![CDATA[$=$Param.Input[0].connectionPointID]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SET Id="RDK:18827158" VarRef="cp_partner" DesignTimeNotes="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].connectionPoints[&quot;cpId=&quot;+cpId]">
+						<SET Id="RDK:18827158" VarRef="cp_partner" Suppressed="True" DesignTimeNotes="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].connectionPoints[&quot;cpId=&quot;+cpId]">
 							<EXP><![CDATA[$=$FromJSON(ShapeList["id="+Param.Input[1].shapeID].connectionPoints)["cpId="+cpId]]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
@@ -22421,6 +22631,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="Dbl" />
 							<PAR Name="Int" />
 							<PAR Name="Boo" />
+							<PAR Name="StrArr" />
 						</SET_STRUCT>
 						<SET_STRUCT Id="RDK:18827156" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
 							<PAR Name="Key">
@@ -22432,8 +22643,9 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="Dbl" />
 							<PAR Name="Int" />
 							<PAR Name="Boo" />
+							<PAR Name="StrArr" />
 						</SET_STRUCT>
-						<SET_STRUCT Id="RDK:18895219" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+						<SET_STRUCT Id="RDK:18895219" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe" Suppressed="True">
 							<PAR Name="Key">
 								<EXP><![CDATA[$C$Hoehe]]></EXP>
 							</PAR>