From 349fb6c94eed20ad6cf4433bf350357ce2a55830 Mon Sep 17 00:00:00 2001
From: mistangl <m.stangl@schoenenberger.de>
Date: Tue, 26 Nov 2024 13:13:43 +0100
Subject: [PATCH] =?UTF-8?q?Fix=20zur=20Pr=C3=BCfung=20ob=20der=20Variof?=
 =?UTF-8?q?=C3=B6rderer=20an=20Kreisel=20oder=20Eckrad=20angebunden=20ist,?=
 =?UTF-8?q?=20also=20die=20H=C3=B6he=20gen=C3=A4ndert=20werden=20kann.=20V?=
 =?UTF-8?q?erlauf=20Auf,=20Ab=20oder=20Horizontal=20readonly=20gesetzt.=20?=
 =?UTF-8?q?Wird=20aus=20den=20H=C3=B6hen=20gesetzt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 60 +++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 55 insertions(+), 5 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 0062adf..7ba68da 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-25T18:03:38" LanguageVersion="2014.1.3.699" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-11-26T13:12:25" 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">
@@ -14907,7 +14907,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<EXP><![CDATA[$=$FieldAffected="H_Anfang"]]></EXP>
 								</VALUECONDITION>
 								<VALUECONDITION Value="true">
-									<EXP><![CDATA[$=$FieldAffected="H_Unten"]]></EXP>
+									<EXP><![CDATA[$=$FieldAffected="H_Ende"]]></EXP>
 								</VALUECONDITION>
 								<COMMENTS Id="RDK:22069144" DesignTimeRemark="Änderung der Höhen" DesignTimeTip="Wenn sich eine der Höhen ändert dann prüfe welche sich ändern darf, bzw. ob eine an einem Kreisel angebunden ist." />
 								<GROUP Id="RDK:22069150" Name="localVars" SubType="VarSet" IncludeDate="0">
@@ -22847,9 +22847,12 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<VALUECONDITION Value="true">
 									<EXP><![CDATA[$=$cpId="cp1"]]></EXP>
 								</VALUECONDITION>
-								<VALUECONDITION Value="true">
+								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$FieldAffected="HoeheOben"]]></EXP>
 								</VALUECONDITION>
+								<VALUECONDITION Value="true">
+									<EXP><![CDATA[$=$FieldAffected="H_Anfang"]]></EXP>
+								</VALUECONDITION>
 								<GROUP Id="RDK:21236949" SubType="Then">
 									<SET Id="RDK:21237028" VarRef="Param.Result">
 										<EXP><![CDATA[$=$True]]></EXP>
@@ -22862,9 +22865,12 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<VALUECONDITION Value="true">
 									<EXP><![CDATA[$=$cpId="cp2"]]></EXP>
 								</VALUECONDITION>
-								<VALUECONDITION Value="true">
+								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$FieldAffected="HoeheUnten"]]></EXP>
 								</VALUECONDITION>
+								<VALUECONDITION Value="true">
+									<EXP><![CDATA[$=$FieldAffected="H_Ende"]]></EXP>
+								</VALUECONDITION>
 								<GROUP Id="RDK:21264022" SubType="Then">
 									<SET Id="RDK:21264020" VarRef="Param.Result">
 										<EXP><![CDATA[$=$True]]></EXP>
@@ -23416,6 +23422,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<EXP><![CDATA[$=$False]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
+						<SET Id="RDK:22241365" VarRef="shape_item.VarioFoerdererDefinition.Typ">
+							<EXP><![CDATA[$C$Horizontal]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 						<SET Id="RDK:22071902" VarRef="shape_item.text">
 							<EXP><![CDATA[$C$O]]></EXP>
 							<PAR Name="AdvancedOptions" />
@@ -23468,12 +23478,31 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<EXP><![CDATA[$=$IIF(shape_item.VarioFoerdererDefinition.LH_fits, "↓", "O")]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
+								<SET Id="RDK:22241333" VarRef="shape_item.VarioFoerdererDefinition.Typ">
+									<EXP><![CDATA[$C$Ab]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 							</GROUP>
 							<GROUP Id="RDK:22071917" SubType="Else">
 								<SET Id="RDK:22071916" VarRef="shape_item.text" DesignTimeTip="↓">
 									<EXP><![CDATA[$=$IIF(shape_item.VarioFoerdererDefinition.LH_fits, "↑", "O")]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
+								<SET Id="RDK:22241337" VarRef="shape_item.VarioFoerdererDefinition.Typ">
+									<EXP><![CDATA[$C$Auf]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+						</IFTHENELSE>
+						<IFTHENELSE Id="RDK:22241353">
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$shape_item.VarioFoerdererDefinition.H_Anfang-shape_item.VarioFoerdererDefinition.H_Ende < 0.01]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:22241349" SubType="Then">
+								<SET Id="RDK:22241348" VarRef="shape_item.VarioFoerdererDefinition.Typ">
+									<EXP><![CDATA[$C$Horizontal]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 							</GROUP>
 						</IFTHENELSE>
 						<SET Id="RDK:22071919" VarRef="shape_item.z">
@@ -23742,12 +23771,31 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<EXP><![CDATA[$=$IIF(Shape_Prototype.VarioFoerdererDefinition.LH_fits, "↓", "O")]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
+								<SET Id="RDK:22246711" VarRef="Shape_Prototype.VarioFoerdererDefinition.Typ">
+									<EXP><![CDATA[$C$Ab]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 							</GROUP>
 							<GROUP Id="RDK:22069263" SubType="Else">
 								<SET Id="RDK:22069262" VarRef="Shape_Prototype.text" DesignTimeTip="↓">
 									<EXP><![CDATA[$=$IIF(Shape_Prototype.VarioFoerdererDefinition.LH_fits, "↑", "O")]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
+								<SET Id="RDK:22246713" VarRef="Shape_Prototype.VarioFoerdererDefinition.Typ">
+									<EXP><![CDATA[$C$Auf]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+						</IFTHENELSE>
+						<IFTHENELSE Id="RDK:22246719">
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Shape_Prototype.VarioFoerdererDefinition.H_Anfang - Shape_Prototype.VarioFoerdererDefinition.H_Ende < 0.01]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:22246725" SubType="Then">
+								<SET Id="RDK:22246727" VarRef="Shape_Prototype.VarioFoerdererDefinition.Typ">
+									<EXP><![CDATA[$C$Horizontal]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 							</GROUP>
 						</IFTHENELSE>
 					</GROUP>
@@ -32362,7 +32410,9 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<EXP><![CDATA[$C$True]]></EXP>
 							</PAR>
 							<PAR Name="Hidden" />
-							<PAR Name="ROnly" />
+							<PAR Name="ROnly">
+								<EXP><![CDATA[$C$True]]></EXP>
+							</PAR>
 							<PAR Name="Disabled" />
 							<PAR Name="Pressed" />
 							<PAR Name="AutoCommit">