From 9a9a71ce704244dfb9587356c13570fcd809c30f Mon Sep 17 00:00:00 2001
From: mistangl <m.stangl@schoenenberger.de>
Date: Wed, 29 Jan 2025 12:29:55 +0100
Subject: [PATCH] =?UTF-8?q?BUGFIX:=20Bezeichner=20von=20Gef=C3=A4llestreck?=
 =?UTF-8?q?en=20etc.=20wurden=20beim=20Mustern=20nicht=20aus=20den=20Namen?=
 =?UTF-8?q?=20der=20neuen=20Objekte=20abgeleitet.=20FIX:=20Beschreibung=20?=
 =?UTF-8?q?beim=20Export=20der=20Weichen=20enth=C3=A4lt=20jetzt=20auch=20d?=
 =?UTF-8?q?ie=20richigen=20Referenzen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 127 ++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 105 insertions(+), 22 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 4d38592..ccf2a50 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-01-28T11:52:28" LanguageVersion="2014.1.3.699" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2025-01-29T12:28:43" 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">
@@ -1175,7 +1175,6 @@
 			<VAR Id="RDK:20857929" Name="groupStrings" Type="string[]" DesignTimeRemark="Enthält ; separtiert alle Strings, damit die Gruppen beschrieben werden können. a;b;c wäre z.B. eine Gruppe aus den Objekten a, b und c" />
 			<VAR Id="RDK:22342749" Name="CountKeys" Type="SSGDictInt[]" DesignTimeRemark="Array von Key-Value paaren, um sich die Anzahl von Key  in Value zu merken. Dient zum Zählen" />
 			<VAR Id="RDK:22938910" Name="KeyValues" Type="SSGDictArr[]" DesignTimeRemark="Array von Key-Value paaren, um sich eine liste von Begriffen zu einem Key zu merken" />
-			<VAR Id="RDK:22955433" Name="kv" Type="string" DesignTimeRemark="Generated by RD" />
 		</GROUP>
 		<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
 			<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
@@ -21064,6 +21063,7 @@ me.x
 					<PAR Name="includeInBOM" />
 					<PAR Name="KurveDefinition" />
 					<PAR Name="KurveFoerdererDefinition" />
+					<PAR Name="VarioFoerdererDefinition" />
 				</SET_STRUCT>
 				<SET_STRUCT Id="RDK:20732587" VarRef="Property_Prototype" DesignTimeRemark="Id Nullen, damit in Folge eine neue erzeugt wird.">
 					<PAR Name="id">
@@ -21736,7 +21736,8 @@ me.x
 						<EXP><![CDATA[$V$]]></EXP>
 					</PAR>
 					<GROUP Id="RDK:20689948" Name="Local Variables" SubType="VarSet" IncludeDate="0">
-						<VAR Id="RDK:20689950" Name="shape_index" Type="string" />
+						<VAR Id="RDK:20689950" Name="oldName" Type="string" />
+						<VAR Id="RDK:22972768" Name="shape_index" Type="string" />
 						<VAR Id="RDK:20733338" Name="newId" Type="string" />
 						<VAR Id="RDK:20741541" Name="orientierung" Type="string" />
 						<VAR Id="RDK:20689944" Name="shapeId_kreisel1" Type="string" />
@@ -22033,6 +22034,7 @@ me.x
 									</PAR>
 									<PAR Name="Int" />
 									<PAR Name="Boo" />
+									<PAR Name="StrArr" />
 								</SET_STRUCT>
 								<SET_STRUCT Id="RDK:20733333" VarRef="SSGParameter" ClearAll="True" ListRef="Offsets">
 									<PAR Name="Key">
@@ -22093,6 +22095,10 @@ me.x
 									</PAR>
 									<PAR Name="Options" />
 								</CALLFUNCTION>
+								<SET Id="RDK:22972770" VarRef="ShapeList[&quot;id=&quot;+newId].GefaelleDefinition.Beschreibung" Bookmarked="True">
+									<EXP><![CDATA[$=$Shape_Prototype.name]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 								<SET Id="RDK:20773269" VarRef="LinkTo">
 									<EXP><![CDATA[$C$NOTHING]]></EXP>
 									<PAR Name="AdvancedOptions" />
@@ -22182,6 +22188,10 @@ me.x
 									</PAR>
 									<PAR Name="Options" />
 								</CALLFUNCTION>
+								<SET Id="RDK:22972772" VarRef="ShapeList[&quot;id=&quot;+newId].FoerdererDefinition.Beschreibung" Bookmarked="True">
+									<EXP><![CDATA[$=$Shape_Prototype.name]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 								<SET_STRUCT Id="RDK:20733342" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
 									<PAR Name="Key">
 										<EXP><![CDATA[$C$newId]]></EXP>
@@ -22221,6 +22231,10 @@ me.x
 									</PAR>
 									<PAR Name="Options" />
 								</CALLFUNCTION>
+								<SET Id="RDK:22972774" VarRef="ShapeList[&quot;id=&quot;+newId].VarioFoerdererDefinition.Beschreibung" Bookmarked="True">
+									<EXP><![CDATA[$=$Shape_Prototype.name]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 								<SET_STRUCT Id="RDK:22071754" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
 									<PAR Name="Key">
 										<EXP><![CDATA[$C$newId]]></EXP>
@@ -22681,6 +22695,12 @@ me.x
 					<VAR Id="RDK:22353236" Name="isWritten" Type="boolean" />
 					<VAR Id="RDK:22353222" Name="alreadyWritten" Type="string[]" />
 					<VAR Id="RDK:22353208" Name="number" Type="integer" />
+					<VAR Id="RDK:22966980" Name="lineNumber" Type="integer">
+						<SET Id="RDK:22966981" VarRef="Me">
+							<EXP><![CDATA[$C$0]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</VAR>
 					<VAR Id="RDK:22943902" Name="bezeichnungen" Type="string[]" />
 					<VAR Id="RDK:22955413" Name="name" Type="string" />
 				</GROUP>
@@ -22795,7 +22815,7 @@ me.x
 						</PAR>
 						<PAR Name="Options" />
 					</CALLFUNCTION>
-					<CALLFUNCTION Id="RDK:22943899">
+					<CALLFUNCTION Id="RDK:22943899" DesignTimeRemark="Hole die Namen aller &quot;gleichen&quot; Elemente unter diesem AttributId">
 						<PAR Name="FuncName">
 							<EXP><![CDATA[$C$GetValues]]></EXP>
 						</PAR>
@@ -22807,7 +22827,7 @@ me.x
 						</PAR>
 						<PAR Name="Options" />
 					</CALLFUNCTION>
-					<CALLFUNCTION Id="RDK:22957106">
+					<CALLFUNCTION Id="RDK:22957106" DesignTimeRemark="und baue daraus einen Namen">
 						<PAR Name="FuncName">
 							<EXP><![CDATA[$C$BuildItemsName]]></EXP>
 						</PAR>
@@ -22853,9 +22873,13 @@ me.x
 								</PAR>
 								<PAR Name="POS_TO_ADD" />
 							</LIST_ADD>
+							<SET Id="RDK:22966982" VarRef="lineNumber">
+								<EXP><![CDATA[$=$lineNumber + 1]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
 							<SET_STRUCT Id="RDK:22342695" VarRef="Sivas_Item" ClearAll="True">
 								<PAR Name="Elementnummer">
-									<EXP><![CDATA[$=$CSV_Item.Elementnummer]]></EXP>
+									<EXP><![CDATA[$=$lineNumber]]></EXP>
 								</PAR>
 								<PAR Name="TeileArt">
 									<EXP><![CDATA[$=$CSV_Item.TeileArt]]></EXP>
@@ -22892,9 +22916,13 @@ me.x
 					</PAR>
 					<PAR Name="Options" />
 				</CALLFUNCTION>
+				<SET Id="RDK:22966984" VarRef="lineNumber">
+					<EXP><![CDATA[$=$lineNumber + 1]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
 				<SET_STRUCT Id="RDK:22537198" VarRef="Sivas_Item" ClearAll="True">
 					<PAR Name="Elementnummer">
-						<EXP><![CDATA[$=$CSV_Item.Elementnummer]]></EXP>
+						<EXP><![CDATA[$=$lineNumber]]></EXP>
 					</PAR>
 					<PAR Name="TeileArt">
 						<EXP><![CDATA[$=$CSV_Item.TeileArt]]></EXP>
@@ -22906,7 +22934,7 @@ me.x
 						<EXP><![CDATA[$=$CSV_Item.Bezeichnung]]></EXP>
 					</PAR>
 					<PAR Name="Anzahl">
-						<EXP><![CDATA[$=$number]]></EXP>
+						<EXP><![CDATA[$C$1]]></EXP>
 					</PAR>
 					<PAR Name="Merkmale">
 						<EXP><![CDATA[$=$CSV_Item.Merkmale]]></EXP>
@@ -23033,20 +23061,75 @@ me.x
 					<EXP><![CDATA[$=$StrBefore(RemoveQuote(allNames[0]), " :") + " :"]]></EXP>
 					<PAR Name="AdvancedOptions" />
 				</SET>
-				<FOREACHLOOP Id="RDK:22955430" ItemVarRef="name">
-					<PAR Name="ArrayValueExp">
-						<EXP><![CDATA[$=$allNames]]></EXP>
-					</PAR>
-					<PAR Name="ExitCondExp">
-						<EXP><![CDATA[$V$]]></EXP>
-					</PAR>
-					<LIST_ADD Id="RDK:22957111" ListRef="parts">
-						<PAR Name="VALUE_TO_ADD">
-							<EXP><![CDATA[$=$ReplaceByRegExp(RemoveQuote(name), "^.*:", "")]]></EXP>
-						</PAR>
-						<PAR Name="POS_TO_ADD" />
-					</LIST_ADD>
-				</FOREACHLOOP>
+				<IFTHENELSE Id="RDK:22972775" DesignTimeRemark="Weichen erfordern eine Kürzung der Beschreibung">
+					<VALUECONDITION Value="true">
+						<EXP><![CDATA[$=$StrIndexOf(base, "zw.", 0) > 0]]></EXP>
+					</VALUECONDITION>
+					<GROUP Id="RDK:22972776" SubType="Then">
+						<SET Id="RDK:22972810" VarRef="base">
+							<EXP><![CDATA[$C$Weiche:]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:22972788" VarRef="allNames">
+							<EXP><![CDATA[$=$StrReplaceOnItems(allNames, "Kreisel", "K")]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:22972790" VarRef="allNames">
+							<EXP><![CDATA[$=$StrReplaceOnItems(allNames, "Eckrad", "E")]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:22972792" VarRef="allNames">
+							<EXP><![CDATA[$=$StrReplaceOnItems(allNames, "VarioFoerderer", "VF")]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:22972794" VarRef="allNames">
+							<EXP><![CDATA[$=$StrReplaceOnItems(allNames, "Förderer", "F")]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:22972802" VarRef="allNames">
+							<EXP><![CDATA[$=$StrReplaceOnItems(allNames, "zw. ", "")]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:22972804" VarRef="allNames">
+							<EXP><![CDATA[$=$StrReplaceOnItems(allNames, " und ", "-")]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:22972806" VarRef="allNames">
+							<EXP><![CDATA[$=$StrReplaceOnItems(allNames, " :", "")]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<FOREACHLOOP Id="RDK:22972817" ItemVarRef="name">
+							<PAR Name="ArrayValueExp">
+								<EXP><![CDATA[$=$allNames]]></EXP>
+							</PAR>
+							<PAR Name="ExitCondExp">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<LIST_ADD Id="RDK:22972816" ListRef="parts">
+								<PAR Name="VALUE_TO_ADD">
+									<EXP><![CDATA[$=$RemoveQuote(name)]]></EXP>
+								</PAR>
+								<PAR Name="POS_TO_ADD" />
+							</LIST_ADD>
+						</FOREACHLOOP>
+					</GROUP>
+					<GROUP Id="RDK:22972813" SubType="Else">
+						<FOREACHLOOP Id="RDK:22955430" ItemVarRef="name">
+							<PAR Name="ArrayValueExp">
+								<EXP><![CDATA[$=$allNames]]></EXP>
+							</PAR>
+							<PAR Name="ExitCondExp">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<LIST_ADD Id="RDK:22957111" ListRef="parts">
+								<PAR Name="VALUE_TO_ADD">
+									<EXP><![CDATA[$=$ReplaceByRegExp(RemoveQuote(name), "^.*:", "")]]></EXP>
+								</PAR>
+								<PAR Name="POS_TO_ADD" />
+							</LIST_ADD>
+						</FOREACHLOOP>
+					</GROUP>
+				</IFTHENELSE>
 				<SET Id="RDK:22955426" VarRef="Param.Result">
 					<EXP><![CDATA[$=$addQuote(base + ListToStr(parts, ","))]]></EXP>
 					<PAR Name="AdvancedOptions" />