From 68067ebafdb9e104676605f8bb6d2efed0c7d8c0 Mon Sep 17 00:00:00 2001
From: Simon Schmutzler <s.schmutzler@schoenenberger.de>
Date: Fri, 12 Jan 2024 09:54:15 +0100
Subject: [PATCH] =?UTF-8?q?CSV=20Export=20um=20Eckrad=20und=20BTMTBeladung?=
 =?UTF-8?q?=20erg=C3=A4nzt,=20Gef=C3=A4llestrecke=20Name=20gefixt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 121 +++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 112 insertions(+), 9 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 0017b4e..3f3cda3 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="dre [NBDELP3561-04C]" ModDate="2023-12-15T10:00:06" LanguageVersion="2014.1.3.627" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-01-12T09:48:33" LanguageVersion="2014.1.3.627" />
 	<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" />
@@ -65,7 +65,7 @@
 					<FIELD Id="RDK:973716" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:973714" Name="Weichenart" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:1652525" Name="BTMTBeladungType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:1652525" Name="BTMTBeladungType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:1652521" Name="AbstandMS" Type="double" Suppressed="True" />
 					<FIELD Id="RDK:1652522" Name="Hoehe" Type="double" />
@@ -73,7 +73,7 @@
 					<FIELD Id="RDK:1657744" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:1652524" Name="Durchmesser" Type="double" Suppressed="True" />
 				</TYPE>
-				<TYPE Id="RDK:79642" Name="SSG_ShapeType" SubType="structure">
+				<TYPE Id="RDK:79642" Name="SSG_ShapeType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:79643" Name="SivasNummer" Type="string" />
 					<FIELD Id="RDK:1561689" Name="Rotationsklasse" Type="string" />
@@ -679,15 +679,24 @@
 					<FIELD Id="RDK:952180" Name="Anzahl der Rampen" Type="string" />
 					<FIELD Id="RDK:1065211" Name="Höhe in m" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:903598" Name="GefaellestreckelMerkmaleType" SubType="structure">
+				<TYPE Id="RDK:903598" Name="GefaellestreckeMerkmaleType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:903599" Name="Anzahl der Zusatzseparatoren" Type="string" />
 					<FIELD Id="RDK:903600" Name="Länge in Meter" Type="string" />
+					<FIELD Id="RDK:1674242" Name="Anzahl der Scanner" Type="integer" />
 				</TYPE>
 				<TYPE Id="RDK:973721" Name="WeicheMerkmaleType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:973723" Name="Weichenart" Type="string" />
 				</TYPE>
+				<TYPE Id="RDK:1664608" Name="EckradMerkmaleType" SubType="structure" DesignTimeNotes="{ &quot;Abstand (Kreiselachse A - Kreiselachse) in Meter&quot;: &quot;4.5&quot;, &quot;Anzahl der Separatoren&quot;:&quot;2&quot;, &quot;Anzahl der Scanner&quot;:&quot;1&quot;, &quot;Anzahl der Scanner&quot;:&quot;1&quot;, &quot;Anzahl der Weichen&quot;: &quot;4&quot;  }">
+					<TYPE_VALUES />
+					<FIELD Id="RDK:1664607" Name="Höhe in m" Type="string" />
+				</TYPE>
+				<TYPE Id="RDK:1668585" Name="BTMTBeladungMerkmaleType" Expanded="True" SubType="structure" DesignTimeNotes="{ &quot;Abstand (Kreiselachse A - Kreiselachse) in Meter&quot;: &quot;4.5&quot;, &quot;Anzahl der Separatoren&quot;:&quot;2&quot;, &quot;Anzahl der Scanner&quot;:&quot;1&quot;, &quot;Anzahl der Scanner&quot;:&quot;1&quot;, &quot;Anzahl der Weichen&quot;: &quot;4&quot;  }">
+					<TYPE_VALUES />
+					<FIELD Id="RDK:1668591" Name="Höhe in m" Type="string" Suppressed="True" />
+				</TYPE>
 			</GROUP>
 			<TYPE Id="RDK:1007393" Name="Point2D" SubType="structure" HasArrayType="True">
 				<TYPE_VALUES />
@@ -764,7 +773,7 @@
 			</GROUP>
 			<GROUP Id="RDK:314272" Name="MUI" SubType="VarSet" IncludeDate="0">
 				<VAR Id="RDK:426767" Name="KreiselData" Type="KreiselType" />
-				<VAR Id="RDK:1520551" Name="EckradData" Type="KreiselType" />
+				<VAR Id="RDK:1520551" Name="EckradData" Type="EckradType" />
 				<VAR Id="RDK:397366" Name="Render_Kreisel" Type="MUIPanelType[]" />
 				<VAR Id="RDK:1545832" Name="Render_Eckrad" Type="MUIPanelType[]" />
 				<VAR Id="RDK:397368" Name="Render_Gefaelle" Type="MUIPanelType[]" />
@@ -9815,8 +9824,10 @@ me.x
 					<GROUP Id="RDK:1516849" Name="CSV Export" SubType="VarSet" IncludeDate="0">
 						<VAR Id="RDK:1516843" Name="CSV_List" Type="CSVType[]" />
 						<VAR Id="RDK:1516844" Name="KreiselMerkmale" Type="KreiselMerkmaleType" />
-						<VAR Id="RDK:1516845" Name="GefaellestreckelMerkmale" Type="GefaellestreckelMerkmaleType" />
+						<VAR Id="RDK:1516845" Name="GefaellestreckeMerkmale" Type="GefaellestreckeMerkmaleType" />
 						<VAR Id="RDK:1516846" Name="WeicheMerkmale" Type="WeicheMerkmaleType" />
+						<VAR Id="RDK:1666873" Name="EckradMerkmale" Type="EckradMerkmaleType" />
+						<VAR Id="RDK:1668589" Name="BTMTBeladungMerkmale" Type="BTMTBeladungMerkmaleType" />
 						<VAR Id="RDK:1516847" Name="CSVFileName" Type="string" />
 						<VAR Id="RDK:1516848" Name="CSVFile" Type="string" />
 					</GROUP>
@@ -9945,16 +9956,19 @@ me.x
 									</CALLFUNCTION>
 								</GROUP>
 								<GROUP Id="RDK:1516879" Name="Merkmale" SubType="Generic">
-									<SET_STRUCT Id="RDK:1516877" VarRef="GefaellestreckelMerkmale" ClearAll="True">
+									<SET_STRUCT Id="RDK:1516877" VarRef="GefaellestreckeMerkmale" ClearAll="True">
 										<PAR Name="Anzahl der Zusatzseparatoren">
 											<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.n_Sep]]></EXP>
 										</PAR>
 										<PAR Name="Länge in Meter">
 											<EXP><![CDATA[$=$StrReplace(ShapeItem.GefaelleDefinition.L1/1000, ",", ".")]]></EXP>
 										</PAR>
+										<PAR Name="Anzahl der Scanner">
+											<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.n_Scan]]></EXP>
+										</PAR>
 									</SET_STRUCT>
 									<SET Id="RDK:1516878" VarRef="CSV_Item.Merkmale">
-										<EXP><![CDATA[$=$ToJSON(GefaellestreckelMerkmale)]]></EXP>
+										<EXP><![CDATA[$=$ToJSON(GefaellestreckeMerkmale)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
@@ -10009,6 +10023,95 @@ me.x
 									<PAR Name="POS_TO_ADD" />
 								</LIST_ADD>
 							</CASEGROUP>
+							<CASEGROUP Id="RDK:1663400" CaseType="0">
+								<EXP><![CDATA[$C$BTMTBeladung]]></EXP>
+								<GROUP Id="RDK:1663391" Name="TeileArt" SubType="Generic">
+									<SET Id="RDK:1663390" VarRef="CSV_Item.TeileArt">
+										<EXP><![CDATA[$=$ToJSON("BT - Beladung")]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+								</GROUP>
+								<GROUP Id="RDK:1663393" Name="Bezeichnung" SubType="Generic">
+									<SET Id="RDK:1663392" VarRef="CSV_Item.Bezeichnung">
+										<EXP><![CDATA[$=$ToJSON(ShapeItem.BTMTBeladungDefinition.Beschreibung)]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+								</GROUP>
+								<GROUP Id="RDK:1663395" Name="Planquadrat" SubType="Generic">
+									<CALLFUNCTION Id="RDK:1663394">
+										<PAR Name="FuncName">
+											<EXP><![CDATA[$C$GetPlanquadratPosition]]></EXP>
+										</PAR>
+										<PAR Name="InputExp" />
+										<PAR Name="ResultRef">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="Options" />
+									</CALLFUNCTION>
+								</GROUP>
+								<GROUP Id="RDK:1668572" Name="Merkmale" SubType="Generic">
+									<SET_STRUCT Id="RDK:1668587" VarRef="BTMTBeladungMerkmale" ClearAll="True">
+										<PAR Name="Höhe in m">
+											<EXP><![CDATA[$C$5]]></EXP>
+										</PAR>
+									</SET_STRUCT>
+									<SET Id="RDK:1668581" VarRef="CSV_Item.Merkmale">
+										<EXP><![CDATA[$=$ToJSON(BTMTBeladungMerkmale)]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+								</GROUP>
+								<LIST_ADD Id="RDK:1663399" ListRef="CSV_List">
+									<PAR Name="VALUE_TO_ADD">
+										<EXP><![CDATA[$=$CSV_Item
+]]></EXP>
+									</PAR>
+									<PAR Name="POS_TO_ADD" />
+								</LIST_ADD>
+							</CASEGROUP>
+							<CASEGROUP Id="RDK:1663437" CaseType="0">
+								<EXP><![CDATA[$C$Eckrad]]></EXP>
+								<GROUP Id="RDK:1663428" Name="TeileArt" SubType="Generic">
+									<SET Id="RDK:1663440" VarRef="CSV_Item.TeileArt">
+										<EXP><![CDATA[$=$ToJSON("ILS 2.0 Eckrad")]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+								</GROUP>
+								<GROUP Id="RDK:1663430" Name="Bezeichnung" SubType="Generic">
+									<SET Id="RDK:1663429" VarRef="CSV_Item.Bezeichnung">
+										<EXP><![CDATA[$=$ToJSON(ShapeItem.EckradDefinition.Beschreibung)]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+								</GROUP>
+								<GROUP Id="RDK:1663432" Name="Planquadrat" SubType="Generic">
+									<CALLFUNCTION Id="RDK:1663431">
+										<PAR Name="FuncName">
+											<EXP><![CDATA[$C$GetPlanquadratPosition]]></EXP>
+										</PAR>
+										<PAR Name="InputExp" />
+										<PAR Name="ResultRef">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="Options" />
+									</CALLFUNCTION>
+								</GROUP>
+								<GROUP Id="RDK:1664575" Name="Merkmale" SubType="Generic">
+									<SET_STRUCT Id="RDK:1666872" VarRef="EckradMerkmale" ClearAll="True">
+										<PAR Name="Höhe in m">
+											<EXP><![CDATA[$=$StrReplace(ShapeItem.EckradDefinition.Hoehe/1000, ",", ".")]]></EXP>
+										</PAR>
+									</SET_STRUCT>
+									<SET Id="RDK:1664574" VarRef="CSV_Item.Merkmale">
+										<EXP><![CDATA[$=$ToJSON(EckradMerkmale)]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+								</GROUP>
+								<LIST_ADD Id="RDK:1663436" ListRef="CSV_List">
+									<PAR Name="VALUE_TO_ADD">
+										<EXP><![CDATA[$=$CSV_Item]]></EXP>
+									</PAR>
+									<PAR Name="POS_TO_ADD" />
+								</LIST_ADD>
+							</CASEGROUP>
 							<CASEGROUP Id="RDK:1516893" CaseType="1">
 								<EXP />
 							</CASEGROUP>