From 9117e5c72de8f43487714d13dc53452bd5430309 Mon Sep 17 00:00:00 2001
From: mistangl <m.stangl@schoenenberger.de>
Date: Wed, 23 Apr 2025 17:10:43 +0200
Subject: [PATCH] =?UTF-8?q?veraltete=20OFBogen=20Definition=20raus.=20Radi?=
 =?UTF-8?q?us,=20H=C3=B6he=20und=20Sivasnr=20als=20Basis=20f=C3=BCr=20eine?=
 =?UTF-8?q?=20Id=20verwendet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 286a76b..0b6a14a 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="2025-04-15T16:49:17" LanguageVersion="2014.1.3.710" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2025-04-23T17:07:00" LanguageVersion="2014.1.3.710" />
 	<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">
@@ -1010,7 +1010,7 @@
 					<TYPE_VALUES />
 					<FIELD Id="RDK:16685911" Name="Höhe in m" Type="string" Suppressed="True" />
 				</TYPE>
-				<TYPE Id="RDK:23017780" Name="OFGeradeMerkmaleType" SubType="structure">
+				<TYPE Id="RDK:23017780" Name="OFGeradeMerkmaleType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:23017774" Name="Anzahl der Separatoren" Type="string" />
 					<FIELD Id="RDK:23017775" Name="Länge in Meter" Type="string" />
@@ -1019,15 +1019,15 @@
 					<FIELD Id="RDK:23017778" Name="Höhe oben" Type="string" />
 					<FIELD Id="RDK:23017779" Name="Höhe unten" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:23017792" Name="OFBogenMerkmaleType" SubType="structure">
+				<TYPE Id="RDK:23017792" Name="OFBogenMerkmaleType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:23017787" Name="Länge in Meter" Type="string" />
 					<FIELD Id="RDK:23017789" Name="Kurvenwinkel" Type="double" />
-					<FIELD Id="RDK:23017790" Name="Höhe Anfang" Type="string" />
-					<FIELD Id="RDK:23017791" Name="Höhe Ende" Type="string" />
+					<FIELD Id="RDK:24269555" Name="Radius" Type="double" />
+					<FIELD Id="RDK:23017790" Name="Höhe" Type="string" />
 					<FIELD Id="RDK:23017794" Name="SivasNummer" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:23221889" Name="OFWeicheMerkmaleType" SubType="structure">
+				<TYPE Id="RDK:23221889" Name="OFWeicheMerkmaleType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:23221883" Name="Länge in Meter links" Type="string" />
 					<FIELD Id="RDK:23221893" Name="Länge in Meter rechts" Type="string" />
@@ -9072,14 +9072,14 @@ SSGConnectionPoint.x_M
 								<CASEGROUP Id="RDK:23016604" CaseType="0">
 									<EXP><![CDATA[$C$OFBogen]]></EXP>
 									<SET Id="RDK:23016603" VarRef="idStr">
-										<EXP><![CDATA[$=$"KVOF"+shapeItem.OFBogenDefinition.KurvenWinkel+shapeItem.OFBogenDefinition.KurvenRichtung]]></EXP>
+										<EXP><![CDATA[$=$"KVOF"+shapeItem.OFBogenDefinition.Radius+shapeItem.OFBogenDefinition.KurvenWinkel+"-"+shapeItem.OFBogenDefinition.Sivasnr]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</CASEGROUP>
 								<CASEGROUP Id="RDK:23221945" CaseType="0">
 									<EXP><![CDATA[$C$OFWeiche]]></EXP>
 									<SET Id="RDK:23221944" VarRef="idStr">
-										<EXP><![CDATA[$=$"WEOF"+shapeItem.OFWeicheDefinition.WeichenTyp+shapeItem.OFWeicheDefinition.Sivasnr]]></EXP>
+										<EXP><![CDATA[$=$"WEOF"+shapeItem.OFWeicheDefinition.WeichenTyp+"-"+shapeItem.OFWeicheDefinition.Sivasnr]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</CASEGROUP>
@@ -33983,20 +33983,17 @@ me.x
 										<PAR Name="Länge in Meter">
 											<EXP><![CDATA[$=$ShapeItem.OFBogenDefinition.L1]]></EXP>
 										</PAR>
-										<PAR Name="Kurvenrichtung">
-											<EXP><![CDATA[$=$ShapeItem.OFBogenDefinition.]]></EXP>
-										</PAR>
 										<PAR Name="Kurvenwinkel">
 											<EXP><![CDATA[$=$ShapeItem.OFBogenDefinition.KurvenWinkel]]></EXP>
 										</PAR>
-										<PAR Name="Höhe Anfang">
-											<EXP><![CDATA[$=$StrReplace(ShapeItem.OFBogenDefinition.H_Anfang/1000, ",", ".")]]></EXP>
+										<PAR Name="Radius">
+											<EXP><![CDATA[$=$ShapeItem.OFBogenDefinition.Radius]]></EXP>
 										</PAR>
-										<PAR Name="Höhe Ende">
-											<EXP><![CDATA[$=$StrReplace(ShapeItem.OFBogenDefinition.H_Ende/1000, ",", ".")]]></EXP>
+										<PAR Name="Höhe">
+											<EXP><![CDATA[$=$ShapeItem.OFBogenDefinition.Hoehe]]></EXP>
 										</PAR>
 										<PAR Name="SivasNummer">
-											<EXP><![CDATA[$C$notyetdone]]></EXP>
+											<EXP><![CDATA[$=$ShapeItem.OFBogenDefinition.Sivasnr]]></EXP>
 										</PAR>
 									</SET_STRUCT>
 									<SET Id="RDK:23016867" VarRef="CSV_Item.Merkmale">