Shape der Motor und Spannstation mit Path für die Verwendung von Stroke angepasst; Fix der Indexfunktion (nun wird lokaler Index verwendet) für InheritHeight

This commit is contained in:
Simon Schmutzler
2024-06-12 12:17:53 +02:00
parent dd72b5db0f
commit ac3482c735
3 changed files with 90 additions and 13 deletions
+85 -6
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="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-06-12T09:47:57" LanguageVersion="2014.1.3.674" />
<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-06-12T11:57:48" LanguageVersion="2014.1.3.674" />
<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">
@@ -50,7 +50,7 @@
<FIELD Id="RDK:1520421" Name="Drehung" Type="integer" DesignTimeNotes="1= im Uhrzeigersinn=rechts&#xD;&#xA;-1= Gegen Uhrzeigersinn=links" />
<FIELD Id="RDK:1520424" Name="Durchmesser" Type="double" />
</TYPE>
<TYPE Id="RDK:302581" Name="GefaelleType" Expanded="True" SubType="structure">
<TYPE Id="RDK:302581" Name="GefaelleType" SubType="structure">
<TYPE_VALUES />
<FIELD Id="RDK:302571" Name="Beschreibung" Type="string" />
<FIELD Id="RDK:880709" Name="L1" Type="double" />
@@ -4174,7 +4174,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
<PAR Name="Options" />
</ACTION_CALL>
<COMMENTS Id="RDK:1653127" Bookmarked="True" DesignTimeRemark="Inherit Rotation" />
<SET_STRUCT Id="RDK:1653128" VarRef="Shape_Prototype" ListRef="ShapeList" Options="$=$&quot;(REPLACEIDX=&quot;+i+&quot;)&quot;" Bookmarked="True" DesignTimeNotes="Shape.depth*Inch/DPI&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Shape_Prototype.KreiselDefinition.OrientierungHV&#xD;&#xA;IIF(Shape_Prototype.KreiselDefinition.OrientierungHV&lt;&gt;Shape_Prototype.rotation,Shape_Prototype.rotation,Shape_Prototype.KreiselDefinition.OrientierungHV)">
<SET_STRUCT Id="RDK:1653128" VarRef="Shape_Prototype" ListRef="ShapeList" Options="$=$&quot;(REPLACEIDX=&quot;+i+&quot;)&quot;" Suppressed="True" Bookmarked="True" DesignTimeNotes="Shape.depth*Inch/DPI&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Shape_Prototype.KreiselDefinition.OrientierungHV&#xD;&#xA;IIF(Shape_Prototype.KreiselDefinition.OrientierungHV&lt;&gt;Shape_Prototype.rotation,Shape_Prototype.rotation,Shape_Prototype.KreiselDefinition.OrientierungHV)">
<PAR Name="SivasNummer" />
<PAR Name="Rotationsklasse" />
<PAR Name="IDCounter" />
@@ -4248,6 +4248,80 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
<PAR Name="selected" />
<PAR Name="includeInBOM" />
</SET_STRUCT>
<SET_STRUCT Id="RDK:19615244" VarRef="Shape_Prototype" ListRef="ShapeList" Options="$=$&quot;(REPLACEIDX=&quot;+i+&quot;)&quot;" Bookmarked="True" DesignTimeNotes="Shape.depth*Inch/DPI&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Shape_Prototype.KreiselDefinition.OrientierungHV&#xD;&#xA;IIF(Shape_Prototype.KreiselDefinition.OrientierungHV&lt;&gt;Shape_Prototype.rotation,Shape_Prototype.rotation,Shape_Prototype.KreiselDefinition.OrientierungHV)">
<PAR Name="SivasNummer" />
<PAR Name="Rotationsklasse" />
<PAR Name="IDCounter" />
<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="source">
<EXP><![CDATA[$C$BTMTBeladung_Default]]></EXP>
</PAR>
<PAR Name="sourceLibrary">
<EXP><![CDATA[$=$GS2DLibraryName]]></EXP>
</PAR>
<PAR Name="signature" />
<PAR Name="id">
<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
</PAR>
<PAR Name="name" />
<PAR Name="family" />
<PAR Name="description" />
<PAR Name="x" />
<PAR Name="y" />
<PAR Name="z" />
<PAR Name="width">
<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.width, "mm", 96)]]></EXP>
</PAR>
<PAR Name="height">
<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.height, "mm", 96)]]></EXP>
</PAR>
<PAR Name="depth">
<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.depth, "mm", 96)]]></EXP>
</PAR>
<PAR Name="rotation">
<EXP><![CDATA[$=$Shape_Prototype.rotation]]></EXP>
</PAR>
<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" />
<PAR Name="connectionPoints" />
<PAR Name="modified" />
<PAR Name="pinned" />
<PAR Name="selected" />
<PAR Name="includeInBOM" />
</SET_STRUCT>
</GROUP>
</CASEGROUP>
<CASEGROUP Id="RDK:18107672" CaseType="0">
@@ -7860,6 +7934,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
</SET>
</VAR>
<VAR Id="RDK:19440105" Name="idx" Type="integer" />
<VAR Id="RDK:19615246" Name="temp_link" Type="string" />
<VAR Id="RDK:19440117" Name="shape_id" Type="string">
<SET Id="RDK:19440124" VarRef="Me">
<EXP><![CDATA[$=$Param.Input["key=id"].Str]]></EXP>
@@ -7867,7 +7942,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
</SET>
</VAR>
</GROUP>
<FOREACHLOOP Id="RDK:19440093" ItemVarRef="Link" IndexVarRef="idx">
<FOREACHLOOP Id="RDK:19440093" ItemVarRef="temp_link" IndexVarRef="idx">
<PAR Name="ArrayValueExp">
<EXP><![CDATA[$=$id_array]]></EXP>
</PAR>
@@ -7876,7 +7951,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
</PAR>
<IFTHENELSE Id="RDK:19440095">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$Link=shape_id]]></EXP>
<EXP><![CDATA[$=$temp_link=shape_id]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:19440096" SubType="Then">
<SET Id="RDK:19441477" VarRef="Param.Result">
@@ -15546,7 +15621,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
</VAR>
<VAR Id="RDK:19595237" Name="label" Type="string">
<SET Id="RDK:19595243" VarRef="Me">
<EXP><![CDATA[$=$Param.Input["key=Label"].Str]]></EXP>
<EXP><![CDATA[$=$E$ Param.Input["key=Label"].Str]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</VAR>
@@ -15567,6 +15642,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
<EXP><![CDATA[$=$shape_item.family]]></EXP>
<CASEGROUP Id="RDK:19595346" CaseType="0">
<EXP><![CDATA[$C$Kreisel]]></EXP>
<SET Id="RDK:19615251" VarRef="ShapeList[&quot;id=&quot;+shapeId].KreiselDefinition.Hoehe">
<EXP><![CDATA[$=$hoehe]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</CASEGROUP>
<CASEGROUP Id="RDK:19595362" CaseType="0">
<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>