die Funktion SetStauts für OFGerade OFBonge sowie OFWeiche sind angepasst.
This commit is contained in:
@@ -1 +1 @@
|
||||
[{"id":"c_ILS","name":"ILS","hasShapes":false,"items":[{"id":"c_Kreiselmodule","name":"Kreisel-Module","hasShapes":true},{"id":"c_Zusatzmodul","name":"Zusatzmodul","hasShapes":true},{"id":"c_Foerderer","name":"Förderer","hasShapes":true},{"id":"c_Kurven","name":"Gefällestrecke","hasShapes":true}]},{"id":"c10","name":"PBU","hasShapes":true},{"id":"c_Background","name":"Background","hideName":true,"hasShapes":true},{"id":"c_Parts","name":"Parts","description":"Shapes used for creating new Assemblies while Session","hasShapes":true},{"id":"c_Session","name":"Session","hasShapes":true},{"id":"c_Omniflo","name":"Omniflo","hasShapes":false,"items":[{"id":"c_Boegen","name":"Bögen","hasShapes":true},{"id":"c_Gerade","name":"Aluprofil Gerade","hasShapes":true},{"id":"c_Weichen_90","name":"Weiche 90°","hasShapes":true},{"id":"c_Weichen_45","name":"Weiche 45°","hasShapes":false},{"id":"c_Weichenkoerper","name":"Weichenkörper","hasShapes":false},{"id":"c_Weichenkombinationen","name":"Delta Weichen","hasShapes":true},{"id":"c_TEFElemente","name":"TEF Elemente","hasShapes":true}]},{"id":"c_OmnifloBogen","name":"Omniflo Bogen","hasShapes":true,"items":[{"id":"c_Boegen_90","name":"Bögen 90°","hasShapes":true}]},{"id":"c_OmnifloWeiche","name":"Omniflo Weiche","hasShapes":true},{"id":"c_OmnifloTEFParts","name":"Omniflo TEF Elemente","hasShapes":true}]
|
||||
[{"id":"c_ILS","name":"ILS","hasShapes":false,"items":[{"id":"c_Kreiselmodule","name":"Kreisel-Module","hasShapes":true},{"id":"c_Zusatzmodul","name":"Zusatzmodul","hasShapes":true},{"id":"c_Foerderer","name":"Förderer","hasShapes":true},{"id":"c_Kurven","name":"Gefällestrecke","hasShapes":true}]},{"id":"c10","name":"PBU","hasShapes":true},{"id":"c_Background","name":"Background","hideName":true,"hasShapes":true},{"id":"c_Parts","name":"Parts","description":"Shapes used for creating new Assemblies while Session","hasShapes":true},{"id":"c_Session","name":"Session","hasShapes":true},{"id":"c_Omniflo","name":"Omniflo","hasShapes":false,"items":[{"id":"c_Boegen","name":"Bögen","hasShapes":true},{"id":"c_Gerade","name":"Aluprofil Gerade","hasShapes":true},{"id":"c_Weichen_90","name":"Weiche 90°","hasShapes":true},{"id":"c_Weichen_45","name":"Weiche 45°","hasShapes":false},{"id":"c_Weichenkoerper","name":"Weichenkörper","hasShapes":false},{"id":"c_Weichenkombinationen","name":"Weichenkombinationen","hasShapes":true},{"id":"c_TEFElemente","name":"TEF Elemente","hasShapes":true}]},{"id":"c_OmnifloBogen","name":"Omniflo Bogen","hasShapes":true,"items":[{"id":"c_Boegen_90","name":"Bögen 90°","hasShapes":true}]},{"id":"c_OmnifloWeiche","name":"Omniflo Weiche","hasShapes":true},{"id":"c_OmnifloTEFParts","name":"Omniflo TEF Elemente","hasShapes":true}]
|
||||
+137
-67
@@ -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="2025-03-11T11:49:47" LanguageVersion="2014.1.3.698" />
|
||||
<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="y.wang [ANGEBOT-NB02]" ModDate="2025-03-12T09:59:48" 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">
|
||||
@@ -174,7 +174,7 @@
|
||||
<FIELD Id="RDK:973716" Name="Beschreibung" Type="string" />
|
||||
<FIELD Id="RDK:973714" Name="Weichenart" Type="string" />
|
||||
</TYPE>
|
||||
<TYPE Id="RDK:23017103" Name="OFGeradeType" SubType="structure">
|
||||
<TYPE Id="RDK:23017103" Name="OFGeradeType" Expanded="True" SubType="structure">
|
||||
<TYPE_VALUES />
|
||||
<FIELD Id="RDK:23017087" Name="Beschreibung" Type="string" />
|
||||
<FIELD Id="RDK:23017088" Name="L1" Type="double" />
|
||||
@@ -196,8 +196,9 @@
|
||||
<FIELD Id="RDK:23484090" Name="d_min" Type="double" DesignTimeRemark="Mindestabstand für den ersten und den letzten CP" />
|
||||
<FIELD Id="RDK:23017101" Name="n_Sep" Type="integer" />
|
||||
<FIELD Id="RDK:23017102" Name="n_Scan" Type="integer" />
|
||||
<FIELD Id="RDK:23786145" Name="isOk" Type="boolean" DesignTimeRemark="True beide Punkte angebunden sind und die Höhen der Nachbarn passen" />
|
||||
</TYPE>
|
||||
<TYPE Id="RDK:23017447" Name="OFBogenType" SubType="structure" HasArrayType="True">
|
||||
<TYPE Id="RDK:23017447" Name="OFBogenType" Expanded="True" SubType="structure" HasArrayType="True">
|
||||
<TYPE_VALUES />
|
||||
<FIELD Id="RDK:23017438" Name="Beschreibung" Type="string" />
|
||||
<FIELD Id="RDK:23017439" Name="L1" Type="double" />
|
||||
@@ -211,7 +212,7 @@
|
||||
<FIELD Id="RDK:23222856" Name="Länge" Options="Ausdehnung im Bild nach oben" Type="double" />
|
||||
<FIELD Id="RDK:23222860" Name="Breite" Options="Ausdehnung im Bild nach rechts" Type="double" />
|
||||
</TYPE>
|
||||
<TYPE Id="RDK:23221861" Name="OFWeicheType" SubType="structure" HasArrayType="True">
|
||||
<TYPE Id="RDK:23221861" Name="OFWeicheType" Expanded="True" SubType="structure" HasArrayType="True">
|
||||
<TYPE_VALUES />
|
||||
<FIELD Id="RDK:23221848" Name="Beschreibung" Type="string" />
|
||||
<FIELD Id="RDK:23221857" Name="WeichenTyp" Type="string" />
|
||||
@@ -243,7 +244,7 @@
|
||||
<FIELD Id="RDK:16525231" Name="Drehung" Type="integer" DesignTimeNotes="1= im Uhrzeigersinn=rechts
-1= Gegen Uhrzeigersinn=links" />
|
||||
<FIELD Id="RDK:16577441" Name="Beschreibung" Type="string" />
|
||||
</TYPE>
|
||||
<TYPE Id="RDK:79642" Name="SSG_ShapeType" SubType="structure">
|
||||
<TYPE Id="RDK:79642" Name="SSG_ShapeType" Expanded="True" SubType="structure">
|
||||
<TYPE_VALUES />
|
||||
<FIELD Id="RDK:79643" Name="SivasNummer" Type="string" />
|
||||
<FIELD Id="RDK:1561689" Name="Rotationsklasse" Type="string" />
|
||||
@@ -266,7 +267,7 @@
|
||||
<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 Id="RDK:18530527" Name="SSG_ShapeType_limit" Expanded="True" SubType="structure">
|
||||
<TYPE_VALUES />
|
||||
<FIELD Id="RDK:18530520" Name="KreiselDefinition" Type="KreiselType" />
|
||||
<FIELD Id="RDK:18530521" Name="EckradDefinition" Type="EckradType" />
|
||||
@@ -25697,6 +25698,18 @@ SSGConnectionPoint.x_M
|
||||
</PAR>
|
||||
<PAR Name="Options" />
|
||||
</CALLFUNCTION>
|
||||
<CALLFUNCTION Id="RDK:23777366">
|
||||
<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 Id="RDK:23017651" Name="UI" SubType="Generic">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$Param.Input[0].class<>"OnPasted"]]></EXP>
|
||||
@@ -29396,67 +29409,18 @@ me.x
|
||||
</CASEGROUP>
|
||||
<CASEGROUP Id="RDK:23017707" CaseType="0">
|
||||
<EXP><![CDATA[$C$OFGerade]]></EXP>
|
||||
<IFTHENELSE Id="RDK:23017703">
|
||||
<IFTHENELSE Id="RDK:23783232">
|
||||
<VALUECONDITION Value="true" Oper="OR">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Kreisel"]]></EXP>
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="OFBogen"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<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="Eckrad"]]></EXP>
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="OFWeiche"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:23017702" SubType="Then">
|
||||
<CALLFUNCTION Id="RDK:23017699" Suppressed="True">
|
||||
<PAR Name="FuncName">
|
||||
<EXP><![CDATA[$C$AddWeiche]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="InputExp">
|
||||
<EXP><![CDATA[$=$Param.Input]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="ResultRef">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Options" />
|
||||
</CALLFUNCTION>
|
||||
<CALLFUNCTION Id="RDK:23017700">
|
||||
<PAR Name="FuncName">
|
||||
<EXP><![CDATA[$C$SetHeightOnConnect]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="InputExp">
|
||||
<EXP><![CDATA[$=$UebergabeListe]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="ResultRef">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Options" />
|
||||
</CALLFUNCTION>
|
||||
<CALLFUNCTION Id="RDK:23017701">
|
||||
<PAR Name="FuncName">
|
||||
<EXP><![CDATA[$C$UpdateShape]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="InputExp">
|
||||
<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="ResultRef">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Options" />
|
||||
</CALLFUNCTION>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
<IFTHENELSE Id="RDK:23017706">
|
||||
<VALUECONDITION Value="true" Oper="OR">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Kurve"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<VALUECONDITION Value="true" Oper="OR">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Foerderer"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<VALUECONDITION Value="true" Oper="OR">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Gefaellestrecke"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="KurveFoerderer"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:23017705" SubType="Then">
|
||||
<CALLFUNCTION Id="RDK:23017704">
|
||||
<GROUP Id="RDK:23783229" SubType="Then">
|
||||
<CALLFUNCTION Id="RDK:23783228">
|
||||
<PAR Name="FuncName">
|
||||
<EXP><![CDATA[$C$SetHeightOfStreckeOnConnect]]></EXP>
|
||||
</PAR>
|
||||
@@ -29469,6 +29433,27 @@ me.x
|
||||
<PAR Name="Options" />
|
||||
</CALLFUNCTION>
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:23783231" SubType="Else">
|
||||
<ACTION_CALL Id="RDK:23783230" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
|
||||
<PAR Name="RDLibraryName">
|
||||
<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="MsgText">
|
||||
<EXP><![CDATA[$C$connect not allowed. No Data set. Please unlink it again. ]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="MsgStyle">
|
||||
<EXP><![CDATA[$C$-1]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="BtnLayout">
|
||||
<EXP><![CDATA[$C$-1]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="MsgCaption" />
|
||||
<PAR Name="BaloonType" />
|
||||
<PAR Name="BtnPressed">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
</PAR>
|
||||
</ACTION_CALL>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
</CASEGROUP>
|
||||
<CASEGROUP Id="RDK:23016795" CaseType="0">
|
||||
@@ -34196,6 +34181,36 @@ ShapeList["id="+Param.Input[1].shapeID].name
|
||||
</SET>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
<IFTHENELSE Id="RDK:23767636">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$shape_item.OFWeicheDefinition.WeichenTyp = "Sternweiche"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:23767633" SubType="Then">
|
||||
<IFTHENELSE Id="RDK:23767652">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$Count(shape_item.links) = 4]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:23767649" SubType="Then">
|
||||
<SET Id="RDK:23767648" VarRef="Param.Result">
|
||||
<EXP><![CDATA[$=$True]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:23767651" SubType="Else">
|
||||
<SET Id="RDK:23767650" VarRef="Param.Result">
|
||||
<EXP><![CDATA[$=$False]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:23767635" SubType="Else">
|
||||
<SET Id="RDK:23767634" 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>
|
||||
@@ -39250,6 +39265,47 @@ ShapeList["id="+Param.Input[1].shapeID].name
|
||||
</IFTHENELSE>
|
||||
<EXIT_PROCESS Id="RDK:23387301" BreakType="4" ExitStatus="0" />
|
||||
</CASEGROUP>
|
||||
<CASEGROUP Id="RDK:23772519" CaseType="0">
|
||||
<EXP><![CDATA[$C$OFGerade]]></EXP>
|
||||
<IFTHENELSE Id="RDK:23772517">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$isDefined]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:23772514" SubType="Then">
|
||||
<SET Id="RDK:23772512" VarRef="ShapeList["id="+shapeId].OFGeradeDefinition.isOk">
|
||||
<EXP><![CDATA[$=$isDefined]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<CALLFUNCTION Id="RDK:23772513">
|
||||
<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:23772516" SubType="Else">
|
||||
<CALLFUNCTION Id="RDK:23772515">
|
||||
<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:23772518" BreakType="4" ExitStatus="0" />
|
||||
</CASEGROUP>
|
||||
<CASEGROUP Id="RDK:23387295" CaseType="0">
|
||||
<EXP><![CDATA[$C$OFWeiche]]></EXP>
|
||||
<IFTHENELSE Id="RDK:23387294">
|
||||
@@ -40014,10 +40070,23 @@ ShapeList["id="+Param.Input[1].shapeID].name
|
||||
</CASEGROUP>
|
||||
<CASEGROUP Id="RDK:23017842" CaseType="0">
|
||||
<EXP><![CDATA[$C$OFGerade]]></EXP>
|
||||
<SET Id="RDK:23017841" VarRef="color">
|
||||
<EXP><![CDATA[$C$#ffe31b]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<IFTHENELSE Id="RDK:23780286">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$shape_item.OFGeradeDefinition.isOk]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:23780283" SubType="Then">
|
||||
<SET Id="RDK:23780282" VarRef="color">
|
||||
<EXP><![CDATA[$C$#ffe31b]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:23780285" SubType="Else">
|
||||
<SET Id="RDK:23780284" VarRef="color">
|
||||
<EXP><![CDATA[$C$#0E499F]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
</CASEGROUP>
|
||||
<CASEGROUP Id="RDK:23016984" CaseType="0">
|
||||
<EXP><![CDATA[$C$OFBogen]]></EXP>
|
||||
@@ -40090,6 +40159,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
|
||||
<PAR Name="Dbl" />
|
||||
<PAR Name="Int" />
|
||||
<PAR Name="Boo" />
|
||||
<PAR Name="StrArr" />
|
||||
</SET_STRUCT>
|
||||
<SET_STRUCT Id="RDK:19435291" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
|
||||
<PAR Name="Key">
|
||||
|
||||
Reference in New Issue
Block a user