From b72978ac1594f84af380036bea1fb59da63d58d7 Mon Sep 17 00:00:00 2001
From: Simon Schmutzler <s.schmutzler@schoenenberger.de>
Date: Thu, 6 Jun 2024 16:29:41 +0200
Subject: [PATCH] =?UTF-8?q?Tempor=C3=A4rer=20commit=20um=20die=20direkte?=
 =?UTF-8?q?=20Farb=C3=A4nderung=20der=20Shapes=20mit=20einer=20Funktion=20?=
 =?UTF-8?q?zu=20=C3=BCberschreiben?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 175 ++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 151 insertions(+), 24 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 4b9f2be..a5e4a17 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="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-06-06T13:59:09" LanguageVersion="2014.1.3.673" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-06-06T16:26:46" LanguageVersion="2014.1.3.673" />
 	<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">
@@ -3728,7 +3728,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="Options" />
 									</ACTION_CALL>
 									<COMMENTS Id="RDK:18547250" Bookmarked="True" DesignTimeRemark="Inherit Rotation" />
-									<SET_STRUCT Id="RDK:18547251" VarRef="Shape_Prototype" ListRef="ShapeList" Options="$=$&quot;(REPLACEIDX=&quot;+i+&quot;)&quot;" Bookmarked="True" DesignTimeNotes="Shape.depth*Inch/DPI&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Shape_Prototype.KreiselDefinition.OrientierungHV&#xD;&#xA;IIF(Shape_Prototype.KreiselDefinition.OrientierungHV&lt;&gt;Shape_Prototype.rotation,Shape_Prototype.rotation,Shape_Prototype.KreiselDefinition.OrientierungHV)">
+									<SET_STRUCT Id="RDK:18547251" VarRef="Shape_Prototype" ListRef="ShapeList" Options="$=$&quot;(REPLACEIDX=&quot;+i+&quot;)&quot;" Suppressed="True" Bookmarked="True" DesignTimeNotes="Shape.depth*Inch/DPI&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Shape_Prototype.KreiselDefinition.OrientierungHV&#xD;&#xA;IIF(Shape_Prototype.KreiselDefinition.OrientierungHV&lt;&gt;Shape_Prototype.rotation,Shape_Prototype.rotation,Shape_Prototype.KreiselDefinition.OrientierungHV)">
 										<PAR Name="SivasNummer" />
 										<PAR Name="Rotationsklasse" />
 										<PAR Name="IDCounter" />
@@ -3802,6 +3802,80 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
 									</SET_STRUCT>
+									<SET_STRUCT Id="RDK:19341158" VarRef="Shape_Prototype" ListRef="ShapeList" Options="$=$&quot;(REPLACEIDX=&quot;+i+&quot;)&quot;" Bookmarked="True" DesignTimeNotes="Shape.depth*Inch/DPI&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Shape_Prototype.KreiselDefinition.OrientierungHV&#xD;&#xA;IIF(Shape_Prototype.KreiselDefinition.OrientierungHV&lt;&gt;Shape_Prototype.rotation,Shape_Prototype.rotation,Shape_Prototype.KreiselDefinition.OrientierungHV)">
+										<PAR Name="SivasNummer" />
+										<PAR Name="Rotationsklasse" />
+										<PAR Name="IDCounter" />
+										<PAR Name="KreiselDefinition" />
+										<PAR Name="EckradDefinition" />
+										<PAR Name="GefaelleDefinition" />
+										<PAR Name="StreckeDefinition" />
+										<PAR Name="FoerdererDefinition" />
+										<PAR Name="WeicheDefinition" />
+										<PAR Name="BTMTBeladungDefinition" />
+										<PAR Name="BTMTEntladungDefinition" />
+										<PAR Name="source">
+											<EXP><![CDATA[$=$"Gefaellestrecke_Default"]]></EXP>
+										</PAR>
+										<PAR Name="sourceLibrary">
+											<EXP><![CDATA[$=$GS2DLibraryName]]></EXP>
+										</PAR>
+										<PAR Name="signature" />
+										<PAR Name="id">
+											<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+										</PAR>
+										<PAR Name="name" />
+										<PAR Name="family" />
+										<PAR Name="description" />
+										<PAR Name="x" />
+										<PAR Name="y" />
+										<PAR Name="z" />
+										<PAR Name="width">
+											<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.width, "mm", 96)]]></EXP>
+										</PAR>
+										<PAR Name="height">
+											<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.height, "mm", 96)]]></EXP>
+										</PAR>
+										<PAR Name="depth">
+											<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.depth, "mm", 96)]]></EXP>
+										</PAR>
+										<PAR Name="rotation">
+											<EXP><![CDATA[$=$Shape_Prototype.rotation]]></EXP>
+										</PAR>
+										<PAR Name="text" />
+										<PAR Name="behaviour" />
+										<PAR Name="datadump" />
+										<PAR Name="path" />
+										<PAR Name="ctrl1x" />
+										<PAR Name="ctrl1y" />
+										<PAR Name="ctrl2x" />
+										<PAR Name="ctrl2y" />
+										<PAR Name="shapeFromId" />
+										<PAR Name="shapeFromPointIndex" />
+										<PAR Name="shapeToId" />
+										<PAR Name="shapeToPointIndex" />
+										<PAR Name="dimStack" />
+										<PAR Name="dimType" />
+										<PAR Name="dimDriving" />
+										<PAR Name="dimValue" />
+										<PAR Name="color" />
+										<PAR Name="colorOpacity" />
+										<PAR Name="color3D" />
+										<PAR Name="colorOpacity3D" />
+										<PAR Name="lineWidth" />
+										<PAR Name="lineColor" />
+										<PAR Name="lineOpacity" />
+										<PAR Name="lineColor3D" />
+										<PAR Name="lineOpacity3D" />
+										<PAR Name="links" />
+										<PAR Name="group" />
+										<PAR Name="layer" />
+										<PAR Name="connectionPoints" />
+										<PAR Name="modified" />
+										<PAR Name="pinned" />
+										<PAR Name="selected" />
+										<PAR Name="includeInBOM" />
+									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
 							<CASEGROUP Id="RDK:18732280" CaseType="0">
@@ -7844,6 +7918,30 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							<EXP><![CDATA[$C$#f33256]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
+						<CALLFUNCTION Id="RDK:19341159">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$SetStatus_False]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$Link]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+						<CALLFUNCTION Id="RDK:19341161">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$SetStatus_False]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$Link]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
 						<GROUP Id="RDK:1176848" Name="Set NOT direct linked Shapes to GELB or NOTHING" SubType="Generic" DesignTimeRemark="except Kreisel Groups">
 							<VALUECONDITION Value="false">
 								<EXP><![CDATA[$=$ListStrContains(Shape_Prototype.links, "*;" + Link)]]></EXP>
@@ -15224,11 +15322,19 @@ ShapeList["id="+Param.Input[1].shapeID].name
 				<GROUP Id="RDK:19265766" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
 					<VAR Id="RDK:19265765" Name="shape_item" Type="Editor2DShapeType" />
 				</GROUP>
+				<SET Id="RDK:19330348" VarRef="Param.Result">
+					<EXP><![CDATA[$=$True]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
 				<IFTHENELSE Id="RDK:19265769">
 					<VALUECONDITION Value="true">
 						<EXP><![CDATA[$=$IsEmpty(Param.Input)]]></EXP>
 					</VALUECONDITION>
 					<GROUP Id="RDK:19265768" SubType="Then">
+						<SET Id="RDK:19318853" VarRef="Param.Result">
+							<EXP><![CDATA[$=$False]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 						<EXIT_PROCESS Id="RDK:19265767" BreakType="4" ExitStatus="0" />
 					</GROUP>
 				</IFTHENELSE>
@@ -15368,18 +15474,39 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<EXP><![CDATA[$=$shape_item]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<CALLFUNCTION Id="RDK:19281369">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$SetStatus_Ok]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
+						<IFTHENELSE Id="RDK:19306684">
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$shape_item.GefaelleDefinition.LH_fits]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:19306685" SubType="Then">
+								<CALLFUNCTION Id="RDK:19281369">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$SetStatus_Ok]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+							</GROUP>
+							<GROUP Id="RDK:19306686" SubType="Else">
+								<CALLFUNCTION Id="RDK:19306690">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$SetStatus_False]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+							</GROUP>
+						</IFTHENELSE>
 					</GROUP>
 				</IFTHENELSE>
 			</FUNCTION>
@@ -15429,21 +15556,21 @@ ShapeList["id="+Param.Input[1].shapeID].name
 				</IFTHENELSE>
 			</FUNCTION>
 			<FUNCTION Id="RDK:1698052" Name="SetHeightOnConnect" InputTypeName="Editor2DEventArgumentsTypeList" ResultTypeName="SSGParameter[]">
+				<GROUP Id="RDK:1772339" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
+					<VAR Id="RDK:1772341" Name="item_0" Type="Editor2DShapeType" />
+					<VAR Id="RDK:1772343" Name="item_1" Type="Editor2DShapeType" />
+					<VAR Id="RDK:1772345" Name="cpId" Type="string" />
+					<VAR Id="RDK:1772347" Name="cp_kreiselpartner" Type="SSGConnectionPoint" />
+					<VAR Id="RDK:1772349" Name="kreiselhoehe" Type="double" />
+					<VAR Id="RDK:1782656" Name="jsonValues" Type="string" />
+					<VAR Id="RDK:1783805" Name="UebergabeListe" Type="SSGParameter[]" />
+					<VAR Id="RDK:18374136" Name="RueckgabeListe" Type="SSGParameter[]" />
+				</GROUP>
 				<GROUP Id="RDK:1698060" Name="Filter" SubType="Generic" DesignTimeNotes="(ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].family=&quot;Gefaellestrecke&quot; And  (ShapeList[&quot;id=&quot;+Param.Input[1].shapeID].Rotationsklasse=&quot;Rotationsobjekt&quot;and IsTagInString(Param.Input[1].connectionPointID, &quot;defcp&quot;)))  &#xA;Or &#xA;(ShapeList[&quot;id=&quot;+Param.Input[1].shapeID].family=&quot;Gefaellestrecke&quot; And  (ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].Rotationsklasse=&quot;Rotationsobjekt&quot; and IsTagInString(Param.Input[0].connectionPointID, &quot;defcp&quot;)))  &#xA;">
 					<VALUECONDITION Value="true">
 						<EXP><![CDATA[$=$(ShapeList["id="+Param.Input[0].shapeID].family="Kreisel" and (ShapeList["id="+Param.Input[1].shapeID].family="Gefaellestrecke") or ShapeList["id="+Param.Input[1].shapeID].family="Foerderer") or
 (ShapeList["id="+Param.Input[1].shapeID].family="Kreisel" and (ShapeList["id="+Param.Input[0].shapeID].family="Gefaellestrecke") or (ShapeList["id="+Param.Input[0].shapeID].family="Foerderer"))]]></EXP>
 					</VALUECONDITION>
-					<GROUP Id="RDK:1772339" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
-						<VAR Id="RDK:1772341" Name="item_0" Type="Editor2DShapeType" />
-						<VAR Id="RDK:1772343" Name="item_1" Type="Editor2DShapeType" />
-						<VAR Id="RDK:1772345" Name="cpId" Type="string" />
-						<VAR Id="RDK:1772347" Name="cp_kreiselpartner" Type="SSGConnectionPoint" />
-						<VAR Id="RDK:1772349" Name="kreiselhoehe" Type="double" />
-						<VAR Id="RDK:1782656" Name="jsonValues" Type="string" />
-						<VAR Id="RDK:1783805" Name="UebergabeListe" Type="SSGParameter[]" />
-						<VAR Id="RDK:18374136" Name="RueckgabeListe" Type="SSGParameter[]" />
-					</GROUP>
 					<SET Id="RDK:1707740" VarRef="item_0">
 						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID]]]></EXP>
 						<PAR Name="AdvancedOptions" />