Compare commits

...

2 Commits

Author SHA1 Message Date
Simon Schmutzler b215332130 Merge 2024-07-03 09:35:52 +02:00
Simon Schmutzler 0d4f0582d0 Commit vor Merge für SetHeightOnConnect ersetzt durch InheritHeight, unvollständige Aufrufe von InheritHeight 2024-07-03 09:27:44 +02:00
+84 -37
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-07-02T09:39:18" LanguageVersion="2014.1.3.674" />
<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-07-03T09:31:38" LanguageVersion="2014.1.3.676" />
<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">
@@ -127,6 +127,7 @@
<FIELD Id="RDK:973719" Name="WeicheDefinition" Type="WeicheType" />
<FIELD Id="RDK:1652536" Name="BTMTBeladungDefinition" Type="BTMTBeladungType" />
<FIELD Id="RDK:16525361" Name="BTMTEntladungDefinition" Type="BTMTEntladungType" />
<FIELD Id="RDK:19961198" Name="isDefined" Type="boolean" />
</TYPE>
<TYPE Id="RDK:18530527" Name="SSG_ShapeType_limit" SubType="structure">
<TYPE_VALUES />
@@ -9479,10 +9480,16 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
<FUNCTION Id="RDK:1332780" Name="InheritHeight" DesignTimeNotes="20231005 -1-" InputTypeName="InheritHeightType">
<GROUP Id="RDK:1219232" Name="Inherit height" SubType="Generic" DesignTimeNotes="20230928 -1-">
<VALUECONDITION Value="false">
<EXP><![CDATA[$=$Count(Shape_Prototype.links) = 0]]></EXP>
<EXP><![CDATA[$=$Count(ShapeList[Param.Input.ParentIndex].links) = 0]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:1143994" Name="Local Vars" SubType="VarSet" IncludeDate="0" DesignTimeNotes="20230928 -1-">
<VAR Id="RDK:1528242" Name="TempKreisel" Type="string" />
<VAR Id="RDK:1528242" Name="parent_links" Type="string[]">
<SET Id="RDK:19945395" VarRef="Me">
<EXP><![CDATA[$=$ShapeList[Param.Input.ParentIndex].links]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</VAR>
<VAR Id="RDK:19942027" Name="TempKreisel" Type="string" />
<VAR Id="RDK:19795588" Name="TempKreiselLink" Type="string" />
<VAR Id="RDK:19866065" Name="KreiselGroupList" Type="string[]" DesignTimeNotes="20230928 -1-" />
</GROUP>
@@ -9491,7 +9498,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
<EXP><![CDATA[$C$CollectKreiselGroup]]></EXP>
</PAR>
<PAR Name="InputExp">
<EXP><![CDATA[$=$ExecOnValues(Shape_Prototype.links, "StrAfter(Me, "";"")", "")]]></EXP>
<EXP><![CDATA[$=$ExecOnValues(parent_links, "StrAfter(Me, "";"")", "")]]></EXP>
</PAR>
<PAR Name="ResultRef">
<EXP><![CDATA[$V$KreiselGroupList]]></EXP>
@@ -9655,7 +9662,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
<GROUP Id="RDK:19839574" Name="Set DirectConnHeights" SubType="Generic" DesignTimeNotes="20231011 -1-">
<FOREACHLOOP Id="RDK:19841614" ItemVarRef="Link">
<PAR Name="ArrayValueExp">
<EXP><![CDATA[$=$Shape_Prototype.links]]></EXP>
<EXP><![CDATA[$=$parent_links]]></EXP>
</PAR>
<PAR Name="ExitCondExp">
<EXP><![CDATA[$V$]]></EXP>
@@ -9681,7 +9688,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
<EXP><![CDATA[$C$shapeId_0]]></EXP>
</PAR>
<PAR Name="Str">
<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
<EXP><![CDATA[$=$ShapeList[Param.Input.ParentIndex].id]]></EXP>
</PAR>
<PAR Name="Dbl" />
<PAR Name="Int" />
@@ -9962,9 +9969,9 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
</GROUP>
</IFTHENELSE>
</GROUP>
<GROUP Id="RDK:1128682" Name="Kreisel height was changed" SubType="Generic" DesignTimeNotes="Inherit height to direct Shaps and set others to Gelb (except Kreisel Groups).&#xD;&#xA;&#xD;&#xA;ShapeList[&quot;id=&quot; + Shape_Prototype.id].KreiselDefinition.Hoehe is not working here (returns empty or wrong value).&#xD;&#xA;Because of this use TempIndex instead.">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$ShapeList["id=" + Shape_Prototype.id].KreiselDefinition.Hoehe <> Shape_Prototype.KreiselDefinition.Hoehe]]></EXP>
<GROUP Id="RDK:1128682" Name="Kreisel exists" SubType="Generic" DesignTimeNotes="Inherit height to direct Shaps and set others to Gelb (except Kreisel Groups).&#xD;&#xA;&#xD;&#xA;ShapeList[&quot;id=&quot; + Shape_Prototype.id].KreiselDefinition.Hoehe is not working here (returns empty or wrong value).&#xD;&#xA;Because of this use TempIndex instead.">
<VALUECONDITION Value="false">
<EXP><![CDATA[$=$IndexOf(ShapeList, Shape_Prototype) = -1]]></EXP>
</VALUECONDITION>
<SET_STRUCT Id="RDK:1345491" VarRef="InheritHeightData" ClearAll="True" DesignTimeNotes="Results in -1:&#xD;&#xA;IndexOfByFieldValue(ShapeList, &quot;id&quot;, Shape_Prototype.id)&#xD;&#xA;But element is in list">
<PAR Name="ParentIndex">
@@ -9990,30 +9997,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
<PAR Name="Options" />
</CALLFUNCTION>
</GROUP>
<GROUP Id="RDK:1424827" Name="Kreisel height was NOT changed" SubType="Generic">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$ShapeList["id=" + Shape_Prototype.id].KreiselDefinition.Hoehe = Shape_Prototype.KreiselDefinition.Hoehe]]></EXP>
</VALUECONDITION>
<SET_STRUCT Id="RDK:1426962" VarRef="InheritHeightData" ClearAll="True" DesignTimeNotes="Results in -1:&#xD;&#xA;IndexOfByFieldValue(ShapeList, &quot;id&quot;, Shape_Prototype.id)&#xD;&#xA;But element is in list">
<PAR Name="ParentIndex">
<EXP><![CDATA[$=$IndexOf(ShapeList, Shape_Prototype)]]></EXP>
</PAR>
<PAR Name="NewHoehe">
<EXP><![CDATA[$=$]]></EXP>
</PAR>
<PAR Name="NewHoeheOben" />
<PAR Name="NewHoeheUnten" />
<PAR Name="Text" />
</SET_STRUCT>
<SET Id="RDK:1424830" VarRef="ShapeList[InheritHeightData.ParentIndex].text" Suppressed="True">
<EXP><![CDATA[$=$TempText]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:18768039" VarRef="ShapeList[InheritHeightData.ParentIndex].lineColor" Suppressed="True">
<EXP><![CDATA[$=$TempColor]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
<EXIT_PROCESS Id="RDK:618290" BreakType="3" ExitStatus="0" />
</CASEGROUP>
<CASEGROUP Id="RDK:812291" CaseType="0">
@@ -17705,6 +17688,30 @@ me.x
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family]]></EXP>
<CASEGROUP Id="RDK:1576707" CaseType="0">
<EXP><![CDATA[$C$Kreisel]]></EXP>
<COMMENTS Id="RDK:19602905" Suppressed="True" DesignTimeRemark="InheritHeight wird hier nicht benötigt; Höhe wird durch Funktion SetHeightOnConnect gesetzt" />
<SET_STRUCT Id="RDK:19937317" VarRef="InheritHeightData" ClearAll="True" DesignTimeNotes="Results in -1:&#xD;&#xA;IndexOfByFieldValue(ShapeList, &quot;id&quot;, Shape_Prototype.id)&#xD;&#xA;But element is in list">
<PAR Name="ParentIndex">
<EXP><![CDATA[$=$IndexOf(ShapeList, ShapeList["id="+Param.Input[1].shapeID])]]></EXP>
</PAR>
<PAR Name="NewHoehe">
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].KreiselDefinition.Hoehe]]></EXP>
</PAR>
<PAR Name="NewHoeheOben" />
<PAR Name="NewHoeheUnten" />
<PAR Name="Text" />
</SET_STRUCT>
<CALLFUNCTION Id="RDK:19927916" DesignTimeNotes="20231005 -1-">
<PAR Name="FuncName">
<EXP><![CDATA[$C$InheritHeight]]></EXP>
</PAR>
<PAR Name="InputExp">
<EXP><![CDATA[$=$InheritHeightData]]></EXP>
</PAR>
<PAR Name="ResultRef">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
<GROUP Id="RDK:304141" Name="Kreisel Operations" SubType="Generic" DesignTimeNotes="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].family=&quot;Kreisel&quot;&#xD;&#xA;ShapeList[&quot;id=&quot;+Param.Input[1].shapeID].family=&quot;Kreisel&quot;">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$(ShapeList["id="+Param.Input[0].shapeID].Rotationsklasse="Rotationsobjekt") Or
@@ -17928,8 +17935,7 @@ me.x
</GROUP>
</IFTHENELSE>
</GROUP>
<COMMENTS Id="RDK:19602905" DesignTimeRemark="InheritHeight wird hier nicht benötigt; Höhe wird durch Funktion SetHeightOnConnect gesetzt" />
<CALLFUNCTION Id="RDK:1698068">
<CALLFUNCTION Id="RDK:1698068" Suppressed="True">
<PAR Name="FuncName">
<EXP><![CDATA[$C$SetHeightOnConnect]]></EXP>
</PAR>
@@ -17941,7 +17947,7 @@ me.x
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
<CALLFUNCTION Id="RDK:19474698">
<CALLFUNCTION Id="RDK:19474698" Suppressed="True">
<PAR Name="FuncName">
<EXP><![CDATA[$C$SetStatus_Ok]]></EXP>
</PAR>
@@ -18566,6 +18572,47 @@ me.x
</CASEGROUP>
</SELECTCASE>
</FUNCTION>
<FUNCTION Id="RDK:19960886" Name="OnEditor2DUnlinked" InputTypeName="Editor2DEventArgumentsTypeList" Options="(TYPEFUNCTION)">
<SELECTCASE Id="RDK:19961188">
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family]]></EXP>
<CASEGROUP Id="RDK:19961090" CaseType="0">
<EXP><![CDATA[$C$Kreisel]]></EXP>
</CASEGROUP>
<CASEGROUP Id="RDK:19961115" CaseType="0">
<EXP><![CDATA[$C$Eckrad]]></EXP>
</CASEGROUP>
<CASEGROUP Id="RDK:19961124" CaseType="0">
<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
<SET Id="RDK:19961199" VarRef="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].isDefined" DesignTimeRemark="Wenn die Höhen nicht definiert sind, wird der Flag isDefined auf false gesetzt.">
<EXP><![CDATA[$=$False]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</CASEGROUP>
<CASEGROUP Id="RDK:19961131" CaseType="0">
<EXP><![CDATA[$C$Strecke]]></EXP>
<SET Id="RDK:19961202" VarRef="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].isDefined" DesignTimeRemark="Wenn die Höhen nicht definiert sind, wird der Flag isDefined auf false gesetzt.">
<EXP><![CDATA[$=$False]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</CASEGROUP>
<CASEGROUP Id="RDK:19961166" CaseType="0">
<EXP><![CDATA[$C$Foerderer]]></EXP>
<SET Id="RDK:19961204" VarRef="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].isDefined" DesignTimeRemark="Wenn die Höhen nicht definiert sind, wird der Flag isDefined auf false gesetzt.">
<EXP><![CDATA[$=$False]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</CASEGROUP>
<CASEGROUP Id="RDK:19961178" CaseType="0">
<EXP><![CDATA[$C$BTMTBeladung]]></EXP>
</CASEGROUP>
<CASEGROUP Id="RDK:19961186" CaseType="0">
<EXP><![CDATA[$C$BTMTEntladung]]></EXP>
</CASEGROUP>
<CASEGROUP Id="RDK:19961187" CaseType="1">
<EXP />
</CASEGROUP>
</SELECTCASE>
</FUNCTION>
<FUNCTION Id="RDK:296" Name="OnEditor2DRegrouped" InputTypeName="Editor2DShapePropertyType" Options="(TYPEFUNCTION)">
<COMMENTS Id="RDK:32100" />
</FUNCTION>
@@ -20374,7 +20421,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
<EXP><![CDATA[$=$hoehe]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:19929932" VarRef="ShapeList[&quot;id=&quot;+shapeId].z = hoehe">
<SET Id="RDK:19929932" VarRef="ShapeList[&quot;id=&quot;+shapeId].z">
<EXP><![CDATA[$=$hoehe]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>