From d0e333859a48985ecea779b310681b898d1770a5 Mon Sep 17 00:00:00 2001
From: dre <reif@pbu-cad.de>
Date: Mon, 20 Nov 2023 16:16:54 +0100
Subject: [PATCH] Bugfix ERK-64

---
 MAIN_SSG.rdx | 73 ++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 60 insertions(+), 13 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index fa8636c..866e11f 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-11-20T15:12:52" LanguageVersion="2014.1.3.618" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="dre [NBDELP3561-04C]" ModDate="2023-11-20T16:16:06" LanguageVersion="2014.1.3.618" />
 	<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">
@@ -69,6 +69,7 @@
 					<TYPE_VALUES />
 					<FIELD Id="RDK:79643" Name="SivasNummer" Type="string" />
 					<FIELD Id="RDK:1561689" Name="Rotationsklasse" Type="string" />
+					<FIELD Id="RDK:1630764" Name="IDCounter" Type="integer" />
 					<FIELD Id="RDK:122039" Name="KreiselDefinition" Type="KreiselType" />
 					<FIELD Id="RDK:1520553" Name="EckradDefinition" Type="EckradType" />
 					<FIELD Id="RDK:412309" Name="GefaelleDefinition" Type="GefaelleType" />
@@ -834,6 +835,7 @@
 			<VAR Id="RDK:1054119" Name="Trace" Type="string" DesignTimeRemark="Generated by RD" />
 			<VAR Id="RDK:1241416" Name="ExportSnapshot" Type="string" DesignTimeRemark="Generated by RD" />
 			<VAR Id="RDK:1519830" Name="SessionZip" Type="string" />
+			<VAR Id="RDK:1621335" Name="ID" Type="string" DesignTimeRemark="Generated by RD" />
 		</GROUP>
 		<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
 			<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
@@ -7819,6 +7821,20 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 					<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID]]]></EXP>
 					<PAR Name="AdvancedOptions" />
 				</SET>
+				<CALLFUNCTION Id="RDK:1630769">
+					<PAR Name="FuncName">
+						<EXP><![CDATA[$C$GetNewShapeID]]></EXP>
+					</PAR>
+					<PAR Name="InputExp" />
+					<PAR Name="ResultRef">
+						<EXP><![CDATA[$V$]]></EXP>
+					</PAR>
+					<PAR Name="Options" />
+				</CALLFUNCTION>
+				<SET Id="RDK:1632453" VarRef="Shape_Prototype.name">
+					<EXP><![CDATA[$=$Shape_Prototype.family+" :"+Shape_Prototype.IDCounter]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
 				<SELECTCASE Id="RDK:426769">
 					<EXP><![CDATA[$=$Shape_Prototype.family]]></EXP>
 					<CASEGROUP Id="RDK:426771" CaseType="0">
@@ -7835,10 +7851,6 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 							<EXP><![CDATA[$C$Strecke]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SET Id="RDK:426764" VarRef="Shape_Prototype.name">
-							<EXP><![CDATA[$=$Shape_Prototype.name+":"+Count(FilterByFieldValue(ShapeList, "family", Shape_Prototype.family))]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
 						<SET Id="RDK:946585" VarRef="Shape_Prototype.KreiselDefinition.Beschreibung">
 							<EXP><![CDATA[$=$Shape_Prototype.name]]></EXP>
 							<PAR Name="AdvancedOptions" />
@@ -7998,10 +8010,6 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 							<EXP><![CDATA[$C$Strecke]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SET Id="RDK:1520439" VarRef="Shape_Prototype.name">
-							<EXP><![CDATA[$=$Shape_Prototype.name+":"+Count(FilterByFieldValue(ShapeList, "family", Shape_Prototype.family))]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
 						<SET Id="RDK:1520441" VarRef="Shape_Prototype.EckradDefinition.Beschreibung">
 							<EXP><![CDATA[$=$Shape_Prototype.name]]></EXP>
 							<PAR Name="AdvancedOptions" />
@@ -8133,10 +8141,6 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 							<EXP><![CDATA[$C$Strecke]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SET Id="RDK:839935" VarRef="Shape_Prototype.name">
-							<EXP><![CDATA[$=$Shape_Prototype.name+":"+Count(FilterByFieldValue(ShapeList, "family", Shape_Prototype.family))]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
 						<GROUP Id="RDK:837502" Name="UI" SubType="Generic">
 							<ACTION_CALL Id="RDK:837498" Name="RDEngineering_RemoteRedirect" DesignTimeRemark="{Action Mode} {Url}" DesignTimeNotes="(CLOSEBUTTON)(TITLE=TITOLO DEL POP UP)(TITLECOLOR=#000000)(TITLEBACKCOLOR=RED)(STARTPOSITION=bottom)(NOPADDING)(DRAGGABLE)">
 								<PAR Name="RDLibraryName">
@@ -8927,6 +8931,43 @@ me.x
 			</FUNCTION>
 			<FUNCTION Id="RDK:289" Name="OnEditor2DPasted" InputTypeName="Editor2DEventArgumentsTypeList" Options="(TYPEFUNCTION)">
 				<COMMENTS Id="RDK:383198" />
+				<GROUP Id="RDK:1645267" Name="Local Variables" SubType="VarSet" IncludeDate="0">
+					<VAR Id="RDK:1645268" Name="IDs" Type="string[]" />
+				</GROUP>
+				<SET Id="RDK:1645269" VarRef="IDs">
+					<EXP><![CDATA[$=$StrArrayFromListOfStructs(Param.Input, "shapeID")]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+				<FOREACHLOOP Id="RDK:1620226" ItemVarRef="ID" ByRefMode="True">
+					<PAR Name="ArrayValueExp">
+						<EXP><![CDATA[$=$IDs]]></EXP>
+					</PAR>
+					<PAR Name="ExitCondExp">
+						<EXP><![CDATA[$V$]]></EXP>
+					</PAR>
+					<SET Id="RDK:1640253" VarRef="Shape_Prototype">
+						<EXP><![CDATA[$=$ShapeList["id="+ID]]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<CALLFUNCTION Id="RDK:1630771">
+						<PAR Name="FuncName">
+							<EXP><![CDATA[$C$GetNewShapeID]]></EXP>
+						</PAR>
+						<PAR Name="InputExp" />
+						<PAR Name="ResultRef">
+							<EXP><![CDATA[$V$]]></EXP>
+						</PAR>
+						<PAR Name="Options" />
+					</CALLFUNCTION>
+					<SET Id="RDK:1632455" VarRef="ShapeList[&quot;id=&quot;+ID].IDCounter">
+						<EXP><![CDATA[$=$Shape_Prototype.IDCounter]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<SET Id="RDK:1652512" VarRef="ShapeList[&quot;id=&quot;+ID].name">
+						<EXP><![CDATA[$=$Shape_Prototype.family+" :"+Shape_Prototype.IDCounter]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+				</FOREACHLOOP>
 			</FUNCTION>
 			<FUNCTION Id="RDK:290" Name="OnEditor2DRemoved" InputTypeName="Editor2DEventArgumentsTypeList" Options="(TYPEFUNCTION)" />
 			<FUNCTION Id="RDK:291" Name="OnEditor2DRotated" InputTypeName="Editor2DEventArgumentsTypeList" Options="(TYPEFUNCTION)" />
@@ -9808,6 +9849,12 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					</ACTION_CALL>
 				</GROUP>
 			</FUNCTION>
+			<FUNCTION Id="RDK:1630766" Name="GetNewShapeID" InputTypeName="string">
+				<SET Id="RDK:1630768" VarRef="Shape_Prototype.IDCounter" ByRef="True">
+					<EXP><![CDATA[$=$FieldValue(LastOf(SortListOfStructs(FilterByFieldValue(ShapeList, "family", Shape_Prototype.family), "IDCounter", false)), "IDCounter")+1]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+			</FUNCTION>
 		</GROUP>
 	</GROUP>
 	<GROUP Id="RDK:0008" Name="Main Group" SubType="Generic" Expanded="True">