Redundanten Code entfernt: In SetHeightOfStreckeOnConnect die Fkt. SetHeight verwenden

This commit is contained in:
2024-10-30 17:15:55 +01:00
parent 3de8e82bdf
commit f19421c6eb
+69 -13
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="m.stangl [ENTW-NB08]" ModDate="2024-10-29T15:41:51" LanguageVersion="2014.1.3.699" />
<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-10-30T16:51:45" 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">
@@ -17047,6 +17047,27 @@ me.x
<PAR Name="Options" />
</CALLFUNCTION>
</GROUP>
<GROUP Id="RDK:21929515" SubType="Else">
<ACTION_CALL Id="RDK:21929517" 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 unlik 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:21692168" CaseType="0">
@@ -21677,11 +21698,13 @@ ShapeList["id="+Param.Input[1].shapeID].name
</SET>
</GROUP>
</IFTHENELSE>
<CALLFUNCTION Id="RDK:21920364" Suppressed="True">
<CALLFUNCTION Id="RDK:21920364">
<PAR Name="FuncName">
<EXP><![CDATA[$C$Calculate Foerderer]]></EXP>
</PAR>
<PAR Name="InputExp" />
<PAR Name="InputExp">
<EXP><![CDATA[$C$shapeId]]></EXP>
</PAR>
<PAR Name="ResultRef">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
@@ -21752,7 +21775,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
</GROUP>
</IFTHENELSE>
<SET Id="RDK:21920383" VarRef="ShapeList[&quot;id=&quot;+shapeId].z">
<EXP><![CDATA[$=$ShapeList["id="+shapeId].KurveFoerdererDefinition.H_Anfang/2 + ShapeList["id="+shapeId].KurveFoerdererDefinition.H_Ende/2]]></EXP>
<EXP><![CDATA[$=$hoehe]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</CASEGROUP>
@@ -23452,7 +23475,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
<VAR Id="RDK:18935909" Name="cp_partner" Type="SSGConnectionPoint" />
<VAR Id="RDK:18827203" Name="hoehe" Type="double" />
<VAR Id="RDK:18742671" Name="UebergabeListe" Type="SSGParameter[]" />
<VAR Id="RDK:18742672" Name="RueckgabeListe" Type="SSGParameter[]" />
<VAR Id="RDK:21940012" Name="UebergabeSetHeight" Type="SSGParameter[]" />
<VAR Id="RDK:20803353" Name="cpId" Type="string" />
</GROUP>
<SET Id="RDK:18742693" VarRef="item_0">
@@ -23463,6 +23486,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
<EXP><![CDATA[$=$Param.Input[0].connectionPointID]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<COMMENTS Id="RDK:21940014" DesignTimeRemark="Hole dir die Höhe des Vorgängers um es im nachfolgenden Koordinatensystem zu setzen" />
<SET_STRUCT Id="RDK:18827137" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
<PAR Name="Key">
<EXP><![CDATA[$C$shapeID]]></EXP>
@@ -23503,7 +23527,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
<EXP><![CDATA[$=$RueckgabeListe["key=Hoehe"].Dbl]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SELECTCASE Id="RDK:18827082">
<SELECTCASE Id="RDK:18827082" Suppressed="True">
<EXP><![CDATA[$=$item_0.family]]></EXP>
<CASEGROUP Id="RDK:18827142" CaseType="0">
<EXP><![CDATA[$C$Foerderer]]></EXP>
@@ -23672,22 +23696,54 @@ ShapeList["id="+Param.Input[1].shapeID].name
<EXP />
</CASEGROUP>
</SELECTCASE>
<SET_STRUCT Id="RDK:18827193" VarRef="SSGParameter" ClearAll="True" ListRef="RueckgabeListe">
<SET_STRUCT Id="RDK:21940004" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeSetHeight">
<PAR Name="Key">
<EXP><![CDATA[$C$shapeID]]></EXP>
<EXP><![CDATA[$C$ShapeId]]></EXP>
</PAR>
<PAR Name="StrArr" />
<PAR Name="Str">
<EXP><![CDATA[$=$item_0.id]]></EXP>
</PAR>
<PAR Name="Dbl" />
<PAR Name="Int" />
<PAR Name="Boo" />
<PAR Name="StrArr" />
</SET_STRUCT>
<SET Id="RDK:18742729" VarRef="Param.Result">
<EXP><![CDATA[$=$RueckgabeListe]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET_STRUCT Id="RDK:21940008" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeSetHeight">
<PAR Name="Key">
<EXP><![CDATA[$C$Hoehe]]></EXP>
</PAR>
<PAR Name="StrArr" />
<PAR Name="Str" />
<PAR Name="Dbl">
<EXP><![CDATA[$=$hoehe]]></EXP>
</PAR>
<PAR Name="Int" />
<PAR Name="Boo" />
</SET_STRUCT>
<SET_STRUCT Id="RDK:21940010" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeSetHeight">
<PAR Name="Key">
<EXP><![CDATA[$C$Label]]></EXP>
</PAR>
<PAR Name="StrArr" />
<PAR Name="Str">
<EXP><![CDATA[$=$cpid]]></EXP>
</PAR>
<PAR Name="Dbl" />
<PAR Name="Int" />
<PAR Name="Boo" />
</SET_STRUCT>
<CALLFUNCTION Id="RDK:21940002">
<PAR Name="FuncName">
<EXP><![CDATA[$C$SetHeight]]></EXP>
</PAR>
<PAR Name="InputExp">
<EXP><![CDATA[$=$UebergabeSetHeight]]></EXP>
</PAR>
<PAR Name="ResultRef">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
</FUNCTION>
<FUNCTION Id="RDK:18741851" Name="GetHeightOfItem" InputTypeName="SSGParameter[]" ResultTypeName="SSGParameter[]">
<GROUP Id="RDK:18741873" Name="LocalVariables" SubType="VarSet" IncludeDate="0">