Einen Bug beim Hinzufügen von Verbindungspunkten an der Motorsationseite beheben.

This commit is contained in:
2024-06-28 14:38:25 +02:00
+406 -8
View File
@@ -4,7 +4,7 @@
<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">
<TYPE Id="RDK:313478" Name="SSGConnectionPoint" Expanded="True" SubType="structure" HasArrayType="True">
<TYPE Id="RDK:313478" Name="SSGConnectionPoint" SubType="structure" HasArrayType="True">
<TYPE_VALUES />
<FIELD Id="RDK:609117" Name="id" Type="string" />
<FIELD Id="RDK:313462" Name="x_M" Type="double" />
@@ -3163,20 +3163,42 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
<PAR Name="eventHandlers" />
</SET_STRUCT>
</FUNCTION>
<FUNCTION Id="RDK:18550444" Name="CreatePrototype_Gefaellestrecke">
<GROUP Id="RDK:18550440" Name="Local Variables" SubType="VarSet" IncludeDate="0" />
<COMMENTS Id="RDK:18550441" DesignTimeRemark="Angle definition in GS2D" DesignTimeNotes=" 0&#xD;&#xA; |&#xD;&#xA;270 &lt;-------&gt;90&#xD;&#xA; |&#xD;&#xA; 180&#xD;&#xA;" />
<SET Id="RDK:18550442" VarRef="Property_Prototype">
<FUNCTION Id="RDK:20163513" Name="CreatePrototype_Gefaellestrecke">
<GROUP Id="RDK:20163498" Name="Local Variables" SubType="VarSet" IncludeDate="0">
<VAR Id="RDK:20163493" Name="ChildList" Type="Editor2DChildTypeList" />
<VAR Id="RDK:20163494" Name="ChiltItem" Type="Editor2DChildType" />
<VAR Id="RDK:20163495" Name="Z0" Type="double" />
<VAR Id="RDK:20163496" Name="Z1" Type="double" />
<VAR Id="RDK:20163497" Name="L1" Type="double" />
</GROUP>
<COMMENTS Id="RDK:20163499" DesignTimeRemark="Angle definition in GS2D" DesignTimeNotes=" 0&#xD;&#xA; |&#xD;&#xA;270 &lt;-------&gt;90&#xD;&#xA; |&#xD;&#xA; 180&#xD;&#xA;" />
<GROUP Id="RDK:20163503" Name="DEBUG" SubType="Generic">
<SET Id="RDK:20163500" VarRef="Z0">
<EXP><![CDATA[$C$2000]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:20163501" VarRef="Z0">
<EXP><![CDATA[$C$1000]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:20163502" VarRef="L1">
<EXP><![CDATA[$C$3000]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
<SET Id="RDK:20163504" VarRef="Property_Prototype">
<EXP><![CDATA[$=$Shape_Prototype]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET_STRUCT Id="RDK:18550443" VarRef="Property_Prototype">
<SET_STRUCT Id="RDK:20163505" VarRef="Property_Prototype" Suppressed="True">
<PAR Name="id" />
<PAR Name="name" />
<PAR Name="family" />
<PAR Name="description" />
<PAR Name="text" />
<PAR Name="shapeMode" />
<PAR Name="shapeMode">
<EXP><![CDATA[$C$0]]></EXP>
</PAR>
<PAR Name="icon" />
<PAR Name="iconBig" />
<PAR Name="image" />
@@ -3215,6 +3237,150 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
<PAR Name="eventHandler" />
<PAR Name="eventHandlers" />
</SET_STRUCT>
<SET_STRUCT Id="RDK:20163506" VarRef="Property_Prototype">
<PAR Name="id">
<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
</PAR>
<PAR Name="name" />
<PAR Name="family" />
<PAR Name="description" />
<PAR Name="text" />
<PAR Name="shapeMode">
<EXP><![CDATA[$C$1]]></EXP>
</PAR>
<PAR Name="icon" />
<PAR Name="iconBig" />
<PAR Name="image" />
<PAR Name="srcSVG" />
<PAR Name="src3D" />
<PAR Name="srcTexture3D" />
<PAR Name="width">
<EXP><![CDATA[$=$ConvertToPixel(Property_Prototype.width, "mm", 96)]]></EXP>
</PAR>
<PAR Name="height">
<EXP><![CDATA[$=$ConvertToPixel(Property_Prototype.height, "mm", 96)]]></EXP>
</PAR>
<PAR Name="depth">
<EXP><![CDATA[$=$ConvertToPixel(Property_Prototype.depth, "mm", 96)]]></EXP>
</PAR>
<PAR Name="behaviour" />
<PAR Name="help" />
<PAR Name="eventClass" />
<PAR Name="linkClass" />
<PAR Name="collisionClass" />
<PAR Name="containerClass" />
<PAR Name="snapClass" />
<PAR Name="color" />
<PAR Name="colorOpacity" />
<PAR Name="lineColor" />
<PAR Name="lineColorOpacity" />
<PAR Name="color3D" />
<PAR Name="colorOpacity3D" />
<PAR Name="lineColor3D" />
<PAR Name="lineColorOpacity3D" />
<PAR Name="custom" />
<PAR Name="connectionPoints" />
<PAR Name="group2dShapes" />
<PAR Name="group2dConnectors" />
<PAR Name="group3d" />
<PAR Name="eventHandler" />
<PAR Name="eventHandlers" />
</SET_STRUCT>
<COMMENTS Id="RDK:20163507" DesignTimeRemark="Zusammensetzen der Assembly für Gefällestrecke" />
<GROUP Id="RDK:20163512" Name="Shapes" SubType="Generic" Bookmarked="True">
<SET_STRUCT Id="RDK:20163508" VarRef="ChiltItem" ClearAll="True" ListRef="ChildList" DesignTimeNotes="0-&gt;X------------------------------------------------------------&#xD;&#xA; | |&#xD;&#xA;Y M S |&#xD;&#xA;| |&#xD;&#xA;--------------------------------------------------------------------">
<PAR Name="id" />
<PAR Name="source">
<EXP><![CDATA[$C$s_TBogen]]></EXP>
</PAR>
<PAR Name="width">
<EXP><![CDATA[$=$ConvertToPixel(430, "mm", 96)]]></EXP>
</PAR>
<PAR Name="height">
<EXP><![CDATA[$=$ConvertToPixel(245, "mm", 96)]]></EXP>
</PAR>
<PAR Name="depth">
<EXP><![CDATA[$=$ConvertToPixel(90, "mm", 96)]]></EXP>
</PAR>
<PAR Name="x">
<EXP><![CDATA[$=$ConvertToPixel(215, "mm", 96)]]></EXP>
</PAR>
<PAR Name="y">
<EXP><![CDATA[$C$0]]></EXP>
</PAR>
<PAR Name="z">
<EXP><![CDATA[$C$0]]></EXP>
</PAR>
<PAR Name="rotation" />
<PAR Name="data" />
<PAR Name="color" />
<PAR Name="colorOpacity" />
</SET_STRUCT>
<SET_STRUCT Id="RDK:20163509" VarRef="ChiltItem" ClearAll="True" ListRef="ChildList" DesignTimeNotes="0-&gt;X------------------------------------------------------------&#xD;&#xA; | |&#xD;&#xA;Y M S |&#xD;&#xA;| |&#xD;&#xA;--------------------------------------------------------------------">
<PAR Name="id" />
<PAR Name="source">
<EXP><![CDATA[$C$s_TBogen]]></EXP>
</PAR>
<PAR Name="width">
<EXP><![CDATA[$=$ConvertToPixel(430, "mm", 96)]]></EXP>
</PAR>
<PAR Name="height">
<EXP><![CDATA[$=$ConvertToPixel(245, "mm", 96)]]></EXP>
</PAR>
<PAR Name="depth">
<EXP><![CDATA[$=$ConvertToPixel(90, "mm", 96)]]></EXP>
</PAR>
<PAR Name="x">
<EXP><![CDATA[$=$ConvertToPixel(215, "mm", 96)]]></EXP>
</PAR>
<PAR Name="y">
<EXP><![CDATA[$=$ConvertToPixel(1600, "mm", 96)]]></EXP>
</PAR>
<PAR Name="z">
<EXP><![CDATA[$C$0]]></EXP>
</PAR>
<PAR Name="rotation">
<EXP><![CDATA[$C$180]]></EXP>
</PAR>
<PAR Name="data" />
<PAR Name="color" />
<PAR Name="colorOpacity" />
</SET_STRUCT>
<SET_STRUCT Id="RDK:20163510" VarRef="ChiltItem" ClearAll="True" ListRef="ChildList" DesignTimeNotes="0-&gt;X------------------------------------------------------------&#xD;&#xA; | |&#xD;&#xA;Y M S |&#xD;&#xA;| |&#xD;&#xA;--------------------------------------------------------------------">
<PAR Name="id" />
<PAR Name="source">
<EXP><![CDATA[$C$s_Gefaellestrecke_Verbinder]]></EXP>
</PAR>
<PAR Name="width">
<EXP><![CDATA[$=$ConvertToPixel(90, "mm", 96)]]></EXP>
</PAR>
<PAR Name="height">
<EXP><![CDATA[$=$ConvertToPixel(1200, "mm", 96)]]></EXP>
</PAR>
<PAR Name="depth">
<EXP><![CDATA[$=$ConvertToPixel(90, "mm", 96)]]></EXP>
</PAR>
<PAR Name="x">
<EXP><![CDATA[$=$ConvertToPixel(215, "mm", 96)]]></EXP>
</PAR>
<PAR Name="y">
<EXP><![CDATA[$=$ConvertToPixel(800, "mm", 96)]]></EXP>
</PAR>
<PAR Name="z">
<EXP><![CDATA[$C$0]]></EXP>
</PAR>
<PAR Name="rotation">
<EXP><![CDATA[$C$0]]></EXP>
</PAR>
<PAR Name="data" />
<PAR Name="color" />
<PAR Name="colorOpacity" />
</SET_STRUCT>
<SET Id="RDK:20163511" VarRef="Property_Prototype.group2dShapes">
<EXP><![CDATA[$=$ToJSON(ChildList)]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
</FUNCTION>
<FUNCTION Id="RDK:18732260" Name="CreatePrototype_Strecke">
<GROUP Id="RDK:18732256" Name="Local Variables" SubType="VarSet" IncludeDate="0" />
@@ -3672,7 +3838,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
</SET_STRUCT>
</GROUP>
</CASEGROUP>
<CASEGROUP Id="RDK:18547253" CaseType="0">
<CASEGROUP Id="RDK:18547253" CaseType="0" Suppressed="True">
<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
<GROUP Id="RDK:18547246" Name="Gefaellestrecke in der Library anlegen" SubType="Generic">
<SET Id="RDK:18547244" VarRef="Property_Prototype.eventClass">
@@ -3830,6 +3996,238 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
</SET_STRUCT>
</GROUP>
</CASEGROUP>
<CASEGROUP Id="RDK:20164890" CaseType="0">
<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
<GROUP Id="RDK:20164882" Name="Gefaellestrecke in der Library anlegen" SubType="Generic">
<SET Id="RDK:20164880" VarRef="Property_Prototype.eventClass">
<EXP><![CDATA[$C$OnDoubleclick,OnInserted,OnLinked,OnPasted]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<ACTION_CALL Id="RDK:20164881" Name="RDEngineering_E2DManageShape">
<PAR Name="RDLibraryName">
<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
</PAR>
<PAR Name="e2dMode">
<EXP><![CDATA[$C$0]]></EXP>
</PAR>
<PAR Name="libraryID">
<EXP><![CDATA[$=$GS2DLibraryName]]></EXP>
</PAR>
<PAR Name="operType">
<EXP><![CDATA[$C$2]]></EXP>
</PAR>
<PAR Name="shpId">
<EXP><![CDATA[$=$Property_Prototype.id]]></EXP>
</PAR>
<PAR Name="catId">
<EXP><![CDATA[$C$c_Session]]></EXP>
</PAR>
<PAR Name="shpItemId" />
<PAR Name="shpItem">
<EXP><![CDATA[$=$Property_Prototype]]></EXP>
</PAR>
<PAR Name="shpItemList">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<PAR Name="shpList">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<PAR Name="outShapeIdList">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<PAR Name="Options">
<EXP><![CDATA[$C$(OVERWRITE)]]></EXP>
</PAR>
</ACTION_CALL>
</GROUP>
<GROUP Id="RDK:20164889" Name="Gefaellestrecke platzieren" SubType="Generic">
<COMMENTS Id="RDK:20164883" DesignTimeRemark="pixel in mm" />
<COMMENTS Id="RDK:20164884" DesignTimeRemark="Shape in ShapeList wird gedreht" />
<ACTION_CALL Id="RDK:20164885" Name="RDEngineering_E2DManageShape">
<PAR Name="RDLibraryName">
<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
</PAR>
<PAR Name="e2dMode">
<EXP><![CDATA[$C$0]]></EXP>
</PAR>
<PAR Name="libraryID">
<EXP><![CDATA[$=$GS2DLibraryName]]></EXP>
</PAR>
<PAR Name="operType">
<EXP><![CDATA[$C$0]]></EXP>
</PAR>
<PAR Name="shpId">
<EXP><![CDATA[$=$ID]]></EXP>
</PAR>
<PAR Name="catId">
<EXP><![CDATA[$C$c_Session]]></EXP>
</PAR>
<PAR Name="shpItemId" />
<PAR Name="shpItem">
<EXP><![CDATA[$=$Shape_Prototype]]></EXP>
</PAR>
<PAR Name="shpItemList">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<PAR Name="shpList">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<PAR Name="outShapeIdList">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<PAR Name="Options" />
</ACTION_CALL>
<COMMENTS Id="RDK:20164886" Bookmarked="True" DesignTimeRemark="Inherit Rotation" />
<SET_STRUCT Id="RDK:20164887" 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)&#xD;&#xA;&#xD;&#xA;depth&#xD;&#xA;">
<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[$=$]]></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>
<SET_STRUCT Id="RDK:20164888" 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)&#xD;&#xA;&#xD;&#xA;depth&#xD;&#xA;">
<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[$=$Shape_Prototype.id]]></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:18732280" CaseType="0">
<EXP><![CDATA[$C$Strecke]]></EXP>
<GROUP Id="RDK:18732273" Name="Strecke in der Library anlegen" SubType="Generic">