Merge
This commit is contained in:
+8
-20
@@ -3601,22 +3601,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
|
||||
<PAR Name="id">
|
||||
<EXP><![CDATA[$=$"defcp"+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:187101" VarRef="Property_Prototype.connectionPoints">
|
||||
<EXP><![CDATA[$=$ToJSON(ConnectionPointList)]]></EXP>
|
||||
@@ -39984,7 +39968,7 @@ me.x
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Kurve"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<VALUECONDITION Value="true" Oper="OR">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Foerderer"]]></EXP>
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="VarioFoerderer"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<VALUECONDITION Value="true" Oper="OR">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Gefaellestrecke"]]></EXP>
|
||||
@@ -49909,6 +49893,7 @@ me.x
|
||||
<PAR Name="Dbl" />
|
||||
<PAR Name="Int" />
|
||||
<PAR Name="Boo" />
|
||||
<PAR Name="StrArr2D" />
|
||||
</SET_STRUCT>
|
||||
<SET_STRUCT Id="RDK:21827689" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeCps">
|
||||
<PAR Name="Key">
|
||||
@@ -49921,6 +49906,7 @@ me.x
|
||||
<PAR Name="Dbl" />
|
||||
<PAR Name="Int" />
|
||||
<PAR Name="Boo" />
|
||||
<PAR Name="StrArr2D" />
|
||||
</SET_STRUCT>
|
||||
<CALLFUNCTION Id="RDK:21895146" 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">
|
||||
@@ -52266,6 +52252,7 @@ me.x
|
||||
<PAR Name="Dbl" />
|
||||
<PAR Name="Int" />
|
||||
<PAR Name="Boo" />
|
||||
<PAR Name="StrArr2D" />
|
||||
</SET_STRUCT>
|
||||
<CALLFUNCTION Id="RDK:18827141">
|
||||
<PAR Name="FuncName">
|
||||
@@ -52294,6 +52281,7 @@ me.x
|
||||
<PAR Name="Dbl" />
|
||||
<PAR Name="Int" />
|
||||
<PAR Name="Boo" />
|
||||
<PAR Name="StrArr2D" />
|
||||
</SET_STRUCT>
|
||||
<SET_STRUCT Id="RDK:21940008" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeSetHeight">
|
||||
<PAR Name="Key">
|
||||
@@ -52478,13 +52466,13 @@ me.x
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:22071998" SubType="Then">
|
||||
<SET Id="RDK:22071997" VarRef="hoehe">
|
||||
<EXP><![CDATA[$=$h1]]></EXP>
|
||||
<EXP><![CDATA[$=$h2]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:22072000" SubType="Else">
|
||||
<SET Id="RDK:22071999" VarRef="hoehe">
|
||||
<EXP><![CDATA[$=$h2]]></EXP>
|
||||
<EXP><![CDATA[$=$h1]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
@@ -65375,4 +65363,4 @@ me.x
|
||||
</PROFILES_DATA>
|
||||
<BOM_DATA />
|
||||
</EXTERNAL_DATA>
|
||||
</PROCESS>
|
||||
</PROCESS>
|
||||
|
||||
Reference in New Issue
Block a user