diff --git a/Editor2DLibrary/SSG/shapes/categories.txt b/Editor2DLibrary/SSG/shapes/categories.txt index 4427030..b38f460 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":"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","description":"Assemblies created while Session","hasShapes":false}] \ No newline at end of file +[{"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":"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","description":"Assemblies created while Session","hasShapes":true}] \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/img/Kurve_30_32px.png b/Editor2DLibrary/SSG/shapes/img/Kurve_30_32px.png new file mode 100644 index 0000000..84deba2 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/Kurve_30_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/Kurve_30_64px.png b/Editor2DLibrary/SSG/shapes/img/Kurve_30_64px.png new file mode 100644 index 0000000..50f781b Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/Kurve_30_64px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/Kurve_60_32px.png b/Editor2DLibrary/SSG/shapes/img/Kurve_60_32px.png new file mode 100644 index 0000000..a29324f Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/Kurve_60_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/Kurve_60_64px.png b/Editor2DLibrary/SSG/shapes/img/Kurve_60_64px.png new file mode 100644 index 0000000..6d8ce2b Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/Kurve_60_64px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/Kurve_90_32px.png b/Editor2DLibrary/SSG/shapes/img/Kurve_90_32px.png new file mode 100644 index 0000000..707a7e5 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/Kurve_90_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/Kurve_90_64px.png b/Editor2DLibrary/SSG/shapes/img/Kurve_90_64px.png new file mode 100644 index 0000000..ded8086 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/Kurve_90_64px.png differ diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_ILS.xml b/Editor2DLibrary/SSG/shapes/palettes/c_ILS.xml index 6fd1f1c..4b9c061 100644 --- a/Editor2DLibrary/SSG/shapes/palettes/c_ILS.xml +++ b/Editor2DLibrary/SSG/shapes/palettes/c_ILS.xml @@ -1,3 +1,5 @@ 
Gefällestrecke
-
90 Kurve rechts
+
90 Kurve
+
60 Kurve
+
30 Kurve
\ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_Parts.xml b/Editor2DLibrary/SSG/shapes/palettes/c_Parts.xml index 116673c..3b7f203 100644 --- a/Editor2DLibrary/SSG/shapes/palettes/c_Parts.xml +++ b/Editor2DLibrary/SSG/shapes/palettes/c_Parts.xml @@ -8,7 +8,6 @@
Pin-Band
Weiche aktiv
Weiche passiv
-
Kurve 90
Eckrad
Eckrad
BTMT-Beladung
diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_Session.xml b/Editor2DLibrary/SSG/shapes/palettes/c_Session.xml new file mode 100644 index 0000000..821ff47 --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/palettes/c_Session.xml @@ -0,0 +1,77 @@ +
Strecke :1
+
Strecke :2
+
Strecke :3
+
Strecke :4
+
Strecke :1
+
Strecke :2
+
Strecke :3
+
Strecke :4
+
Strecke :1
+
Strecke :2
+
Strecke :3
+
Strecke :1
+
Strecke :1
+
Strecke :2
+
Gefaellestrecke :1
+
Gefaellestrecke :2
+
Strecke :3
+
Strecke :4
+
Strecke :5
+
Strecke :6
+
Strecke :7
+
Strecke :8
+
Strecke :9
+
Strecke :1
+
Strecke :2
+
Strecke :3
+
Strecke :4
+
Strecke :5
+
Strecke :6
+
Strecke :1
+
Strecke :2
+
Strecke :3
+
Strecke :4
+
Strecke :5
+
Strecke :6
+
Strecke :7
+
Strecke :8
+
Strecke :9
+
Strecke :1
+
Strecke :2
+
Strecke :3
+
Strecke :4
+
Strecke :5
+
Strecke :6
+
Strecke :7
+
Strecke :8
+
Strecke :9
+
Strecke :10
+
Strecke :11
+
Strecke :12
+
Strecke :13
+
Strecke :14
+
Strecke :15
+
Strecke :16
+
Strecke :17
+
Gefaellestrecke :1
+
Strecke :18
+
Strecke :19
+
Strecke :20
+
Strecke :21
+
Strecke :22
+
Strecke :23
+
Strecke :24
+
Strecke :25
+
Strecke :26
+
Strecke :27
+
Strecke :28
+
Strecke :29
+
Strecke :30
+
Strecke :31
+
Strecke :32
+
Strecke :33
+
Strecke :34
+
Strecke :35
+
Strecke :36
+
Strecke :37
+
\ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/s_Kurve_30.txt b/Editor2DLibrary/SSG/shapes/props/s_Kurve_30.txt new file mode 100644 index 0000000..0a4d0f5 --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/props/s_Kurve_30.txt @@ -0,0 +1,52 @@ +{ + "shapeMode": 0, + "name": "30 Kurve", + "family": "Strecke", + "icon": "SSG/shapes/img/Kurve_30_32px.png", + "iconBig": "SSG/shapes/img/Kurve_30_64px.png", + "srcSVG": "SSG/shapes/svg/s_Kurve_30.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" +} \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/s_Kurve_60.txt b/Editor2DLibrary/SSG/shapes/props/s_Kurve_60.txt new file mode 100644 index 0000000..958af94 --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/props/s_Kurve_60.txt @@ -0,0 +1,52 @@ +{ + "shapeMode": 0, + "name": "60 Kurve", + "family": "Strecke", + "icon": "SSG/shapes/img/Kurve_60_32px.png", + "iconBig": "SSG/shapes/img/Kurve_60_64px.png", + "srcSVG": "SSG/shapes/svg/s_Kurve_60.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" +} \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/s_Kurve_90.txt b/Editor2DLibrary/SSG/shapes/props/s_Kurve_90.txt index 94cdee0..be2af34 100644 --- a/Editor2DLibrary/SSG/shapes/props/s_Kurve_90.txt +++ b/Editor2DLibrary/SSG/shapes/props/s_Kurve_90.txt @@ -1,32 +1,14 @@ { "shapeMode": 0, - "name": "Kurve 90", + "name": "90 Kurve", "family": "Strecke", - "icon": "SSG/shapes/img/", + "icon": "SSG/shapes/img/Kurve_90_32px.png", + "iconBig": "SSG/shapes/img/Kurve_90_64px.png", "srcSVG": "SSG/shapes/svg/s_Kurve_90.xml", - "width": 1889.7638, - "height": 1889.7638, - "depth": 755.9055, - "behaviour": "(NOSTRETCH)(NOEDIT)(HIDEDIMENSIONS)(HIDECOORDINATES)(HIDEROTATION)(HIDEPIN)(HIDELAYER)(HIDEUPDATEBUTTON)(ORIGIN=CENTER)", + "width": 1511.811, + "height": 1511.811, + "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)", "connectionPoints": [ - { - "id": "cp0", - "x": 0.0, - "y": 1000.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 180.0, - "label": "", - "isDimension": true - }, { "id": "cp1", "x": 1000.0, @@ -42,8 +24,29 @@ "zMax": "", "zStep": "", "direction": 90.0, - "label": "", + "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" } \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_30.xml b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_30.xml new file mode 100644 index 0000000..3087455 --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_30.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_60.xml b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_60.xml new file mode 100644 index 0000000..7672a1d --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_60.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_90.xml b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_90.xml index 6a2b02a..2719748 100644 --- a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_90.xml +++ b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_90.xml @@ -4,8 +4,8 @@ - + - + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_90_Part.xml b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_90_Part.xml new file mode 100644 index 0000000..07b5f23 --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_90_Part.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index 7a203a3..720074f 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -4512,8 +4512,9 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + - + @@ -15839,7 +15840,7 @@ me.x - + @@ -15867,7 +15868,7 @@ me.x - + diff --git a/SVGs/Kurve_90_rechts.svg b/SVGs/Kurve_30.svg similarity index 51% rename from SVGs/Kurve_90_rechts.svg rename to SVGs/Kurve_30.svg index afb5957..2ef9583 100644 --- a/SVGs/Kurve_90_rechts.svg +++ b/SVGs/Kurve_30.svg @@ -2,13 +2,16 @@ + inkscape:current-layer="layer1" /> + id="layer1" + transform="translate(5.0067902e-6,-1.0851037e-5)"> diff --git a/SVGs/Kurve_90_links.svg b/SVGs/Kurve_60.svg similarity index 50% rename from SVGs/Kurve_90_links.svg rename to SVGs/Kurve_60.svg index 21a7aab..4793641 100644 --- a/SVGs/Kurve_90_links.svg +++ b/SVGs/Kurve_60.svg @@ -2,13 +2,16 @@ + inkscape:current-layer="layer1" /> + inkscape:export-filename="Kurve_30.svg" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96" /> diff --git a/SVGs/Kurve_90.svg b/SVGs/Kurve_90.svg index 478a48f..adaf963 100644 --- a/SVGs/Kurve_90.svg +++ b/SVGs/Kurve_90.svg @@ -7,7 +7,7 @@ viewBox="0 0 264.58333 264.58333" version="1.1" id="svg1209" - inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" + inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" sodipodi:docname="Kurve_90.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" @@ -24,15 +24,16 @@ inkscape:deskcolor="#d1d1d1" inkscape:document-units="mm" showgrid="false" - inkscape:zoom="0.2973261" - inkscape:cx="-28.588139" - inkscape:cy="107.62594" - inkscape:window-width="1920" - inkscape:window-height="1137" - inkscape:window-x="1912" - inkscape:window-y="-8" + inkscape:zoom="0.4204826" + inkscape:cx="768.16496" + inkscape:cy="398.3518" + inkscape:window-width="3440" + inkscape:window-height="1351" + inkscape:window-x="2391" + inkscape:window-y="-9" inkscape:window-maximized="1" - inkscape:current-layer="layer1" /> + inkscape:current-layer="layer1" + inkscape:pageshadow="2" />