Merge

Editor2DLibrary/SSG/shapes/props/0_B10020.txt

@@ -5,8 +5,10 @@
   "icon": "SSG/shapes/img/Antriebst.rechts_TEF_rechts_32px.png",
   "iconBig": "SSG/shapes/img/Antriebst.rechts_TEF_rechts_64px.png",
   "srcSVG": "SSG/shapes/svg/0_B10020.xml",
-  "width": 2067.0992,
+  "src3D": "SSG/shapes/obj/0_B10020.stl",
-  "height": 1254.8031,
+  "width": 993.90239999999994,
+  "height": 1924.6866,
+  "depth": 839.0551,
   "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)",
   "connectionPoints": [
     {

Editor2DLibrary/SSG/shapes/props/s_TEFGerade.txt

@@ -1,12 +1,69 @@
 {
   "shapeMode": 0,
-  "name": "TEFGERADE",
+  "name": "TEF Gerade",
-  "icon": "SSG/shapes/img/",
+  "family": "TEFGerade",
-  "srcSVG": "SSG/shapes/svg/s_TEFGerade.xml",
+  "icon": "SSG/shapes/img/AP_32px.png",
-  "src3D": "SSG/shapes/obj/s_TEFGerade.stl",
+  "iconBig": "SSG/shapes/img/AP_64px.png",
+  "srcSVG": "SSG/shapes/svg/s_Gerade_TEF.xml",
   "width": 236.5984,
   "height": 3779.5276,
   "depth": 264.5669,
-  "behaviour": "(ORIGIN=CENTER)",
+  "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)",
-  "color3D": "#FF0000"
+  "group3d": [
+    {
+      "source": "s_TEFGerade",
+      "id": "g0",
+      "width": 236.5984,
+      "height": 3779.5276,
+      "depth": 264.5669,
+      "x": 0.0,
+      "y": 0.0,
+      "z": 207.874,
+      "rotation": "0;0;0",
+      "data": "",
+      "color": "#FF0000",
+      "colorOpacity": 1.0
+    }
+  ],
+  "connectionPoints": [
+    {
+      "id": "cp1",
+      "x": 500.0,
+      "y": 0.0,
+      "z": 0.0,
+      "xMin": "",
+      "xMax": "",
+      "xStep": "",
+      "yMin": "",
+      "yMax": "",
+      "yStep": "",
+      "zMin": "",
+      "zMax": "",
+      "zStep": "",
+      "direction": 0.0,
+      "linkClass": "OmnifloTEF",
+      "label": "TEF",
+      "isDimension": true
+    },
+    {
+      "id": "cp2",
+      "x": 500.0,
+      "y": 1000.0,
+      "z": 0.0,
+      "xMin": "",
+      "xMax": "",
+      "xStep": "",
+      "yMin": "",
+      "yMax": "",
+      "yStep": "",
+      "zMin": "",
+      "zMax": "",
+      "zStep": "",
+      "direction": 180.0,
+      "linkClass": "OmnifloTEF",
+      "label": "TEF",
+      "isDimension": true
+    }
+  ],
+  "eventClass": "OnInserted,OnDoubleclick,OnPasted,OnLinked,OnRemoved"
 }

MAIN_SSG.rdx

@@ -91,7 +91,7 @@
 					<FIELD Id="RDK:22007211" Name="KurvenRichtung" Type="string" DesignTimeRemark="true, wenn eine Rechtskurve, ansonsten links" />
 					<FIELD Id="RDK:21700894" Name="isOk" Type="boolean" DesignTimeRemark="True beide Punkte angebunden sind und die Höhen der Nachbarn passen" />
 				</TYPE>
-				<TYPE Id="RDK:23747149" Name="TEFBogenType" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:23747149" Name="TEFBogenType" Expanded="True" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:23747141" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:23747143" Name="Hoehe" Type="double" />
@@ -136,7 +136,7 @@
 					<FIELD Id="RDK:22007213" Name="KurvenRichtung" Type="string" DesignTimeRemark="rechts oder links, je nach Wahl des Nutzers" />
 					<FIELD Id="RDK:21700896" Name="isOk" Type="boolean" DesignTimeRemark="True beide Punkte angebunden sind und die Höhen der Nachbarn passen" />
 				</TYPE>
-				<TYPE Id="RDK:26502276" Name="KettenFoerdererType" SubType="structure">
+				<TYPE Id="RDK:26502276" Name="KettenFoerdererType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:26502268" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:26502269" Name="L1" Type="double" />
@@ -333,7 +333,7 @@
 					<FIELD Id="RDK:22938802" Name="Key" Type="string" />
 					<FIELD Id="RDK:22938803" Name="StrArr" Type="string[]" />
 				</TYPE>
-				<TYPE Id="RDK:18530545" Name="SSG_Limits" SubType="structure">
+				<TYPE Id="RDK:18530545" Name="SSG_Limits" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18530548" Name="Kreisel_top" Type="KreiselType" />
 					<FIELD Id="RDK:18530546" Name="Kreisel_bot" Type="KreiselType" />