diff --git a/CAD/OmnifloCAD/TEFBogen/Antriebst.links_TEF_links.dwg b/CAD/OmnifloCAD/TEFBogen/Antriebst.links_TEF_links.dwg index 675771d..65f5eac 100644 Binary files a/CAD/OmnifloCAD/TEFBogen/Antriebst.links_TEF_links.dwg and b/CAD/OmnifloCAD/TEFBogen/Antriebst.links_TEF_links.dwg differ diff --git a/Editor2DLibrary/SSG/shapes/categories.txt b/Editor2DLibrary/SSG/shapes/categories.txt index c62aa11..34e6f48 100644 --- a/Editor2DLibrary/SSG/shapes/categories.txt +++ b/Editor2DLibrary/SSG/shapes/categories.txt @@ -1 +1 @@ -[{"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},{"id":"c_Omniflo","name":"Omniflo","hasShapes":false,"items":[{"id":"c_Boegen","name":"Bögen","hasShapes":true},{"id":"c_Gerade","name":"Aluprofil Gerade","hasShapes":true},{"id":"c_Weichen_90","name":"Weiche 90°","hasShapes":true},{"id":"c_Weichen_45","name":"Weiche 45°","hasShapes":true},{"id":"c_Weichen_Parallel","name":"Weichen Parallel","hasShapes":true},{"id":"c_Weichenkoerper","name":"Weichenkörper","hasShapes":true},{"id":"c_Weichenkombinationen","name":"Weichenkombinationen","hasShapes":true},{"id":"c_TEFElemente","name":"TEF Elemente","hasShapes":true}]},{"id":"c_OmnifloBogen","name":"Omniflo Bogen","hasShapes":true,"items":[{"id":"c_Boegen_90","name":"Bögen 90°","hasShapes":true}]},{"id":"c_OmnifloWeiche","name":"Omniflo Weiche","hasShapes":true},{"id":"c_OmnifloTEFParts","name":"Omniflo TEF Elemente","hasShapes":true}] \ 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},{"id":"c_Omniflo","name":"Omniflo","hasShapes":false,"items":[{"id":"c_Boegen","name":"Bögen","hasShapes":true},{"id":"c_Gerade","name":"Aluprofil Gerade","hasShapes":true},{"id":"c_Weichen_90","name":"Weiche 90°","hasShapes":true},{"id":"c_Weichen_45","name":"Weiche 45°","hasShapes":true},{"id":"c_Weichen_Parallel","name":"Weichen Parallel","hasShapes":true},{"id":"c_Weichenkoerper","name":"Weichenkörper","hasShapes":true},{"id":"c_Weichenkombinationen","name":"Weichenkombinationen","hasShapes":true},{"id":"c_TEFElemente","name":"TEF Elemente","hasShapes":true}]},{"id":"c_OmnifloBogen","name":"Omniflo Bogen","hasShapes":true,"items":[{"id":"c_Boegen_90","name":"Bögen 90°","hasShapes":true}]},{"id":"c_OmnifloWeiche","name":"Omniflo Weiche","hasShapes":true}] \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/img/Antriebst.links_TEF_links_32px.png b/Editor2DLibrary/SSG/shapes/img/Antriebst.links_TEF_links_32px.png new file mode 100644 index 0000000..db4579a Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/Antriebst.links_TEF_links_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/Antriebst.links_TEF_links_64px.png b/Editor2DLibrary/SSG/shapes/img/Antriebst.links_TEF_links_64px.png new file mode 100644 index 0000000..3145e5b Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/Antriebst.links_TEF_links_64px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/Antriebst.rechts_TEF_rechts_32px.png b/Editor2DLibrary/SSG/shapes/img/Antriebst.rechts_TEF_rechts_32px.png new file mode 100644 index 0000000..c8e25cd Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/Antriebst.rechts_TEF_rechts_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/Antriebst.rechts_TEF_rechts_64px.png b/Editor2DLibrary/SSG/shapes/img/Antriebst.rechts_TEF_rechts_64px.png new file mode 100644 index 0000000..a65132f Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/Antriebst.rechts_TEF_rechts_64px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/Umlenkspannst.rechts_TEF_links_32px.png b/Editor2DLibrary/SSG/shapes/img/Umlenkspannst.rechts_TEF_links_32px.png new file mode 100644 index 0000000..020b448 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/Umlenkspannst.rechts_TEF_links_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/Umlenkspannst.rechts_TEF_links_64px.png b/Editor2DLibrary/SSG/shapes/img/Umlenkspannst.rechts_TEF_links_64px.png new file mode 100644 index 0000000..131fc04 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/Umlenkspannst.rechts_TEF_links_64px.png differ diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_TEFElemente.xml b/Editor2DLibrary/SSG/shapes/palettes/c_TEFElemente.xml index fb0a748..6c2ba2e 100644 --- a/Editor2DLibrary/SSG/shapes/palettes/c_TEFElemente.xml +++ b/Editor2DLibrary/SSG/shapes/palettes/c_TEFElemente.xml @@ -1,4 +1,7 @@ -
APB 110 R 630/90 800/800 mit TEF Aussen
-
TEF Bogen 90° R725
-
Umlenkspannst. links für TEF rechts
+
Umlenkspannst. links für TEF rechts
+
Umlenkspannst. rechts für TEF links
+
TEF Bogen 90° R725
+
TEF Bogen 90° R535
+
Antriebst. links für TEF links
+
Antriebst. rechts für TEF rechts
 \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/0_B10010.txt b/Editor2DLibrary/SSG/shapes/props/0_B10010.txt new file mode 100644 index 0000000..015ecdc --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/props/0_B10010.txt @@ -0,0 +1,33 @@ +{ + "shapeMode": 0, + "name": "Antriebst. links für TEF links", + "family": "TEFUmlenk", + "icon": "SSG/shapes/img/Antriebst.links_TEF_links_32px.png", + "iconBig": "SSG/shapes/img/Antriebst.links_TEF_links_64px.png", + "srcSVG": "SSG/shapes/svg/0_B10010.xml", + "width": 2067.0992, + "height": 1254.8031, + "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", + "connectionPoints": [ + { + "id": "cp1", + "x": 0.0, + "y": 582.305, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 270.0, + "linkClass": "OmnifloTEF", + "label": "", + "isDimension": true + } + ], + "eventClass": "OnDoubleclick,OnLinked,OnPasted,OnInserted,OnRemoved" +} \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/0_B10020.txt b/Editor2DLibrary/SSG/shapes/props/0_B10020.txt new file mode 100644 index 0000000..4c56bfb --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/props/0_B10020.txt @@ -0,0 +1,33 @@ +{ + "shapeMode": 0, + "name": "Antriebst. rechts für TEF rechts", + "family": "TEFUmlenk", + "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, + "height": 1254.8031, + "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", + "connectionPoints": [ + { + "id": "cp1", + "x": 1000.0, + "y": 582.305, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 90.0, + "linkClass": "OmnifloTEF", + "label": "", + "isDimension": true + } + ], + "eventClass": "OnDoubleclick,OnLinked,OnPasted,OnInserted,OnRemoved" +} \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/Umlenk_rechts_TEF_links.txt b/Editor2DLibrary/SSG/shapes/props/Umlenk_rechts_TEF_links.txt new file mode 100644 index 0000000..ed04008 --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/props/Umlenk_rechts_TEF_links.txt @@ -0,0 +1,33 @@ +{ + "shapeMode": 0, + "name": "Umlenkspannst. rechts für TEF links", + "family": "TEFUmlenk", + "icon": "SSG/shapes/img/Umlenkspannst.rechts_TEF_links_32px.png", + "iconBig": "SSG/shapes/img/Umlenkspannst.rechts_TEF_links_64px.png", + "srcSVG": "SSG/shapes/svg/Umlenk_rechts_TEF_links.xml", + "width": 1363.4835, + "height": 1004.2091, + "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", + "connectionPoints": [ + { + "id": "cp1", + "x": 0.0, + "y": 462.038, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 270.0, + "linkClass": "OmnifloTEF", + "label": "", + "isDimension": true + } + ], + "eventClass": "OnDoubleclick,OnLinked,OnPasted,OnInserted,OnRemoved" +} \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/settings.txt b/Editor2DLibrary/SSG/shapes/settings.txt index 6d69628..7708879 100644 --- a/Editor2DLibrary/SSG/shapes/settings.txt +++ b/Editor2DLibrary/SSG/shapes/settings.txt @@ -1 +1 @@ -{"categories":{"c_ILS":{"expanded":true},"c_Kreiselmodule":{"expanded":true},"c_Zusatzmodul":{"expanded":true},"c_Foerderer":{"expanded":true},"c_Kurven":{"expanded":true},"c10":{"expanded":true},"c_Background":{"expanded":true},"c_Parts":{"expanded":true},"c_Session":{"expanded":false},"c_Omniflo":{"expanded":true},"c_Boegen":{"expanded":true},"c_Gerade":{"expanded":true},"c_Weichen_90":{"expanded":true},"c_Weichen_45":{"expanded":true},"c_Weichen_Parallel":{"expanded":true},"c_Weichenkoerper":{"expanded":true},"c_Weichenkombinationen":{"expanded":true},"c_TEFElemente":{"expanded":true},"c_OmnifloBogen":{"expanded":true},"c_Boegen_90":{"expanded":false},"c_OmnifloWeiche":{"expanded":true},"c_OmnifloTEFParts":{"expanded":true}},"shapes":{}} \ No newline at end of file +{"categories":{"c_ILS":{"expanded":true},"c_Kreiselmodule":{"expanded":true},"c_Zusatzmodul":{"expanded":true},"c_Foerderer":{"expanded":true},"c_Kurven":{"expanded":true},"c10":{"expanded":true},"c_Background":{"expanded":true},"c_Parts":{"expanded":true},"c_Session":{"expanded":false},"c_Omniflo":{"expanded":true},"c_Boegen":{"expanded":true},"c_Gerade":{"expanded":true},"c_Weichen_90":{"expanded":true},"c_Weichen_45":{"expanded":true},"c_Weichen_Parallel":{"expanded":true},"c_Weichenkoerper":{"expanded":true},"c_Weichenkombinationen":{"expanded":true},"c_TEFElemente":{"expanded":true},"c_OmnifloBogen":{"expanded":true},"c_Boegen_90":{"expanded":false},"c_OmnifloWeiche":{"expanded":false}},"shapes":{}} \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/0_B10010.xml b/Editor2DLibrary/SSG/shapes/svg/0_B10010.xml new file mode 100644 index 0000000..c731305 --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/svg/0_B10010.xml @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/0_B10020.xml b/Editor2DLibrary/SSG/shapes/svg/0_B10020.xml new file mode 100644 index 0000000..9a55188 --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/svg/0_B10020.xml @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/0_B10040.xml b/Editor2DLibrary/SSG/shapes/svg/0_B10040.xml index aab2767..3a9892a 100644 --- a/Editor2DLibrary/SSG/shapes/svg/0_B10040.xml +++ b/Editor2DLibrary/SSG/shapes/svg/0_B10040.xml @@ -2,10 +2,7 @@ - - - - - + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/0_B10050.xml b/Editor2DLibrary/SSG/shapes/svg/0_B10050.xml index d31f55b..100fbc0 100644 --- a/Editor2DLibrary/SSG/shapes/svg/0_B10050.xml +++ b/Editor2DLibrary/SSG/shapes/svg/0_B10050.xml @@ -2,8 +2,7 @@ - - - + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/Umlenk_links_TEF_rechts.xml b/Editor2DLibrary/SSG/shapes/svg/Umlenk_links_TEF_rechts.xml index aadfa5f..c39bbd9 100644 --- a/Editor2DLibrary/SSG/shapes/svg/Umlenk_links_TEF_rechts.xml +++ b/Editor2DLibrary/SSG/shapes/svg/Umlenk_links_TEF_rechts.xml @@ -2,107 +2,102 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/Umlenk_rechts_TEF_links.xml b/Editor2DLibrary/SSG/shapes/svg/Umlenk_rechts_TEF_links.xml new file mode 100644 index 0000000..31d7568 --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/svg/Umlenk_rechts_TEF_links.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SVGs/Omniflo/Antriebst.links_TEF_links.svg b/SVGs/Omniflo/Antriebst.links_TEF_links.svg new file mode 100644 index 0000000..db69fa4 --- /dev/null +++ b/SVGs/Omniflo/Antriebst.links_TEF_links.svg @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SVGs/Omniflo/Antriebst.rechts_TEF_rechts.svg b/SVGs/Omniflo/Antriebst.rechts_TEF_rechts.svg new file mode 100644 index 0000000..607f9d5 --- /dev/null +++ b/SVGs/Omniflo/Antriebst.rechts_TEF_rechts.svg @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SVGs/Omniflo/Umlenkspannst.rechts_TEF_links.svg b/SVGs/Omniflo/Umlenkspannst.rechts_TEF_links.svg new file mode 100644 index 0000000..c5fb897 --- /dev/null +++ b/SVGs/Omniflo/Umlenkspannst.rechts_TEF_links.svg @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +