Set Status für Bögen und Weiche wurde korrigiert.

This commit is contained in:
2025-02-28 08:49:14 +01:00
parent 6417708056
commit ec24a91cb1
15 changed files with 211 additions and 186 deletions
+185 -156
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="m.stangl [ENTW-NB08]" ModDate="2025-02-27T13:47:14" LanguageVersion="2014.1.3.699" />
<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="y.wang [ANGEBOT-NB02]" ModDate="2025-02-28T08:46:23" LanguageVersion="2014.1.3.698" />
<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">
@@ -25499,9 +25499,12 @@ me.x
<VALUECONDITION Value="true" Oper="OR">
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="OFBogen"]]></EXP>
</VALUECONDITION>
<VALUECONDITION Value="true">
<VALUECONDITION Value="true" Oper="OR">
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="OFGerade"]]></EXP>
</VALUECONDITION>
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="OFWeiche"]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:23016791" SubType="Then">
<CALLFUNCTION Id="RDK:23016790">
<PAR Name="FuncName">
@@ -30171,6 +30174,66 @@ ShapeList["id="+Param.Input[1].shapeID].name
<CASEGROUP Id="RDK:19265787" CaseType="0">
<EXP><![CDATA[$C$BTMTEntladung]]></EXP>
</CASEGROUP>
<CASEGROUP Id="RDK:23383402" CaseType="0">
<EXP><![CDATA[$C$OFBogen]]></EXP>
<IFTHENELSE Id="RDK:23383418">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$Count(shape_item.links) = 2]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:23383415" SubType="Then">
<SET Id="RDK:23383414" VarRef="Param.Result">
<EXP><![CDATA[$=$True]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
<GROUP Id="RDK:23383417" SubType="Else">
<SET Id="RDK:23383416" VarRef="Param.Result">
<EXP><![CDATA[$=$False]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
</IFTHENELSE>
</CASEGROUP>
<CASEGROUP Id="RDK:23383404" CaseType="0">
<EXP><![CDATA[$C$OFWeiche]]></EXP>
<IFTHENELSE Id="RDK:23383430">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$Count(shape_item.links) = 3]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:23383427" SubType="Then">
<SET Id="RDK:23383426" VarRef="Param.Result">
<EXP><![CDATA[$=$True]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
<GROUP Id="RDK:23383429" SubType="Else">
<SET Id="RDK:23383428" VarRef="Param.Result">
<EXP><![CDATA[$=$False]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
</IFTHENELSE>
</CASEGROUP>
<CASEGROUP Id="RDK:23383406" CaseType="0">
<EXP><![CDATA[$C$OFGerade]]></EXP>
<IFTHENELSE Id="RDK:23383444">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$Count(shape_item.links) = 2]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:23383441" SubType="Then">
<SET Id="RDK:23383440" VarRef="Param.Result">
<EXP><![CDATA[$=$True]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
<GROUP Id="RDK:23383443" SubType="Else">
<SET Id="RDK:23383442" VarRef="Param.Result">
<EXP><![CDATA[$=$False]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
</IFTHENELSE>
</CASEGROUP>
<CASEGROUP Id="RDK:19265788" CaseType="1">
<EXP />
</CASEGROUP>
@@ -33308,87 +33371,26 @@ ShapeList["id="+Param.Input[1].shapeID].name
</CASEGROUP>
<CASEGROUP Id="RDK:23016954" CaseType="0">
<EXP><![CDATA[$C$OFBogen]]></EXP>
<IFTHENELSE Id="RDK:23016950" DesignTimeRemark="Hier kommen wir vom Ende der Kurve, bzw. setzen die Höhe des Endes">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$label="cp2"]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:23016940" SubType="Then">
<SET Id="RDK:23016932" VarRef="ShapeList[&quot;id=&quot;+shapeId].OFBogenDefinition.H_Ende">
<EXP><![CDATA[$=$hoehe]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:23016933" VarRef="ShapeList[&quot;id=&quot;+shapeId].OFBogenDefinition.H_Anfang">
<EXP><![CDATA[$=$hoehe + OFBogenData_defaults.Delta_h]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<IFTHENELSE Id="RDK:23016936">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$ShapeList["id="+shapeId].OFBogenDefinition.KurvenWinkel < 31]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:23016935" SubType="Then">
<SET Id="RDK:23016934" VarRef="ShapeList[&quot;id=&quot;+shapeId].OFBogenDefinition.H_Anfang">
<EXP><![CDATA[$=$hoehe + Round(OFBogenData_defaults.Delta_h/3, 1)]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
</IFTHENELSE>
<IFTHENELSE Id="RDK:23016939">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$ShapeList["id="+shapeId].OFBogenDefinition.KurvenWinkel < 61]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:23016938" SubType="Then">
<SET Id="RDK:23016937" VarRef="ShapeList[&quot;id=&quot;+shapeId].OFBogenDefinition.H_Anfang">
<EXP><![CDATA[$=$hoehe + Round(OFBogenData_defaults.Delta_h*2/3, 1)]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
</IFTHENELSE>
</GROUP>
<GROUP Id="RDK:23016949" SubType="Else">
<SET Id="RDK:23016941" VarRef="ShapeList[&quot;id=&quot;+shapeId].OFBogenDefinition.H_Anfang">
<EXP><![CDATA[$=$hoehe]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:23016942" VarRef="ShapeList[&quot;id=&quot;+shapeId].OFBogenDefinition.H_Ende">
<EXP><![CDATA[$=$hoehe - OFBogenData_defaults.Delta_h]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<IFTHENELSE Id="RDK:23016945">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$ShapeList["id="+shapeId].OFBogenDefinition.KurvenWinkel < 31]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:23016944" SubType="Then">
<SET Id="RDK:23016943" VarRef="ShapeList[&quot;id=&quot;+shapeId].OFBogenDefinition.H_Anfang">
<EXP><![CDATA[$=$hoehe - Round(OFBogenData_defaults.Delta_h/3,1)]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
</IFTHENELSE>
<IFTHENELSE Id="RDK:23016948">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$ShapeList["id="+shapeId].OFBogenDefinition.KurvenWinkel < 61]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:23016947" SubType="Then">
<SET Id="RDK:23016946" VarRef="ShapeList[&quot;id=&quot;+shapeId].OFBogenDefinition.H_Anfang">
<EXP><![CDATA[$=$hoehe - Round(OFBogenData_defaults.Delta_h*2/3,1)]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
</IFTHENELSE>
</GROUP>
</IFTHENELSE>
<COMMENTS Id="RDK:23016951" DesignTimeRemark="Setze den Zustand erst einmal auf ok, nachdem die Höhe definiert ist" />
<SET Id="RDK:23016952" VarRef="ShapeList[&quot;id=&quot;+shapeId].OFBogenDefinition.isOk">
<EXP><![CDATA[$C$True]]></EXP>
<SET Id="RDK:23016953" VarRef="ShapeList[&quot;id=&quot;+shapeId].z">
<EXP><![CDATA[$=$hoehe]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:23016953" VarRef="ShapeList[&quot;id=&quot;+shapeId].z">
<EXP><![CDATA[$=$ShapeList["id="+shapeId].OFBogenDefinition.H_Anfang/2 + ShapeList["id="+shapeId].OFBogenDefinition.H_Ende/2]]></EXP>
<SET Id="RDK:23383392" VarRef="ShapeList[&quot;id=&quot;+shapeId].OFBogenDefinition.H_Ende">
<EXP><![CDATA[$=$hoehe]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:23383394" VarRef="ShapeList[&quot;id=&quot;+shapeId].OFBogenDefinition.H_Anfang">
<EXP><![CDATA[$=$hoehe]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:23016952" VarRef="ShapeList[&quot;id=&quot;+shapeId].OFBogenDefinition.isOk" Suppressed="True">
<EXP><![CDATA[$C$True]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</CASEGROUP>
<CASEGROUP Id="RDK:23222426" CaseType="0">
<EXP><![CDATA[$C$OFGerade]]></EXP>
<EXP><![CDATA[$C$OFWeiche]]></EXP>
<SET Id="RDK:23222417" VarRef="ShapeList[&quot;id=&quot;+shapeId].OFWeicheDefinition.Hoehe">
<EXP><![CDATA[$=$hoehe]]></EXP>
<PAR Name="AdvancedOptions" />
@@ -34853,6 +34855,91 @@ ShapeList["id="+Param.Input[1].shapeID].name
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
<SELECTCASE Id="RDK:23387297" DesignTimeRemark="Diese Elemente haben nur 2 Zustände. OK oder nicht OK">
<EXP><![CDATA[$=$ShapeList[shapeList_idx].family]]></EXP>
<CASEGROUP Id="RDK:23387289" CaseType="0">
<EXP><![CDATA[$C$OFBogen]]></EXP>
<IFTHENELSE Id="RDK:23387288">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$isDefined]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:23387285" SubType="Then">
<SET Id="RDK:23390066" VarRef="ShapeList[&quot;id=&quot;+shapeId].OFBogenDefinition.isOk">
<EXP><![CDATA[$=$isDefined]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<CALLFUNCTION Id="RDK:23387284">
<PAR Name="FuncName">
<EXP><![CDATA[$C$SetStatus_Ok]]></EXP>
</PAR>
<PAR Name="InputExp">
<EXP><![CDATA[$=$shapeId]]></EXP>
</PAR>
<PAR Name="ResultRef">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
</GROUP>
<GROUP Id="RDK:23387287" SubType="Else">
<CALLFUNCTION Id="RDK:23387286">
<PAR Name="FuncName">
<EXP><![CDATA[$C$SetStatus_False]]></EXP>
</PAR>
<PAR Name="InputExp">
<EXP><![CDATA[$=$shapeId]]></EXP>
</PAR>
<PAR Name="ResultRef">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
</GROUP>
</IFTHENELSE>
<EXIT_PROCESS Id="RDK:23387301" BreakType="4" ExitStatus="0" />
</CASEGROUP>
<CASEGROUP Id="RDK:23387295" CaseType="0">
<EXP><![CDATA[$C$OFWeiche]]></EXP>
<IFTHENELSE Id="RDK:23387294">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$isDefined]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:23387291" SubType="Then">
<SET Id="RDK:23390072" VarRef="ShapeList[&quot;id=&quot;+shapeId].OFWeicheDefinition.isOk">
<EXP><![CDATA[$=$isDefined]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<CALLFUNCTION Id="RDK:23387290">
<PAR Name="FuncName">
<EXP><![CDATA[$C$SetStatus_Ok]]></EXP>
</PAR>
<PAR Name="InputExp">
<EXP><![CDATA[$=$shapeId]]></EXP>
</PAR>
<PAR Name="ResultRef">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
</GROUP>
<GROUP Id="RDK:23387293" SubType="Else">
<CALLFUNCTION Id="RDK:23387292">
<PAR Name="FuncName">
<EXP><![CDATA[$C$SetStatus_False]]></EXP>
</PAR>
<PAR Name="InputExp">
<EXP><![CDATA[$=$shapeId]]></EXP>
</PAR>
<PAR Name="ResultRef">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
</GROUP>
</IFTHENELSE>
<EXIT_PROCESS Id="RDK:23387303" BreakType="4" ExitStatus="0" />
</CASEGROUP>
</SELECTCASE>
<IFTHENELSE Id="RDK:20700339">
<VALUECONDITION Value="false">
<EXP><![CDATA[$=$isDefined]]></EXP>
@@ -35193,78 +35280,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
</GROUP>
</IFTHENELSE>
</CASEGROUP>
<CASEGROUP Id="RDK:23016972" CaseType="0">
<EXP><![CDATA[$C$OFBogen]]></EXP>
<IFTHENELSE Id="RDK:23016971">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$ShapeList[shapeList_idx].KurveDefinition.isOk]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:23016968" SubType="Then">
<CALLFUNCTION Id="RDK:23016967">
<PAR Name="FuncName">
<EXP><![CDATA[$C$SetStatus_Ok]]></EXP>
</PAR>
<PAR Name="InputExp">
<EXP><![CDATA[$=$shapeId]]></EXP>
</PAR>
<PAR Name="ResultRef">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
</GROUP>
<GROUP Id="RDK:23016970" SubType="Else">
<CALLFUNCTION Id="RDK:23016969">
<PAR Name="FuncName">
<EXP><![CDATA[$C$SetStatus_False]]></EXP>
</PAR>
<PAR Name="InputExp">
<EXP><![CDATA[$=$shapeId]]></EXP>
</PAR>
<PAR Name="ResultRef">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
</GROUP>
</IFTHENELSE>
</CASEGROUP>
<CASEGROUP Id="RDK:23222444" CaseType="0">
<EXP><![CDATA[$C$OFWeiche]]></EXP>
<IFTHENELSE Id="RDK:23222443">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$ShapeList[shapeList_idx].OFWeicheDefinition.isOk]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:23222440" SubType="Then">
<CALLFUNCTION Id="RDK:23222439">
<PAR Name="FuncName">
<EXP><![CDATA[$C$SetStatus_Ok]]></EXP>
</PAR>
<PAR Name="InputExp">
<EXP><![CDATA[$=$shapeId]]></EXP>
</PAR>
<PAR Name="ResultRef">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
</GROUP>
<GROUP Id="RDK:23222442" SubType="Else">
<CALLFUNCTION Id="RDK:23222441">
<PAR Name="FuncName">
<EXP><![CDATA[$C$SetStatus_False]]></EXP>
</PAR>
<PAR Name="InputExp">
<EXP><![CDATA[$=$shapeId]]></EXP>
</PAR>
<PAR Name="ResultRef">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
</GROUP>
</IFTHENELSE>
</CASEGROUP>
<CASEGROUP Id="RDK:19602981" CaseType="1">
<EXP />
</CASEGROUP>
@@ -35307,6 +35322,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
<PAR Name="Dbl" />
<PAR Name="Int" />
<PAR Name="Boo" />
<PAR Name="StrArr" />
</SET_STRUCT>
<CALLFUNCTION Id="RDK:19290445">
<PAR Name="FuncName">
@@ -35476,7 +35492,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
<CASEGROUP Id="RDK:23017842" CaseType="0">
<EXP><![CDATA[$C$OFGerade]]></EXP>
<SET Id="RDK:23017841" VarRef="color">
<EXP><![CDATA[$C$#6C6E70]]></EXP>
<EXP><![CDATA[$C$#ffe31b]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</CASEGROUP>
@@ -35484,11 +35500,11 @@ ShapeList["id="+Param.Input[1].shapeID].name
<EXP><![CDATA[$C$OFBogen]]></EXP>
<IFTHENELSE Id="RDK:23016983">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$shape_item.KurveDefinition.isOk]]></EXP>
<EXP><![CDATA[$=$shape_item.OFBogenDefinition.isOk]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:23016980" SubType="Then">
<SET Id="RDK:23016979" VarRef="color">
<EXP><![CDATA[$C$#6C6E70]]></EXP>
<EXP><![CDATA[$C$#ffe31b]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
@@ -35504,13 +35520,26 @@ ShapeList["id="+Param.Input[1].shapeID].name
<EXP><![CDATA[$C$OFWeiche]]></EXP>
<IFTHENELSE Id="RDK:23222461">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$shape_item.KurveDefinition.isOk]]></EXP>
<EXP><![CDATA[$=$shape_item.OFWeicheDefinition.isOk]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:23222458" SubType="Then">
<SET Id="RDK:23222457" VarRef="color">
<EXP><![CDATA[$C$#6C6E70]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<IFTHENELSE Id="RDK:23383458">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$shape_item.OFWeicheDefinition.Schaltungstyp="M"]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:23383463" SubType="Then">
<SET Id="RDK:23222457" VarRef="color">
<EXP><![CDATA[$C$#ffe31b]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
<GROUP Id="RDK:23383465" SubType="Else">
<SET Id="RDK:23383467" VarRef="color">
<EXP><![CDATA[$C$#1bff38]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
</IFTHENELSE>
</GROUP>
<GROUP Id="RDK:23222460" SubType="Else">
<SET Id="RDK:23222459" VarRef="color">