From 612e27ce0e6af6464982c6f30ad98596d324b09d Mon Sep 17 00:00:00 2001
From: mistangl <m.stangl@schoenenberger.de>
Date: Wed, 23 Oct 2024 13:15:38 +0200
Subject: [PATCH] =?UTF-8?q?Status=20der=20Kurve=20und=20angetriebenen=20Ku?=
 =?UTF-8?q?rve=20nur=20noch=20von=20einem=20Flag=20isOk=20abh=C3=A4ngig.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 5c08a10..7e8e1f2 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-10-23T12:34:59" LanguageVersion="2014.1.3.699" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-10-23T13:15:02" 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">
@@ -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" 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" />
@@ -76,23 +76,23 @@
 					<FIELD Id="RDK:302575" Name="n_Sep" Type="integer" />
 					<FIELD Id="RDK:302576" Name="n_Scan" Type="integer" />
 				</TYPE>
-				<TYPE Id="RDK:18732236" Name="KurveType" SubType="structure">
+				<TYPE Id="RDK:18732236" Name="KurveType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18732225" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:18732226" Name="L1" Type="double" />
 					<FIELD Id="RDK:18732231" Name="H_Anfang" Type="double" />
 					<FIELD Id="RDK:18732232" Name="H_Ende" Type="double" />
 					<FIELD Id="RDK:18732250" Name="Delta_h" Type="double" DesignTimeRemark="Höhendifferenz" />
-					<FIELD Id="RDK:20933952" Name="Richtung" Type="string" Suppressed="True" DesignTimeRemark="Links oder Rechts" />
-					<FIELD Id="RDK:20933954" Name="Art" Type="string" Suppressed="True" DesignTimeRemark="Gefällestrecke(nicht angetrieben) oder Förderer (angetrieben)" />
+					<FIELD Id="RDK:21700894" Name="isOk" Type="boolean" DesignTimeRemark="True beide Punkte angebunden sind und die Höhen der Nachbarn passen" />
 				</TYPE>
-				<TYPE Id="RDK:21686352" Name="KurveFoerdererType" SubType="structure">
+				<TYPE Id="RDK:21686352" Name="KurveFoerdererType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:21686345" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:21686346" Name="L1" Type="double" />
 					<FIELD Id="RDK:21686347" Name="H_Anfang" Type="double" />
 					<FIELD Id="RDK:21686348" Name="H_Ende" Type="double" />
 					<FIELD Id="RDK:21686349" Name="Delta_h" Type="double" DesignTimeRemark="Höhendifferenz" />
+					<FIELD Id="RDK:21700896" Name="isOk" Type="boolean" DesignTimeRemark="True beide Punkte angebunden sind und die Höhen der Nachbarn passen" />
 				</TYPE>
 				<TYPE Id="RDK:18116690" Name="FoerdererType" SubType="structure">
 					<TYPE_VALUES />
@@ -133,7 +133,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" />
@@ -149,7 +149,7 @@
 					<FIELD Id="RDK:16525361" Name="BTMTEntladungDefinition" Type="BTMTEntladungType" />
 					<FIELD Id="RDK:19961198" Name="isDefined" Type="boolean" />
 				</TYPE>
-				<TYPE Id="RDK:18530527" Name="SSG_ShapeType_limit" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:18530527" Name="SSG_ShapeType_limit" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18530520" Name="KreiselDefinition" Type="KreiselType" />
 					<FIELD Id="RDK:18530521" Name="EckradDefinition" Type="EckradType" />
@@ -23188,11 +23188,8 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<CASEGROUP Id="RDK:19602977" CaseType="0">
 						<EXP><![CDATA[$C$Kurve]]></EXP>
 						<IFTHENELSE Id="RDK:21032034">
-							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$ShapeList[shapeList_idx].KurveDefinition.H_Anfang >  ShapeList[shapeList_idx].KurveDefinition.H_Ende]]></EXP>
-							</VALUECONDITION>
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$ShapeList[shapeList_idx].KurveDefinition.H_Anfang <  ShapeList[shapeList_idx].KurveDefinition.H_Ende]]></EXP>
+								<EXP><![CDATA[$=$ShapeList[shapeList_idx].KurveDefinition.isOk]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:21032047" SubType="Then">
 								<CALLFUNCTION Id="RDK:21032046">
@@ -23227,11 +23224,8 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<CASEGROUP Id="RDK:21692418" CaseType="0">
 						<EXP><![CDATA[$C$KurveFoerderer]]></EXP>
 						<IFTHENELSE Id="RDK:21692417">
-							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$ShapeList[shapeList_idx].KurveFoerdererDefinition.H_Anfang >  ShapeList[shapeList_idx].KurveFoerdererDefinition.H_Ende]]></EXP>
-							</VALUECONDITION>
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$ShapeList[shapeList_idx].KurveFoerdererDefinition.H_Anfang <  ShapeList[shapeList_idx].KurveFoerdererDefinition.H_Ende]]></EXP>
+								<EXP><![CDATA[$=$ShapeList[shapeList_idx].KurveFoerdererDefinition.isOk]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:21692414" SubType="Then">
 								<CALLFUNCTION Id="RDK:21692413">
@@ -23494,7 +23488,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						<EXP><![CDATA[$C$Kurve]]></EXP>
 						<IFTHENELSE Id="RDK:21040948">
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$shape_item.KurveDefinition.Art="Gefällestrecke"]]></EXP>
+								<EXP><![CDATA[$=$shape_item.KurveDefinition.isOk]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:21040949" SubType="Then">
 								<SET Id="RDK:19435280" VarRef="color">
@@ -23514,11 +23508,11 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						<EXP><![CDATA[$C$KurveFoerderer]]></EXP>
 						<IFTHENELSE Id="RDK:21692441">
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$shape_item.KurveFoerdererDefinition.Art="Gefällestrecke"]]></EXP>
+								<EXP><![CDATA[$=$shape_item.KurveFoerdererDefinition.isOk]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:21692438" SubType="Then">
 								<SET Id="RDK:21692437" VarRef="color">
-									<EXP><![CDATA[$C$#6C6E70]]></EXP>
+									<EXP><![CDATA[$C$#7284ff]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</GROUP>