Fix for ERK-49
This commit is contained in:
+85
-141
@@ -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="dre [NBDELP3561-04C]" ModDate="2023-09-19T10:45:39" LanguageVersion="2014.1.3.596" />
|
||||
<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="dre [NBDELP3561-04C]" ModDate="2023-09-20T16:18:56" LanguageVersion="2014.1.3.596" />
|
||||
<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">
|
||||
@@ -3060,7 +3060,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<GROUP Id="RDK:591735" Name="Motorstation" SubType="Generic">
|
||||
<FOREACHLOOP Id="RDK:591726" ItemVarRef="SSGConnectionPoint">
|
||||
<FOREACHLOOP Id="RDK:591726" ItemVarRef="SSGConnectionPoint" IndexVarRef="i">
|
||||
<PAR Name="ArrayValueExp">
|
||||
<EXP><![CDATA[$=$Shape_Prototype.KreiselDefinition.M_Strecke]]></EXP>
|
||||
</PAR>
|
||||
@@ -3073,7 +3073,9 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
|
||||
</VALUECONDITION>
|
||||
<COMMENTS Id="RDK:769123" DesignTimeRemark="CP Gefällestrecke" />
|
||||
<SET_STRUCT Id="RDK:591728" VarRef="ConnectionPointItem" ClearAll="True" ListRef="ConnectionPointList" DesignTimeRemark="Links mitte" DesignTimeTip="Links mitte">
|
||||
<PAR Name="id" />
|
||||
<PAR Name="id">
|
||||
<EXP><![CDATA[$=$SSGConnectionPoint.id+"_G"]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="x">
|
||||
<EXP><![CDATA[$=$Call("mm2pxBOX", NewListDbl(
|
||||
' Param 1 Gesamtlänge in mm
|
||||
@@ -3111,7 +3113,9 @@ SSGConnectionPoint.x_M+(KreiselData.Durchmesser/2)
|
||||
</SET_STRUCT>
|
||||
<COMMENTS Id="RDK:769125" DesignTimeRemark="CP Kreisel" />
|
||||
<SET_STRUCT Id="RDK:766702" VarRef="ConnectionPointItem" ClearAll="True" ListRef="ConnectionPointList" DesignTimeRemark="Links mitte" DesignTimeTip="Links mitte">
|
||||
<PAR Name="id" />
|
||||
<PAR Name="id">
|
||||
<EXP><![CDATA[$=$SSGConnectionPoint.id+"_K"]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="x">
|
||||
<EXP><![CDATA[$=$Call("mm2pxBOX", NewListDbl(
|
||||
' Param 1 Gesamtlänge in mm
|
||||
@@ -3149,7 +3153,7 @@ SSGConnectionPoint.x_M+(KreiselData.Durchmesser/2)
|
||||
</FOREACHLOOP>
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:592701" Name="Spannstation" SubType="Generic">
|
||||
<FOREACHLOOP Id="RDK:592700" ItemVarRef="SSGConnectionPoint">
|
||||
<FOREACHLOOP Id="RDK:592700" ItemVarRef="SSGConnectionPoint" IndexVarRef="i">
|
||||
<PAR Name="ArrayValueExp">
|
||||
<EXP><![CDATA[$=$Shape_Prototype.KreiselDefinition.S_Strecke]]></EXP>
|
||||
</PAR>
|
||||
@@ -3162,7 +3166,9 @@ SSGConnectionPoint.x_M+(KreiselData.Durchmesser/2)
|
||||
</VALUECONDITION>
|
||||
<COMMENTS Id="RDK:837477" DesignTimeRemark="CP Gefällestrecke" />
|
||||
<SET_STRUCT Id="RDK:592699" VarRef="ConnectionPointItem" ClearAll="True" ListRef="ConnectionPointList" DesignTimeRemark="Links mitte" DesignTimeTip="Links mitte">
|
||||
<PAR Name="id" />
|
||||
<PAR Name="id">
|
||||
<EXP><![CDATA[$=$SSGConnectionPoint.id+"_G"]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="x">
|
||||
<EXP><![CDATA[$=$Call("mm2pxBOX", NewListDbl(
|
||||
' Param 1 Gesamtlänge in mm
|
||||
@@ -3200,7 +3206,9 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
</SET_STRUCT>
|
||||
<COMMENTS Id="RDK:837479" DesignTimeRemark="CP Kreisel" />
|
||||
<SET_STRUCT Id="RDK:837481" VarRef="ConnectionPointItem" ClearAll="True" ListRef="ConnectionPointList" DesignTimeRemark="Links mitte" DesignTimeTip="Links mitte">
|
||||
<PAR Name="id" />
|
||||
<PAR Name="id">
|
||||
<EXP><![CDATA[$=$SSGConnectionPoint.id+"_K"]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="x">
|
||||
<EXP><![CDATA[$=$Call("mm2pxBOX", NewListDbl(
|
||||
' Param 1 Gesamtlänge in mm
|
||||
@@ -3237,10 +3245,26 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
</GROUP>
|
||||
</FOREACHLOOP>
|
||||
</GROUP>
|
||||
<EXEC_ON_VALUES Id="RDK:591730" VarRef="ConnectionPointList">
|
||||
<EXEC_ON_VALUES Id="RDK:591730" VarRef="ConnectionPointList" Suppressed="True" Bookmarked="True">
|
||||
<PAR Name="id">
|
||||
<EXP><![CDATA[$=$"ncp"+Me_idx]]></EXP>
|
||||
<EXP><![CDATA[$=$"ncp"+i+Me_idx]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="x" />
|
||||
<PAR Name="y" />
|
||||
<PAR Name="z" />
|
||||
<PAR Name="xMin" />
|
||||
<PAR Name="xMax" />
|
||||
<PAR Name="xStep" />
|
||||
<PAR Name="yMin" />
|
||||
<PAR Name="yMax" />
|
||||
<PAR Name="yStep" />
|
||||
<PAR Name="zMin" />
|
||||
<PAR Name="zMax" />
|
||||
<PAR Name="zStep" />
|
||||
<PAR Name="direction" />
|
||||
<PAR Name="linkClass" />
|
||||
<PAR Name="label" />
|
||||
<PAR Name="isDimension" />
|
||||
</EXEC_ON_VALUES>
|
||||
<SET Id="RDK:591732" VarRef="Property_Prototype.connectionPoints">
|
||||
<EXP><![CDATA[$=$ToJSON(ListJoin(FromJSON(Property_Prototype.connectionPoints), ConnectionPointList))
|
||||
@@ -3385,9 +3409,9 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$LastPosition<=TotalLength]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<SET_STRUCT Id="RDK:796762" VarRef="SSGConnectionPoint" ClearAll="True">
|
||||
<SET_STRUCT Id="RDK:796762" VarRef="SSGConnectionPoint" ClearAll="True" DesignTimeNotes="Param.Input+"CP_"+CreateGUID(true)">
|
||||
<PAR Name="id">
|
||||
<EXP><![CDATA[$=$Param.Input+"CP_"+CreateGUID(true)]]></EXP>
|
||||
<EXP><![CDATA[$=$"ncp"+c+Param.Input]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="x_M">
|
||||
<EXP><![CDATA[$=$IIF(Param.Input="M",LastPosition,"")]]></EXP>
|
||||
@@ -4713,6 +4737,38 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
</PAR>
|
||||
<PAR Name="Options" />
|
||||
</CALLFUNCTION>
|
||||
<GROUP Id="RDK:1081548" Name="CleanUPCPs" SubType="Generic">
|
||||
<FOREACHLOOP Id="RDK:1081551" ItemVarRef="link" ByRefMode="True">
|
||||
<PAR Name="ArrayValueExp">
|
||||
<EXP><![CDATA[$=$Shape_Prototype.links]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="ExitCondExp">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
</PAR>
|
||||
<IFTHENELSE Id="RDK:1081552">
|
||||
<VALUECONDITION Value="true" Oper="OR">
|
||||
<EXP><![CDATA[$=$Count(FilterByFieldValue(FilterByFieldValue(Shape_Prototype.KreiselDefinition.M_Strecke, "id", StrBefore(link, "_")), "aktiv", false))>0
|
||||
]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$Count(FilterByFieldValue(FilterByFieldValue(Shape_Prototype.KreiselDefinition.S_Strecke, "id", StrBefore(link, "_")), "aktiv", false))>0
|
||||
]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:1081553" SubType="Then">
|
||||
<REMOVE_ADD Id="RDK:1081567" ListRef="ShapeList" Expr="Me.source="link-line" 
And
(Me.shapeFromId=StrAfter(link, ";")
OR
Me.shapeToId=StrAfter(link, ";"))
">
|
||||
<EXP />
|
||||
</REMOVE_ADD>
|
||||
<REMOVE_ADD Id="RDK:1081569" ListRef="ShapeList" Expr="Me.source="s_weiche_aktiv" 
And
(Me.shapeFromId=StrAfter(link, ";")
OR
Me.shapeToId=StrAfter(link, ";"))
">
|
||||
<EXP />
|
||||
</REMOVE_ADD>
|
||||
<REMOVE_ADD Id="RDK:1081571" Suppressed="True" ListRef="Shape_Prototype.links" Value="$=$link">
|
||||
<EXP />
|
||||
</REMOVE_ADD>
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:1081554" SubType="Else" />
|
||||
</IFTHENELSE>
|
||||
</FOREACHLOOP>
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:629944" Name="Group" SubType="Generic">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$Param.Input="OnDoubleclick"]]></EXP>
|
||||
@@ -7520,142 +7576,22 @@ Or
|
||||
</PAR>
|
||||
<PAR Name="Options" />
|
||||
</ACTION_CALL>
|
||||
<ACTION_CALL Id="RDK:966820" Name="RDEngineering_E2DShapeOperation" Suppressed="True" DesignTimeRemark="{operationType}">
|
||||
<PAR Name="RDLibraryName">
|
||||
<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="e2dMode">
|
||||
<EXP><![CDATA[$C$0]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="operationType">
|
||||
<EXP><![CDATA[$C$6]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="operationType3D">
|
||||
<EXP><![CDATA[$C$5]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="libraryID">
|
||||
<EXP><![CDATA[$=$GS2DLibraryName]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="categoryID" />
|
||||
<PAR Name="shapeId" />
|
||||
<PAR Name="shape">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID]]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="shapeList">
|
||||
<EXP><![CDATA[$=$ShapeList]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="pageOptions">
|
||||
<EXP><![CDATA[$=$Editor2DOption]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="outDistance">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="outRotation">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="outPoint">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="outPoints">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="outShape">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="outShapeList">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="outConnectionPoint">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="outConnectionPointList">
|
||||
<EXP><![CDATA[$V$OverlappingSSGConnectionPointList]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Options" />
|
||||
</ACTION_CALL>
|
||||
<SET Id="RDK:984518" VarRef="Shape_Prototype.WeicheDefinition.Weichenart">
|
||||
<EXP><![CDATA[$C$Aktiv]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:973730" VarRef="Shape_Prototype.name">
|
||||
<EXP><![CDATA[$=$Shape_Prototype.family+":"+Count(FilterByFieldValue(ShapeList, "family", Shape_Prototype.family))]]></EXP>
|
||||
<EXP><![CDATA[$=$Shape_Prototype.family+" :"+(Count(FilterByFieldValue(ShapeList, "family", Shape_Prototype.family))+1)]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:986051" VarRef="Shape_Prototype.WeicheDefinition.Beschreibung" Bookmarked="True">
|
||||
<EXP><![CDATA[$C$test]]></EXP>
|
||||
<EXP><![CDATA[$=$" zw. "+
|
||||
ShapeList["id="+Param.Input[0].shapeID].name+" und "+
|
||||
ShapeList["id="+Param.Input[1].shapeID].name
|
||||
|
||||
]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET_STRUCT Id="RDK:1065199" VarRef="Shape_Prototype" ListRef="ShapeList" Suppressed="True">
|
||||
<PAR Name="SivasNummer" />
|
||||
<PAR Name="KreiselDefinition" />
|
||||
<PAR Name="GefaelleDefinition" />
|
||||
<PAR Name="WeicheDefinition" />
|
||||
<PAR Name="source">
|
||||
<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="sourceLibrary" />
|
||||
<PAR Name="signature" />
|
||||
<PAR Name="id">
|
||||
<EXP><![CDATA[$=$"Weiche_"+CreateGUID()]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="name" />
|
||||
<PAR Name="family" />
|
||||
<PAR Name="description" />
|
||||
<PAR Name="x">
|
||||
<EXP><![CDATA[$=$OverlappingSSGConnectionPointList["id="+Param.Input[0].shapeID+"--"+Param.Input[0].connectionPointID].x
|
||||
]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="y">
|
||||
<EXP><![CDATA[$=$OverlappingSSGConnectionPointList["id="+Param.Input[0].shapeID+"--"+Param.Input[0].connectionPointID].y
|
||||
]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="z" />
|
||||
<PAR Name="width">
|
||||
<EXP><![CDATA[$=$Round(Shape_Prototype.width*Inch/DPI,0)]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="height">
|
||||
<EXP><![CDATA[$=$Round(Shape_Prototype.height*Inch/DPI,0)]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="depth">
|
||||
<EXP><![CDATA[$=$Round(Shape_Prototype.depth*Inch/DPI,0)]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="rotation" />
|
||||
<PAR Name="text" />
|
||||
<PAR Name="behaviour" />
|
||||
<PAR Name="datadump" />
|
||||
<PAR Name="path" />
|
||||
<PAR Name="ctrl1x" />
|
||||
<PAR Name="ctrl1y" />
|
||||
<PAR Name="ctrl2x" />
|
||||
<PAR Name="ctrl2y" />
|
||||
<PAR Name="shapeFromId" />
|
||||
<PAR Name="shapeFromPointIndex" />
|
||||
<PAR Name="shapeToId" />
|
||||
<PAR Name="shapeToPointIndex" />
|
||||
<PAR Name="dimStack" />
|
||||
<PAR Name="dimType" />
|
||||
<PAR Name="dimDriving" />
|
||||
<PAR Name="dimValue" />
|
||||
<PAR Name="color" />
|
||||
<PAR Name="colorOpacity" />
|
||||
<PAR Name="color3D" />
|
||||
<PAR Name="colorOpacity3D" />
|
||||
<PAR Name="lineWidth" />
|
||||
<PAR Name="lineColor" />
|
||||
<PAR Name="lineOpacity" />
|
||||
<PAR Name="lineColor3D" />
|
||||
<PAR Name="lineOpacity3D" />
|
||||
<PAR Name="links" />
|
||||
<PAR Name="group" />
|
||||
<PAR Name="layer">
|
||||
<EXP><![CDATA[$C$Weiche]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="connectionPoints" />
|
||||
<PAR Name="modified" />
|
||||
<PAR Name="pinned" />
|
||||
<PAR Name="selected" />
|
||||
<PAR Name="includeInBOM" />
|
||||
</SET_STRUCT>
|
||||
<SET_STRUCT Id="RDK:1065214" VarRef="Shape_Prototype" ListRef="ShapeList">
|
||||
<PAR Name="SivasNummer" />
|
||||
<PAR Name="KreiselDefinition" />
|
||||
@@ -7693,10 +7629,18 @@ Or
|
||||
<PAR Name="ctrl1y" />
|
||||
<PAR Name="ctrl2x" />
|
||||
<PAR Name="ctrl2y" />
|
||||
<PAR Name="shapeFromId" />
|
||||
<PAR Name="shapeFromPointIndex" />
|
||||
<PAR Name="shapeToId" />
|
||||
<PAR Name="shapeToPointIndex" />
|
||||
<PAR Name="shapeFromId">
|
||||
<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="shapeFromPointIndex">
|
||||
<EXP><![CDATA[$=$Param.Input[0].connectionPointID]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="shapeToId">
|
||||
<EXP><![CDATA[$=$Param.Input[1].shapeID]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="shapeToPointIndex">
|
||||
<EXP><![CDATA[$=$Param.Input[1].connectionPointID]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="dimStack" />
|
||||
<PAR Name="dimType" />
|
||||
<PAR Name="dimDriving" />
|
||||
|
||||
Reference in New Issue
Block a user