Foederer Farbe richtig oder falsch angepasst

This commit is contained in:
2024-04-16 12:21:10 +02:00
parent 615ff01faf
commit 16efcaa5b6
4 changed files with 212 additions and 13 deletions
+99 -13
View File
@@ -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="y.wang [ANGEBOT-NB02]" ModDate="2024-04-15T15:04:22" LanguageVersion="2014.1.3.635" />
<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="y.wang [ANGEBOT-NB02]" ModDate="2024-04-16T12:15:23" 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" Expanded="True" SubType="structure">
<TYPE Id="RDK:302581" Name="GefaelleType" 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" Expanded="True" SubType="structure">
<TYPE Id="RDK:18116690" Name="FoerdererType" SubType="structure">
<TYPE_VALUES />
<FIELD Id="RDK:18116683" Name="Beschreibung" Type="string" />
<FIELD Id="RDK:18116696" Name="Typ" Type="string" DesignTimeRemark="Auf oder Ab" />
@@ -784,7 +784,7 @@
<FIELD Id="RDK:1007391" Name="X" Type="double" />
<FIELD Id="RDK:1007392" Name="Y" Type="double" />
</TYPE>
<TYPE Id="RDK:1007741" Name="SSY_Shapes" SubType="structure" HasArrayType="True">
<TYPE Id="RDK:1007741" Name="SSY_Shapes" Expanded="True" SubType="structure" HasArrayType="True">
<TYPE_VALUES />
<FIELD Id="RDK:1007735" Name="name" Type="string" />
<FIELD Id="RDK:1007736" Name="ShapeID" Type="string" />
@@ -793,7 +793,7 @@
<FIELD Id="RDK:1007739" Name="Withdraw_Start" Type="double" />
<FIELD Id="RDK:1007740" Name="Withdraw_End" Type="double" />
</TYPE>
<TYPE Id="RDK:1345483" Name="InheritHeightType" SubType="structure" DesignTimeNotes="20231005 -1-">
<TYPE Id="RDK:1345483" Name="InheritHeightType" Expanded="True" SubType="structure" DesignTimeNotes="20231005 -1-">
<TYPE_VALUES />
<FIELD Id="RDK:1345484" Name="ParentIndex" Type="integer" />
<FIELD Id="RDK:1345485" Name="NewHoehe" Type="double" />
@@ -3189,6 +3189,59 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
<PAR Name="eventHandlers" />
</SET_STRUCT>
</FUNCTION>
<FUNCTION Id="RDK:18664122" Name="CreatePrototype_Foerderer">
<GROUP Id="RDK:18664118" Name="Local Variables" SubType="VarSet" IncludeDate="0" />
<COMMENTS Id="RDK:18664119" DesignTimeRemark="Angle definition in GS2D" DesignTimeNotes=" 0&#xD;&#xA; |&#xD;&#xA;270 &lt;-------&gt;90&#xD;&#xA; |&#xD;&#xA; 180&#xD;&#xA;" />
<SET Id="RDK:18664120" VarRef="Property_Prototype">
<EXP><![CDATA[$=$Shape_Prototype]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET_STRUCT Id="RDK:18664121" VarRef="Property_Prototype">
<PAR Name="id" />
<PAR Name="name" />
<PAR Name="family" />
<PAR Name="description" />
<PAR Name="text" />
<PAR Name="shapeMode" />
<PAR Name="icon" />
<PAR Name="iconBig" />
<PAR Name="image" />
<PAR Name="srcSVG" />
<PAR Name="src3D" />
<PAR Name="srcTexture3D" />
<PAR Name="width">
<EXP><![CDATA[$=$ConvertToPixel(Property_Prototype.width, "mm", 96)]]></EXP>
</PAR>
<PAR Name="height">
<EXP><![CDATA[$=$ConvertToPixel(Property_Prototype.height, "mm", 96)]]></EXP>
</PAR>
<PAR Name="depth">
<EXP><![CDATA[$=$ConvertToPixel(Property_Prototype.depth, "mm", 96)]]></EXP>
</PAR>
<PAR Name="behaviour" />
<PAR Name="help" />
<PAR Name="eventClass" />
<PAR Name="linkClass" />
<PAR Name="collisionClass" />
<PAR Name="containerClass" />
<PAR Name="snapClass" />
<PAR Name="color" />
<PAR Name="colorOpacity" />
<PAR Name="lineColor" />
<PAR Name="lineColorOpacity" />
<PAR Name="color3D" />
<PAR Name="colorOpacity3D" />
<PAR Name="lineColor3D" />
<PAR Name="lineColorOpacity3D" />
<PAR Name="custom" />
<PAR Name="connectionPoints" />
<PAR Name="group2dShapes" />
<PAR Name="group2dConnectors" />
<PAR Name="group3d" />
<PAR Name="eventHandler" />
<PAR Name="eventHandlers" />
</SET_STRUCT>
</FUNCTION>
<FUNCTION Id="RDK:439270" Name="Create/Update Shape">
<GROUP Id="RDK:439268" Name="Local Variables" SubType="VarSet" IncludeDate="0">
<VAR Id="RDK:439269" Name="ID" Type="string" />
@@ -6544,7 +6597,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
<EXP><![CDATA[$=$True]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<CALLFUNCTION Id="RDK:18656463">
<CALLFUNCTION Id="RDK:18656463" Suppressed="True">
<PAR Name="FuncName">
<EXP><![CDATA[$C$Create/Update Shape]]></EXP>
</PAR>
@@ -6771,7 +6824,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
<PAR Name="DataSource" />
<PAR Name="Options" />
</ACTION_CALL>
<CALLFUNCTION Id="RDK:18661567">
<CALLFUNCTION Id="RDK:18661567" Suppressed="True">
<PAR Name="FuncName">
<EXP><![CDATA[$C$Create/Update Shape]]></EXP>
</PAR>
@@ -9432,11 +9485,11 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
<CASEGROUP Id="RDK:18116644" CaseType="0">
<EXP><![CDATA[$C$OK]]></EXP>
<GROUP Id="RDK:18116639" Name="Write Properties" SubType="Generic">
<SET Id="RDK:18116637" VarRef="i">
<SET Id="RDK:18116637" VarRef="i" Suppressed="True">
<EXP><![CDATA[$=$IndexOfByFieldValue(ShapeList, "id", Shape_Prototype.id)]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET_STRUCT Id="RDK:18116638" VarRef="Shape_Prototype" ListRef="ShapeList" Options="$=$&quot;(REPLACEIDX=&quot;+i+&quot;)&quot;" DesignTimeNotes="Shape.depth*Inch/DPI">
<SET_STRUCT Id="RDK:18116638" VarRef="Shape_Prototype" ListRef="ShapeList" Options="$=$&quot;(REPLACEIDX=&quot;+i+&quot;)&quot;" Suppressed="True" DesignTimeNotes="Shape.depth*Inch/DPI">
<PAR Name="SivasNummer" />
<PAR Name="Rotationsklasse" />
<PAR Name="IDCounter" />
@@ -9505,6 +9558,34 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
<PAR Name="selected" />
<PAR Name="includeInBOM" />
</SET_STRUCT>
<SET Id="RDK:18664125" VarRef="Shape_Prototype.height">
<EXP><![CDATA[$=$Shape_Prototype.FoerdererDefinition.L1]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<CALLFUNCTION Id="RDK:18664127">
<PAR Name="FuncName">
<EXP><![CDATA[$C$CreatePrototype_Foerderer]]></EXP>
</PAR>
<PAR Name="InputExp">
<EXP><![CDATA[$=$]]></EXP>
</PAR>
<PAR Name="ResultRef">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
<CALLFUNCTION Id="RDK:18664129">
<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>
</GROUP>
<GROUP Id="RDK:18116642" Name="Gefaellestrecke HoeheOben OR HoeheUnten was changed" SubType="Generic" Suppressed="True" 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">
@@ -9513,6 +9594,7 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$ShapeList["id=" + Shape_Prototype.id].GefaelleDefinition.HoeheUnten <> Shape_Prototype.GefaelleDefinition.HoeheUnten]]></EXP>
</VALUECONDITION>
<COMMENTS Id="RDK:18664165" DesignTimeRemark="Todo: Anpassung wie Gefaellestrecken später nötig" />
<SET_STRUCT Id="RDK:18116640" VarRef="InheritHeightData" ClearAll="True">
<PAR Name="ParentIndex">
<EXP><![CDATA[$=$i]]></EXP>
@@ -13412,6 +13494,10 @@ me.x
<GROUP Id="RDK:1611859" 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[$=$Not ((ShapeList["id="+Param.Input[0].shapeID].family="Gefaellestrecke" or ShapeList["id="+Param.Input[1].shapeID].family="Gefaellestrecke") And
(IsTagInString(Param.Input[0].connectionPointID, "ncp") or IsTagInString(Param.Input[1].connectionPointID, "ncp")))]]></EXP>
</VALUECONDITION>
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$Not ((ShapeList["id="+Param.Input[0].shapeID].family="Foerderer" or ShapeList["id="+Param.Input[1].shapeID].family="Foerderer") And
(IsTagInString(Param.Input[0].connectionPointID, "ncp") or IsTagInString(Param.Input[1].connectionPointID, "ncp")))]]></EXP>
</VALUECONDITION>
<SET Id="RDK:1589022" VarRef="Shape_Prototype">
@@ -13470,10 +13556,14 @@ ShapeList["id="+Param.Input[1].shapeID].name
<SET_STRUCT Id="RDK:1589027" VarRef="Shape_Prototype" ListRef="ShapeList">
<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[$=$Shape_Prototype.id]]></EXP>
</PAR>
@@ -13542,10 +13632,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
<PAR Name="pinned" />
<PAR Name="selected" />
<PAR Name="includeInBOM" />
<PAR Name="IDCounter" />
<PAR Name="FoerdererDefinition" />
<PAR Name="BTMTBeladungDefinition" />
<PAR Name="BTMTEntladungDefinition" />
</SET_STRUCT>
<ACTION_CALL Id="RDK:1589028" Name="RDEngineering_E2DLinkShapes">
<PAR Name="RDLibraryName">