From 5640e4f96357f438c8e8211a7f321ea20294690c Mon Sep 17 00:00:00 2001
From: Yuelin Wang <y.wang@schoenenberger.de>
Date: Tue, 18 Nov 2025 12:51:21 +0100
Subject: [PATCH] Kleine Fehler bei Exportfunktion wurde korrigiert.

---
 MAIN_SSG.rdx | 98 +++++++++++++++++++++-------------------------------
 1 file changed, 40 insertions(+), 58 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 8f315bf..c4968d7 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-11-11T14:41:52" LanguageVersion="2014.1.3.712" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="y.wang [ANGEBOT-NB02]" ModDate="2025-11-18T12:46:27" LanguageVersion="2014.1.3.712" />
 	<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" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:302581" Name="GefaelleType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:302571" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:880709" Name="L1" Type="double" />
@@ -156,7 +156,7 @@
 					<FIELD Id="RDK:18530488" Name="LH_fits" Type="boolean" DesignTimeRemark="True wenn Länge L1 und L_th zueinander passen und damit zur Höhendifferenz" />
 					<FIELD Id="RDK:18530602" Name="LH_toleranz" Type="double" DesignTimeRemark="Toleranz in mm für den Längenunterschied, bei dem eine Differenz akzeptiert wird" />
 				</TYPE>
-				<TYPE Id="RDK:22028969" Name="VarioFoerdererType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:22028969" Name="VarioFoerdererType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:22028956" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:22038424" Name="Typ" Type="string" DesignTimeRemark="Auf, Ab oder Horizontal" />
@@ -191,7 +191,7 @@
 					<FIELD Id="RDK:973716" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:973714" Name="Weichenart" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:23017103" Name="OFGeradeType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:23017103" Name="OFGeradeType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:23017087" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:24227748" Name="Sivasnr" Type="string" />
@@ -350,14 +350,14 @@
 					<FIELD Id="RDK:18530562" Name="Weiche_top" Type="WeicheType" />
 					<FIELD Id="RDK:18530564" Name="Weiche_bot" Type="WeicheType" />
 				</TYPE>
-				<TYPE Id="RDK:26256702" Name="Foerderer_Attributes" Expanded="True" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:26256702" Name="Foerderer_Attributes" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:26256698" Name="comment" Type="string" />
 					<FIELD Id="RDK:26256759" Name="delta_h_min" Type="double" />
 					<FIELD Id="RDK:26256699" Name="delta_s_min" Type="double" />
 					<FIELD Id="RDK:26256700" Name="winkel" Type="double" />
 				</TYPE>
-				<TYPE Id="RDK:19260062" Name="ILS_Attributes" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:19260062" Name="ILS_Attributes" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:19260048" Name="Einschleuselement_delta_h" Type="double" />
 					<FIELD Id="RDK:19260066" Name="Einschleuselement_delta_s" Type="double" />
@@ -12594,7 +12594,7 @@ SSGConnectionPoint.x_M
 											</VALUECONDITION>
 											<GROUP Id="RDK:26481384" SubType="Then" DesignTimeRemark="Länge übernimmt.">
 												<SET Id="RDK:26481383" VarRef="L1">
-													<EXP><![CDATA[$=$L_th]]></EXP>
+													<EXP><![CDATA[$=$shape_item.GefaelleDefinition.L_th]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
 											</GROUP>
@@ -12630,7 +12630,7 @@ SSGConnectionPoint.x_M
 													</VALUECONDITION>
 													<GROUP Id="RDK:26481331" SubType="Then" DesignTimeRemark="Länge übernimmt.">
 														<SET Id="RDK:26481298" VarRef="L1">
-															<EXP><![CDATA[$=$L_th]]></EXP>
+															<EXP><![CDATA[$=$shape_item.GefaelleDefinition.L_th]]></EXP>
 															<PAR Name="AdvancedOptions" />
 														</SET>
 													</GROUP>
@@ -12704,7 +12704,7 @@ SSGConnectionPoint.x_M
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<SET Id="RDK:21069358" VarRef="winkel_th">
-									<EXP><![CDATA[$=$Round(RadToDeg(ATAN(Abs(HoeheOben-HoeheUnten)/L1)),0)]]></EXP>
+									<EXP><![CDATA[$=$Round(RadToDeg(ATAN(Abs(HoeheOben-HoeheUnten)/shape_item.GefaelleDefinition.L1)),0)]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<SET Id="RDK:21069362" VarRef="LH_fits">
@@ -13321,6 +13321,28 @@ SSGConnectionPoint.x_M
 										</ACTION_CALL>
 									</GROUP>
 									<GROUP Id="RDK:23134071" SubType="Else">
+										<IFTHENELSE Id="RDK:26481450" DesignTimeRemark="Winkel-&gt; Lth übernimmt">
+											<VALUECONDITION Value="true">
+												<EXP><![CDATA[$=$FesteL_th]]></EXP>
+											</VALUECONDITION>
+											<GROUP Id="RDK:26481449" SubType="Then">
+												<SET Id="RDK:26481448" VarRef="L1">
+													<EXP><![CDATA[$=$L_th]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
+											</GROUP>
+										</IFTHENELSE>
+										<IFTHENELSE Id="RDK:23134038" DesignTimeRemark="Länge ist auch Fixiert -&gt; Winkel">
+											<VALUECONDITION Value="true">
+												<EXP><![CDATA[$=$FesteL1]]></EXP>
+											</VALUECONDITION>
+											<GROUP Id="RDK:23134037" SubType="Then">
+												<SET Id="RDK:23134035" VarRef="winkel">
+													<EXP><![CDATA[$=$Round(RadToDeg(ATAN(Abs(HoeheOben-HoeheUnten)/L1)),1)]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
+											</GROUP>
+										</IFTHENELSE>
 										<IFTHENELSE Id="RDK:23134059" DesignTimeRemark="HöheOben UND HöheUnten haben Werte und sind fixiert">
 											<VALUECONDITION Value="true">
 												<EXP><![CDATA[$=$FesteH1]]></EXP>
@@ -13333,28 +13355,6 @@ SSGConnectionPoint.x_M
 													<EXP><![CDATA[$=$Abs(HoeheOben-HoeheUnten)]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
-												<IFTHENELSE Id="RDK:26481429" DesignTimeRemark="Winkel-&gt; Lth übernimmt">
-													<VALUECONDITION Value="true">
-														<EXP><![CDATA[$=$FesteL_th]]></EXP>
-													</VALUECONDITION>
-													<GROUP Id="RDK:26481426" SubType="Then">
-														<SET Id="RDK:26481427" VarRef="L1">
-															<EXP><![CDATA[$=$L_th]]></EXP>
-															<PAR Name="AdvancedOptions" />
-														</SET>
-													</GROUP>
-												</IFTHENELSE>
-												<IFTHENELSE Id="RDK:23134038" DesignTimeRemark="Länge ist auch Fixiert -&gt; Winkel">
-													<VALUECONDITION Value="true">
-														<EXP><![CDATA[$=$FesteL1]]></EXP>
-													</VALUECONDITION>
-													<GROUP Id="RDK:23134037" SubType="Then">
-														<SET Id="RDK:23134035" VarRef="winkel">
-															<EXP><![CDATA[$=$Round(RadToDeg(ATAN(Abs(HoeheOben-HoeheUnten)/L1)),1)]]></EXP>
-															<PAR Name="AdvancedOptions" />
-														</SET>
-													</GROUP>
-												</IFTHENELSE>
 											</GROUP>
 											<GROUP Id="RDK:26481438" SubType="Else">
 												<IFTHENELSE Id="RDK:23697502" DesignTimeRemark="Es gibt zwei Höhenangaben, aber keine ist fest gegeben: Winkel und Länge zählen">
@@ -13369,28 +13369,6 @@ SSGConnectionPoint.x_M
 															<EXP><![CDATA[$=$Abs(Round(L1*Tan(DegToRad(winkel)),2))]]></EXP>
 															<PAR Name="AdvancedOptions" />
 														</SET>
-														<IFTHENELSE Id="RDK:26481450" DesignTimeRemark="Winkel-&gt; Lth übernimmt">
-															<VALUECONDITION Value="true">
-																<EXP><![CDATA[$=$FesteL_th]]></EXP>
-															</VALUECONDITION>
-															<GROUP Id="RDK:26481449" SubType="Then">
-																<SET Id="RDK:26481448" VarRef="L1">
-																	<EXP><![CDATA[$=$L_th]]></EXP>
-																	<PAR Name="AdvancedOptions" />
-																</SET>
-															</GROUP>
-														</IFTHENELSE>
-														<IFTHENELSE Id="RDK:23134057" DesignTimeRemark="Nur Länge ist fixiert, ">
-															<VALUECONDITION Value="true">
-																<EXP><![CDATA[$=$FesteL1]]></EXP>
-															</VALUECONDITION>
-															<GROUP Id="RDK:23134056" SubType="Then" DesignTimeRemark="Höhen sind bestimmt aber nicht fix -&gt; winkel">
-																<SET Id="RDK:23697358" VarRef="winkel">
-																	<EXP><![CDATA[$=$Round(RadToDeg(ATAN(Abs(HoeheOben-HoeheUnten)/L1)),1)]]></EXP>
-																	<PAR Name="AdvancedOptions" />
-																</SET>
-															</GROUP>
-														</IFTHENELSE>
 													</GROUP>
 													<GROUP Id="RDK:26450670" SubType="Else">
 														<IFTHENELSE Id="RDK:23134048" DesignTimeRemark="Bestimme die Höhe oben und unten, je nach Wunsch grösser/kleiner einer Höhe">
@@ -26285,25 +26263,27 @@ ShapeList["id="+Param.Input[1].shapeID].name
 										<PAR Name="Key">
 											<EXP><![CDATA[$C$shapeId_0]]></EXP>
 										</PAR>
+										<PAR Name="StrArr" />
+										<PAR Name="StrArr2D" />
 										<PAR Name="Str">
 											<EXP><![CDATA[$=$Param.Input]]></EXP>
 										</PAR>
 										<PAR Name="Dbl" />
 										<PAR Name="Int" />
 										<PAR Name="Boo" />
-										<PAR Name="StrArr" />
 									</SET_STRUCT>
 									<SET_STRUCT Id="RDK:19841626" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
 										<PAR Name="Key">
 											<EXP><![CDATA[$C$shapeId_1]]></EXP>
 										</PAR>
+										<PAR Name="StrArr" />
+										<PAR Name="StrArr2D" />
 										<PAR Name="Str">
 											<EXP><![CDATA[$=$shape_item.id]]></EXP>
 										</PAR>
 										<PAR Name="Dbl" />
 										<PAR Name="Int" />
 										<PAR Name="Boo" />
-										<PAR Name="StrArr" />
 									</SET_STRUCT>
 									<CALLFUNCTION Id="RDK:19841627">
 										<PAR Name="FuncName">
@@ -39844,7 +39824,7 @@ me.x
 								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Kurve"]]></EXP>
 							</VALUECONDITION>
 							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Foerderer"]]></EXP>
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="VarioFoerderer"]]></EXP>
 							</VALUECONDITION>
 							<VALUECONDITION Value="true" Oper="OR">
 								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Gefaellestrecke"]]></EXP>
@@ -45559,7 +45539,7 @@ me.x
 									</VALUECONDITION>
 									<GROUP Id="RDK:26448196" SubType="Then">
 										<SET Id="RDK:26448195" VarRef="AnzahlUmlenkVarioFörderer">
-											<EXP><![CDATA[$=$AnzahlUmlenkVarioFördererr+1]]></EXP>
+											<EXP><![CDATA[$=$AnzahlUmlenkVarioFörderer+1]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
 									</GROUP>
@@ -50403,6 +50383,7 @@ me.x
 							<EXP><![CDATA[$C$cpId]]></EXP>
 						</PAR>
 						<PAR Name="StrArr" />
+						<PAR Name="StrArr2D" />
 						<PAR Name="Str">
 							<EXP><![CDATA[$=$cps_verbunden[0]]]></EXP>
 						</PAR>
@@ -50611,7 +50592,7 @@ me.x
 								</PAR>
 								<PAR Name="Options" />
 							</CALLFUNCTION>
-							<CALLFUNCTION Id="RDK:25950488">
+							<CALLFUNCTION Id="RDK:25950488" Suppressed="True">
 								<PAR Name="FuncName">
 									<EXP><![CDATA[$C$Calculate Gefaellestrecke]]></EXP>
 								</PAR>
@@ -52634,6 +52615,7 @@ me.x
 					<PAR Name="Int" />
 					<PAR Name="Boo" />
 					<PAR Name="StrArr" />
+					<PAR Name="StrArr2D" />
 				</SET_STRUCT>
 				<SET_STRUCT Id="RDK:18827138" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
 					<PAR Name="Key">