From 82c9543b4cfd314165cdc4a280832b07d9ce3af0 Mon Sep 17 00:00:00 2001
From: Yuelin Wang <y.wang@schoenenberger.de>
Date: Tue, 18 Jun 2024 10:09:14 +0200
Subject: [PATCH] =?UTF-8?q?Weitere=20Anzeigefeld=20f=C3=BCr=20Neigungswink?=
 =?UTF-8?q?el=20bei=20Gef=C3=A4llestrecke?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 154 +++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 112 insertions(+), 42 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index dce15ff..6bb6340 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-06-17T15:16:41" LanguageVersion="2014.1.3.674" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="y.wang [ANGEBOT-NB02]" ModDate="2024-06-18T10:07:44" LanguageVersion="2014.1.3.674" />
 	<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">
@@ -50,7 +50,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" />
@@ -60,6 +60,7 @@
 					<FIELD Id="RDK:302584" Name="winkel" Type="integer" />
 					<FIELD Id="RDK:302573" Name="HoeheOben" Type="double" />
 					<FIELD Id="RDK:302583" Name="HoeheUnten" Type="double" />
+					<FIELD Id="RDK:19866070" Name="winkel_th" Type="double" DesignTimeRemark="winkel_th berechnet aus Höhendifferenz (Abs(HoeheOben-HoeheUnten)) und L1 (projezierte Länge)" />
 					<FIELD Id="RDK:18539542" Name="H_th" Type="double" DesignTimeRemark="Theoretische Höhendifferenz berechnet aus Winkel und L1 (projezierte Länge)" />
 					<FIELD Id="RDK:302575" Name="n_Sep" Type="integer" />
 					<FIELD Id="RDK:302576" Name="n_Scan" Type="integer" />
@@ -995,6 +996,7 @@
 			<VAR Id="RDK:19841636" Name="shape_item" Type="Editor2DShapeType" DesignTimeRemark="Generated by RD" />
 			<VAR Id="RDK:19841637" Name="shape_item" Type="Editor2DShapeType" DesignTimeRemark="Generated by RD" />
 			<VAR Id="RDK:19866002" Name="shapeList_idx" Type="string" DesignTimeRemark="Generated by RD" />
+			<VAR Id="RDK:19871466" Name="winkel_th" Type="double" DesignTimeRemark="Generated by RD" />
 		</GROUP>
 		<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
 			<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
@@ -4619,7 +4621,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 								</GROUP>
 							</CASEGROUP>
 						</SELECTCASE>
-						<CALLFUNCTION Id="RDK:19615241">
+						<CALLFUNCTION Id="RDK:19615241" Suppressed="True">
 							<PAR Name="FuncName">
 								<EXP><![CDATA[$C$SetStatus]]></EXP>
 							</PAR>
@@ -4631,6 +4633,39 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 							</PAR>
 							<PAR Name="Options" />
 						</CALLFUNCTION>
+						<IFTHENELSE Id="RDK:19866094">
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$(isDefined= True)]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:19866091" SubType="Then">
+								<CALLFUNCTION Id="RDK:19866090">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$SetStatus_Ok]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$ID]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+							</GROUP>
+							<GROUP Id="RDK:19866093" SubType="Else">
+								<CALLFUNCTION Id="RDK:19866092">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$SetStatus_False]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$ID]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+							</GROUP>
+						</IFTHENELSE>
 					</FUNCTION>
 					<FUNCTION Id="RDK:604706" Name="Write CPs From Data to Prototype">
 						<SET Id="RDK:592704" VarRef="ConnectionPointList">
@@ -8986,15 +9021,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 														<PAR Name="x_M">
 															<EXP><![CDATA[$=$Me.x_M+Shape_Prototype.KreiselDefinition.d_cp]]></EXP>
 														</PAR>
-														<PAR Name="id" />
-														<PAR Name="x_S" />
-														<PAR Name="x" />
-														<PAR Name="y" />
-														<PAR Name="z" />
-														<PAR Name="direction" />
-														<PAR Name="linkClass" />
-														<PAR Name="label" />
-														<PAR Name="aktiv" />
 													</EXEC_ON_VALUES>
 													<SET Id="RDK:714933" VarRef="Shape_Prototype.KreiselDefinition.M_Strecke_selected">
 														<EXP><![CDATA[$C$NOTHING]]></EXP>
@@ -9214,18 +9240,9 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 														</PAR>
 													</SET_STRUCT>
 													<EXEC_ON_VALUES Id="RDK:824002" VarRef="Shape_Prototype.KreiselDefinition.S_Strecke" ExecMode="1" FilterExp="Me_idx&gt;StrToInt(Shape_Prototype.KreiselDefinition.S_Strecke_selected[0])+1&#xA;&#xA;">
-														<PAR Name="id" />
-														<PAR Name="x_M" />
 														<PAR Name="x_S">
 															<EXP><![CDATA[$=$Me.x_S+Shape_Prototype.KreiselDefinition.d_cp]]></EXP>
 														</PAR>
-														<PAR Name="x" />
-														<PAR Name="y" />
-														<PAR Name="z" />
-														<PAR Name="direction" />
-														<PAR Name="linkClass" />
-														<PAR Name="label" />
-														<PAR Name="aktiv" />
 													</EXEC_ON_VALUES>
 													<SET Id="RDK:824003" VarRef="Shape_Prototype.KreiselDefinition.S_Strecke_selected">
 														<EXP><![CDATA[$C$NOTHING]]></EXP>
@@ -11624,15 +11641,6 @@ ShapeTotalLength
 me.x
 ))-(Shape_Prototype.KreiselDefinition.Durchmesser/2)]]></EXP>
 											</PAR>
-											<PAR Name="id" />
-											<PAR Name="x_S" />
-											<PAR Name="x" />
-											<PAR Name="y" />
-											<PAR Name="z" />
-											<PAR Name="direction" />
-											<PAR Name="linkClass" />
-											<PAR Name="label" />
-											<PAR Name="aktiv" />
 										</EXEC_ON_VALUES>
 									</GROUP>
 									<GROUP Id="RDK:607197" Name="Spannstation" SubType="Generic">
@@ -11650,15 +11658,6 @@ ShapeTotalLength
 me.x
 ))-(Shape_Prototype.KreiselDefinition.Durchmesser/2)]]></EXP>
 											</PAR>
-											<PAR Name="id" />
-											<PAR Name="x_M" />
-											<PAR Name="x" />
-											<PAR Name="y" />
-											<PAR Name="z" />
-											<PAR Name="direction" />
-											<PAR Name="linkClass" />
-											<PAR Name="label" />
-											<PAR Name="aktiv" />
 										</EXEC_ON_VALUES>
 									</GROUP>
 								</GROUP>
@@ -15053,6 +15052,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<EXP><![CDATA[$=$shape_item.GefaelleDefinition.L1*Tan(DegToRad(shape_item.GefaelleDefinition.winkel))]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
+						<SET Id="RDK:19871470" VarRef="winkel_th">
+							<EXP><![CDATA[$=$Round(RadToDeg((Abs(shape_item.GefaelleDefinition.HoeheOben-shape_item.GefaelleDefinition.HoeheUnten)/shape_item.GefaelleDefinition.L1)),0)]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 						<SET Id="RDK:18539548" VarRef="shape_item.GefaelleDefinition.L_th">
 							<EXP><![CDATA[$=$Abs(Round(L_th, 0))]]></EXP>
 							<PAR Name="AdvancedOptions" />
@@ -15061,6 +15064,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<EXP><![CDATA[$=$Abs(Round(H_th, 0))]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
+						<SET Id="RDK:19871472" VarRef="shape_item.GefaelleDefinition.winkel_th">
+							<EXP><![CDATA[$=$winkel_th]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 						<SET Id="RDK:18530611" VarRef="shape_item.GefaelleDefinition.LH_fits">
 							<EXP><![CDATA[$=$IIF(Abs(shape_item.GefaelleDefinition.L1-L_th)<shape_item.GefaelleDefinition.LH_toleranz,True,False)]]></EXP>
 							<PAR Name="AdvancedOptions" />
@@ -15106,6 +15113,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel)),0))]]></EXP>
 							<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),0)]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 						<SET Id="RDK:18547223" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
 							<EXP><![CDATA[$=$L_th]]></EXP>
 							<PAR Name="AdvancedOptions" />
@@ -15114,6 +15125,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<EXP><![CDATA[$=$H_th]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
+						<SET Id="RDK:19879521" VarRef="Shape_Prototype.GefaelleDefinition.winkel_th">
+							<EXP><![CDATA[$=$winkel_th]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 						<SET Id="RDK:18547225" VarRef="Shape_Prototype.GefaelleDefinition.LH_fits">
 							<EXP><![CDATA[$=$IIF(Abs(Shape_Prototype.GefaelleDefinition.L1-L_th)<Shape_Prototype.GefaelleDefinition.LH_toleranz,True,False)]]></EXP>
 							<PAR Name="AdvancedOptions" />
@@ -19563,7 +19578,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="Tooltip" />
 							<PAR Name="Styles" />
 							<PAR Name="Classes">
-								<EXP><![CDATA[$C$col-6]]></EXP>
+								<EXP><![CDATA[$C$col-4]]></EXP>
 							</PAR>
 							<PAR Name="Rules" />
 							<PAR Name="Image" />
@@ -19618,7 +19633,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="Tooltip" />
 							<PAR Name="Styles" />
 							<PAR Name="Classes">
-								<EXP><![CDATA[$C$col-6]]></EXP>
+								<EXP><![CDATA[$C$col-4]]></EXP>
 							</PAR>
 							<PAR Name="Rules" />
 							<PAR Name="Image" />
@@ -19642,6 +19657,61 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="DataSource" />
 							<PAR Name="Options" />
 						</ACTION_CALL>
+						<ACTION_CALL Id="RDK:19866068" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
+							<PAR Name="RDLibraryName">
+								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+							</PAR>
+							<PAR Name="RenderList">
+								<EXP><![CDATA[$=$Render_Gefaelle]]></EXP>
+							</PAR>
+							<PAR Name="PanelName">
+								<EXP><![CDATA[$C$0]]></EXP>
+							</PAR>
+							<PAR Name="CustomPanel" />
+							<PAR Name="ActionType">
+								<EXP><![CDATA[$C$0]]></EXP>
+							</PAR>
+							<PAR Name="Id">
+								<EXP><![CDATA[$C$winkel_th]]></EXP>
+							</PAR>
+							<PAR Name="ParentId" />
+							<PAR Name="Label">
+								<EXP><![CDATA[$C$Theoretische Neigungswinkel]]></EXP>
+							</PAR>
+							<PAR Name="Field">
+								<EXP><![CDATA[$C$winkel_th]]></EXP>
+							</PAR>
+							<PAR Name="Value" />
+							<PAR Name="Uom" />
+							<PAR Name="Tooltip" />
+							<PAR Name="Styles" />
+							<PAR Name="Classes">
+								<EXP><![CDATA[$C$col-4]]></EXP>
+							</PAR>
+							<PAR Name="Rules" />
+							<PAR Name="Image" />
+							<PAR Name="ControlType">
+								<EXP><![CDATA[$C$textbox]]></EXP>
+							</PAR>
+							<PAR Name="ButtonSubType" />
+							<PAR Name="DropdownSubType" />
+							<PAR Name="TextboxSubType" />
+							<PAR Name="Action" />
+							<PAR Name="Required" />
+							<PAR Name="Hidden" />
+							<PAR Name="ROnly">
+								<EXP><![CDATA[$C$True]]></EXP>
+							</PAR>
+							<PAR Name="Disabled" />
+							<PAR Name="Pressed" />
+							<PAR Name="AutoCommit">
+								<EXP><![CDATA[$=$]]></EXP>
+							</PAR>
+							<PAR Name="ValidateFail" />
+							<PAR Name="ValidateMsg" />
+							<PAR Name="DataSource" />
+							<PAR Name="Options" />
+						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:837490" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}" DesignTimeTip="cp2 top point" DesignTimeNotes="20231005 -1-&#xD;&#xA;Read only changed&#xD;&#xA;&#xD;&#xA;20230928 -1-&#xD;&#xA;Label changed">
 							<PAR Name="RDLibraryName">
 								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
@@ -19661,7 +19731,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</PAR>
 							<PAR Name="ParentId" />
 							<PAR Name="Label">
-								<EXP><![CDATA[$C$h0]]></EXP>
+								<EXP><![CDATA[$C$H0]]></EXP>
 							</PAR>
 							<PAR Name="Field">
 								<EXP><![CDATA[$C$HoeheUnten]]></EXP>