Globale Felder um der Gruppenfunktionen um eines reduziert. Weniger verwaltungsaufwand im Code.
This commit is contained in:
+33
-135
@@ -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-09-25T15:07:26" LanguageVersion="2014.1.3.690" />
|
||||
<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-09-25T17:16:29" LanguageVersion="2014.1.3.690" />
|
||||
<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">
|
||||
@@ -995,12 +995,7 @@
|
||||
<VAR Id="RDK:1007447" Name="Point2DList" Type="Point2D[]" />
|
||||
<VAR Id="RDK:1007444" Name="Point2D" Type="Point2D" />
|
||||
<VAR Id="RDK:1519830" Name="SessionZip" Type="string" />
|
||||
<VAR Id="RDK:20857714" Name="groupIds" Type="string[]" />
|
||||
<VAR Id="RDK:20857929" Name="groupStrings" Type="string[]" />
|
||||
<VAR Id="RDK:20857934" Name="lineStr" Type="string" DesignTimeRemark="Generated by RD" />
|
||||
<VAR Id="RDK:20880189" Name="newLineStr" Type="string" DesignTimeRemark="Generated by RD" />
|
||||
<VAR Id="RDK:20880286" Name="idx" Type="integer" DesignTimeRemark="Generated by RD" />
|
||||
<VAR Id="RDK:20924240" Name="id" Type="variant" DesignTimeRemark="Generated by RD" />
|
||||
<VAR Id="RDK:20857929" Name="groupStrings" Type="string[]" DesignTimeRemark="Enthält ; separtiert alle Strings, damit die Gruppen beschrieben werden können. a;b;c wäre z.B. eine Gruppe aus den Objekten a, b und c" />
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
|
||||
<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
|
||||
@@ -9639,82 +9634,11 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
</SET>
|
||||
</FUNCTION>
|
||||
<GROUP Id="RDK:20817725" Name="StreckeGroupFunctions" SubType="FunctionSet" IncludeDate="0">
|
||||
<FUNCTION Id="RDK:20817716" Name="StrTestsForGroupMethods" DesignTimeRemark="enthält die String Funktionen zum Test deren Funktionaliät" InputTypeName="list" ResultTypeName="boolean">
|
||||
<GROUP Id="RDK:20824312" Name="Local Variables" SubType="VarSet" IncludeDate="0">
|
||||
<VAR Id="RDK:20824311" Name="id0" Type="string">
|
||||
<SET Id="RDK:20824328" VarRef="Me">
|
||||
<EXP><![CDATA[$=$Param.Input[0]]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</VAR>
|
||||
<VAR Id="RDK:20831166" Name="id1" Type="string">
|
||||
<SET Id="RDK:20831165" VarRef="Me">
|
||||
<EXP><![CDATA[$=$Param.Input[1]]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</VAR>
|
||||
<VAR Id="RDK:20834689" Name="lineStr" Type="string" />
|
||||
<VAR Id="RDK:20852855" Name="idx" Type="integer" />
|
||||
<VAR Id="RDK:20852861" Name="elemIdx" Type="integer" />
|
||||
<VAR Id="RDK:20851482" Name="line" Type="string[]" />
|
||||
<VAR Id="RDK:20854915" Name="testarr" Type="string[]" />
|
||||
</GROUP>
|
||||
<SET Id="RDK:20834693" VarRef="line">
|
||||
<EXP><![CDATA[$=$NewList(id0, id1)]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:20851484" VarRef="lineStr">
|
||||
<EXP><![CDATA[$=$ListToStr(line, ";")]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:20852851" VarRef="testarr">
|
||||
<EXP><![CDATA[$=$splitStr(lineStr, ";")]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:20852857" VarRef="idx">
|
||||
<EXP><![CDATA[$=$StrIndexOf(lineStr, id0, 0)]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:20852859" VarRef="idx">
|
||||
<EXP><![CDATA[$=$StrIndexOf(lineStr, id1, 0)]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:20856965" VarRef="idx">
|
||||
<EXP><![CDATA[$=$StrIndexOf(lineStr, "blubb", 0)]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:20852863" VarRef="elemIdx">
|
||||
<EXP><![CDATA[$=$IndexOf(line, id0)]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:20852865" VarRef="elemIdx">
|
||||
<EXP><![CDATA[$=$IndexOf(line, id1)]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:20856281" VarRef="elemIdx">
|
||||
<EXP><![CDATA[$=$IndexOf(line, "blubb")]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</FUNCTION>
|
||||
<FUNCTION Id="RDK:20857698" Name="CreateGroup" DesignTimeRemark="Erzeugt eine Gruppe aus den gegebenen (mindestens zwei) Ids" InputTypeName="list" ResultTypeName="boolean">
|
||||
<GROUP Id="RDK:20857685" Name="Local Variables" SubType="VarSet" IncludeDate="0">
|
||||
<VAR Id="RDK:20857677" Name="id" Type="string" />
|
||||
<VAR Id="RDK:20857936" Name="lineStr" Type="string" />
|
||||
</GROUP>
|
||||
<FOREACHLOOP Id="RDK:20924239" ItemVarRef="id">
|
||||
<PAR Name="ArrayValueExp">
|
||||
<EXP><![CDATA[$=$Param.Input]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="ExitCondExp">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
</PAR>
|
||||
<LIST_ADD Id="RDK:20857921" DesignTimeRemark="enthält alle ShapeIds, die in Gruppen verbaut wurden" ListRef="GroupIds">
|
||||
<PAR Name="VALUE_TO_ADD">
|
||||
<EXP><![CDATA[$=$id]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="POS_TO_ADD" />
|
||||
</LIST_ADD>
|
||||
</FOREACHLOOP>
|
||||
<SET Id="RDK:20857933" VarRef="lineStr">
|
||||
<EXP><![CDATA[$=$ListToStr(Param.Input, ";")]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
@@ -9776,17 +9700,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
<REMOVE_ADD Id="RDK:20892781" ListRef="groupStrings" Value="$=$rg">
|
||||
<EXP />
|
||||
</REMOVE_ADD>
|
||||
<FOREACHLOOP Id="RDK:20880390" ItemVarRef="id">
|
||||
<PAR Name="ArrayValueExp">
|
||||
<EXP><![CDATA[$=$splitStr(rg, ";")]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="ExitCondExp">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
</PAR>
|
||||
<REMOVE_ADD Id="RDK:20892783" ListRef="GroupIds" Value="$=$id">
|
||||
<EXP />
|
||||
</REMOVE_ADD>
|
||||
</FOREACHLOOP>
|
||||
</FOREACHLOOP>
|
||||
</FUNCTION>
|
||||
<FUNCTION Id="RDK:20817720" Name="IsInGroup" DesignTimeRemark="Prüft ob das Element der gegeben Id in einer Gruppe ist" InputTypeName="string" ResultTypeName="boolean">
|
||||
@@ -9797,29 +9710,32 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</VAR>
|
||||
<VAR Id="RDK:20860735" Name="elemIdx" Type="integer" />
|
||||
<VAR Id="RDK:20927027" Name="lineStr" Type="string" />
|
||||
</GROUP>
|
||||
<SET Id="RDK:20857806" VarRef="elemIdx">
|
||||
<EXP><![CDATA[$=$IndexOf(groupIds, id0)]]></EXP>
|
||||
<FOREACHLOOP Id="RDK:20924285" DesignTimeRemark="finde betroffene Gruppe" ItemVarRef="lineStr">
|
||||
<PAR Name="ArrayValueExp">
|
||||
<EXP><![CDATA[$=$groupStrings]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="ExitCondExp">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
</PAR>
|
||||
<IFTHENELSE Id="RDK:20924284" DesignTimeRemark="suche ob die Id in der Gruppe ist">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$StrIndexOf(lineStr, id0, 0) >= 0]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:20924283" SubType="Then">
|
||||
<SET Id="RDK:20857800" VarRef="Param.Result">
|
||||
<EXP><![CDATA[$C$True]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<EXIT_PROCESS Id="RDK:20924282" BreakType="4" ExitStatus="0" />
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
</FOREACHLOOP>
|
||||
<SET Id="RDK:20857782" VarRef="Param.Result">
|
||||
<EXP><![CDATA[$C$False]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<IFTHENELSE Id="RDK:20857794">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$elemIdx < 0]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:20857792" SubType="Then">
|
||||
<SET Id="RDK:20857782" VarRef="Param.Result">
|
||||
<EXP><![CDATA[$C$False]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:20857793" SubType="Else">
|
||||
<SET Id="RDK:20857800" VarRef="Param.Result">
|
||||
<EXP><![CDATA[$C$True]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
</FUNCTION>
|
||||
<FUNCTION Id="RDK:20817722" Name="GetFollowingIds" DesignTimeRemark="Gibt Alle Ids in der Gruppe zurüc, die dem gegebenen Element folgen" InputTypeName="string" ResultTypeName="string[]">
|
||||
<GROUP Id="RDK:20832564" Name="Local Variables" SubType="VarSet" IncludeDate="0">
|
||||
@@ -9837,8 +9753,9 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
</SET>
|
||||
</VAR>
|
||||
<VAR Id="RDK:20902069" Name="splitarr" Type="string[]" />
|
||||
<VAR Id="RDK:20924253" Name="lineStr" Type="string" />
|
||||
</GROUP>
|
||||
<FOREACHLOOP Id="RDK:20901983" DesignTimeRemark="finde betroffene Gruppe" ItemVarRef="lineStr" IndexVarRef="idx">
|
||||
<FOREACHLOOP Id="RDK:20901983" DesignTimeRemark="finde betroffene Gruppe" ItemVarRef="lineStr">
|
||||
<PAR Name="ArrayValueExp">
|
||||
<EXP><![CDATA[$=$groupStrings]]></EXP>
|
||||
</PAR>
|
||||
@@ -9902,9 +9819,10 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
</VAR>
|
||||
<VAR Id="RDK:20902090" Name="item" Type="string" />
|
||||
<VAR Id="RDK:20902093" Name="splitarr" Type="string[]" />
|
||||
<VAR Id="RDK:20924257" Name="lineStr" Type="string" />
|
||||
</GROUP>
|
||||
</GROUP>
|
||||
<FOREACHLOOP Id="RDK:20902115" DesignTimeRemark="finde betroffene Gruppe" ItemVarRef="lineStr" IndexVarRef="idx">
|
||||
<FOREACHLOOP Id="RDK:20902115" DesignTimeRemark="finde betroffene Gruppe" ItemVarRef="lineStr">
|
||||
<PAR Name="ArrayValueExp">
|
||||
<EXP><![CDATA[$=$groupStrings]]></EXP>
|
||||
</PAR>
|
||||
@@ -10049,9 +9967,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
<EXP><![CDATA[$=$newGroups]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<REMOVE_ADD Id="RDK:20895519" ListRef="GroupIds" Value="$=$idToRemove">
|
||||
<EXP />
|
||||
</REMOVE_ADD>
|
||||
</FUNCTION>
|
||||
<FUNCTION Id="RDK:20880133" Name="AddToGroup" DesignTimeRemark="Fügt die gegebene Id in die Gruppe ein" DesignTimeTip="Params: <Id to Add>, <Id in a Group>" InputTypeName="string[]" ResultTypeName="boolean">
|
||||
<GROUP Id="RDK:20880116" Name="Local Variables" SubType="VarSet" IncludeDate="0">
|
||||
@@ -10072,12 +9987,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
<VAR Id="RDK:20880113" Name="splitarr" Type="string[]" />
|
||||
<VAR Id="RDK:20880114" Name="newGroups" Type="string[]" />
|
||||
</GROUP>
|
||||
<LIST_ADD Id="RDK:20880117" ListRef="GroupIds">
|
||||
<PAR Name="VALUE_TO_ADD">
|
||||
<EXP><![CDATA[$=$idToAdd]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="POS_TO_ADD" />
|
||||
</LIST_ADD>
|
||||
<FOREACHLOOP Id="RDK:20880131" ItemVarRef="lineStr">
|
||||
<PAR Name="ArrayValueExp">
|
||||
<EXP><![CDATA[$=$groupStrings]]></EXP>
|
||||
@@ -10161,8 +10070,9 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
</VAR>
|
||||
<VAR Id="RDK:20895607" Name="groupHinten" Type="string" />
|
||||
<VAR Id="RDK:20899146" Name="splitarr" Type="string[]" />
|
||||
<VAR Id="RDK:20924261" Name="lineStr" Type="string" />
|
||||
</GROUP>
|
||||
<FOREACHLOOP Id="RDK:20895553" DesignTimeRemark="finde Anfang und Ende der beiden betroffenen Gruppen" ItemVarRef="lineStr" IndexVarRef="idx">
|
||||
<FOREACHLOOP Id="RDK:20895553" DesignTimeRemark="finde Anfang und Ende der beiden betroffenen Gruppen" ItemVarRef="lineStr">
|
||||
<PAR Name="ArrayValueExp">
|
||||
<EXP><![CDATA[$=$groupStrings]]></EXP>
|
||||
</PAR>
|
||||
@@ -10180,7 +10090,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
<GROUP Id="RDK:20895549" SubType="Then">
|
||||
<IFTHENELSE Id="RDK:20895660" DesignTimeRemark="Id ist am Kopf der Gruppe">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$FirstOf(spllitarr) = id0]]></EXP>
|
||||
<EXP><![CDATA[$=$FirstOf(splitarr) = id0]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:20895659" SubType="Then">
|
||||
<SET Id="RDK:20895676" VarRef="groupHinten">
|
||||
@@ -10204,7 +10114,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
<GROUP Id="RDK:20895691" SubType="Then">
|
||||
<IFTHENELSE Id="RDK:20895690" DesignTimeRemark="Id ist am Kopf">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$FirstOf(spllitarr) = id1]]></EXP>
|
||||
<EXP><![CDATA[$=$FirstOf(splitarr) = id1]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:20895687" SubType="Then">
|
||||
<SET Id="RDK:20895688" VarRef="groupHinten">
|
||||
@@ -10449,18 +10359,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
</IFTHENELSE>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
<CALLFUNCTION Id="RDK:20857853" Suppressed="True">
|
||||
<PAR Name="FuncName">
|
||||
<EXP><![CDATA[$C$IsInGroup]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="InputExp">
|
||||
<EXP><![CDATA[$=$id0]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="ResultRef">
|
||||
<EXP><![CDATA[$V$IsUsed0]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Options" />
|
||||
</CALLFUNCTION>
|
||||
</FUNCTION>
|
||||
</GROUP>
|
||||
</GROUP>
|
||||
|
||||
Reference in New Issue
Block a user