diff --git a/CAD/OmnifloCAD/OmnifloBogen.dwg b/CAD/OmnifloCAD/OmnifloBogen.dwg index 0fb466a..ba294cf 100644 Binary files a/CAD/OmnifloCAD/OmnifloBogen.dwg and b/CAD/OmnifloCAD/OmnifloBogen.dwg differ diff --git a/CAD/OmnifloCAD/TEFBogen.dwg b/CAD/OmnifloCAD/TEFBogen.dwg index 671f119..2d10280 100644 Binary files a/CAD/OmnifloCAD/TEFBogen.dwg and b/CAD/OmnifloCAD/TEFBogen.dwg differ diff --git a/Editor2DLibrary/SSG/shapes/img/Umlenkspannst.links_TEF_rechts_32px.png b/Editor2DLibrary/SSG/shapes/img/Umlenkspannst.links_TEF_rechts_32px.png index b24a0b2..020b448 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/Umlenkspannst.links_TEF_rechts_32px.png and b/Editor2DLibrary/SSG/shapes/img/Umlenkspannst.links_TEF_rechts_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/Umlenkspannst.links_TEF_rechts_64px.png b/Editor2DLibrary/SSG/shapes/img/Umlenkspannst.links_TEF_rechts_64px.png index 07fbd31..131fc04 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/Umlenkspannst.links_TEF_rechts_64px.png and b/Editor2DLibrary/SSG/shapes/img/Umlenkspannst.links_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 index 020b448..b24a0b2 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/Umlenkspannst.rechts_TEF_links_32px.png 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 index 131fc04..07fbd31 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/Umlenkspannst.rechts_TEF_links_64px.png 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 6c2ba2e..431b71c 100644 --- a/Editor2DLibrary/SSG/shapes/palettes/c_TEFElemente.xml +++ b/Editor2DLibrary/SSG/shapes/palettes/c_TEFElemente.xml @@ -1,5 +1,5 @@ -
Umlenkspannst. links für TEF rechts
-
Umlenkspannst. rechts für TEF links
+
Umlenkspannst. rechts für TEF links
+
Umlenkspannst. links für TEF rechts
TEF Bogen 90° R725
TEF Bogen 90° R535
Antriebst. links für TEF links
diff --git a/Editor2DLibrary/SSG/shapes/props/0_B10010.txt b/Editor2DLibrary/SSG/shapes/props/0_B10010.txt index 015ecdc..fd754dd 100644 --- a/Editor2DLibrary/SSG/shapes/props/0_B10010.txt +++ b/Editor2DLibrary/SSG/shapes/props/0_B10010.txt @@ -27,6 +27,25 @@ "linkClass": "OmnifloTEF", "label": "", "isDimension": true + }, + { + "id": "cp2", + "x": 45.382, + "y": 876.294, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 270.0, + "linkClass": "Omniflo", + "label": "", + "isDimension": true } ], "eventClass": "OnDoubleclick,OnLinked,OnPasted,OnInserted,OnRemoved" diff --git a/Editor2DLibrary/SSG/shapes/props/0_B10020.txt b/Editor2DLibrary/SSG/shapes/props/0_B10020.txt index 4c56bfb..d176dcb 100644 --- a/Editor2DLibrary/SSG/shapes/props/0_B10020.txt +++ b/Editor2DLibrary/SSG/shapes/props/0_B10020.txt @@ -27,6 +27,25 @@ "linkClass": "OmnifloTEF", "label": "", "isDimension": true + }, + { + "id": "cp2", + "x": 954.674, + "y": 874.215, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 90.0, + "linkClass": "Omniflo", + "label": "", + "isDimension": true } ], "eventClass": "OnDoubleclick,OnLinked,OnPasted,OnInserted,OnRemoved" diff --git a/Editor2DLibrary/SSG/shapes/props/821104033+0_B10040.txt b/Editor2DLibrary/SSG/shapes/props/821104033+0_B10040.txt index 29a8e68..b557749 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104033+0_B10040.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104033+0_B10040.txt @@ -1,4 +1,4 @@ -{ +{ "shapeMode": 0, "name": "APB 110 R 630/90 800/800 mit TEF Aussen", "family": "TEFBogen", diff --git a/Editor2DLibrary/SSG/shapes/props/821104033+0_B10050.txt b/Editor2DLibrary/SSG/shapes/props/821104033+0_B10050.txt index ae3abed..cb59617 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104033+0_B10050.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104033+0_B10050.txt @@ -1,4 +1,4 @@ -{ +{ "shapeMode": 0, "name": "APB 110 R 630/90 800/800 mit TEF Innen", "family": "TEFBogen", diff --git a/Editor2DLibrary/SSG/shapes/props/Umlenk_links_TEF_rechts.txt b/Editor2DLibrary/SSG/shapes/props/Umlenk_links_TEF_rechts.txt index 12a26ce..cbe3cf3 100644 --- a/Editor2DLibrary/SSG/shapes/props/Umlenk_links_TEF_rechts.txt +++ b/Editor2DLibrary/SSG/shapes/props/Umlenk_links_TEF_rechts.txt @@ -2,32 +2,6 @@ "shapeMode": 0, "name": "Umlenkspannst. links für TEF rechts", "family": "TEFUmlenk", - "icon": "SSG/shapes/img/Umlenkspannst.links_TEF_rechts_32px.png", - "iconBig": "SSG/shapes/img/Umlenkspannst.links_TEF_rechts_64px.png", - "srcSVG": "SSG/shapes/svg/Umlenk_links_TEF_rechts.xml", - "width": 1363.4835, - "height": 1004.2091, - "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", - "connectionPoints": [ - { - "id": "cp1", - "x": 1000.0, - "y": 462.038, - "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" + "icon": "SSG/shapes/img/Umlenkspannst.rechts_TEF_links_32px.png", + "iconBig": "SSG/shapes/img/Umlenkspannst.rechts_TEF_links_64px.png" } \ 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 index ed04008..9b96adc 100644 --- a/Editor2DLibrary/SSG/shapes/props/Umlenk_rechts_TEF_links.txt +++ b/Editor2DLibrary/SSG/shapes/props/Umlenk_rechts_TEF_links.txt @@ -2,8 +2,8 @@ "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", + "icon": "SSG/shapes/img/Umlenkspannst.links_TEF_rechts32px.png", + "iconBig": "SSG/shapes/img/Umlenkspannst.links_TEF_rechts_64px.png", "srcSVG": "SSG/shapes/svg/Umlenk_rechts_TEF_links.xml", "width": 1363.4835, "height": 1004.2091, @@ -11,7 +11,7 @@ "connectionPoints": [ { "id": "cp1", - "x": 0.0, + "x": 1000.0, "y": 462.038, "z": 0.0, "xMin": "", @@ -23,10 +23,29 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 270.0, + "direction": 90.0, "linkClass": "OmnifloTEF", "label": "", "isDimension": true + }, + { + "id": "cp2", + "x": 936.586, + "y": 837.618, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 90.0, + "linkClass": "Omniflo", + "label": "", + "isDimension": true } ], "eventClass": "OnDoubleclick,OnLinked,OnPasted,OnInserted,OnRemoved" diff --git a/Editor2DLibrary/SSG/shapes/svg/0_B10010.xml b/Editor2DLibrary/SSG/shapes/svg/0_B10010.xml index c731305..6cd44d2 100644 --- a/Editor2DLibrary/SSG/shapes/svg/0_B10010.xml +++ b/Editor2DLibrary/SSG/shapes/svg/0_B10010.xml @@ -2,186 +2,191 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/0_B10020.xml b/Editor2DLibrary/SSG/shapes/svg/0_B10020.xml index 9a55188..4a738de 100644 --- a/Editor2DLibrary/SSG/shapes/svg/0_B10020.xml +++ b/Editor2DLibrary/SSG/shapes/svg/0_B10020.xml @@ -2,186 +2,191 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104033+0_B10040.xml b/Editor2DLibrary/SSG/shapes/svg/821104033+0_B10040.xml index 6e2a6d8..9ba4067 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104033+0_B10040.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104033+0_B10040.xml @@ -9,28 +9,18 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - + - - - - - \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104033+0_B10050.xml b/Editor2DLibrary/SSG/shapes/svg/821104033+0_B10050.xml index d71eb1b..bca330a 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104033+0_B10050.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104033+0_B10050.xml @@ -9,28 +9,18 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - + - - - - - \ 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 c39bbd9..c46baff 100644 --- a/Editor2DLibrary/SSG/shapes/svg/Umlenk_links_TEF_rechts.xml +++ b/Editor2DLibrary/SSG/shapes/svg/Umlenk_links_TEF_rechts.xml @@ -2,102 +2,107 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 index 31d7568..c46baff 100644 --- a/Editor2DLibrary/SSG/shapes/svg/Umlenk_rechts_TEF_links.xml +++ b/Editor2DLibrary/SSG/shapes/svg/Umlenk_rechts_TEF_links.xml @@ -7,7 +7,7 @@ - +