From 59ba3fb4f42b4e9b6f22e6f8c3efe8319bb2055a Mon Sep 17 00:00:00 2001
From: Yuelin Wang <y.wang@schoenenberger.de>
Date: Wed, 17 Jul 2024 12:42:34 +0200
Subject: [PATCH] =?UTF-8?q?der=20Fehler=20bei=20der=20Auswahl=20der=20fixi?=
 =?UTF-8?q?erten=20L=C3=A4nge=20der=20Gef=C3=A4llestrecke=20wurde=20behobe?=
 =?UTF-8?q?n.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 103 ++++++++++++++++++++++++++++++++-------------------
 1 file changed, 65 insertions(+), 38 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index a049f83..fcd0190 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-07-09T13:27:55" LanguageVersion="2014.1.3.679" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="y.wang [ANGEBOT-NB02]" ModDate="2024-07-17T11:13:44" LanguageVersion="2014.1.3.679" />
 	<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">
@@ -17,7 +17,7 @@
 					<FIELD Id="RDK:313476" Name="label" Type="string" />
 					<FIELD Id="RDK:721671" Name="aktiv" Type="boolean" />
 				</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" />
@@ -52,7 +52,7 @@
 					<FIELD Id="RDK:1520421" Name="Drehung" Type="integer" DesignTimeNotes="1= im Uhrzeigersinn=rechts&#xD;&#xA;-1= Gegen Uhrzeigersinn=links" />
 					<FIELD Id="RDK:1520424" Name="Durchmesser" Type="double" />
 				</TYPE>
-				<TYPE Id="RDK:302581" Name="GefaelleType" SubType="structure">
+				<TYPE Id="RDK:302581" Name="GefaelleType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:302571" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:880709" Name="L1" Type="double" />
@@ -264,7 +264,7 @@
 					<FIELD Id="RDK:1013892" Name="userFilter" Type="string" />
 					<FIELD Id="RDK:1013893" Name="styleTags" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:1013942" Name="Editor2DShapeType" SubType="structure" InheritTypeName="SSG_ShapeType">
+				<TYPE Id="RDK:1013942" Name="Editor2DShapeType" Expanded="True" SubType="structure" InheritTypeName="SSG_ShapeType">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:1013895" Name="source" Type="string" />
 					<FIELD Id="RDK:1013896" Name="sourceLibrary" Type="string" />
@@ -340,7 +340,7 @@
 					<UI_INPUT_SUPPORT />
 					<TYPE_VALUES />
 				</TYPE>
-				<TYPE Id="RDK:1013994" Name="Editor2DShapePropertyType" SubType="structure">
+				<TYPE Id="RDK:1013994" Name="Editor2DShapePropertyType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:1013957" Name="id" Type="string" DesignTimeRemark="REQUIRED" />
 					<FIELD Id="RDK:1013958" Name="name" Type="string" DesignTimeRemark="REQUIRED" />
@@ -5057,7 +5057,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
-										<PAR Name="isDefined" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -10884,7 +10883,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 												<PAR Name="Label" />
 												<PAR Name="Field" />
 												<PAR Name="Value">
-													<EXP><![CDATA[$C$Ein neuer Verbindungspunkt wurde hinzugefügt!]]></EXP>
+													<EXP><![CDATA[$C$Ein neuer Verbindungspunkt wurde hinzugefügt!werden!]]></EXP>
 												</PAR>
 												<PAR Name="Uom" />
 												<PAR Name="Tooltip" />
@@ -10992,7 +10991,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 													<PAR Name="Label" />
 													<PAR Name="Field" />
 													<PAR Name="Value">
-														<EXP><![CDATA[$C$Verbindungspunkt ist bereits vorhanden.]]></EXP>
+														<EXP><![CDATA[$C$Verbindungspunkte ist bereits vorhanden.]]></EXP>
 													</PAR>
 													<PAR Name="Uom" />
 													<PAR Name="Tooltip" />
@@ -11490,6 +11489,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<PAR Name="selected" />
 									<PAR Name="includeInBOM" />
 									<PAR Name="StreckeDefinition" />
+									<PAR Name="isDefined" />
 								</SET_STRUCT>
 								<SET Id="RDK:18556791" VarRef="Shape_Prototype.height">
 									<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.L1]]></EXP>
@@ -12013,7 +12013,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							<EXP><![CDATA[$V$EventData]]></EXP>
 						</PAR>
 						<PAR Name="Options" />
-						<PAR Name="ProfileName" />
 					</ACTION_CALL>
 					<SELECTCASE Id="RDK:973746">
 						<EXP><![CDATA[$=$Button]]></EXP>
@@ -12715,7 +12714,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 				</SET>
 				<CALLFUNCTION Id="RDK:1630769">
 					<PAR Name="FuncName">
-						<EXP><![CDATA[$C$GetNewShapeIDCounter]]></EXP>
+						<EXP><![CDATA[$C$GetNewShapeID]]></EXP>
 					</PAR>
 					<PAR Name="InputExp" />
 					<PAR Name="ResultRef">
@@ -14250,7 +14249,7 @@ me.x
 					</SET>
 					<CALLFUNCTION Id="RDK:1630771" Suppressed="True">
 						<PAR Name="FuncName">
-							<EXP><![CDATA[$C$GetNewShapeIDCounter]]></EXP>
+							<EXP><![CDATA[$C$GetNewShapeID]]></EXP>
 						</PAR>
 						<PAR Name="InputExp" />
 						<PAR Name="ResultRef">
@@ -15591,7 +15590,7 @@ me.x
 									<EXP><![CDATA[$C$CreatePrototype_Gefaellestrecke]]></EXP>
 								</PAR>
 								<PAR Name="InputExp">
-									<EXP><![CDATA[$=$]]></EXP>
+									<EXP><![CDATA[$=$shapeId]]></EXP>
 								</PAR>
 								<PAR Name="ResultRef">
 									<EXP><![CDATA[$V$]]></EXP>
@@ -15618,7 +15617,7 @@ me.x
 									<EXP><![CDATA[$C$CreatePrototype_Foerderer]]></EXP>
 								</PAR>
 								<PAR Name="InputExp">
-									<EXP><![CDATA[$=$]]></EXP>
+									<EXP><![CDATA[$=$shapeId]]></EXP>
 								</PAR>
 								<PAR Name="ResultRef">
 									<EXP><![CDATA[$V$]]></EXP>
@@ -15630,7 +15629,7 @@ me.x
 									<EXP><![CDATA[$C$Create/Update Shape]]></EXP>
 								</PAR>
 								<PAR Name="InputExp">
-									<EXP><![CDATA[$=$]]></EXP>
+									<EXP><![CDATA[$=$shapeId]]></EXP>
 								</PAR>
 								<PAR Name="ResultRef">
 									<EXP><![CDATA[$V$]]></EXP>
@@ -16340,12 +16339,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<PAR Name="KreiselDefinition" />
 								<PAR Name="EckradDefinition" />
 								<PAR Name="GefaelleDefinition" />
-								<PAR Name="StreckeDefinition" />
 								<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>
@@ -16414,6 +16411,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<PAR Name="pinned" />
 								<PAR Name="selected" />
 								<PAR Name="includeInBOM" />
+								<PAR Name="StreckeDefinition" />
 							</SET_STRUCT>
 							<ACTION_CALL Id="RDK:1589028" Name="RDEngineering_E2DLinkShapes">
 								<PAR Name="RDLibraryName">
@@ -16915,7 +16913,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					</ACTION_CALL>
 				</GROUP>
 			</FUNCTION>
-			<FUNCTION Id="RDK:1630766" Name="GetNewShapeIDCounter" InputTypeName="string">
+			<FUNCTION Id="RDK:1630766" Name="GetNewShapeID" InputTypeName="string">
 				<SET Id="RDK:1630768" VarRef="Shape_Prototype.IDCounter">
 					<EXP><![CDATA[$=$FieldValue(LastOf(SortListOfStructs(FilterByFieldValue(ShapeList, "family", Shape_Prototype.family), "IDCounter", false)), "IDCounter")+1]]></EXP>
 					<PAR Name="AdvancedOptions" />
@@ -17241,26 +17239,55 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteL1]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:20572209" SubType="Then">
-								<SET Id="RDK:20572216" VarRef="Shape_Prototype.GefaelleDefinition.winkel_th">
-									<EXP><![CDATA[$=$winkel_th]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:20590479" VarRef="H_th">
-									<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel_th)),0))]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:19879521" VarRef="Shape_Prototype.GefaelleDefinition.winkel">
-									<EXP><![CDATA[$=$Round(winkel_th,1)]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:20636495" VarRef="L_th">
-									<EXP><![CDATA[$=$Abs(Round((Shape_Prototype.GefaelleDefinition.HoeheOben-Shape_Prototype.GefaelleDefinition.HoeheUnten)/Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel_th)),0))]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:20646626" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
-									<EXP><![CDATA[$=$L_th]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
+								<IFTHENELSE Id="RDK:20658807">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$winkel_th=0]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:20658808" SubType="Then">
+										<SET Id="RDK:20658813" VarRef="winkel_th">
+											<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.winkel]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:20658815" VarRef="H_th">
+											<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(winkel_th)),0))]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:20658819" VarRef="L_th">
+											<EXP><![CDATA[$=$Abs(Round((H_th)/Tan(DegToRad(winkel_th)),0))]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:20658821" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
+											<EXP><![CDATA[$=$L_th]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:20667604" VarRef="Shape_Prototype.GefaelleDefinition.winkel_th">
+											<EXP><![CDATA[$=$winkel_th]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+									</GROUP>
+									<GROUP Id="RDK:20658809" SubType="Else">
+										<SET Id="RDK:20572216" VarRef="Shape_Prototype.GefaelleDefinition.winkel_th">
+											<EXP><![CDATA[$=$winkel_th]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:20590479" VarRef="H_th">
+											<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel_th)),0))]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:19879521" VarRef="Shape_Prototype.GefaelleDefinition.winkel">
+											<EXP><![CDATA[$=$Round(winkel_th,1)]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:20636495" VarRef="L_th">
+											<EXP><![CDATA[$=$Abs(Round((Shape_Prototype.GefaelleDefinition.HoeheOben-Shape_Prototype.GefaelleDefinition.HoeheUnten)/Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel_th)),0))]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:20646626" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
+											<EXP><![CDATA[$=$L_th]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+									</GROUP>
+								</IFTHENELSE>
 							</GROUP>
 							<GROUP Id="RDK:20572211" SubType="Else">
 								<SET Id="RDK:18547222" VarRef="H_th">
@@ -24858,4 +24885,4 @@ ShapeList["id="+Param.Input[1].shapeID].name
 		</PROFILES_DATA>
 		<BOM_DATA />
 	</EXTERNAL_DATA>
-</PROCESS>
+</PROCESS>
\ No newline at end of file