From 2b581684efd927e1933622ebaf00b4b994841d66 Mon Sep 17 00:00:00 2001
From: mistangl <m.stangl@schoenenberger.de>
Date: Tue, 1 Oct 2024 16:40:14 +0200
Subject: [PATCH] =?UTF-8?q?weitere=20Fehlerabfrage=20bei=20der=20Berechnun?=
 =?UTF-8?q?g=20des=20Gef=C3=A4lles:=20L=C3=A4nge=20muss=20>=200=20sein.=20?=
 =?UTF-8?q?CalculateSecondHeight=20um=20Aufrufe=20zur=20Kurve=20erg=C3=A4n?=
 =?UTF-8?q?zt.=20Create/Update=20Shape=20hatt=20einige=20seltame=20Verweis?=
 =?UTF-8?q?e=20in=20der=20Plazieren=20Gruppe.=20SetStruct=20Shapelist=20ha?=
 =?UTF-8?q?tte=20z.B.=20beim=20Eckrad=20eine=20Gef=C3=A4lledefinition?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 157 ++++++++++++++++++++++++++-------------------------
 1 file changed, 80 insertions(+), 77 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 4a53488..8a870b1 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-01T14:56:04" LanguageVersion="2014.1.3.690" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-10-01T16:27:38" 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">
@@ -3826,11 +3826,12 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										</PAR>
 										<PAR Name="EckradDefinition" />
 										<PAR Name="GefaelleDefinition" />
-										<PAR Name="StreckeDefinition" />
+										<PAR Name="KurveDefinition" />
 										<PAR Name="FoerdererDefinition" />
 										<PAR Name="WeicheDefinition" />
 										<PAR Name="BTMTBeladungDefinition" />
 										<PAR Name="BTMTEntladungDefinition" />
+										<PAR Name="isDefined" />
 										<PAR Name="source">
 											<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
 										</PAR>
@@ -3894,7 +3895,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
-										<PAR Name="isDefined" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -3985,14 +3985,16 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="Rotationsklasse" />
 										<PAR Name="IDCounter" />
 										<PAR Name="KreiselDefinition" />
-										<PAR Name="EckradDefinition" />
-										<PAR Name="GefaelleDefinition">
-											<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition]]></EXP>
+										<PAR Name="EckradDefinition">
+											<EXP><![CDATA[$=$Shape_Prototype.EckradDefinition]]></EXP>
 										</PAR>
+										<PAR Name="GefaelleDefinition" />
+										<PAR Name="KurveDefinition" />
 										<PAR Name="FoerdererDefinition" />
 										<PAR Name="WeicheDefinition" />
 										<PAR Name="BTMTBeladungDefinition" />
 										<PAR Name="BTMTEntladungDefinition" />
+										<PAR Name="isDefined" />
 										<PAR Name="source">
 											<EXP><![CDATA[$=$IIF(Shape_Prototype.EckradDefinition.Drehung=1,"Eckrad_Rechts","Eckrad_Links")]]></EXP>
 										</PAR>
@@ -4054,8 +4056,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
-										<PAR Name="StreckeDefinition" />
-										<PAR Name="isDefined" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -4214,6 +4214,8 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
+										<PAR Name="KurveDefinition" />
+										<PAR Name="isDefined" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -4381,8 +4383,10 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="IDCounter" />
 										<PAR Name="KreiselDefinition" />
 										<PAR Name="EckradDefinition" />
-										<PAR Name="GefaelleDefinition" />
-										<PAR Name="StreckeDefinition" />
+										<PAR Name="GefaelleDefinition">
+											<EXP><![CDATA[$=$]]></EXP>
+										</PAR>
+										<PAR Name="KurveDefinition" />
 										<PAR Name="FoerdererDefinition" />
 										<PAR Name="WeicheDefinition" />
 										<PAR Name="BTMTBeladungDefinition" />
@@ -4449,7 +4453,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
-										<PAR Name="KurveDefinition" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -4768,6 +4771,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
+										<PAR Name="KurveDefinition" />
 									</SET_STRUCT>
 									<SET_STRUCT Id="RDK:19615244" VarRef="Shape_Prototype" ListRef="ShapeList" Options="$=$&quot;(REPLACEIDX=&quot;+i+&quot;)&quot;" Suppressed="True" Bookmarked="True" DesignTimeNotes="Shape.depth*Inch/DPI&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Shape_Prototype.KreiselDefinition.OrientierungHV&#xD;&#xA;IIF(Shape_Prototype.KreiselDefinition.OrientierungHV&lt;&gt;Shape_Prototype.rotation,Shape_Prototype.rotation,Shape_Prototype.KreiselDefinition.OrientierungHV)">
 										<PAR Name="SivasNummer" />
@@ -4843,6 +4847,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
 										<PAR Name="isDefined" />
+										<PAR Name="KurveDefinition" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -5002,6 +5007,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
+										<PAR Name="KurveDefinition" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -19643,6 +19649,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 			</FUNCTION>
 			<FUNCTION Id="RDK:18326311" Name="CalculateSecondHeight" InputTypeName="string">
 				<COMMENTS Id="RDK:1792975" DesignTimeRemark="Berechne die zweite Höhe der Gefällestrecke/Kurve/Förderer, wenn eine Höhe vorgegeben ist" />
+				<SET Id="RDK:21176872" VarRef="Param.Result">
+					<EXP><![CDATA[$=$False]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
 				<IFTHENELSE Id="RDK:18396608">
 					<VALUECONDITION Value="true">
 						<EXP><![CDATA[$=$IsEmpty(Param.Input)]]></EXP>
@@ -19653,12 +19663,13 @@ ShapeList["id="+Param.Input[1].shapeID].name
 				</IFTHENELSE>
 				<COMMENTS Id="RDK:18530478" DesignTimeRemark="Param.Input" />
 				<GROUP Id="RDK:18329391" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
-					<VAR Id="RDK:18376628" Name="shape_item" Type="Editor2DShapeType" />
+					<VAR Id="RDK:18376628" Name="shape_item" Type="Editor2DShapeType">
+						<SET Id="RDK:21161039" VarRef="Me">
+							<EXP><![CDATA[$=$ShapeList["id="+Param.Input]]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</VAR>
 				</GROUP>
-				<SET Id="RDK:18376630" VarRef="shape_item">
-					<EXP><![CDATA[$=$ShapeList["id="+Param.Input]]]></EXP>
-					<PAR Name="AdvancedOptions" />
-				</SET>
 				<IFTHENELSE Id="RDK:21038333">
 					<VALUECONDITION Value="false">
 						<EXP><![CDATA[$=$Count(shape_item.links)= 1]]></EXP>
@@ -19710,31 +19721,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<GROUP Id="RDK:18330619" SubType="Else" />
 						</IFTHENELSE>
 					</CASEGROUP>
-					<CASEGROUP Id="RDK:21071590" CaseType="0">
-						<EXP><![CDATA[$C$Foerderer]]></EXP>
-						<IFTHENELSE Id="RDK:21071650">
-							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$IsEmpty(shape_item.FoerdererDefinition.H_0)]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$IsEmpty(shape_item.FoerdererDefinition.H_1)]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$Abs(shape_item.FoerdererDefinition.winkel_f) < 0.0001]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$Abs(shape_item.FoerdererDefinition.winkel_s) < 0.0001]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:21071648" SubType="Then">
-								<SET Id="RDK:21071646" VarRef="Param.Result">
-									<EXP><![CDATA[$C$False]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<EXIT_PROCESS Id="RDK:21071647" BreakType="4" ExitStatus="0" />
-							</GROUP>
-							<GROUP Id="RDK:21071649" SubType="Else" />
-						</IFTHENELSE>
-					</CASEGROUP>
 					<CASEGROUP Id="RDK:21071591" CaseType="1">
 						<EXP />
 						<EXIT_PROCESS Id="RDK:21071603" BreakType="4" ExitStatus="0" />
@@ -19749,15 +19735,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<VAR Id="RDK:21076529" Name="ResultListe" Type="string[]" />
 					<VAR Id="RDK:21076530" Name="cpId" Type="string" />
 				</GROUP>
-				<COMMENTS Id="RDK:21038320" DesignTimeRemark="Wenn die Gefällestrecke nur einseitig angebunden ist, kann man von Länge und Winkel als wahre Größe ausgehen" />
-				<SET Id="RDK:21038363" VarRef="H_th">
-					<EXP><![CDATA[$=$Tan(DegToRad(shape_item.GefaelleDefinition.winkel)) * shape_item.GefaelleDefinition.L1]]></EXP>
-					<PAR Name="AdvancedOptions" />
-				</SET>
-				<SET Id="RDK:21104691" VarRef="H_th">
-					<EXP><![CDATA[$=$Round(H_th,1)]]></EXP>
-					<PAR Name="AdvancedOptions" />
-				</SET>
 				<COMMENTS Id="RDK:21070831" DesignTimeRemark="feststellen, welche der beiden Enden verbunden ist (oben oder unten)" />
 				<CALLFUNCTION Id="RDK:21069439">
 					<PAR Name="FuncName">
@@ -19820,9 +19797,39 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<EXP><![CDATA[$=$shape_item.family]]></EXP>
 					<CASEGROUP Id="RDK:21070844" CaseType="0">
 						<EXP><![CDATA[$C$Kurve]]></EXP>
+						<IFTHENELSE Id="RDK:21161033">
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$cpId="cp1"]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:21161030" SubType="Then">
+								<SET Id="RDK:21161029" VarRef="shape_item.KurveDefinition.H_1">
+									<EXP><![CDATA[$=$shape_item.KurveDefinition.H_0 - KurveData_defaults.Delta_h]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+							<GROUP Id="RDK:21161032" SubType="Else">
+								<SET Id="RDK:21161031" VarRef="shape_item.KurveDefinition.H_0">
+									<EXP><![CDATA[$=$shape_item.KurveDefinition.H_1 + KurveData_defaults.Delta_h]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+						</IFTHENELSE>
+						<SET Id="RDK:21176868" VarRef="ShapeList[&quot;id=&quot;+Param.Input]">
+							<EXP><![CDATA[$=$shape_item]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:21070846" CaseType="0">
 						<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
+						<COMMENTS Id="RDK:21038320" DesignTimeRemark="Wenn die Gefällestrecke nur einseitig angebunden ist, kann man von Länge und Winkel als wahre Größe ausgehen" />
+						<SET Id="RDK:21038363" VarRef="H_th">
+							<EXP><![CDATA[$=$Tan(DegToRad(shape_item.GefaelleDefinition.winkel)) * shape_item.GefaelleDefinition.L1]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:21104691" VarRef="H_th">
+							<EXP><![CDATA[$=$Round(H_th,1)]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 						<IFTHENELSE Id="RDK:21157583">
 							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$cpId="cp1"]]></EXP>
@@ -19840,6 +19847,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								</SET>
 							</GROUP>
 						</IFTHENELSE>
+						<SET Id="RDK:18330639" VarRef="ShapeList[&quot;id=&quot;+Param.Input]">
+							<EXP><![CDATA[$=$shape_item]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 						<CALLFUNCTION Id="RDK:21119118">
 							<PAR Name="FuncName">
 								<EXP><![CDATA[$C$Calculate Gefaellestrecke]]></EXP>
@@ -19852,31 +19863,20 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</PAR>
 							<PAR Name="Options" />
 						</CALLFUNCTION>
-						<SET Id="RDK:21048675" VarRef="shape_item.GefaelleDefinition.L_th" Suppressed="True">
-							<EXP><![CDATA[$=$shape_item.GefaelleDefinition.L1]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:21048677" VarRef="shape_item.GefaelleDefinition.H_th" Suppressed="True">
-							<EXP><![CDATA[$=$Abs(H_th)]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:21048679" VarRef="shape_item.GefaelleDefinition.winkel_th" Suppressed="True">
-							<EXP><![CDATA[$=$shape_item.GefaelleDefinition.winkel]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:21046617" VarRef="shape_item.GefaelleDefinition.LH_fits" Suppressed="True">
-							<EXP><![CDATA[$=$True]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-					</CASEGROUP>
-					<CASEGROUP Id="RDK:21070848" CaseType="0">
-						<EXP><![CDATA[$C$Foerderer]]></EXP>
+						<CALLFUNCTION Id="RDK:21168638">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$SetStatus]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$shape_item.id]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
 					</CASEGROUP>
 				</SELECTCASE>
-				<SET Id="RDK:18330639" VarRef="ShapeList[&quot;id=&quot;+Param.Input]">
-					<EXP><![CDATA[$=$shape_item]]></EXP>
-					<PAR Name="AdvancedOptions" />
-				</SET>
 				<SET Id="RDK:19474679" VarRef="Param.Result">
 					<EXP><![CDATA[$=$True]]></EXP>
 					<PAR Name="AdvancedOptions" />
@@ -19970,18 +19970,21 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<VAR Id="RDK:19881505" Name="winkel_th" Type="double" />
 				</GROUP>
 				<IFTHENELSE Id="RDK:18376614">
-					<VALUECONDITION Value="true">
+					<VALUECONDITION Value="true" Oper="OR">
 						<EXP><![CDATA[$=$IsEmpty(Shape_Prototype.GefaelleDefinition.HoeheOben)]]></EXP>
 					</VALUECONDITION>
-					<VALUECONDITION Value="true">
+					<VALUECONDITION Value="true" Oper="OR">
 						<EXP><![CDATA[$=$IsEmpty(Shape_Prototype.GefaelleDefinition.HoeheUnten)]]></EXP>
 					</VALUECONDITION>
-					<VALUECONDITION Value="true">
+					<VALUECONDITION Value="true" Oper="OR">
 						<EXP><![CDATA[$=$Abs(Shape_Prototype.GefaelleDefinition.winkel) < 0.0001]]></EXP>
 					</VALUECONDITION>
-					<VALUECONDITION Value="true">
+					<VALUECONDITION Value="true" Oper="OR">
 						<EXP><![CDATA[$=$Shape_Prototype.family = "Gefaellestrecke"]]></EXP>
 					</VALUECONDITION>
+					<VALUECONDITION Value="true">
+						<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.L1 < 0.0001]]></EXP>
+					</VALUECONDITION>
 					<GROUP Id="RDK:18376610" SubType="Then">
 						<EXIT_PROCESS Id="RDK:18376609" BreakType="4" ExitStatus="0" />
 					</GROUP>