From c85637abf2e0d7ee3f97087edabf68d37ec72b22 Mon Sep 17 00:00:00 2001
From: Yuelin Wang <y.wang@schoenenberger.de>
Date: Wed, 29 Jan 2025 13:12:11 +0100
Subject: [PATCH] =?UTF-8?q?kleine=20Anpassung=20bei=20CalcGFTehoritischel?=
 =?UTF-8?q?=C3=A4nge=20und=20CalcVFTehoritischel=C3=A4nge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 64 +++++++++++++++++++++++++---------------------------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 4e09aa0..ca5601a 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="2025-01-27T15:45:26" LanguageVersion="2014.1.3.698" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="y.wang [ANGEBOT-NB02]" ModDate="2025-01-29T12:51:20" LanguageVersion="2014.1.3.698" />
 	<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">
@@ -60,7 +60,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" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:302581" Name="GefaelleType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:302571" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:880709" Name="L1" Type="double" />
@@ -160,7 +160,7 @@
 					<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" />
@@ -25524,7 +25524,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</VALUECONDITION>
 							<GROUP Id="RDK:22825572" SubType="Then">
 								<SET Id="RDK:22825587" VarRef="Shape_Prototype.GefaelleDefinition.H_th">
-									<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel]]></EXP>
+									<EXP><![CDATA[$=$Round(Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel)),2)]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<SET Id="RDK:22825589" VarRef="Shape_Prototype.text">
@@ -25602,7 +25602,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									</GROUP>
 									<GROUP Id="RDK:22825640" SubType="Else">
 										<SET Id="RDK:22825618" VarRef="H_th">
-											<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel)),0))]]></EXP>
+											<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel)),2))]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
 										<IFTHENELSE Id="RDK:22825804">
@@ -25610,6 +25610,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 												<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteL1]]></EXP>
 											</VALUECONDITION>
 											<GROUP Id="RDK:22825813" SubType="Then">
+												<SET Id="RDK:22988640" VarRef="L_th">
+													<EXP><![CDATA[$=$Abs(Round(H_th/Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel)),0))]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
 												<IFTHENELSE Id="RDK:22825668">
 													<VALUECONDITION Value="true">
 														<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteH1]]></EXP>
@@ -25624,13 +25628,13 @@ ShapeList["id="+Param.Input[1].shapeID].name
 															</VALUECONDITION>
 															<GROUP Id="RDK:22844688" SubType="Then">
 																<SET Id="RDK:22844691" VarRef="Shape_Prototype.GefaelleDefinition.HoeheUnten">
-																	<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheOben+H_th]]></EXP>
+																	<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheOben+Round(H_th,0)]]></EXP>
 																	<PAR Name="AdvancedOptions" />
 																</SET>
 															</GROUP>
 															<GROUP Id="RDK:22844689" SubType="Else">
 																<SET Id="RDK:22825722" VarRef="Shape_Prototype.GefaelleDefinition.HoeheUnten">
-																	<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheOben-H_th]]></EXP>
+																	<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheOben-Round(H_th,0)]]></EXP>
 																	<PAR Name="AdvancedOptions" />
 																</SET>
 															</GROUP>
@@ -25651,13 +25655,13 @@ ShapeList["id="+Param.Input[1].shapeID].name
 															</VALUECONDITION>
 															<GROUP Id="RDK:22844698" SubType="Then">
 																<SET Id="RDK:22825724" VarRef="Shape_Prototype.GefaelleDefinition.HoeheOben">
-																	<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheUnten-H_th]]></EXP>
+																	<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheUnten-Round(H_th,0)]]></EXP>
 																	<PAR Name="AdvancedOptions" />
 																</SET>
 															</GROUP>
 															<GROUP Id="RDK:22844700" SubType="Else">
 																<SET Id="RDK:22844705" VarRef="Shape_Prototype.GefaelleDefinition.HoeheOben">
-																	<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheUnten-H_th]]></EXP>
+																	<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheUnten+Round(H_th,0)]]></EXP>
 																	<PAR Name="AdvancedOptions" />
 																</SET>
 															</GROUP>
@@ -25965,7 +25969,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 											<PAR Name="AdvancedOptions" />
 										</SET>
 										<SET Id="RDK:22069241" VarRef="H_th">
-											<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.VarioFoerdererDefinition.L1*Tan(DegToRad(winkel_th)),0))]]></EXP>
+											<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.VarioFoerdererDefinition.L1*Tan(DegToRad(winkel_th)),2))]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
 										<SET Id="RDK:22069242" VarRef="L_th">
@@ -25982,53 +25986,45 @@ ShapeList["id="+Param.Input[1].shapeID].name
 										</SET>
 									</GROUP>
 									<GROUP Id="RDK:22069251" SubType="Else">
+										<SET Id="RDK:22646542" VarRef="Shape_Prototype.VarioFoerdererDefinition.winkel_th">
+											<EXP><![CDATA[$=$winkel_th]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
 										<IFTHENELSE Id="RDK:22646514">
 											<VALUECONDITION Value="true">
 												<EXP><![CDATA[$=$Shape_Prototype.VarioFoerdererDefinition.H_Anfang >0 and Shape_Prototype.VarioFoerdererDefinition.H_Ende>0]]></EXP>
 											</VALUECONDITION>
 											<GROUP Id="RDK:22646535" SubType="Then">
-												<SET Id="RDK:22646533" VarRef="H_th">
-													<EXP><![CDATA[$=$Abs(Shape_Prototype.VarioFoerdererDefinition.H_Anfang - Shape_Prototype.VarioFoerdererDefinition.H_Ende)]]></EXP>
+												<SET Id="RDK:23014799" VarRef="H_th">
+													<EXP><![CDATA[$=$Abs(Round((Shape_Prototype.VarioFoerdererDefinition.H_Anfang-Shape_Prototype.VarioFoerdererDefinition.H_Ende),2))]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
-												<SET Id="RDK:22646540" VarRef="winkel_th">
-													<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>
-												<SET Id="RDK:22646542" VarRef="Shape_Prototype.VarioFoerdererDefinition.winkel_th">
-													<EXP><![CDATA[$=$winkel_th]]></EXP>
+												<SET Id="RDK:22646546" VarRef="Shape_Prototype.VarioFoerdererDefinition.L_th">
+													<EXP><![CDATA[$=$Abs(Round(H_th/Tan(DegToRad(Shape_Prototype.VarioFoerdererDefinition.winkel_th)),0))]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
 												<SET Id="RDK:22646544" VarRef="Shape_Prototype.VarioFoerdererDefinition.winkel">
 													<EXP><![CDATA[$=$Ceiling(Shape_Prototype.VarioFoerdererDefinition.winkel_th)]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
-												<SET Id="RDK:22646546" VarRef="Shape_Prototype.VarioFoerdererDefinition.L_th">
-													<EXP><![CDATA[$=$Shape_Prototype.VarioFoerdererDefinition.L1]]></EXP>
-													<PAR Name="AdvancedOptions" />
-												</SET>
 											</GROUP>
 											<GROUP Id="RDK:22646536" SubType="Else">
-												<SET Id="RDK:22069246" VarRef="Shape_Prototype.VarioFoerdererDefinition.winkel_th">
-													<EXP><![CDATA[$=$winkel_th]]></EXP>
-													<PAR Name="AdvancedOptions" />
-												</SET>
 												<SET Id="RDK:22069247" VarRef="H_th">
-													<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.VarioFoerdererDefinition.L1*Tan(DegToRad(Shape_Prototype.VarioFoerdererDefinition.winkel_th)),0))]]></EXP>
-													<PAR Name="AdvancedOptions" />
-												</SET>
-												<SET Id="RDK:22069248" VarRef="Shape_Prototype.VarioFoerdererDefinition.winkel">
-													<EXP><![CDATA[$=$Round(winkel_th,1)]]></EXP>
+													<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.VarioFoerdererDefinition.L1*Tan(DegToRad(Shape_Prototype.VarioFoerdererDefinition.winkel)),0))]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
 												<SET Id="RDK:22069249" VarRef="L_th">
-													<EXP><![CDATA[$=$Abs(Round((Shape_Prototype.VarioFoerdererDefinition.H_Anfang-Shape_Prototype.VarioFoerdererDefinition.H_Ende)/Tan(DegToRad(Shape_Prototype.VarioFoerdererDefinition.winkel_th)),0))]]></EXP>
+													<EXP><![CDATA[$=$Abs(Round((Shape_Prototype.VarioFoerdererDefinition.H_Anfang-Shape_Prototype.VarioFoerdererDefinition.H_Ende)/Tan(DegToRad(Shape_Prototype.VarioFoerdererDefinition.winkel)),0))]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
 												<SET Id="RDK:22069250" VarRef="Shape_Prototype.VarioFoerdererDefinition.L_th">
 													<EXP><![CDATA[$=$L_th]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
+												<SET Id="RDK:23014803" VarRef="Shape_Prototype.VarioFoerdererDefinition.winkel">
+													<EXP><![CDATA[$=$Ceiling(Shape_Prototype.VarioFoerdererDefinition.winkel_th)]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
 											</GROUP>
 										</IFTHENELSE>
 									</GROUP>
@@ -26036,7 +26032,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</GROUP>
 							<GROUP Id="RDK:22069256" SubType="Else">
 								<SET Id="RDK:22069254" VarRef="H_th">
-									<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.VarioFoerdererDefinition.L1*Tan(DegToRad(Shape_Prototype.VarioFoerdererDefinition.winkel)),0))]]></EXP>
+									<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.VarioFoerdererDefinition.L1*Tan(DegToRad(Shape_Prototype.VarioFoerdererDefinition.winkel)),2))]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<SET Id="RDK:22069255" VarRef="Shape_Prototype.VarioFoerdererDefinition.winkel_th">
@@ -35922,6 +35918,8 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<PAR Name="n_Scan">
 						<EXP><![CDATA[$C$0]]></EXP>
 					</PAR>
+					<PAR Name="FesteH0" />
+					<PAR Name="FesteH1" />
 				</SET_STRUCT>
 			</GROUP>
 			<GROUP Id="RDK:1007716" Name="SSG_Shapes" SubType="Generic">