FIX: CSV Merkmale nur als JSON String der Funktion zurückgeben, ansonsten wird CSV_Item nicht beschrieben. Anzahl der Zusatzseparatoren und Scanner noch in das Kriterium der eindeutigkeit der AttributIds mit aufgenommen: getAttributeIdOfShapeItem entsprechend ergänzt
This commit is contained in:
+22
-26
@@ -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="2024-12-23T09:37:32" LanguageVersion="2014.1.3.699" />
|
||||
<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-12-23T10:38:08" LanguageVersion="2014.1.3.699" />
|
||||
<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">
|
||||
@@ -6764,6 +6764,10 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
<EXP><![CDATA[$=$"KRE"+shapeItem.KreiselDefinition.AbstandMS]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:22370649" VarRef="idStr">
|
||||
<EXP><![CDATA[$=$idStr+"-Sep"+ shapeItem.KreiselDefinition.n_Sep + "-Scan"+ shapeItem.KreiselDefinition.n_Scan]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</CASEGROUP>
|
||||
<CASEGROUP Id="RDK:22341733" CaseType="0">
|
||||
<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
|
||||
@@ -6771,6 +6775,10 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
<EXP><![CDATA[$=$"GEF"+shapeItem.GefaelleDefinition.L1]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:22370651" VarRef="idStr">
|
||||
<EXP><![CDATA[$=$idStr+"-Sep"+ shapeItem.GefaelleDefinition.n_Sep + "-Scan"+ shapeItem.GefaelleDefinition.n_Scan]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</CASEGROUP>
|
||||
<CASEGROUP Id="RDK:22341744" CaseType="0">
|
||||
<EXP><![CDATA[$C$Foerderer]]></EXP>
|
||||
@@ -6778,6 +6786,10 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
<EXP><![CDATA[$=$"FOD"+shapeItem.FoerdererDefinition.L1]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:22370653" VarRef="idStr">
|
||||
<EXP><![CDATA[$=$idStr+"-Sep"+ shapeItem.FoerdererDefinition.n_Sep + "-Scan"+ shapeItem.FoerdererDefinition.n_Scan]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</CASEGROUP>
|
||||
<CASEGROUP Id="RDK:22341755" CaseType="0">
|
||||
<EXP><![CDATA[$C$VarioFoerderer]]></EXP>
|
||||
@@ -6785,6 +6797,10 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
<EXP><![CDATA[$=$"VAF"+shapeItem.VarioFoerdererDefinition.L1]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:22370655" VarRef="idStr">
|
||||
<EXP><![CDATA[$=$idStr+"-Sep"+ shapeItem.VarioFoerdererDefinition.n_Sep + "-Scan"+ shapeItem.VarioFoerdererDefinition..n_Scan]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</CASEGROUP>
|
||||
<CASEGROUP Id="RDK:22341766" CaseType="0">
|
||||
<EXP><![CDATA[$C$Weiche]]></EXP>
|
||||
@@ -6839,7 +6855,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</FUNCTION>
|
||||
<FUNCTION Id="RDK:22028265" Name="SetGroupAttributes" DesignTimeRemark="Set die Werte für den CSV Export für eine Strecke, bestehend aus Förderer und Gefälleanteilen" InputTypeName="string">
|
||||
<FUNCTION Id="RDK:22028265" Name="SetGroupAttributes" DesignTimeRemark="Set die Werte für den CSV Export für eine Strecke, bestehend aus Förderer und Gefälleanteilen" InputTypeName="string" ResultTypeName="string">
|
||||
<GROUP Id="RDK:22028256" Name="Local Variables" SubType="VarSet" IncludeDate="0">
|
||||
<VAR Id="RDK:22028283" Name="group" Type="string">
|
||||
<SET Id="RDK:22028285" VarRef="Me">
|
||||
@@ -7144,7 +7160,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
<EXP><![CDATA[$=$SUM_ASM]]></EXP>
|
||||
</PAR>
|
||||
</SET_STRUCT>
|
||||
<SET Id="RDK:22028271" VarRef="CSV_Item.Merkmale">
|
||||
<SET Id="RDK:22028271" VarRef="Param.Result">
|
||||
<EXP><![CDATA[$=$ToJSON(GruppeMerkmale)]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
@@ -7802,11 +7818,11 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:22306056" VarRef="anzahlScanner">
|
||||
<EXP><![CDATA[$=$ASM.{Anzahl der Scanner}+ anzahlScanner]]></EXP>
|
||||
<EXP><![CDATA[$=$GFM.{Anzahl der Scanner}+ anzahlScanner]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:22306060" VarRef="anzahlZusatzseparatoren">
|
||||
<EXP><![CDATA[$=$ASM.Zusatzseparatoren+ anzahlZusatzseparatoren]]></EXP>
|
||||
<EXP><![CDATA[$=$GFM.Zusatzseparatoren+ anzahlZusatzseparatoren]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<LIST_ADD Id="RDK:22306052" ListRef="hoehenInMeter">
|
||||
@@ -7815,12 +7831,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
</PAR>
|
||||
<PAR Name="POS_TO_ADD" />
|
||||
</LIST_ADD>
|
||||
<LIST_ADD Id="RDK:22341541" Suppressed="True" ListRef="längenInMeter">
|
||||
<PAR Name="VALUE_TO_ADD">
|
||||
<EXP><![CDATA[$=$länge]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="POS_TO_ADD" />
|
||||
</LIST_ADD>
|
||||
<FOREACHLOOP Id="RDK:22306067" ItemVarRef="länge">
|
||||
<PAR Name="ArrayValueExp">
|
||||
<EXP><![CDATA[$=$GFM.{Länge in Meter}]]></EXP>
|
||||
@@ -8026,12 +8036,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
</PAR>
|
||||
<PAR Name="POS_TO_ADD" />
|
||||
</LIST_ADD>
|
||||
<LIST_ADD Id="RDK:22341539" Suppressed="True" ListRef="längenInMeter">
|
||||
<PAR Name="VALUE_TO_ADD">
|
||||
<EXP><![CDATA[$=$laenge]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="POS_TO_ADD" />
|
||||
</LIST_ADD>
|
||||
<FOREACHLOOP Id="RDK:22306061" ItemVarRef="laenge">
|
||||
<PAR Name="ArrayValueExp">
|
||||
<EXP><![CDATA[$=$ASM.{Länge in Meter}]]></EXP>
|
||||
@@ -12526,14 +12530,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
<GROUP Id="RDK:22358792" Name="Local Variables" SubType="VarSet" IncludeDate="0">
|
||||
<VAR Id="RDK:22358788" Name="kv" Type="SSGDictInt" />
|
||||
</GROUP>
|
||||
<IFTHENELSE Id="RDK:22361169">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$IsEmpty(CountKeys)]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:22361166" SubType="Then">
|
||||
<EXIT_PROCESS Id="RDK:22361179" BreakType="4" ExitStatus="0" />
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
<FOREACHLOOP Id="RDK:22342810" ItemVarRef="kv">
|
||||
<PAR Name="ArrayValueExp">
|
||||
<EXP><![CDATA[$=$CountKeys]]></EXP>
|
||||
@@ -22906,7 +22902,7 @@ me.x
|
||||
<EXP><![CDATA[$=$group]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="ResultRef">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
<EXP><![CDATA[$V$CSV_Item.Merkmale]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Options" />
|
||||
</CALLFUNCTION>
|
||||
|
||||
Reference in New Issue
Block a user