Merge
This commit is contained in:
+78
-16
@@ -17453,6 +17453,7 @@ SSGConnectionPoint.x_M
|
||||
<PAR Name="Options">
|
||||
<EXP><![CDATA[$C$(RANGE=0,5,0.1)]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="WebviewSubType" />
|
||||
</ACTION_CALL>
|
||||
<ACTION_CALL Id="RDK:25112325" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} <-- {UIType}:{Field} {Id} {ParentID}" DesignTimeNotes="20231005 -1-
Read only changed

20230928 -1-
Label changed">
|
||||
<PAR Name="RDLibraryName">
|
||||
@@ -18092,6 +18093,10 @@ SSGConnectionPoint.x_M
|
||||
</SET>
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:25172129" SubType="Else">
|
||||
<SET Id="RDK:26497235" VarRef="Shape_Prototype.VarioFoerdererDefinition.LH_fits">
|
||||
<EXP><![CDATA[$=$IIF(Abs(Shape_Prototype.VarioFoerdererDefinition.L1-(Shape_Prototype.VarioFoerdererDefinition.L_VF+Shape_Prototype.VarioFoerdererDefinition.L_GF))<Shape_Prototype.VarioFoerdererDefinition.LH_toleranz,True,False)]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<EXIT_PROCESS Id="RDK:22069235" BreakType="4" ExitStatus="0" />
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
@@ -29984,6 +29989,18 @@ ShapeList["id="+Param.Input[1].shapeID].name
|
||||
</PAR>
|
||||
<PAR Name="Options" />
|
||||
</CALLFUNCTION>
|
||||
<CALLFUNCTION Id="RDK:26495243">
|
||||
<PAR Name="FuncName">
|
||||
<EXP><![CDATA[$C$CalcVFTheoretischeLänge_Prototype]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="InputExp">
|
||||
<EXP><![CDATA[$=$]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="ResultRef">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Options" />
|
||||
</CALLFUNCTION>
|
||||
<CALLFUNCTION Id="RDK:22069135">
|
||||
<PAR Name="FuncName">
|
||||
<EXP><![CDATA[$C$Create/Update Shape]]></EXP>
|
||||
@@ -39235,10 +39252,15 @@ me.x
|
||||
<COMMENTS Id="RDK:383198" />
|
||||
<GROUP Id="RDK:1645267" Name="Local Variables" SubType="VarSet" IncludeDate="0">
|
||||
<VAR Id="RDK:1645268" Name="IDs" Type="string[]" />
|
||||
<VAR Id="RDK:26512147" Name="NewIDs" Type="string[]" />
|
||||
<VAR Id="RDK:20749809" Name="ID" Type="string" />
|
||||
<VAR Id="RDK:26512153" Name="RightID" Type="string" />
|
||||
<VAR Id="RDK:24576690" Name="origIDs" Type="string[]" />
|
||||
<VAR Id="RDK:26512139" Name="origIDsInRightSequence" Type="string[]" />
|
||||
<VAR Id="RDK:24613390" Name="InNoGroup" Type="boolean" />
|
||||
<VAR Id="RDK:24609360" Name="InSameGroup" Type="boolean" />
|
||||
<VAR Id="RDK:26512137" Name="groupId" Type="integer" />
|
||||
<VAR Id="RDK:26512168" Name="IndexInGroup" Type="integer" />
|
||||
</GROUP>
|
||||
<SET Id="RDK:1645269" VarRef="IDs">
|
||||
<EXP><![CDATA[$=$StrArrayFromListOfStructs(Param.Input, "shapeID")]]></EXP>
|
||||
@@ -39283,12 +39305,63 @@ me.x
|
||||
<EXP><![CDATA[$=$InSameGroup]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:24609370" SubType="Then">
|
||||
<CALLFUNCTION Id="RDK:26512135">
|
||||
<PAR Name="FuncName">
|
||||
<EXP><![CDATA[$C$GetGroupIndex]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="InputExp">
|
||||
<EXP><![CDATA[$=$origIDs[0]]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="ResultRef">
|
||||
<EXP><![CDATA[$V$groupId]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Options" />
|
||||
</CALLFUNCTION>
|
||||
<LIST_ADD Id="RDK:26514160" ListRef="origIDsInRightSequence">
|
||||
<PAR Name="VALUE_TO_ADD">
|
||||
<EXP><![CDATA[$=$SplitStr(StrReplaceOnItems(groupstrings[groupId], ";", ","),",")]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="POS_TO_ADD" />
|
||||
</LIST_ADD>
|
||||
<FOREACHLOOP Id="RDK:26512143" ItemVarRef="RightID">
|
||||
<PAR Name="ArrayValueExp">
|
||||
<EXP><![CDATA[$=$origIDsInRightSequence]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="ExitCondExp">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
</PAR>
|
||||
<FOREACHLOOP Id="RDK:26512151" ItemVarRef="ID">
|
||||
<PAR Name="ArrayValueExp">
|
||||
<EXP><![CDATA[$=$origIDs]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="ExitCondExp">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
</PAR>
|
||||
<IFTHENELSE Id="RDK:26512158">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$ID=RightID]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:26512159" SubType="Then">
|
||||
<SET Id="RDK:26512164" VarRef="IndexInGroup">
|
||||
<EXP><![CDATA[$=$IndexOf(origIDs, ID)]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<LIST_ADD Id="RDK:26512170" ListRef="NewIDs">
|
||||
<PAR Name="VALUE_TO_ADD">
|
||||
<EXP><![CDATA[$=$IDs[IndexInGroup]]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="POS_TO_ADD" />
|
||||
</LIST_ADD>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
</FOREACHLOOP>
|
||||
</FOREACHLOOP>
|
||||
<CALLFUNCTION Id="RDK:24609374">
|
||||
<PAR Name="FuncName">
|
||||
<EXP><![CDATA[$C$CreateGroup]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="InputExp">
|
||||
<EXP><![CDATA[$=$IDs]]></EXP>
|
||||
<EXP><![CDATA[$=$NewIDs]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="ResultRef">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
@@ -39322,7 +39395,7 @@ me.x
|
||||
</IFTHENELSE>
|
||||
<FOREACHLOOP Id="RDK:1620226" ItemVarRef="ID">
|
||||
<PAR Name="ArrayValueExp">
|
||||
<EXP><![CDATA[$=$IDs]]></EXP>
|
||||
<EXP><![CDATA[$=$NewIDs]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="ExitCondExp">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
@@ -39361,18 +39434,6 @@ me.x
|
||||
<EXP><![CDATA[$=$Shape_Prototype.family+" :"+Shape_Prototype.IDCounter]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<IFTHENELSE Id="RDK:1692933" Suppressed="True">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+ID].family="Kreisel"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:1692934" SubType="Then">
|
||||
<SET Id="RDK:1681600" VarRef="ShapeList["id="+ID].KreiselDefinition.Beschreibung">
|
||||
<EXP><![CDATA[$=$Shape_Prototype.family+" :"+Shape_Prototype.IDCounter]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:1692935" SubType="Else" />
|
||||
</IFTHENELSE>
|
||||
<SELECTCASE Id="RDK:1690659">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+ID].family]]></EXP>
|
||||
<CASEGROUP Id="RDK:1690660" CaseType="0">
|
||||
@@ -50556,11 +50617,11 @@ me.x
|
||||
<PAR Name="StrArr">
|
||||
<EXP><![CDATA[$=$following]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="StrArr2D" />
|
||||
<PAR Name="Str" />
|
||||
<PAR Name="Dbl" />
|
||||
<PAR Name="Int" />
|
||||
<PAR Name="Boo" />
|
||||
<PAR Name="StrArr2D" />
|
||||
</SET_STRUCT>
|
||||
<CALLFUNCTION Id="RDK:21528214" DesignTimeRemark="setzt alle Höhen von Kurven neu ausgehende vom gegebenen Shape, bis man an eine Gefällestrecke oder einen Förderer gelangt">
|
||||
<PAR Name="FuncName">
|
||||
@@ -50685,6 +50746,7 @@ me.x
|
||||
<PAR Name="Dbl" />
|
||||
<PAR Name="Int" />
|
||||
<PAR Name="Boo" />
|
||||
<PAR Name="StrArr2D" />
|
||||
</SET_STRUCT>
|
||||
<SET_STRUCT Id="RDK:21554460" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeCps">
|
||||
<PAR Name="Key">
|
||||
@@ -66585,4 +66647,4 @@ me.x
|
||||
</PROFILES_DATA>
|
||||
<BOM_DATA />
|
||||
</EXTERNAL_DATA>
|
||||
</PROCESS>
|
||||
</PROCESS>
|
||||
|
||||
Reference in New Issue
Block a user