From b05f46010c59ff6928c9de67414ca6f3cbd50686 Mon Sep 17 00:00:00 2001
From: Simon Schmutzler <s.schmutzler@schoenenberger.de>
Date: Fri, 7 Jun 2024 10:47:02 +0200
Subject: [PATCH] =?UTF-8?q?Foerderer=5FDefault=20mit=20angepasster=20Strok?=
 =?UTF-8?q?e=20Farbe=20als=20XML=20f=C3=BCr=20die=20programmatische=20?=
 =?UTF-8?q?=C3=84nderung=20der=20Farbe=20eingef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SSG/shapes/props/Foerderer_Default.txt    |  55 ++++++++++
 .../SSG/shapes/svg/Foerderer_Default.xml      |  11 ++
 .../SSG/shapes/svg/Foerderer_Richtig.xml      |   2 +-
 MAIN_SSG.rdx                                  | 103 ++++++++++++++----
 4 files changed, 147 insertions(+), 24 deletions(-)
 create mode 100644 Editor2DLibrary/SSG/shapes/props/Foerderer_Default.txt
 create mode 100644 Editor2DLibrary/SSG/shapes/svg/Foerderer_Default.xml

diff --git a/Editor2DLibrary/SSG/shapes/props/Foerderer_Default.txt b/Editor2DLibrary/SSG/shapes/props/Foerderer_Default.txt
new file mode 100644
index 0000000..21c725e
--- /dev/null
+++ b/Editor2DLibrary/SSG/shapes/props/Foerderer_Default.txt
@@ -0,0 +1,55 @@
+{
+  "shapeMode": 0,
+  "name": "Etagenförderer_Default",
+  "family": "Foerderer",
+  "description": "ETF",
+  "icon": "SSG/shapes/img/Foerderer_32.png",
+  "iconBig": "SSG/shapes/img/Foerderer_64.png",
+  "srcSVG": "SSG/shapes/svg/Foerderer_Default.xml",
+  "text": "^",
+  "width": 377.9528,
+  "height": 6047.2441,
+  "depth": 755.9055,
+  "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)",
+  "connectionPoints": [
+    {
+      "id": "cp1",
+      "x": 500.0,
+      "y": 0.0,
+      "z": 0.0,
+      "xMin": "",
+      "xMax": "",
+      "xStep": "",
+      "yMin": "",
+      "yMax": "",
+      "yStep": "",
+      "zMin": "",
+      "zMax": "",
+      "zStep": "",
+      "direction": 0.0,
+      "linkClass": "Gefaellestrecke",
+      "label": "H_1",
+      "isDimension": true
+    },
+    {
+      "id": "cp2",
+      "x": 500.0,
+      "y": 1000.0,
+      "z": 0.0,
+      "xMin": "",
+      "xMax": "",
+      "xStep": "",
+      "yMin": "",
+      "yMax": "",
+      "yStep": "",
+      "zMin": "",
+      "zMax": "",
+      "zStep": "",
+      "direction": 180.0,
+      "linkClass": "Gefaellestrecke",
+      "label": "H_0",
+      "isDimension": true
+    }
+  ],
+  "eventClass": "OnInserted,OnDoubleclick,OnPasted,OnLinked"
+}
\ No newline at end of file
diff --git a/Editor2DLibrary/SSG/shapes/svg/Foerderer_Default.xml b/Editor2DLibrary/SSG/shapes/svg/Foerderer_Default.xml
new file mode 100644
index 0000000..25f136c
--- /dev/null
+++ b/Editor2DLibrary/SSG/shapes/svg/Foerderer_Default.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+  <g transform="rotate(0)">
+    <svg viewBox="0 0 26.45833 264.58333" preserveAspectRatio="none" position="absolute" overflow="visible">
+      <defs />
+      <g transform="translate(0,-13.203638)">
+        <path style="opacity:0.94;fill:none;stroke-opacity:1" d="M 13.65157,13.203638 V 277.78696" stroke-width="1px" stroke="#ffa700"/>
+      </g>
+    </svg>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/Editor2DLibrary/SSG/shapes/svg/Foerderer_Richtig.xml b/Editor2DLibrary/SSG/shapes/svg/Foerderer_Richtig.xml
index ed43a36..065afba 100644
--- a/Editor2DLibrary/SSG/shapes/svg/Foerderer_Richtig.xml
+++ b/Editor2DLibrary/SSG/shapes/svg/Foerderer_Richtig.xml
@@ -4,7 +4,7 @@
     <svg viewBox="0 0 26.45833 264.58333" preserveAspectRatio="none" position="absolute" overflow="visible">
       <defs />
       <g transform="translate(0,-13.203638)">
-        <path style="opacity:0.94;fill:none;stroke:#7284ff;stroke-opacity:1" d="M 13.65157,13.203638 V 277.78696" stroke-width="1px" />
+        <path style="opacity:0.94;fill:none;stroke-opacity:1" d="M 13.65157,13.203638 V 277.78696" stroke-width="1px" stroke="#7284ff"/>
       </g>
     </svg>
   </g>
diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index a5e4a17..1183c59 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-06T16:26:46" LanguageVersion="2014.1.3.673" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-06-07T10:45:41" 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">
@@ -4446,7 +4446,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="BTMTBeladungDefinition" />
 										<PAR Name="BTMTEntladungDefinition" />
 										<PAR Name="source">
-											<EXP><![CDATA[$=$IIF(Shape_Prototype.FoerdererDefinition.LH_fits=True,"Foerderer_Richtig","Foerderer_Falsch")]]></EXP>
+											<EXP><![CDATA[$=$"Foerderer_Default"]]></EXP>
 										</PAR>
 										<PAR Name="sourceLibrary">
 											<EXP><![CDATA[$=$GS2DLibraryName]]></EXP>
@@ -6976,7 +6976,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<EXP><![CDATA[$=$Round(L1/x_verhaeltnis, 2)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
-									<SET Id="RDK:18656459" VarRef="Shape_Prototype.FoerdererDefinition.LH_fits" DesignTimeRemark="LH_fits == True, in Ordnung , blau dargestellt">
+									<SET Id="RDK:18656459" VarRef="Shape_Prototype.FoerdererDefinition.LH_fits" DesignTimeRemark="LH_fits == True, in Ordnung">
 										<EXP><![CDATA[$=$True]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
@@ -7918,18 +7918,6 @@ 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>
@@ -8030,10 +8018,22 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 													<EXP><![CDATA[$C$^ Gelb]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
-												<SET Id="RDK:18767994" VarRef="ShapeList[LinkIndex].lineColor">
+												<SET Id="RDK:18767994" VarRef="ShapeList[LinkIndex].lineColor" Suppressed="True">
 													<EXP><![CDATA[$C$orange]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
+												<CALLFUNCTION Id="RDK:19341159">
+													<PAR Name="FuncName">
+														<EXP><![CDATA[$C$SetStatus_Undef]]></EXP>
+													</PAR>
+													<PAR Name="InputExp">
+														<EXP><![CDATA[$=$Link]]></EXP>
+													</PAR>
+													<PAR Name="ResultRef">
+														<EXP><![CDATA[$V$]]></EXP>
+													</PAR>
+													<PAR Name="Options" />
+												</CALLFUNCTION>
 											</GROUP>
 										</GROUP>
 									</IFTHENELSE>
@@ -8146,10 +8146,22 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 														<EXP><![CDATA[$C$Gelb]]></EXP>
 														<PAR Name="AdvancedOptions" />
 													</SET>
-													<SET Id="RDK:18768000" VarRef="ShapeList[TempLinkIndex].lineColor">
+													<SET Id="RDK:18768000" VarRef="ShapeList[TempLinkIndex].lineColor" Suppressed="True">
 														<EXP><![CDATA[$C$orange]]></EXP>
 														<PAR Name="AdvancedOptions" />
 													</SET>
+													<CALLFUNCTION Id="RDK:19357385">
+														<PAR Name="FuncName">
+															<EXP><![CDATA[$C$SetStatus_Undef]]></EXP>
+														</PAR>
+														<PAR Name="InputExp">
+															<EXP><![CDATA[$=$Link]]></EXP>
+														</PAR>
+														<PAR Name="ResultRef">
+															<EXP><![CDATA[$V$]]></EXP>
+														</PAR>
+														<PAR Name="Options" />
+													</CALLFUNCTION>
 												</GROUP>
 											</IFTHENELSE>
 										</CASEGROUP>
@@ -8464,10 +8476,22 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 												<EXP><![CDATA[$C$Gelb]]></EXP>
 												<PAR Name="AdvancedOptions" />
 											</SET>
-											<SET Id="RDK:18768027" VarRef="ShapeList[LinkIndex].lineColor">
+											<SET Id="RDK:18768027" VarRef="ShapeList[LinkIndex].lineColor" Suppressed="True">
 												<EXP><![CDATA[$C$orange]]></EXP>
 												<PAR Name="AdvancedOptions" />
 											</SET>
+											<CALLFUNCTION Id="RDK:19360766">
+												<PAR Name="FuncName">
+													<EXP><![CDATA[$C$SetStatus_Undef]]></EXP>
+												</PAR>
+												<PAR Name="InputExp">
+													<EXP><![CDATA[$=$Link]]></EXP>
+												</PAR>
+												<PAR Name="ResultRef">
+													<EXP><![CDATA[$V$]]></EXP>
+												</PAR>
+												<PAR Name="Options" />
+											</CALLFUNCTION>
 										</GROUP>
 									</CASEGROUP>
 								</SELECTCASE>
@@ -10194,6 +10218,39 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 									</PAR>
 									<PAR Name="Options" />
 								</CALLFUNCTION>
+								<IFTHENELSE Id="RDK:19396618">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$Shape_Prototype.FoerdererDefinition.LH_fits]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:19396619" SubType="Then">
+										<CALLFUNCTION Id="RDK:19396617">
+											<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:19396620" SubType="Else">
+										<CALLFUNCTION Id="RDK:19396624">
+											<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>
 							<GROUP Id="RDK:18116642" Name="Gefaellestrecke HoeheOben OR HoeheUnten was changed" SubType="Generic" DesignTimeNotes="20231005 -1-&#xD;&#xA;&#xD;&#xA;Inherit height to direct Shaps and set others to Gelb (except Kreisel Groups).">
 								<VALUECONDITION Value="true" Oper="OR">
@@ -15841,7 +15898,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 				</GROUP>
 				<IFTHENELSE Id="RDK:19290219">
 					<VALUECONDITION Value="true">
-						<EXP><![CDATA[$=$IndexOfByFieldValue(ShapeList, "id", shape_item.id) > 0]]></EXP>
+						<EXP><![CDATA[$=$IndexOfByFieldValue(ShapeList, "id", shape_item.id) > -1]]></EXP>
 					</VALUECONDITION>
 					<GROUP Id="RDK:19290215" SubType="Then">
 						<SET Id="RDK:19290301" VarRef="color">
@@ -15853,7 +15910,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<EXP><![CDATA[$C$id]]></EXP>
 							</PAR>
 							<PAR Name="Str">
-								<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+								<EXP><![CDATA[$=$Param.Input]]></EXP>
 							</PAR>
 							<PAR Name="Dbl" />
 							<PAR Name="Int" />
@@ -15898,7 +15955,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 				</GROUP>
 				<IFTHENELSE Id="RDK:19290373">
 					<VALUECONDITION Value="true">
-						<EXP><![CDATA[$=$IndexOfByFieldValue(ShapeList, "id", shape_item.id) > 0]]></EXP>
+						<EXP><![CDATA[$=$IndexOfByFieldValue(ShapeList, "id", shape_item.id) > -1]]></EXP>
 					</VALUECONDITION>
 					<GROUP Id="RDK:19290370" SubType="Then">
 						<SET Id="RDK:19290442" VarRef="color">
@@ -15910,7 +15967,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<EXP><![CDATA[$C$id]]></EXP>
 							</PAR>
 							<PAR Name="Str">
-								<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+								<EXP><![CDATA[$=$Param.Input]]></EXP>
 							</PAR>
 							<PAR Name="Dbl" />
 							<PAR Name="Int" />
@@ -16022,7 +16079,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<EXP><![CDATA[$C$id]]></EXP>
 							</PAR>
 							<PAR Name="Str">
-								<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+								<EXP><![CDATA[$=$Param.Input]]></EXP>
 							</PAR>
 							<PAR Name="Dbl" />
 							<PAR Name="Int" />