Merge
This commit is contained in:
+88
-53
@@ -1385,12 +1385,6 @@
|
||||
<VAR Id="RDK:23222557" Name="OFBogenData" Type="OFBogenType[]" DesignTimeRemark="Dropdown Liste aller Bögen im Interface" />
|
||||
<VAR Id="RDK:23222658" Name="OFWeichenData" Type="OFWeicheType[]" DesignTimeRemark="Dropdown Liste aller Weichen im Interface" />
|
||||
<VAR Id="RDK:23747696" Name="TEFBogenData" Type="TEFBogenType[]" DesignTimeRemark="Liste aller TEF Bögen" />
|
||||
<VAR Id="RDK:23611107" Name="HoeheOben" Type="double" DesignTimeRemark="Generated by RD" />
|
||||
<VAR Id="RDK:24038425" Name="Part" Type="string" DesignTimeRemark="Generated by RD" />
|
||||
<VAR Id="RDK:24038426" Name="Part" Type="string" DesignTimeRemark="Generated by RD" />
|
||||
<VAR Id="RDK:24271547" Name="number" Type="string" DesignTimeRemark="Generated by RD" />
|
||||
<VAR Id="RDK:24301240" Name="AnzahlSeparatoren" Type="string" DesignTimeRemark="Generated by RD" />
|
||||
<VAR Id="RDK:24301256" Name="AnzahlScanner" Type="string" DesignTimeRemark="Generated by RD" />
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
|
||||
<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
|
||||
@@ -10876,6 +10870,10 @@ SSGConnectionPoint.x_M
|
||||
<PAR Name="KurveFoerdererDefinition" />
|
||||
<PAR Name="OFGeradeDefinition" />
|
||||
<PAR Name="OFBogenDefinition" />
|
||||
<PAR Name="TEFBogenDefinition" />
|
||||
<PAR Name="TEFGeradeDefinition" />
|
||||
<PAR Name="TEFUmlenkDefinition" />
|
||||
<PAR Name="OFWeicheDefinition" />
|
||||
</SET_STRUCT>
|
||||
</FOREACHLOOP>
|
||||
</FUNCTION>
|
||||
@@ -11285,6 +11283,22 @@ SSGConnectionPoint.x_M
|
||||
<PAR Name="pinned" />
|
||||
<PAR Name="selected" />
|
||||
<PAR Name="includeInBOM" />
|
||||
<PAR Name="Rotationsklasse" />
|
||||
<PAR Name="IDCounter" />
|
||||
<PAR Name="EckradDefinition" />
|
||||
<PAR Name="FoerdererDefinition" />
|
||||
<PAR Name="VarioFoerdererDefinition" />
|
||||
<PAR Name="KurveDefinition" />
|
||||
<PAR Name="TEFBogenDefinition" />
|
||||
<PAR Name="TEFGeradeDefinition" />
|
||||
<PAR Name="TEFUmlenkDefinition" />
|
||||
<PAR Name="KurveFoerdererDefinition" />
|
||||
<PAR Name="OFGeradeDefinition" />
|
||||
<PAR Name="OFBogenDefinition" />
|
||||
<PAR Name="OFWeicheDefinition" />
|
||||
<PAR Name="BTMTBeladungDefinition" />
|
||||
<PAR Name="BTMTEntladungDefinition" />
|
||||
<PAR Name="isDefined" />
|
||||
</SET_STRUCT>
|
||||
<IFTHENELSE Id="RDK:1007686">
|
||||
<VALUECONDITION Value="true">
|
||||
@@ -32317,6 +32331,7 @@ me.x
|
||||
<FUNCTION Id="RDK:22536730" Name="CreateCsvILSAutomation" DesignTimeRemark="Erzeugt allen Elementen der Szene die Angaben für die Automation als CSV Item" ResultTypeName="CSVType">
|
||||
<GROUP Id="RDK:22536766" Name="Local Variables" SubType="VarSet" IncludeDate="0">
|
||||
<VAR Id="RDK:22536749" Name="AutomationMerkmale" Type="AutomationMerkmaleType" />
|
||||
<VAR Id="RDK:24301387" Name="OmnifloSump" Type="OmnifloSumUpType" />
|
||||
<VAR Id="RDK:22537083" Name="AnzahlKreisel" Type="integer">
|
||||
<SET Id="RDK:22537274" VarRef="Me">
|
||||
<EXP><![CDATA[$C$0]]></EXP>
|
||||
@@ -32854,9 +32869,6 @@ me.x
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</CASEGROUP>
|
||||
<CASEGROUP Id="RDK:24301175" CaseType="0">
|
||||
<EXP><![CDATA[$C$OFWeiche]]></EXP>
|
||||
</CASEGROUP>
|
||||
<CASEGROUP Id="RDK:24301248" CaseType="0">
|
||||
<EXP><![CDATA[$C$OFWeiche]]></EXP>
|
||||
<SET Id="RDK:24301247" VarRef="AnzahlWeichen">
|
||||
@@ -32865,7 +32877,7 @@ me.x
|
||||
</SET>
|
||||
<IFTHENELSE Id="RDK:24301251">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$ShapeItem.OFWeicheDefinition.WeichenTyp = 'Weichenkörper']]></EXP>
|
||||
<EXP><![CDATA[$=$ShapeItem.OFWeicheDefinition.WeichenTyp = "Weichenkörper"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:24301252" SubType="Then">
|
||||
<SET Id="RDK:24301244" VarRef="AnzahlWeichengrundkörper">
|
||||
@@ -32874,9 +32886,23 @@ me.x
|
||||
</SET>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
<IFTHENELSE Id="RDK:24301405">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$ShapeItem.OFWeicheDefinition.WeichenTyp = "Einzelweiche"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$ShapeItem.OFWeicheDefinition.KurvenWinkel = 22.5]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:24301404" SubType="Then">
|
||||
<SET Id="RDK:24301403" VarRef="AnzahlWeichengrundkörper">
|
||||
<EXP><![CDATA[$=$AnzahlWeichengrundkörper+1]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
<IFTHENELSE Id="RDK:24301384">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$ShapeItem.OFWeicheDefinition.WeichenTyp = 'Delta']]></EXP>
|
||||
<EXP><![CDATA[$=$ShapeItem.OFWeicheDefinition.WeichenTyp = "Dreifachweiche"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:24301383" SubType="Then">
|
||||
<SET Id="RDK:24301382" VarRef="AnzahlDeltaweichen">
|
||||
@@ -32885,41 +32911,34 @@ me.x
|
||||
</SET>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
<LIST_ADD Id="RDK:24301361" ListRef="längenInMeterOF">
|
||||
<PAR Name="VALUE_TO_ADD">
|
||||
<EXP><![CDATA[$=$ShapeItem.OFWeicheDefinition.L1/1000]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="POS_TO_ADD" />
|
||||
</LIST_ADD>
|
||||
<LIST_ADD Id="RDK:24301362" DesignTimeRemark="TODO: Verzweigung je nach Weichentyp" ListRef="längenInMeterOF">
|
||||
<PAR Name="VALUE_TO_ADD">
|
||||
<EXP><![CDATA[$=$ShapeItem.OFWeicheDefinition.L2/1000]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="POS_TO_ADD" />
|
||||
</LIST_ADD>
|
||||
<IFTHENELSE Id="RDK:24305401">
|
||||
<VALUECONDITION Value="true" Oper="OR">
|
||||
<EXP><![CDATA[$=$ShapeItem.OFWeicheDefinition.WeichenTyp = "Dreiwegeweiche"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$ShapeItem.OFWeicheDefinition.WeichenTyp = "Doppelweiche"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:24305400" SubType="Then">
|
||||
<SET Id="RDK:24305399" VarRef="AnzahlDoppelUndDreiwegeweichen">
|
||||
<EXP><![CDATA[$=$AnzahlDoppelUndDreiwegeweichen+1]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
<IFTHENELSE Id="RDK:24305377">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$ShapeItem.OFWeicheDefinition.WeichenTyp = "Sternweiche"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:24305376" SubType="Then">
|
||||
<SET Id="RDK:24305375" VarRef="AnzahlSternweichen">
|
||||
<EXP><![CDATA[$=$AnzahlSternweichen+1]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
</CASEGROUP>
|
||||
<CASEGROUP Id="RDK:24301366" CaseType="1">
|
||||
<EXP />
|
||||
<ACTION_CALL Id="RDK:24301364" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
|
||||
<PAR Name="RDLibraryName">
|
||||
<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="MsgText">
|
||||
<EXP><![CDATA[$C$element in Gruppe nicht erlaubt]]></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>
|
||||
<EXIT_PROCESS Id="RDK:24301365" BreakType="4" ExitStatus="0" />
|
||||
</CASEGROUP>
|
||||
</SELECTCASE>
|
||||
</FOREACHLOOP>
|
||||
@@ -32940,17 +32959,33 @@ me.x
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET_STRUCT Id="RDK:24301183" VarRef="OmnifloSumUpMerkmale" ClearAll="True">
|
||||
<PAR Name="Anzahl Bögen" />
|
||||
<PAR Name="Anzahl Weichengrundkörper" />
|
||||
<PAR Name="Anzahl Einwegweichen" />
|
||||
<PAR Name="Anzahl Deltaweichen" />
|
||||
<PAR Name="Anzahl Doppelweichen und Dreiwegeweichen" />
|
||||
<PAR Name="Anzahl Sternweichen" />
|
||||
<PAR Name="Gesamtlänge AP110" />
|
||||
<PAR Name="Gesamtlänge AP60" />
|
||||
<PAR Name="Anzahl Bögen">
|
||||
<EXP><![CDATA[$=$AnzahlBögen]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Anzahl Weichengrundkörper">
|
||||
<EXP><![CDATA[$=$AnzahlWeichengrundkörper]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Anzahl Einwegweichen">
|
||||
<EXP><![CDATA[$=$AnzahlWeichen]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Anzahl Deltaweichen">
|
||||
<EXP><![CDATA[$=$AnzahlDeltaweichen]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Anzahl Doppelweichen und Dreiwegeweichen">
|
||||
<EXP><![CDATA[$=$AnzahlDoppelUndDreiwegeweichen]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Anzahl Sternweichen">
|
||||
<EXP><![CDATA[$=$AnzahlSternweichen]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Gesamtlänge AP110">
|
||||
<EXP><![CDATA[$=$GesamtlängeAP110]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Gesamtlänge AP60">
|
||||
<EXP><![CDATA[$=$GestamtlängeAP60]]></EXP>
|
||||
</PAR>
|
||||
</SET_STRUCT>
|
||||
<SET Id="RDK:24301184" VarRef="CSV_Item.Merkmale">
|
||||
<EXP><![CDATA[$=$ToJSON(AutomationMerkmale)]]></EXP>
|
||||
<EXP><![CDATA[$=$ToJSON(OmnifloSumUpMerkmale)]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:24301185" VarRef="Param.Result">
|
||||
@@ -53845,4 +53880,4 @@ ShapeList["id="+Param.Input[1].shapeID].name
|
||||
</PROFILES_DATA>
|
||||
<BOM_DATA />
|
||||
</EXTERNAL_DATA>
|
||||
</PROCESS>
|
||||
</PROCESS>
|
||||
|
||||
Reference in New Issue
Block a user