From dc9d215496fa06d966055c30f8064c9dc134f0cd Mon Sep 17 00:00:00 2001
From: Simon Schmutzler <s.schmutzler@schoenenberger.de>
Date: Tue, 16 Jul 2024 11:43:42 +0200
Subject: [PATCH] =?UTF-8?q?Aufruf=20der=20Set=5FUndef=20Funktion=20f=C3=BC?=
 =?UTF-8?q?r=20SetStatus=20allgemein=20gemacht?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 156 +++++++++++++++++----------------------------------
 1 file changed, 50 insertions(+), 106 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index a273651..12bb906 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="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-07-16T11:18:00" LanguageVersion="2014.1.3.680" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-07-16T11:38:40" LanguageVersion="2014.1.3.680" />
 	<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">
@@ -3609,7 +3609,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 						<GROUP Id="RDK:439268" Name="Local Variables" SubType="VarSet" IncludeDate="0">
 							<VAR Id="RDK:439269" Name="ID" Type="string" />
 							<VAR Id="RDK:476605" Name="i" Type="integer" />
-							<VAR Id="RDK:19265050" Name="isDefined" Type="boolean" />
 						</GROUP>
 						<SET Id="RDK:439276" VarRef="ID">
 							<EXP><![CDATA[$=$Param.Input]]></EXP>
@@ -3619,18 +3618,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 							<EXP><![CDATA[$=$IndexOfByFieldValue(ShapeList, "id", ID)]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<CALLFUNCTION Id="RDK:19269861">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$Check_is_defined]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$ID]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$isDefined]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
 						<SELECTCASE Id="RDK:439273">
 							<EXP><![CDATA[$=$Shape_Prototype.family]]></EXP>
 							<CASEGROUP Id="RDK:439275" CaseType="0">
@@ -5056,7 +5043,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 								</GROUP>
 							</CASEGROUP>
 						</SELECTCASE>
-						<CALLFUNCTION Id="RDK:19615241" Suppressed="True">
+						<CALLFUNCTION Id="RDK:19615241">
 							<PAR Name="FuncName">
 								<EXP><![CDATA[$C$SetStatus]]></EXP>
 							</PAR>
@@ -5068,39 +5055,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 							</PAR>
 							<PAR Name="Options" />
 						</CALLFUNCTION>
-						<IFTHENELSE Id="RDK:19866094">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$(isDefined= True)]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:19866091" SubType="Then">
-								<CALLFUNCTION Id="RDK:19866090">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$SetStatus_Ok]]></EXP>
-									</PAR>
-									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$ID]]></EXP>
-									</PAR>
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
-							</GROUP>
-							<GROUP Id="RDK:19866093" SubType="Else">
-								<CALLFUNCTION Id="RDK:19866092">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$SetStatus_False]]></EXP>
-									</PAR>
-									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$ID]]></EXP>
-									</PAR>
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
-							</GROUP>
-						</IFTHENELSE>
 					</FUNCTION>
 					<FUNCTION Id="RDK:604706" Name="Write CPs From Data to Prototype">
 						<SET Id="RDK:592704" VarRef="ConnectionPointList">
@@ -17106,20 +17060,17 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<CASEGROUP Id="RDK:19265777" CaseType="0">
 						<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
 						<IFTHENELSE Id="RDK:19265776">
-							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$IsEmpty(shape_item.GefaelleDefinition.HoeheOben)]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$IsEmpty(shape_item.GefaelleDefinition.HoeheUnten)]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$shape_item.GefaelleDefinition.HoeheUnten = 0]]></EXP>
-							</VALUECONDITION>
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$shape_item.GefaelleDefinition.HoeheOben = 0]]></EXP>
+								<EXP><![CDATA[$=$Count(shape_item.links) = 2]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:19265775" SubType="Then">
 								<SET Id="RDK:19265774" VarRef="Param.Result">
+									<EXP><![CDATA[$=$True]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+							<GROUP Id="RDK:20700362" SubType="Else">
+								<SET Id="RDK:20700364" VarRef="Param.Result">
 									<EXP><![CDATA[$=$False]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
@@ -17618,30 +17569,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</PAR>
 							<PAR Name="Options" />
 						</CALLFUNCTION>
-						<COMMENTS Id="RDK:19937420" DesignTimeRemark="Höhe des Shapes der Gefällestrecke erst setzen, wenn beide Anschlusspunkte definiert wurden" />
-						<CALLFUNCTION Id="RDK:19937393" Suppressed="True">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$Check_is_defined]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$shapeId]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$isDefined]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
-						<IFTHENELSE Id="RDK:19937405" Suppressed="True">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$(isDefined= True)]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:19937402" SubType="Then">
-								<SET Id="RDK:19937409" VarRef="ShapeList[&quot;id=&quot;+shapeId].z">
-									<EXP><![CDATA[$=$ShapeList["id="+shapeId].GefaelleDefinition.HoeheOben/2 + ShapeList["id="+shapeId].GefaelleDefinition.HoeheUnten/2]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-						</IFTHENELSE>
+						<SET Id="RDK:19937409" VarRef="ShapeList[&quot;id=&quot;+shapeId].z">
+							<EXP><![CDATA[$=$ShapeList["id="+shapeId].GefaelleDefinition.HoeheOben/2 + ShapeList["id="+shapeId].GefaelleDefinition.HoeheUnten/2]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:19595364" CaseType="0">
 						<EXP><![CDATA[$C$Foerderer]]></EXP>
@@ -17676,30 +17607,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</PAR>
 							<PAR Name="Options" />
 						</CALLFUNCTION>
-						<COMMENTS Id="RDK:19943506" DesignTimeRemark="Höhe des Shapes des Förderers erst setzen, wenn beide Anschlusspunkte definiert wurden" />
-						<CALLFUNCTION Id="RDK:19943508">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$Check_is_defined]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$shapeId]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$isDefined]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
-						<IFTHENELSE Id="RDK:19943516">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$(isDefined= True)]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:19943515" SubType="Then">
-								<SET Id="RDK:19943514" VarRef="ShapeList[&quot;id=&quot;+shapeId].z">
-									<EXP><![CDATA[$=$ShapeList["id="+shapeId].FoerdererDefinition.H_1/2 + ShapeList["id="+shapeId].FoerdererDefinition.H_0/2]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-						</IFTHENELSE>
+						<SET Id="RDK:19943514" VarRef="ShapeList[&quot;id=&quot;+shapeId].z">
+							<EXP><![CDATA[$=$ShapeList["id="+shapeId].FoerdererDefinition.H_1/2 + ShapeList["id="+shapeId].FoerdererDefinition.H_0/2]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:19595347" CaseType="0">
 						<EXP><![CDATA[$C$Weiche]]></EXP>
@@ -18383,6 +18294,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						</SET>
 					</VAR>
 					<VAR Id="RDK:19632172" Name="shapeList_idx" Type="integer" />
+					<VAR Id="RDK:20700337" Name="isDefined" Type="boolean" />
 				</GROUP>
 				<CALLFUNCTION Id="RDK:19632170">
 					<PAR Name="FuncName">
@@ -18396,6 +18308,38 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					</PAR>
 					<PAR Name="Options" />
 				</CALLFUNCTION>
+				<CALLFUNCTION Id="RDK:20700335">
+					<PAR Name="FuncName">
+						<EXP><![CDATA[$C$Check_is_defined]]></EXP>
+					</PAR>
+					<PAR Name="InputExp">
+						<EXP><![CDATA[$=$shapeId]]></EXP>
+					</PAR>
+					<PAR Name="ResultRef">
+						<EXP><![CDATA[$V$isDefined]]></EXP>
+					</PAR>
+					<PAR Name="Options" />
+				</CALLFUNCTION>
+				<IFTHENELSE Id="RDK:20700339">
+					<VALUECONDITION Value="false">
+						<EXP><![CDATA[$=$isDefined]]></EXP>
+					</VALUECONDITION>
+					<GROUP Id="RDK:20700340" SubType="Then">
+						<CALLFUNCTION Id="RDK:20700349">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$SetStatus_Undef]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$shapeId]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+						<EXIT_PROCESS Id="RDK:20701718" BreakType="4" ExitStatus="0" />
+					</GROUP>
+				</IFTHENELSE>
 				<SELECTCASE Id="RDK:19602982">
 					<EXP><![CDATA[$=$ShapeList[shapeList_idx].family]]></EXP>
 					<CASEGROUP Id="RDK:19602961" CaseType="0">