From 14e3fc74b3b97243a3195f501e008378a520f05a Mon Sep 17 00:00:00 2001
From: mistangl <m.stangl@schoenenberger.de>
Date: Tue, 27 Feb 2024 11:27:16 +0100
Subject: [PATCH] =?UTF-8?q?fix:=20Wenn=20R=C3=BCckgabeliste=20der=20L?=
 =?UTF-8?q?=C3=A4ngenberechnung=20leer=20ist,=20z.B.=20weil=20die=20Funkti?=
 =?UTF-8?q?on=20fehlschl=C3=A4gt,=20dann=20kann=20keine=20theoretische=20L?=
 =?UTF-8?q?=C3=A4nge=20der=20Gef=C3=A4llestrecke=20bestimmt=20werden?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 92 +++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 65 insertions(+), 27 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index fead23c..d1aec2f 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-02-26T17:42:22" LanguageVersion="2014.1.3.627" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-02-27T10:56:58" LanguageVersion="2014.1.3.615" />
 	<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">
@@ -8398,7 +8398,7 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 								<COMMENTS Id="RDK:18348402" DesignTimeRemark="Shape_Prototype.GefaelleDefinition.winkel" />
 								<CALLFUNCTION Id="RDK:18348398">
 									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$CalcGFTheoretischeLänge]]></EXP>
+										<EXP><![CDATA[$C$CalcGFTheoretischeLänge_Prototype]]></EXP>
 									</PAR>
 									<PAR Name="InputExp">
 										<EXP><![CDATA[$=$]]></EXP>
@@ -10881,6 +10881,7 @@ me.x
 					<VAR Id="RDK:514766" Name="OriginalRatation" Type="integer" />
 					<VAR Id="RDK:18372899" Name="ÜbergabeListe" Type="SSGParameter[]" />
 					<VAR Id="RDK:18374148" Name="RückgabeListe" Type="SSGParameter[]" />
+					<VAR Id="RDK:18399128" Name="shape_id" Type="string" />
 				</GROUP>
 				<SET Id="RDK:1578954" VarRef="Shape_Prototype">
 					<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID]]]></EXP>
@@ -11125,18 +11126,29 @@ me.x
 							</PAR>
 							<PAR Name="Options" />
 						</CALLFUNCTION>
-						<CALLFUNCTION Id="RDK:18369218">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$CalcGFTheoretischeLänge]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$RückgabeListe["key=ShapeId"].Str]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
+						<IFTHENELSE Id="RDK:18397858">
+							<VALUECONDITION Value="false">
+								<EXP><![CDATA[$=$IsEmpty(RückgabeListe)]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:18397875" SubType="Then">
+								<SET Id="RDK:18399131" VarRef="shape_id">
+									<EXP><![CDATA[$=$RückgabeListe["key=ShapeId"].Str]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<CALLFUNCTION Id="RDK:18369218">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$CalcGFTheoretischeLänge]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$shape_id]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+							</GROUP>
+						</IFTHENELSE>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:1576710" CaseType="0">
 						<EXP><![CDATA[$C$Eckrad]]></EXP>
@@ -11306,18 +11318,29 @@ me.x
 							</PAR>
 							<PAR Name="Options" />
 						</CALLFUNCTION>
-						<CALLFUNCTION Id="RDK:18369216">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$CalcGFTheoretischeLänge]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$RückgabeListe["key=ShapeId"].Str]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
+						<IFTHENELSE Id="RDK:18397881">
+							<VALUECONDITION Value="false">
+								<EXP><![CDATA[$=$IsEmpty(RückgabeListe)]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:18397897" SubType="Then">
+								<SET Id="RDK:18399135" VarRef="shape_id">
+									<EXP><![CDATA[$=$RückgabeListe["key=ShapeId"].Str]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<CALLFUNCTION Id="RDK:18399137">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$CalcGFTheoretischeLänge]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$shape_id]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+							</GROUP>
+						</IFTHENELSE>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:18221764" CaseType="0">
 						<EXP><![CDATA[$C$Foerderer]]></EXP>
@@ -12236,6 +12259,14 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<VAR Id="RDK:18329384" Name="L_th" Type="double" />
 					<VAR Id="RDK:18376628" Name="shape_item" Type="Editor2DShapeType" />
 				</GROUP>
+				<IFTHENELSE Id="RDK:18396608">
+					<VALUECONDITION Value="true">
+						<EXP><![CDATA[$=$IsEmpty(Param.Input)]]></EXP>
+					</VALUECONDITION>
+					<GROUP Id="RDK:18396607" SubType="Then">
+						<EXIT_PROCESS Id="RDK:18396606" BreakType="4" ExitStatus="0" />
+					</GROUP>
+				</IFTHENELSE>
 				<COMMENTS Id="RDK:1792975" DesignTimeRemark="Param.Input" />
 				<SET Id="RDK:18376630" VarRef="shape_item">
 					<EXP><![CDATA[$=$ShapeList["id="+Param.Input]]]></EXP>
@@ -12494,6 +12525,13 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						<PAR Name="AdvancedOptions" />
 					</SET>
 				</GROUP>
+				<GROUP Id="RDK:18396546" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
+					<VAR Id="RDK:18396545" Name="RueckgabeListe" Type="SSGParameter[]" />
+				</GROUP>
+				<SET Id="RDK:18396528" VarRef="Param.Result">
+					<EXP><![CDATA[$=$RueckgabeListe]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
 			</FUNCTION>
 		</GROUP>
 	</GROUP>
@@ -17199,4 +17237,4 @@ ShapeList["id="+Param.Input[1].shapeID].name
 		</PROFILES_DATA>
 		<BOM_DATA />
 	</EXTERNAL_DATA>
-</PROCESS>
\ No newline at end of file
+</PROCESS>