Fix der SetHeight Funktion, die nun über den Index der ShapeListe auf das ShapeItem zugreift

This commit is contained in:
Simon Schmutzler
2024-06-17 14:40:43 +02:00
parent 4fdac82c76
commit 9073938198
+107 -5
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="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-06-17T11:54:03" LanguageVersion="2014.1.3.674" />
<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-06-17T14:39:57" LanguageVersion="2014.1.3.674" />
<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">
@@ -1019,6 +1019,9 @@
<VAR Id="RDK:19603024" Name="isDefined" Type="string" Suppressed="True" DesignTimeRemark="Generated by RD" />
<VAR Id="RDK:19632171" Name="shapeList_idx" Type="string" Suppressed="True" DesignTimeRemark="Generated by RD" />
<VAR Id="RDK:19798335" Name="TempKreiselLink" Type="string" DesignTimeRemark="Generated by RD" />
<VAR Id="RDK:19841636" Name="shape_item" Type="Editor2DShapeType" DesignTimeRemark="Generated by RD" />
<VAR Id="RDK:19841637" Name="shape_item" Type="Editor2DShapeType" DesignTimeRemark="Generated by RD" />
<VAR Id="RDK:19866002" Name="shapeList_idx" Type="string" DesignTimeRemark="Generated by RD" />
</GROUP>
<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
@@ -9276,6 +9279,79 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
<EXP><![CDATA[$C$#f33256]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<GROUP Id="RDK:19839574" Name="Set DirectConnHeights" SubType="Generic" DesignTimeNotes="20231011 -1-">
<FOREACHLOOP Id="RDK:19841614" ItemVarRef="Link">
<PAR Name="ArrayValueExp">
<EXP><![CDATA[$=$Shape_Prototype.links]]></EXP>
</PAR>
<PAR Name="ExitCondExp">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<GROUP Id="RDK:19842999" Name="Local Vars" SubType="VarSet" IncludeDate="0" DesignTimeNotes="20230928 -1-">
<VAR Id="RDK:19843001" Name="UebergabeListe" Type="SSGParameter[]" />
</GROUP>
<SET Id="RDK:19841635" VarRef="shape_item">
<EXP><![CDATA[$=$ShapeList["id=" + StrAfter(Link, ";")]]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<IFTHENELSE Id="RDK:19841630">
<VALUECONDITION Value="true" Oper="OR">
<EXP><![CDATA[$=$shape_item.family = "Gefaellestrecke"]]></EXP>
</VALUECONDITION>
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$shape_item.family = "Foerderer"]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:19841629" SubType="Then">
<SET_STRUCT Id="RDK:19841625" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
<PAR Name="Key">
<EXP><![CDATA[$C$shapeId_0]]></EXP>
</PAR>
<PAR Name="Str">
<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
</PAR>
<PAR Name="Dbl" />
<PAR Name="Int" />
<PAR Name="Boo" />
</SET_STRUCT>
<SET_STRUCT Id="RDK:19841626" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
<PAR Name="Key">
<EXP><![CDATA[$C$shapeId_1]]></EXP>
</PAR>
<PAR Name="Str">
<EXP><![CDATA[$=$shape_item.id]]></EXP>
</PAR>
<PAR Name="Dbl" />
<PAR Name="Int" />
<PAR Name="Boo" />
</SET_STRUCT>
<CALLFUNCTION Id="RDK:19841627">
<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:19841628">
<PAR Name="FuncName">
<EXP><![CDATA[$C$SetStatus]]></EXP>
</PAR>
<PAR Name="InputExp">
<EXP><![CDATA[$=$shape_item.id]]></EXP>
</PAR>
<PAR Name="ResultRef">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
</GROUP>
</IFTHENELSE>
</FOREACHLOOP>
</GROUP>
<SET Id="RDK:1134513" VarRef="ShapeList[TempIndex].text" Suppressed="True">
<EXP><![CDATA[$=$Param.Input.Text + Lf() + "Höhe vererbt"]]></EXP>
<PAR Name="AdvancedOptions" />
@@ -15859,11 +15935,11 @@ ShapeList["id="+Param.Input[1].shapeID].name
</SET>
</GROUP>
</IFTHENELSE>
<SET Id="RDK:19595407" VarRef="Shape_Prototype">
<SET Id="RDK:19595407" VarRef="Shape_Prototype" Suppressed="True">
<EXP><![CDATA[$=$ShapeList["id="+shapeId]]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<CALLFUNCTION Id="RDK:19595409">
<CALLFUNCTION Id="RDK:19595409" Suppressed="True">
<PAR Name="FuncName">
<EXP><![CDATA[$C$Calculate Foerderer]]></EXP>
</PAR>
@@ -16252,7 +16328,9 @@ ShapeList["id="+Param.Input[1].shapeID].name
<FUNCTION Id="RDK:1698052" Name="SetHeightOnConnect" InputTypeName="SSGParameter[]" ResultTypeName="SSGParameter[]">
<GROUP Id="RDK:1772339" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
<VAR Id="RDK:1772341" Name="item_0" Type="Editor2DShapeType" />
<VAR Id="RDK:19866003" Name="shapeList_idx_0" Type="integer" />
<VAR Id="RDK:1772343" Name="item_1" Type="Editor2DShapeType" />
<VAR Id="RDK:19866005" Name="shapeList_idx_1" Type="integer" />
<VAR Id="RDK:1772347" Name="cp_kreiselpartner" Type="Editor2DConnectionPointType" />
<VAR Id="RDK:1772349" Name="kreiselhoehe" Type="double" />
<VAR Id="RDK:19493734" Name="zielhoehe" Type="double" />
@@ -16261,12 +16339,36 @@ ShapeList["id="+Param.Input[1].shapeID].name
<VAR Id="RDK:19664798" Name="cps_verbunden" Type="string[]" />
<VAR Id="RDK:19682385" Name="cp_0" Type="structure" />
</GROUP>
<CALLFUNCTION Id="RDK:19866001">
<PAR Name="FuncName">
<EXP><![CDATA[$C$IndexOfByFieldValue_SSG]]></EXP>
</PAR>
<PAR Name="InputExp">
<EXP><![CDATA[$=$Param.Input["key=shapeId_0"].Str]]></EXP>
</PAR>
<PAR Name="ResultRef">
<EXP><![CDATA[$V$shapeList_idx_0]]></EXP>
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
<CALLFUNCTION Id="RDK:19866007">
<PAR Name="FuncName">
<EXP><![CDATA[$C$IndexOfByFieldValue_SSG]]></EXP>
</PAR>
<PAR Name="InputExp">
<EXP><![CDATA[$=$Param.Input["key=shapeId_1"].Str]]></EXP>
</PAR>
<PAR Name="ResultRef">
<EXP><![CDATA[$V$shapeList_idx_1]]></EXP>
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
<SET Id="RDK:19710796" VarRef="item_0">
<EXP><![CDATA[$=$ShapeList["id="+Param.Input["key=shapeId_0"].Str]]]></EXP>
<EXP><![CDATA[$=$ShapeList[shapeList_idx_0]]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:19710798" VarRef="item_1">
<EXP><![CDATA[$=$ShapeList["id="+Param.Input["key=shapeId_1"].Str]]]></EXP>
<EXP><![CDATA[$=$ShapeList[shapeList_idx_1]]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<CALLFUNCTION Id="RDK:19710799">