From f8712afd9377826b1072722d7097e589533d11f1 Mon Sep 17 00:00:00 2001
From: mistangl <m.stangl@schoenenberger.de>
Date: Wed, 8 May 2024 21:01:58 +0200
Subject: [PATCH] =?UTF-8?q?FIX:=20Gef=C3=A4llestrecke=20hatte=20noch=20kei?=
 =?UTF-8?q?ne=20Beschreibung.=20Deswegen=20wurde=20eine=20SE=20Datei=20nic?=
 =?UTF-8?q?ht=20neu=20benannt.=20Nicht=20ben=C3=B6tigte=20Typendeklaration?=
 =?UTF-8?q?=20rausgeworfen.=20Parameter=20Typ=20zum=20Setzen=20von=20Varia?=
 =?UTF-8?q?blenwerten=20neu=20definiert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 71 ++++++++++++++++------------------------------------
 1 file changed, 22 insertions(+), 49 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index c000407..765a2e5 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -1,7 +1,7 @@
 <?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-05-07T17:31:18" LanguageVersion="2014.1.3.635" />
-	<GROUP Id="RDK:0002" Name="Declarations" SubType="Declarations">
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-05-08T20:56:27" LanguageVersion="2014.1.3.635" />
+	<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">
 				<TYPE Id="RDK:313478" Name="SSGConnectionPoint" SubType="structure" HasArrayType="True">
@@ -796,6 +796,12 @@
 				</TYPE>
 			</GROUP>
 			<GROUP Id="RDK:18753242" Name="SE EXPORT" SubType="TypeSet" IncludeDate="0">
+				<TYPE Id="RDK:18946335" Name="SEExportParamType" Expanded="True" SubType="structure" HasArrayType="True">
+					<TYPE_VALUES />
+					<FIELD Id="RDK:18946341" Name="key" Type="string" />
+					<FIELD Id="RDK:18946343" Name="value" Type="double" />
+					<FIELD Id="RDK:18946345" Name="filename" Type="string" />
+				</TYPE>
 				<TYPE Id="RDK:18753212" Name="SEType" Expanded="True" SubType="structure" HasArrayType="True" DesignTimeNotes="Der Rest der Datei ist eine Liste aller Objekte, welche vom Benutzer angelegt wurden.  Die Merkmale jedes Objektes werden wie in die Datei geschrieben, wie sie im RD verwendet werden. Eine Übersetzung in die Merkmale für das ERP findet ausserhalb statt.">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18753205" Name="Elementnummer" Type="integer" DesignTimeNotes="Die Elementnummer ist einfach eine laufende Nummer" />
@@ -817,48 +823,7 @@
 					<FIELD Id="RDK:18760882" Name="Param3value" Type="double" />
 					<FIELD Id="RDK:18760888" Name="Param3key" Type="string" />
 					<FIELD Id="RDK:18931692" Name="Param3filename" Type="string" />
-				</TYPE>
-				<TYPE Id="RDK:18753218" Name="KreiselSEExportType" 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:18753213" Name="Abstand (Kreiselachse A - Kreiselachse) in mm" Type="double" />
-					<FIELD Id="RDK:18753217" Name="Höhe in mm" Type="double" />
-				</TYPE>
-				<TYPE Id="RDK:18753223" Name="GefaellestreckeSEExportType" SubType="structure">
-					<TYPE_VALUES />
-					<FIELD Id="RDK:18753221" Name="Länge in mm" Type="double" />
-					<FIELD Id="RDK:18753228" Name="Alpha_Strecke" Type="double" />
-					<FIELD Id="RDK:18756315" Name="Höhe oben in mm" Type="double" />
-					<FIELD Id="RDK:18756310" Name="Höhe unten in mm" Type="double" />
-				</TYPE>
-				<TYPE Id="RDK:18753225" Name="StreckeSEExportType" SubType="structure">
-					<TYPE_VALUES />
-					<FIELD Id="RDK:18753224" Name="Länge in mm" Type="double" />
-				</TYPE>
-				<TYPE Id="RDK:18753233" Name="FoerdererSEExportType" SubType="structure">
-					<TYPE_VALUES />
-					<FIELD Id="RDK:18753226" Name="Höhe ETF oben in mm" Type="double" />
-					<FIELD Id="RDK:18753227" Name="Höhe ETF unten in mm" Type="double" />
-					<FIELD Id="RDK:18753229" Name="Gesamtlänge Gefällestrecke in mm" Type="double" />
-					<FIELD Id="RDK:18756317" Name="Gesamtlänge Förderer in mm" Type="double" />
-					<FIELD Id="RDK:18755544" Name="Gesamtlänge beides in mm" Type="double" />
-					<FIELD Id="RDK:18756319" Name="Alpha_Strecke" Type="double" />
-					<FIELD Id="RDK:18756321" Name="Alpha_Förderer" Type="double" />
-				</TYPE>
-				<TYPE Id="RDK:18753235" Name="WeicheSEExportType" SubType="structure">
-					<TYPE_VALUES />
-					<FIELD Id="RDK:18753234" Name="Weichenart" Type="string" />
-				</TYPE>
-				<TYPE Id="RDK:18753237" Name="EckradSEExportType" 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:18753236" Name="Höhe in mm" Type="double" />
-				</TYPE>
-				<TYPE Id="RDK:18753239" Name="BTMTBeladungSEExportType" 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:18753238" Name="Höhe in mm" Type="double" />
-				</TYPE>
-				<TYPE Id="RDK:18753241" Name="BTMTEntladungSEExportType" 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:18753240" Name="Höhe in mm" Type="double" />
+					<FIELD Id="RDK:18946347" Name="toSetParameters" Type="SEExportParamType[]" />
 				</TYPE>
 			</GROUP>
 			<TYPE Id="RDK:1007393" Name="Point2D" SubType="structure" HasArrayType="True">
@@ -11263,6 +11228,10 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 							<EXP><![CDATA[$C$Strecke]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
+						<SET Id="RDK:18940759" VarRef="Shape_Prototype.GefaelleDefinition.Beschreibung">
+							<EXP><![CDATA[$=$Shape_Prototype.name]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 						<GROUP Id="RDK:837502" Name="UI" SubType="Generic">
 							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$Param.Input[0].class<>"OnPasted"]]></EXP>
@@ -11430,6 +11399,10 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 							<EXP><![CDATA[$C$Strecke]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
+						<SET Id="RDK:18940761" VarRef="Shape_Prototype.FoerdererDefinition.Beschreibung">
+							<EXP><![CDATA[$=$Shape_Prototype.name]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 						<GROUP Id="RDK:18116663" Name="UI" SubType="Generic">
 							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$Param.Input[0].class<>"OnPasted"]]></EXP>
@@ -20416,7 +20389,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 											<PAR Name="AdvancedOptions" />
 										</SET>
 										<SET Id="RDK:18931672" VarRef="SE_Item.Z">
-											<EXP><![CDATA[$=$ShapeItem.KreiselDefinition.Hoehe]]></EXP>
+											<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.HoeheUnten + (ShapeItem.GefaelleDefinition.HoeheOben - ShapeItem.GefaelleDefinition.HoeheUnten)/2 ]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
 										<SET Id="RDK:18931673" VarRef="SE_Item.rotation" DesignTimeRemark="ShapeItem.rotation">
@@ -20424,7 +20397,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 											<PAR Name="AdvancedOptions" />
 										</SET>
 										<SET Id="RDK:18931674" VarRef="SE_Item.ItemName">
-											<EXP><![CDATA[$=$ShapeItem.KreiselDefinition.Beschreibung]]></EXP>
+											<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.Beschreibung]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
 										<SET Id="RDK:18931675" VarRef="SE_Item.SEFilename">
@@ -20432,7 +20405,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 											<PAR Name="AdvancedOptions" />
 										</SET>
 										<SET Id="RDK:18931696" VarRef="SE_Item.Param1filename">
-											<EXP><![CDATA[$C$000000107.par]]></EXP>
+											<EXP><![CDATA[$C$Gefaellestrecke.par]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
 										<SET Id="RDK:18931678" VarRef="SE_Item.Param1key">
@@ -20464,11 +20437,11 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									</CASEGROUP>
 								</SELECTCASE>
 								<GROUP Id="RDK:18760875" Name="PlaceInSolidEdge" SubType="Generic">
-									<SET Id="RDK:18760836" VarRef="LevelOfDetail" Suppressed="True">
+									<SET Id="RDK:18760836" VarRef="LevelOfDetail">
 										<EXP><![CDATA[$C$templates]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
-									<SET Id="RDK:18937970" VarRef="LevelOfDetail">
+									<SET Id="RDK:18937970" VarRef="LevelOfDetail" Suppressed="True">
 										<EXP><![CDATA[$C$detailed]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>