From 615ff01faff391a1d3b0cb57d3fe6c841ba43cb7 Mon Sep 17 00:00:00 2001
From: Yuelin Wang <y.wang@schoenenberger.de>
Date: Mon, 15 Apr 2024 15:24:55 +0200
Subject: [PATCH] Updated MAIN-SSG.rdx - Foerderer Anpassung

---
 .../SSG/shapes/svg/Foerderer_Falsch.xml       |  11 +
 .../SSG/shapes/svg/Foerderer_Richtig.xml      |  11 +
 MAIN_SSG.rdx                                  | 229 +++++++++++++++++-
 3 files changed, 248 insertions(+), 3 deletions(-)
 create mode 100644 Editor2DLibrary/SSG/shapes/svg/Foerderer_Falsch.xml
 create mode 100644 Editor2DLibrary/SSG/shapes/svg/Foerderer_Richtig.xml

diff --git a/Editor2DLibrary/SSG/shapes/svg/Foerderer_Falsch.xml b/Editor2DLibrary/SSG/shapes/svg/Foerderer_Falsch.xml
new file mode 100644
index 0000000..ec2e3e4
--- /dev/null
+++ b/Editor2DLibrary/SSG/shapes/svg/Foerderer_Falsch.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:#f44336;stroke-opacity:1" d="M 13.65157,13.203638 V 277.78696" stroke-width="1px" />
+      </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
new file mode 100644
index 0000000..ed43a36
--- /dev/null
+++ b/Editor2DLibrary/SSG/shapes/svg/Foerderer_Richtig.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:#7284ff;stroke-opacity:1" d="M 13.65157,13.203638 V 277.78696" stroke-width="1px" />
+      </g>
+    </svg>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 8869a63..d024490 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-04-08T16:02:51" LanguageVersion="2014.1.3.627" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="y.wang [ANGEBOT-NB02]" ModDate="2024-04-15T15:04:22" LanguageVersion="2014.1.3.635" />
 	<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">
@@ -50,7 +50,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" SubType="structure">
+				<TYPE Id="RDK:302581" Name="GefaelleType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:302571" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:880709" Name="L1" Type="double" />
@@ -64,7 +64,7 @@
 					<FIELD Id="RDK:302575" Name="n_Sep" Type="integer" />
 					<FIELD Id="RDK:302576" Name="n_Scan" Type="integer" />
 				</TYPE>
-				<TYPE Id="RDK:18116690" Name="FoerdererType" SubType="structure">
+				<TYPE Id="RDK:18116690" Name="FoerdererType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18116683" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:18116696" Name="Typ" Type="string" DesignTimeRemark="Auf oder Ab" />
@@ -3993,6 +3993,163 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
+							<CASEGROUP Id="RDK:18656449" CaseType="0">
+								<EXP><![CDATA[$C$Foerderer]]></EXP>
+								<GROUP Id="RDK:18656442" Name="Foerderer in der Library anlegen" SubType="Generic">
+									<SET Id="RDK:18656440" VarRef="Property_Prototype.eventClass">
+										<EXP><![CDATA[$C$OnDoubleclick,OnInserted,OnLinked,OnPasted]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<ACTION_CALL Id="RDK:18656441" Name="RDEngineering_E2DManageShape">
+										<PAR Name="RDLibraryName">
+											<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+										</PAR>
+										<PAR Name="e2dMode">
+											<EXP><![CDATA[$C$0]]></EXP>
+										</PAR>
+										<PAR Name="libraryID">
+											<EXP><![CDATA[$=$GS2DLibraryName]]></EXP>
+										</PAR>
+										<PAR Name="operType">
+											<EXP><![CDATA[$C$2]]></EXP>
+										</PAR>
+										<PAR Name="shpId">
+											<EXP><![CDATA[$=$Property_Prototype.id]]></EXP>
+										</PAR>
+										<PAR Name="catId">
+											<EXP><![CDATA[$C$c_Session]]></EXP>
+										</PAR>
+										<PAR Name="shpItemId" />
+										<PAR Name="shpItem">
+											<EXP><![CDATA[$=$Property_Prototype]]></EXP>
+										</PAR>
+										<PAR Name="shpItemList">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="shpList">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="outShapeIdList">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="Options">
+											<EXP><![CDATA[$C$(OVERWRITE)]]></EXP>
+										</PAR>
+									</ACTION_CALL>
+								</GROUP>
+								<GROUP Id="RDK:18656448" Name="Foerderer platzieren" SubType="Generic">
+									<COMMENTS Id="RDK:18656443" DesignTimeRemark="pixel in mm" />
+									<COMMENTS Id="RDK:18656444" DesignTimeRemark="Shape in ShapeList wird gedreht" />
+									<ACTION_CALL Id="RDK:18656445" Name="RDEngineering_E2DManageShape">
+										<PAR Name="RDLibraryName">
+											<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+										</PAR>
+										<PAR Name="e2dMode">
+											<EXP><![CDATA[$C$0]]></EXP>
+										</PAR>
+										<PAR Name="libraryID">
+											<EXP><![CDATA[$=$GS2DLibraryName]]></EXP>
+										</PAR>
+										<PAR Name="operType">
+											<EXP><![CDATA[$C$0]]></EXP>
+										</PAR>
+										<PAR Name="shpId">
+											<EXP><![CDATA[$=$ID]]></EXP>
+										</PAR>
+										<PAR Name="catId">
+											<EXP><![CDATA[$C$c_Session]]></EXP>
+										</PAR>
+										<PAR Name="shpItemId" />
+										<PAR Name="shpItem">
+											<EXP><![CDATA[$=$Shape_Prototype]]></EXP>
+										</PAR>
+										<PAR Name="shpItemList">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="shpList">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="outShapeIdList">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="Options" />
+									</ACTION_CALL>
+									<COMMENTS Id="RDK:18656446" Bookmarked="True" DesignTimeRemark="Inherit Rotation" />
+									<SET_STRUCT Id="RDK:18656447" 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="FoerdererDefinition" />
+										<PAR Name="WeicheDefinition" />
+										<PAR Name="BTMTBeladungDefinition" />
+										<PAR Name="BTMTEntladungDefinition" />
+										<PAR Name="source">
+											<EXP><![CDATA[$=$IIF(Shape_Prototype.FoerdererDefinition.LH_fits=True,"Foerderer_Richtig","Foerderer_Falsch")]]></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>
 						</SELECTCASE>
 					</FUNCTION>
 					<FUNCTION Id="RDK:604706" Name="Write CPs From Data to Prototype">
@@ -6383,6 +6540,22 @@ 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">
+										<EXP><![CDATA[$=$True]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<CALLFUNCTION Id="RDK:18656463">
+										<PAR Name="FuncName">
+											<EXP><![CDATA[$C$Create/Update Shape]]></EXP>
+										</PAR>
+										<PAR Name="InputExp">
+											<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+										</PAR>
+										<PAR Name="ResultRef">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="Options" />
+									</CALLFUNCTION>
 									<EXIT_PROCESS Id="RDK:18197934" BreakType="4" ExitStatus="0" />
 								</GROUP>
 								<GROUP Id="RDK:18150163" SubType="Else">
@@ -6421,6 +6594,10 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<EXP><![CDATA[$=$HoeheOben-HoeheUnten]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
+									<SET Id="RDK:18656461" VarRef="Shape_Prototype.FoerdererDefinition.LH_fits" DesignTimeRemark="LH_fits ==False, nicht in Ordnung , rot dargestellt">
+										<EXP><![CDATA[$=$False]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
 									<ACTION_CALL Id="RDK:18202819" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 										<PAR Name="RDLibraryName">
 											<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
@@ -6594,6 +6771,18 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="DataSource" />
 										<PAR Name="Options" />
 									</ACTION_CALL>
+									<CALLFUNCTION Id="RDK:18661567">
+										<PAR Name="FuncName">
+											<EXP><![CDATA[$C$Create/Update Shape]]></EXP>
+										</PAR>
+										<PAR Name="InputExp">
+											<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+										</PAR>
+										<PAR Name="ResultRef">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="Options" />
+									</CALLFUNCTION>
 									<EXIT_PROCESS Id="RDK:18150177" BreakType="4" ExitStatus="0" />
 								</GROUP>
 							</IFTHENELSE>
@@ -6771,6 +6960,19 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="Int" />
 										<PAR Name="Boo" />
 									</SET_STRUCT>
+									<SET_STRUCT Id="RDK:18656465" VarRef="SSGParameter" ClearAll="True" ListRef="RueckgabeListe">
+										<PAR Name="Key">
+											<EXP><![CDATA[$C$LH_fits]]></EXP>
+										</PAR>
+										<PAR Name="Str" />
+										<PAR Name="Dbl">
+											<EXP><![CDATA[$=$]]></EXP>
+										</PAR>
+										<PAR Name="Int" />
+										<PAR Name="Boo">
+											<EXP><![CDATA[$C$True]]></EXP>
+										</PAR>
+									</SET_STRUCT>
 									<SET Id="RDK:18474076" VarRef="Param.Result">
 										<EXP><![CDATA[$=$RueckgabeListe]]></EXP>
 										<PAR Name="AdvancedOptions" />
@@ -6852,6 +7054,19 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="Int" />
 										<PAR Name="Boo" />
 									</SET_STRUCT>
+									<SET_STRUCT Id="RDK:18656467" VarRef="SSGParameter" ClearAll="True" ListRef="RueckgabeListe">
+										<PAR Name="Key">
+											<EXP><![CDATA[$C$LH_fits]]></EXP>
+										</PAR>
+										<PAR Name="Str" />
+										<PAR Name="Dbl">
+											<EXP><![CDATA[$=$]]></EXP>
+										</PAR>
+										<PAR Name="Int" />
+										<PAR Name="Boo">
+											<EXP><![CDATA[$C$False]]></EXP>
+										</PAR>
+									</SET_STRUCT>
 									<SET Id="RDK:18474074" VarRef="Param.Result">
 										<EXP><![CDATA[$=$RueckgabeListe]]></EXP>
 										<PAR Name="AdvancedOptions" />
@@ -12596,6 +12811,14 @@ me.x
 							<EXP><![CDATA[$=$Param.Input["key=Delta_h"].Dbl]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
+						<SET Id="RDK:18656477" VarRef="shape_item.FoerdererDefinition.LH_fits">
+							<EXP><![CDATA[$=$Param.Input["key=LH_fits"].Boo]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:18656471" VarRef="shape_item.source">
+							<EXP><![CDATA[$=$IIF(shape_item.FoerdererDefinition.LH_fits=True,"Foerderer_Richtig","Foerderer_Falsch")]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 						<GROUP Id="RDK:18474160" Name="Write Properties" SubType="Generic">
 							<SET Id="RDK:18474158" VarRef="ind">
 								<EXP><![CDATA[$=$IndexOfByFieldValue(ShapeList, "id", shape_item.id)]]></EXP>