Merge
This commit is contained in:
+13
-10
@@ -5057,6 +5057,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
|
||||
<PAR Name="pinned" />
|
||||
<PAR Name="selected" />
|
||||
<PAR Name="includeInBOM" />
|
||||
<PAR Name="isDefined" />
|
||||
</SET_STRUCT>
|
||||
</GROUP>
|
||||
</CASEGROUP>
|
||||
@@ -10883,7 +10884,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
<PAR Name="Label" />
|
||||
<PAR Name="Field" />
|
||||
<PAR Name="Value">
|
||||
<EXP><![CDATA[$C$Ein neuer Verbindungspunkt wurde hinzugefügt!werden!]]></EXP>
|
||||
<EXP><![CDATA[$C$Ein neuer Verbindungspunkt wurde hinzugefügt!]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Uom" />
|
||||
<PAR Name="Tooltip" />
|
||||
@@ -10991,7 +10992,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
<PAR Name="Label" />
|
||||
<PAR Name="Field" />
|
||||
<PAR Name="Value">
|
||||
<EXP><![CDATA[$C$Verbindungspunkte ist bereits vorhanden.]]></EXP>
|
||||
<EXP><![CDATA[$C$Verbindungspunkt ist bereits vorhanden.]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Uom" />
|
||||
<PAR Name="Tooltip" />
|
||||
@@ -12012,6 +12013,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
<EXP><![CDATA[$V$EventData]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Options" />
|
||||
<PAR Name="ProfileName" />
|
||||
</ACTION_CALL>
|
||||
<SELECTCASE Id="RDK:973746">
|
||||
<EXP><![CDATA[$=$Button]]></EXP>
|
||||
@@ -12713,7 +12715,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
</SET>
|
||||
<CALLFUNCTION Id="RDK:1630769">
|
||||
<PAR Name="FuncName">
|
||||
<EXP><![CDATA[$C$GetNewShapeID]]></EXP>
|
||||
<EXP><![CDATA[$C$GetNewShapeIDCounter]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="InputExp" />
|
||||
<PAR Name="ResultRef">
|
||||
@@ -14248,7 +14250,7 @@ me.x
|
||||
</SET>
|
||||
<CALLFUNCTION Id="RDK:1630771" Suppressed="True">
|
||||
<PAR Name="FuncName">
|
||||
<EXP><![CDATA[$C$GetNewShapeID]]></EXP>
|
||||
<EXP><![CDATA[$C$GetNewShapeIDCounter]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="InputExp" />
|
||||
<PAR Name="ResultRef">
|
||||
@@ -15589,7 +15591,7 @@ me.x
|
||||
<EXP><![CDATA[$C$CreatePrototype_Gefaellestrecke]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="InputExp">
|
||||
<EXP><![CDATA[$=$shapeId]]></EXP>
|
||||
<EXP><![CDATA[$=$]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="ResultRef">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
@@ -15616,7 +15618,7 @@ me.x
|
||||
<EXP><![CDATA[$C$CreatePrototype_Foerderer]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="InputExp">
|
||||
<EXP><![CDATA[$=$shapeId]]></EXP>
|
||||
<EXP><![CDATA[$=$]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="ResultRef">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
@@ -15628,7 +15630,7 @@ me.x
|
||||
<EXP><![CDATA[$C$Create/Update Shape]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="InputExp">
|
||||
<EXP><![CDATA[$=$shapeId]]></EXP>
|
||||
<EXP><![CDATA[$=$]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="ResultRef">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
@@ -16338,10 +16340,12 @@ ShapeList["id="+Param.Input[1].shapeID].name
|
||||
<PAR Name="KreiselDefinition" />
|
||||
<PAR Name="EckradDefinition" />
|
||||
<PAR Name="GefaelleDefinition" />
|
||||
<PAR Name="StreckeDefinition" />
|
||||
<PAR Name="FoerdererDefinition" />
|
||||
<PAR Name="WeicheDefinition" />
|
||||
<PAR Name="BTMTBeladungDefinition" />
|
||||
<PAR Name="BTMTEntladungDefinition" />
|
||||
<PAR Name="isDefined" />
|
||||
<PAR Name="source">
|
||||
<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
|
||||
</PAR>
|
||||
@@ -16410,7 +16414,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
|
||||
<PAR Name="pinned" />
|
||||
<PAR Name="selected" />
|
||||
<PAR Name="includeInBOM" />
|
||||
<PAR Name="StreckeDefinition" />
|
||||
</SET_STRUCT>
|
||||
<ACTION_CALL Id="RDK:1589028" Name="RDEngineering_E2DLinkShapes">
|
||||
<PAR Name="RDLibraryName">
|
||||
@@ -16912,7 +16915,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
|
||||
</ACTION_CALL>
|
||||
</GROUP>
|
||||
</FUNCTION>
|
||||
<FUNCTION Id="RDK:1630766" Name="GetNewShapeID" InputTypeName="string">
|
||||
<FUNCTION Id="RDK:1630766" Name="GetNewShapeIDCounter" InputTypeName="string">
|
||||
<SET Id="RDK:1630768" VarRef="Shape_Prototype.IDCounter">
|
||||
<EXP><![CDATA[$=$FieldValue(LastOf(SortListOfStructs(FilterByFieldValue(ShapeList, "family", Shape_Prototype.family), "IDCounter", false)), "IDCounter")+1]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
@@ -24855,4 +24858,4 @@ ShapeList["id="+Param.Input[1].shapeID].name
|
||||
</PROFILES_DATA>
|
||||
<BOM_DATA />
|
||||
</EXTERNAL_DATA>
|
||||
</PROCESS>
|
||||
</PROCESS>
|
||||
|
||||
Reference in New Issue
Block a user