From 96434f6ae9a48696301a756276725b0cb2d6c343 Mon Sep 17 00:00:00 2001
From: mistangl <m.stangl@schoenenberger.de>
Date: Tue, 19 Nov 2024 12:07:41 +0100
Subject: [PATCH] =?UTF-8?q?Links=20und=20rechts=20vom=20Variof=C3=B6rderer?=
 =?UTF-8?q?=20erscheint=20jetzt=20eine=20gestrichelte=20Linie?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 65 ++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 48 insertions(+), 17 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 672b902..adc805d 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-11-18T19:12:26" LanguageVersion="2014.1.3.699" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-11-19T11:43:17" LanguageVersion="2014.1.3.699" />
 	<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">
@@ -25,7 +25,7 @@
 					<FIELD Id="RDK:20734834" Name="direction_x" Type="double" DesignTimeRemark="1 if direction posititve x-axis, -1 if is negative x-axis, 0 if it is in y-direction" />
 					<FIELD Id="RDK:20734836" Name="direction_y" Type="double" DesignTimeRemark="1 if direction posititve y-axis, -1 if is negative y-axis, 0 if it is in x-direction" />
 				</TYPE>
-				<TYPE Id="RDK:26388" Name="KreiselType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:26388" Name="KreiselType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:95024" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:26389" Name="AbstandMS" Type="double" />
@@ -143,19 +143,19 @@
 					<FIELD Id="RDK:973716" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:973714" Name="Weichenart" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:1652525" Name="BTMTBeladungType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:1652525" Name="BTMTBeladungType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:1652522" Name="Hoehe" Type="double" />
 					<FIELD Id="RDK:1652523" Name="Drehung" Type="integer" DesignTimeNotes="1= im Uhrzeigersinn=rechts&#xD;&#xA;-1= Gegen Uhrzeigersinn=links" />
 					<FIELD Id="RDK:1657744" Name="Beschreibung" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:16525251" Name="BTMTEntladungType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:16525251" Name="BTMTEntladungType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:16525221" Name="Hoehe" Type="double" />
 					<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" />
@@ -191,7 +191,7 @@
 					<FIELD Id="RDK:1783800" Name="Int" Type="integer" />
 					<FIELD Id="RDK:1783798" Name="Boo" Type="boolean" />
 				</TYPE>
-				<TYPE Id="RDK:18530545" Name="SSG_Limits" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:18530545" Name="SSG_Limits" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18530548" Name="Kreisel_top" Type="KreiselType" />
 					<FIELD Id="RDK:18530546" Name="Kreisel_bot" Type="KreiselType" />
@@ -4192,8 +4192,10 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 											<EXP><![CDATA[$=$Shape_Prototype.EckradDefinition]]></EXP>
 										</PAR>
 										<PAR Name="GefaelleDefinition" />
-										<PAR Name="KurveDefinition" />
 										<PAR Name="FoerdererDefinition" />
+										<PAR Name="VarioFoerdererDefinition" />
+										<PAR Name="KurveDefinition" />
+										<PAR Name="KurveFoerdererDefinition" />
 										<PAR Name="WeicheDefinition" />
 										<PAR Name="BTMTBeladungDefinition" />
 										<PAR Name="BTMTEntladungDefinition" />
@@ -5230,6 +5232,8 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
 										<PAR Name="KurveDefinition" />
+										<PAR Name="VarioFoerdererDefinition" />
+										<PAR Name="KurveFoerdererDefinition" />
 									</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" />
@@ -5306,6 +5310,8 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="includeInBOM" />
 										<PAR Name="isDefined" />
 										<PAR Name="KurveDefinition" />
+										<PAR Name="VarioFoerdererDefinition" />
+										<PAR Name="KurveFoerdererDefinition" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -5558,11 +5564,14 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="KreiselDefinition" />
 										<PAR Name="EckradDefinition" />
 										<PAR Name="GefaelleDefinition" />
-										<PAR Name="StreckeDefinition" />
 										<PAR Name="FoerdererDefinition" />
+										<PAR Name="VarioFoerdererDefinition" />
+										<PAR Name="KurveDefinition" />
+										<PAR Name="KurveFoerdererDefinition" />
 										<PAR Name="WeicheDefinition" />
 										<PAR Name="BTMTBeladungDefinition" />
 										<PAR Name="BTMTEntladungDefinition" />
+										<PAR Name="isDefined" />
 										<PAR Name="source">
 											<EXP><![CDATA[$=$"Foerderer_Default"]]></EXP>
 										</PAR>
@@ -5624,8 +5633,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
-										<PAR Name="isDefined" />
-										<PAR Name="KurveDefinition" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -5729,7 +5736,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="BTMTEntladungDefinition" />
 										<PAR Name="isDefined" />
 										<PAR Name="source">
-											<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+											<EXP><![CDATA[$=$"VarioFoerderer"]]></EXP>
 										</PAR>
 										<PAR Name="sourceLibrary">
 											<EXP><![CDATA[$=$GS2DLibraryName]]></EXP>
@@ -14815,9 +14822,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								</VALUECONDITION>
 								<COMMENTS Id="RDK:22069141" DesignTimeRemark="Änderung der Länge" />
 								<IFTHENELSE Id="RDK:22128811">
-									<VALUECONDITION Value="true" Oper="OR">
-										<EXP><![CDATA[$=$Shape_Prototype.VarioFoerdererDefinition.L1>SSG_Limits_data.VarioFoerderer_top.L1]]></EXP>
-									</VALUECONDITION>
 									<VALUECONDITION Value="true">
 										<EXP><![CDATA[$=$Shape_Prototype.VarioFoerdererDefinition.L1<SSG_Limits_data.VarioFoerderer_bot.L1]]></EXP>
 									</VALUECONDITION>
@@ -14827,7 +14831,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 												<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
 											</PAR>
 											<PAR Name="MsgText">
-												<EXP><![CDATA[$C$Winkel  unter-/überschreitet die zulässigen Länge]]></EXP>
+												<EXP><![CDATA[$C$zulässige Länge unterschritten]]></EXP>
 											</PAR>
 											<PAR Name="MsgStyle">
 												<EXP><![CDATA[$C$-1]]></EXP>
@@ -14844,6 +14848,33 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<EXIT_PROCESS Id="RDK:22128807" BreakType="4" ExitStatus="0" />
 									</GROUP>
 								</IFTHENELSE>
+								<IFTHENELSE Id="RDK:22166990">
+									<VALUECONDITION Value="true" Oper="OR">
+										<EXP><![CDATA[$=$Shape_Prototype.VarioFoerdererDefinition.L1>SSG_Limits_data.VarioFoerderer_top.L1]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:22166989" SubType="Then">
+										<ACTION_CALL Id="RDK:22166987" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
+											<PAR Name="RDLibraryName">
+												<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+											</PAR>
+											<PAR Name="MsgText">
+												<EXP><![CDATA[$C$zulässige Länge überschritten]]></EXP>
+											</PAR>
+											<PAR Name="MsgStyle">
+												<EXP><![CDATA[$C$-1]]></EXP>
+											</PAR>
+											<PAR Name="BtnLayout">
+												<EXP><![CDATA[$C$-1]]></EXP>
+											</PAR>
+											<PAR Name="MsgCaption" />
+											<PAR Name="BaloonType" />
+											<PAR Name="BtnPressed">
+												<EXP><![CDATA[$V$]]></EXP>
+											</PAR>
+										</ACTION_CALL>
+										<EXIT_PROCESS Id="RDK:22166988" BreakType="4" ExitStatus="0" />
+									</GROUP>
+								</IFTHENELSE>
 							</GROUP>
 							<GROUP Id="RDK:22128744" Name="Group" SubType="Generic">
 								<VALUECONDITION Value="true" Oper="OR">
@@ -23478,7 +23509,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<SET Id="RDK:19871465" VarRef="winkel_th">
-							<EXP><![CDATA[$=$Round(RadToDeg(Abs(Shape_Prototype.GefaelleDefinition.HoeheOben-Shape_Prototype.GefaelleDefinition.HoeheUnten)/Shape_Prototype.GefaelleDefinition.L1),1)]]></EXP>
+							<EXP><![CDATA[$=$Round(RadToDeg(ATAN(Abs(Shape_Prototype.GefaelleDefinition.HoeheOben-Shape_Prototype.GefaelleDefinition.HoeheUnten)/Shape_Prototype.GefaelleDefinition.L1)),1)]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<IFTHENELSE Id="RDK:20572212">
@@ -23611,7 +23642,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<SET Id="RDK:22069239" VarRef="winkel_th">
-							<EXP><![CDATA[$=$Round(RadToDeg(Abs(Shape_Prototype.VarioFoerdererDefinition.H_Anfang-Shape_Prototype.VarioFoerdererDefinition.H_Ende)/Shape_Prototype.VarioFoerdererDefinition.L1),1)]]></EXP>
+							<EXP><![CDATA[$=$Round(RadToDeg(ATAN(Abs(Shape_Prototype.VarioFoerdererDefinition.H_Anfang-Shape_Prototype.VarioFoerdererDefinition.H_Ende)/Shape_Prototype.VarioFoerdererDefinition.L1)),1)]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<IFTHENELSE Id="RDK:22069257">