From 5d8ba95f0c46a599fde5508b23888fe7d52544e9 Mon Sep 17 00:00:00 2001
From: mistangl <m.stangl@schoenenberger.de>
Date: Fri, 27 Sep 2024 11:46:44 +0200
Subject: [PATCH] =?UTF-8?q?Filter=20in=20der=20doPattern=20Funktion=20erg?=
 =?UTF-8?q?=C3=A4nzt,=20so=20das=20bereits=20angebunden=20Connection=20poi?=
 =?UTF-8?q?nts=20nicht=20mehr=20vom=20Muster=20neu=20angebunden=20werden?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 131 +++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 106 insertions(+), 25 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 4ea95aa..a0d3e49 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="y.wang [ANGEBOT-NB02]" ModDate="2024-09-26T16:04:33" LanguageVersion="2014.1.3.679" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-09-27T11:45:58" 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">
@@ -76,7 +76,7 @@
 					<FIELD Id="RDK:302575" Name="n_Sep" Type="integer" />
 					<FIELD Id="RDK:302576" Name="n_Scan" Type="integer" />
 				</TYPE>
-				<TYPE Id="RDK:18732236" Name="KurveType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:18732236" Name="KurveType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18732225" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:18732226" Name="L1" Type="double" />
@@ -125,7 +125,7 @@
 					<FIELD Id="RDK:16525231" Name="Drehung" Type="integer" DesignTimeNotes="1= im Uhrzeigersinn=rechts&#xD;&#xA;-1= Gegen Uhrzeigersinn=links" />
 					<FIELD Id="RDK:16577441" Name="Beschreibung" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:79642" Name="SSG_ShapeType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:79642" Name="SSG_ShapeType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:79643" Name="SivasNummer" Type="string" />
 					<FIELD Id="RDK:1561689" Name="Rotationsklasse" Type="string" />
@@ -140,7 +140,7 @@
 					<FIELD Id="RDK:16525361" Name="BTMTEntladungDefinition" Type="BTMTEntladungType" />
 					<FIELD Id="RDK:19961198" Name="isDefined" Type="boolean" />
 				</TYPE>
-				<TYPE Id="RDK:18530527" Name="SSG_ShapeType_limit" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:18530527" Name="SSG_ShapeType_limit" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18530520" Name="KreiselDefinition" Type="KreiselType" />
 					<FIELD Id="RDK:18530521" Name="EckradDefinition" Type="EckradType" />
@@ -148,9 +148,10 @@
 					<FIELD Id="RDK:18530523" Name="FoerdererDefinition" Type="FoerdererType" />
 					<FIELD Id="RDK:18732357" Name="KurveDefinition" Type="KurveType" />
 				</TYPE>
-				<TYPE Id="RDK:1783792" Name="SSGParameter" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:1783792" Name="SSGParameter" Expanded="True" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:1783794" Name="Key" Type="string" />
+					<FIELD Id="RDK:21032090" Name="StrArr" Type="string[]" />
 					<FIELD Id="RDK:1789531" Name="Str" Type="string" />
 					<FIELD Id="RDK:1783796" Name="Dbl" Type="double" />
 					<FIELD Id="RDK:1783800" Name="Int" Type="integer" />
@@ -1007,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:21032106" Name="alreadyConnectedCps" Type="string" DesignTimeRemark="Generated by RD" />
 		</GROUP>
 		<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
 			<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
@@ -14700,15 +14702,6 @@ ShapeTotalLength
 me.x
 ))-(Shape_Prototype.KreiselDefinition.Durchmesser/2)]]></EXP>
 											</PAR>
-											<PAR Name="id" />
-											<PAR Name="x_S" />
-											<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 Id="RDK:607197" Name="Spannstation" SubType="Generic">
@@ -14726,15 +14719,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>
@@ -17273,6 +17257,7 @@ me.x
 					<VAR Id="RDK:20741457" Name="dirY" Type="string" />
 					<VAR Id="RDK:20772419" Name="i1" Type="integer" />
 					<VAR Id="RDK:20772417" Name="i2" Type="integer" />
+					<VAR Id="RDK:21032108" Name="alreadyConnectedCps" Type="string[]" />
 				</GROUP>
 				<IFTHENELSE Id="RDK:20741448">
 					<VALUECONDITION Value="true" Oper="OR">
@@ -17334,6 +17319,10 @@ me.x
 						</SET>
 					</GROUP>
 				</IFTHENELSE>
+				<SET Id="RDK:21032105" VarRef="alreadyConnectedCps">
+					<EXP><![CDATA[$=$Param.Input["key=usedCps"].StrArr]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
 				<FOREACHLOOP Id="RDK:20738412" ItemVarRef="P1" IndexVarRef="i1">
 					<PAR Name="ArrayValueExp">
 						<EXP><![CDATA[$=$CpointsKreisel1]]></EXP>
@@ -17345,7 +17334,7 @@ me.x
 						<EXP><![CDATA[$=$distances1[i1]]]></EXP>
 						<PAR Name="AdvancedOptions" />
 					</SET>
-					<IFTHENELSE Id="RDK:20741582" DesignTimeRemark="Der Connection Point ist schon verbunden">
+					<IFTHENELSE Id="RDK:20741582" DesignTimeRemark="Der Connection Point ist schon verbunden, da es das Ursprungselement ist">
 						<VALUECONDITION Value="true">
 							<EXP><![CDATA[$=$d1 = 0]]></EXP>
 						</VALUECONDITION>
@@ -17353,6 +17342,14 @@ me.x
 							<EXIT_PROCESS Id="RDK:20741580" BreakType="2" ExitStatus="0" />
 						</GROUP>
 					</IFTHENELSE>
+					<IFTHENELSE Id="RDK:21032118" DesignTimeRemark="Der Connection Point ist nicht mehr frei und wurde schon einmal angebunden">
+						<VALUECONDITION Value="true">
+							<EXP><![CDATA[$=$IndexOf(alreadyConnectedCps, P1.id+"_G") >= 0]]></EXP>
+						</VALUECONDITION>
+						<GROUP Id="RDK:21032117" SubType="Then">
+							<EXIT_PROCESS Id="RDK:21032116" BreakType="2" ExitStatus="0" />
+						</GROUP>
+					</IFTHENELSE>
 					<FOREACHLOOP Id="RDK:20738429" ItemVarRef="P2" IndexVarRef="i2">
 						<PAR Name="ArrayValueExp">
 							<EXP><![CDATA[$=$CpointsKreisel2]]></EXP>
@@ -17617,6 +17614,7 @@ me.x
 						<VAR Id="RDK:20689947" Name="shape_kreisel2" Type="Editor2DShapeType" />
 						<VAR Id="RDK:20725686" Name="cpId_1" Type="string" />
 						<VAR Id="RDK:20725688" Name="cpId_2" Type="string" />
+						<VAR Id="RDK:21032094" Name="usedCps" Type="string[]" />
 						<VAR Id="RDK:20725674" Name="UebergabeListe" Type="SSGParameter[]" />
 						<VAR Id="RDK:20725709" Name="ResultListe" Type="string[]" />
 						<VAR Id="RDK:20734842" Name="cp_pairs" Type="SSGConnectionPointPairs[]" />
@@ -17677,7 +17675,7 @@ me.x
 						<PAR Name="Int" />
 						<PAR Name="Boo" />
 					</SET_STRUCT>
-					<CALLFUNCTION Id="RDK:20725694">
+					<CALLFUNCTION Id="RDK:21031395">
 						<PAR Name="FuncName">
 							<EXP><![CDATA[$C$GetCpsOfConnectedShapes]]></EXP>
 						</PAR>
@@ -17758,6 +17756,7 @@ me.x
 						<PAR Name="Dbl" />
 						<PAR Name="Int" />
 						<PAR Name="Boo" />
+						<PAR Name="StrArr" />
 					</SET_STRUCT>
 					<SET_STRUCT Id="RDK:20725678" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
 						<PAR Name="Key">
@@ -17769,6 +17768,7 @@ me.x
 						<PAR Name="Dbl" />
 						<PAR Name="Int" />
 						<PAR Name="Boo" />
+						<PAR Name="StrArr" />
 					</SET_STRUCT>
 					<SET_STRUCT Id="RDK:20725680" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
 						<PAR Name="Key">
@@ -17780,6 +17780,7 @@ me.x
 						<PAR Name="Dbl" />
 						<PAR Name="Int" />
 						<PAR Name="Boo" />
+						<PAR Name="StrArr" />
 					</SET_STRUCT>
 					<SET_STRUCT Id="RDK:20725715" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
 						<PAR Name="Key">
@@ -17791,6 +17792,7 @@ me.x
 						<PAR Name="Dbl" />
 						<PAR Name="Int" />
 						<PAR Name="Boo" />
+						<PAR Name="StrArr" />
 					</SET_STRUCT>
 					<SET_STRUCT Id="RDK:20741543" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
 						<PAR Name="Key">
@@ -17802,6 +17804,55 @@ me.x
 						<PAR Name="Dbl" />
 						<PAR Name="Int" />
 						<PAR Name="Boo" />
+						<PAR Name="StrArr" />
+					</SET_STRUCT>
+					<CALLFUNCTION Id="RDK:20725694">
+						<PAR Name="FuncName">
+							<EXP><![CDATA[$C$GetUsedCps]]></EXP>
+						</PAR>
+						<PAR Name="InputExp">
+							<EXP><![CDATA[$=$shapeId_kreisel1]]></EXP>
+						</PAR>
+						<PAR Name="ResultRef">
+							<EXP><![CDATA[$V$ResultListe]]></EXP>
+						</PAR>
+						<PAR Name="Options" />
+					</CALLFUNCTION>
+					<LIST_ADD Id="RDK:21032095" ListRef="usedCps">
+						<PAR Name="VALUE_TO_ADD">
+							<EXP><![CDATA[$=$ResultListe]]></EXP>
+						</PAR>
+						<PAR Name="POS_TO_ADD" />
+					</LIST_ADD>
+					<CALLFUNCTION Id="RDK:21032092">
+						<PAR Name="FuncName">
+							<EXP><![CDATA[$C$GetUsedCps]]></EXP>
+						</PAR>
+						<PAR Name="InputExp">
+							<EXP><![CDATA[$=$shapeId_kreisel2]]></EXP>
+						</PAR>
+						<PAR Name="ResultRef">
+							<EXP><![CDATA[$V$ResultListe]]></EXP>
+						</PAR>
+						<PAR Name="Options" />
+					</CALLFUNCTION>
+					<LIST_ADD Id="RDK:21032097" ListRef="usedCps">
+						<PAR Name="VALUE_TO_ADD">
+							<EXP><![CDATA[$=$ResultListe]]></EXP>
+						</PAR>
+						<PAR Name="POS_TO_ADD" />
+					</LIST_ADD>
+					<SET_STRUCT Id="RDK:21032099" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+						<PAR Name="Key">
+							<EXP><![CDATA[$C$usedCps]]></EXP>
+						</PAR>
+						<PAR Name="StrArr">
+							<EXP><![CDATA[$=$usedCps]]></EXP>
+						</PAR>
+						<PAR Name="Str" />
+						<PAR Name="Dbl" />
+						<PAR Name="Int" />
+						<PAR Name="Boo" />
 					</SET_STRUCT>
 					<CALLFUNCTION Id="RDK:20734805">
 						<PAR Name="FuncName">
@@ -19771,6 +19822,36 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<PAR Name="AdvancedOptions" />
 				</SET>
 			</FUNCTION>
+			<FUNCTION Id="RDK:21031388" Name="GetUsedCps" DesignTimeRemark="Gibt alle bereits belegten Connection Points dieses Items zurück" InputTypeName="string" ResultTypeName="string[]">
+				<GROUP Id="RDK:21031379" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
+					<VAR Id="RDK:21031374" Name="cps_used" Type="string[]" />
+					<VAR Id="RDK:21031375" Name="item_0" Type="Editor2DShapeType" />
+					<VAR Id="RDK:21031393" Name="pair" Type="string" />
+				</GROUP>
+				<SET Id="RDK:21031380" VarRef="item_0">
+					<EXP><![CDATA[$=$ShapeList["id="+Param.Input]]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+				<COMMENTS Id="RDK:21031382" DesignTimeRemark="Hole alle Connectionpoints welche verwendet sind" />
+				<FOREACHLOOP Id="RDK:21031390" ItemVarRef="pair">
+					<PAR Name="ArrayValueExp">
+						<EXP><![CDATA[$=$ShapeList["id="+item_0.id].links]]></EXP>
+					</PAR>
+					<PAR Name="ExitCondExp">
+						<EXP><![CDATA[$V$]]></EXP>
+					</PAR>
+					<LIST_ADD Id="RDK:21031385" ListRef="cps_used">
+						<PAR Name="VALUE_TO_ADD">
+							<EXP><![CDATA[$=$StrBefore(pair, ";")]]></EXP>
+						</PAR>
+						<PAR Name="POS_TO_ADD" />
+					</LIST_ADD>
+				</FOREACHLOOP>
+				<SET Id="RDK:21031387" VarRef="Param.Result">
+					<EXP><![CDATA[$=$cps_used]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+			</FUNCTION>
 			<FUNCTION Id="RDK:20690034" Name="UpdateShape" InputTypeName="string">
 				<GROUP Id="RDK:20690054" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
 					<VAR Id="RDK:20690046" Name="shapeId" Type="string">