From d3388ba4d654f3672ef11fd93b76cdef2174336a Mon Sep 17 00:00:00 2001 From: Yuelin Wang Date: Tue, 22 Oct 2024 10:07:37 +0200 Subject: [PATCH] Die Kurven sind neu zugeordnet. --- Editor2DLibrary/SSG/shapes/categories.txt | 2 +- .../SSG/shapes/palettes/c_Foerderer.xml | 6 +++ .../SSG/shapes/palettes/c_Kurven.xml | 13 ++--- .../SSG/shapes/props/s_Kurve_30_L_F.txt | 48 +------------------ .../SSG/shapes/props/s_Kurve_30_R_F.txt | 48 +------------------ .../SSG/shapes/props/s_Kurve_60_L_G.txt | 48 +------------------ .../SSG/shapes/props/s_Kurve_60_R_F.txt | 48 +------------------ .../SSG/shapes/props/s_Kurve_90_L_G.txt | 48 +------------------ .../SSG/shapes/props/s_Kurve_90_R_G.txt | 48 +------------------ 9 files changed, 20 insertions(+), 289 deletions(-) diff --git a/Editor2DLibrary/SSG/shapes/categories.txt b/Editor2DLibrary/SSG/shapes/categories.txt index a83ae89..391e452 100644 --- a/Editor2DLibrary/SSG/shapes/categories.txt +++ b/Editor2DLibrary/SSG/shapes/categories.txt @@ -1 +1 @@ -[{"id":"c_ILS","name":"ILS","hasShapes":true,"items":[{"id":"c_Kreiselmodule","name":"Kreisel-Module","hasShapes":true},{"id":"c_Zusatzmodul","name":"Zusatzmodul","hasShapes":true},{"id":"c_Foerderer","name":"Förderer","hasShapes":true},{"id":"c_Kurven","name":"Kurven","hasShapes":true}]},{"id":"c10","name":"PBU","hasShapes":true},{"id":"c_Background","name":"Background","hideName":true,"hasShapes":true},{"id":"c_Parts","name":"Parts","description":"Shapes used for creating new Assemblies while Session","hasShapes":true},{"id":"c_Session","name":"Session","hasShapes":false}] \ No newline at end of file +[{"id":"c_ILS","name":"ILS","hasShapes":false,"items":[{"id":"c_Kreiselmodule","name":"Kreisel-Module","hasShapes":true},{"id":"c_Zusatzmodul","name":"Zusatzmodul","hasShapes":true},{"id":"c_Foerderer","name":"Förderer","hasShapes":true},{"id":"c_Kurven","name":"Gefällestrecke","hasShapes":true}]},{"id":"c10","name":"PBU","hasShapes":true},{"id":"c_Background","name":"Background","hideName":true,"hasShapes":true},{"id":"c_Parts","name":"Parts","description":"Shapes used for creating new Assemblies while Session","hasShapes":true},{"id":"c_Session","name":"Session","hasShapes":true}] \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_Foerderer.xml b/Editor2DLibrary/SSG/shapes/palettes/c_Foerderer.xml index 83fa135..3c693c2 100644 --- a/Editor2DLibrary/SSG/shapes/palettes/c_Foerderer.xml +++ b/Editor2DLibrary/SSG/shapes/palettes/c_Foerderer.xml @@ -1,3 +1,9 @@ 
Etagenförderer
TEF mit Finger
+
90 Kurve links angetrieben
+
90 Kurve rechts angetrieben
+
60 Kurve links angetriebene
+
60 Kurve rechts angetriebene
+
30 Kurve links angetriebene
+
30 Kurve rechts angetriebene
 \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_Kurven.xml b/Editor2DLibrary/SSG/shapes/palettes/c_Kurven.xml index 8cb814d..99951e5 100644 --- a/Editor2DLibrary/SSG/shapes/palettes/c_Kurven.xml +++ b/Editor2DLibrary/SSG/shapes/palettes/c_Kurven.xml @@ -1,7 +1,8 @@ -
90 Kurve links
-
90 Kurve rechts
-
60 Kurve links
-
60 Kurve rechts
-
30 Kurve links
-
30 Kurve rechts
+
Gefällestrecke Gerade
+
90 Kurve links Gefällestrecke
+
90 Kurve rechts Gefällestrecke
+
60 Kurve links Gefällestrecke
+
60 Kurve rechts Gefällestrecke
+
30 Kurve links Gefällestrecke
+
30 Kurve rechts Gefällestrecke
 \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/s_Kurve_30_L_F.txt b/Editor2DLibrary/SSG/shapes/props/s_Kurve_30_L_F.txt index 40e2324..9c8c45f 100644 --- a/Editor2DLibrary/SSG/shapes/props/s_Kurve_30_L_F.txt +++ b/Editor2DLibrary/SSG/shapes/props/s_Kurve_30_L_F.txt @@ -2,51 +2,5 @@ "shapeMode": 0, "name": "30 Kurve links angetriebene", "family": "Kurve", - "icon": "SSG/shapes/img/Kurve_30_L_F_32px.png", - "iconBig": "SSG/shapes/img/Kurve_30_L_F_64px.png", - "srcSVG": "SSG/shapes/svg/s_Kurve_30_L_F.xml", - "width": 202.5449, - "height": 755.9055, - "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)", - "connectionPoints": [ - { - "id": "cp1", - "x": 1000.0, - "y": 0.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 30.0, - "linkClass": "Gefaellestrecke", - "label": "H0", - "isDimension": true - }, - { - "id": "cp2", - "x": 0.0, - "y": 1000.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 180.0, - "linkClass": "Gefaellestrecke", - "label": "H1", - "isDimension": true - } - ], - "eventClass": "OnInserted,OnPasted,OnLinked,OnDoubleclick" + "icon": "SSG/shapes/img/Kurve_30_L_F_32px.png" } \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/s_Kurve_30_R_F.txt b/Editor2DLibrary/SSG/shapes/props/s_Kurve_30_R_F.txt index 9fa9992..54c84c8 100644 --- a/Editor2DLibrary/SSG/shapes/props/s_Kurve_30_R_F.txt +++ b/Editor2DLibrary/SSG/shapes/props/s_Kurve_30_R_F.txt @@ -2,51 +2,5 @@ "shapeMode": 0, "name": "30 Kurve rechts angetriebene", "family": "Kurve", - "icon": "SSG/shapes/img/Kurve_30_R_F_32px.png", - "iconBig": "SSG/shapes/img/Kurve_30_R_F_64px.png", - "srcSVG": "SSG/shapes/svg/s_Kurve_30_R_F.xml", - "width": 202.5449, - "height": 755.9055, - "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)", - "connectionPoints": [ - { - "id": "cp1", - "x": 0.0, - "y": 0.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 150.0, - "linkClass": "Gefaellestrecke", - "label": "H0", - "isDimension": true - }, - { - "id": "cp2", - "x": 1000.0, - "y": 1000.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 0.0, - "linkClass": "Gefaellestrecke", - "label": "H1", - "isDimension": true - } - ], - "eventClass": "OnInserted,OnPasted,OnLinked,OnDoubleclick" + "icon": "SSG/shapes/img/Kurve_30_R_F_32px.png" } \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/s_Kurve_60_L_G.txt b/Editor2DLibrary/SSG/shapes/props/s_Kurve_60_L_G.txt index 144ee18..e6f25a8 100644 --- a/Editor2DLibrary/SSG/shapes/props/s_Kurve_60_L_G.txt +++ b/Editor2DLibrary/SSG/shapes/props/s_Kurve_60_L_G.txt @@ -2,51 +2,5 @@ "shapeMode": 0, "name": "60 Kurve links Gefällestrecke", "family": "Kurve", - "icon": "SSG/shapes/img/Kurve_60_L_G_32px.png", - "iconBig": "SSG/shapes/img/Kurve_60_L_G_64px.png", - "srcSVG": "SSG/shapes/svg/s_Kurve_60_L_G.xml", - "width": 755.9055, - "height": 1309.2661, - "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)", - "connectionPoints": [ - { - "id": "cp1", - "x": 1000.0, - "y": 0.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 60.0, - "linkClass": "Gefaellestrecke", - "label": "H0", - "isDimension": true - }, - { - "id": "cp2", - "x": 0.0, - "y": 1000.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 180.0, - "linkClass": "Gefaellestrecke", - "label": "H1", - "isDimension": true - } - ], - "eventClass": "OnInserted,OnPasted,OnLinked,OnDoubleclick" + "icon": "SSG/shapes/img/Kurve_60_L_G_32px.png" } \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/s_Kurve_60_R_F.txt b/Editor2DLibrary/SSG/shapes/props/s_Kurve_60_R_F.txt index 8bf8300..7818692 100644 --- a/Editor2DLibrary/SSG/shapes/props/s_Kurve_60_R_F.txt +++ b/Editor2DLibrary/SSG/shapes/props/s_Kurve_60_R_F.txt @@ -2,51 +2,5 @@ "shapeMode": 0, "name": "60 Kurve rechts angetriebene", "family": "Kurve", - "icon": "SSG/shapes/img/Kurve_60_R_F_32px.png", - "iconBig": "SSG/shapes/img/Kurve_60_R_F_64px.png", - "srcSVG": "SSG/shapes/svg/s_Kurve_60_R_F.xml", - "width": 755.9055, - "height": 1309.2661, - "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)", - "connectionPoints": [ - { - "id": "cp1", - "x": 0.0, - "y": 0.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 120.0, - "linkClass": "Gefaellestrecke", - "label": "H0", - "isDimension": true - }, - { - "id": "cp2", - "x": 1000.0, - "y": 1000.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 0.0, - "linkClass": "Gefaellestrecke", - "label": "H1", - "isDimension": true - } - ], - "eventClass": "OnInserted,OnPasted,OnLinked,OnDoubleclick" + "icon": "SSG/shapes/img/Kurve_60_R_F_32px.png" } \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/s_Kurve_90_L_G.txt b/Editor2DLibrary/SSG/shapes/props/s_Kurve_90_L_G.txt index c6ff3c9..c5b51b9 100644 --- a/Editor2DLibrary/SSG/shapes/props/s_Kurve_90_L_G.txt +++ b/Editor2DLibrary/SSG/shapes/props/s_Kurve_90_L_G.txt @@ -2,51 +2,5 @@ "shapeMode": 0, "name": "90 Kurve links Gefällestrecke", "family": "Kurve", - "icon": "SSG/shapes/img/Kurve_90_L_G_32px.png", - "iconBig": "SSG/shapes/img/Kurve_90_L_G_64px.png", - "srcSVG": "SSG/shapes/svg/s_Kurve_90_L_G.xml", - "width": 1511.811, - "height": 1511.811, - "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)", - "connectionPoints": [ - { - "id": "cp1", - "x": 1000.0, - "y": 0.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 90.0, - "linkClass": "Gefaellestrecke", - "label": "H0", - "isDimension": true - }, - { - "id": "cp2", - "x": 0.0, - "y": 1000.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 180.0, - "linkClass": "Gefaellestrecke", - "label": "H1", - "isDimension": true - } - ], - "eventClass": "OnInserted,OnPasted,OnLinked,OnDoubleclick" + "icon": "SSG/shapes/img/Kurve_90_L_G_32px.png" } \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/s_Kurve_90_R_G.txt b/Editor2DLibrary/SSG/shapes/props/s_Kurve_90_R_G.txt index 3736276..37c90a9 100644 --- a/Editor2DLibrary/SSG/shapes/props/s_Kurve_90_R_G.txt +++ b/Editor2DLibrary/SSG/shapes/props/s_Kurve_90_R_G.txt @@ -2,51 +2,5 @@ "shapeMode": 0, "name": "90 Kurve rechts Gefällestrecke", "family": "Kurve", - "icon": "SSG/shapes/img/Kurve_90_R_G_32px.png", - "iconBig": "SSG/shapes/img/Kurve_90_R_G_64px.png", - "srcSVG": "SSG/shapes/svg/s_Kurve_90_R_G.xml", - "width": 1511.811, - "height": 1511.811, - "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)", - "connectionPoints": [ - { - "id": "cp1", - "x": 0.0, - "y": 0.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 90.0, - "linkClass": "Gefaellestrecke", - "label": "H0", - "isDimension": true - }, - { - "id": "cp2", - "x": 1000.0, - "y": 1000.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 0.0, - "linkClass": "Gefaellestrecke", - "label": "H1", - "isDimension": true - } - ], - "eventClass": "OnInserted,OnPasted,OnLinked,OnDoubleclick" + "icon": "SSG/shapes/img/Kurve_90_R_G_32px.png" } \ No newline at end of file