diff --git a/CAD/OmnifloCAD/TEFBogen/0_BG080090_TEF_Bogen_Doppelweiche_S_90_700_beideseitig.dwg b/CAD/OmnifloCAD/TEFBogen/0_BG080090_TEF_Bogen_Doppelweiche_S_90_700_beideseitig.dwg new file mode 100644 index 0000000..1afce9f Binary files /dev/null and b/CAD/OmnifloCAD/TEFBogen/0_BG080090_TEF_Bogen_Doppelweiche_S_90_700_beideseitig.dwg differ diff --git a/CAD/OmnifloCAD/TEFBogen/0_BG080090_TEF_Bogen_Doppelweiche_S_90_700_links.dwg b/CAD/OmnifloCAD/TEFBogen/0_BG080090_TEF_Bogen_Doppelweiche_S_90_700_links.dwg new file mode 100644 index 0000000..d97df09 Binary files /dev/null and b/CAD/OmnifloCAD/TEFBogen/0_BG080090_TEF_Bogen_Doppelweiche_S_90_700_links.dwg differ diff --git a/CAD/OmnifloCAD/TEFBogen/0_BG080090_TEF_Bogen_Doppelweiche_S_90_700_rechts.dwg b/CAD/OmnifloCAD/TEFBogen/0_BG080090_TEF_Bogen_Doppelweiche_S_90_700_rechts.dwg new file mode 100644 index 0000000..0ca4c45 Binary files /dev/null and b/CAD/OmnifloCAD/TEFBogen/0_BG080090_TEF_Bogen_Doppelweiche_S_90_700_rechts.dwg differ diff --git a/CAD/OmnifloCAD/TEFBogen/0_BG080090_TEF_Bogen_Dreifachlweiche_S_90_700_beideseitig.dwg b/CAD/OmnifloCAD/TEFBogen/0_BG080090_TEF_Bogen_Dreifachlweiche_S_90_700_beideseitig.dwg new file mode 100644 index 0000000..48ae96e Binary files /dev/null and b/CAD/OmnifloCAD/TEFBogen/0_BG080090_TEF_Bogen_Dreifachlweiche_S_90_700_beideseitig.dwg differ diff --git a/CAD/OmnifloCAD/TEFBogen/0_BG080090_TEF_Bogen_Dreifachlweiche_S_90_700_links.dwg b/CAD/OmnifloCAD/TEFBogen/0_BG080090_TEF_Bogen_Dreifachlweiche_S_90_700_links.dwg new file mode 100644 index 0000000..f5c3b56 Binary files /dev/null and b/CAD/OmnifloCAD/TEFBogen/0_BG080090_TEF_Bogen_Dreifachlweiche_S_90_700_links.dwg differ diff --git a/CAD/OmnifloCAD/TEFBogen/0_BG080090_TEF_Bogen_Dreifachlweiche_S_90_700_rechts.dwg b/CAD/OmnifloCAD/TEFBogen/0_BG080090_TEF_Bogen_Dreifachlweiche_S_90_700_rechts.dwg new file mode 100644 index 0000000..2d30098 Binary files /dev/null and b/CAD/OmnifloCAD/TEFBogen/0_BG080090_TEF_Bogen_Dreifachlweiche_S_90_700_rechts.dwg differ diff --git a/CAD/OmnifloCAD/TEFBogen/0_BG080090_TEF_Bogen_Weiche_S_90_700_ links.dwg b/CAD/OmnifloCAD/TEFBogen/0_BG080090_TEF_Bogen_Weiche_S_90_700_ links.dwg new file mode 100644 index 0000000..c2229da Binary files /dev/null and b/CAD/OmnifloCAD/TEFBogen/0_BG080090_TEF_Bogen_Weiche_S_90_700_ links.dwg differ diff --git a/CAD/OmnifloCAD/TEFBogen/0_BG080090_TEF_Bogen_Weiche_S_90_700_ rechts.dwg b/CAD/OmnifloCAD/TEFBogen/0_BG080090_TEF_Bogen_Weiche_S_90_700_ rechts.dwg new file mode 100644 index 0000000..0b4cc2f Binary files /dev/null and b/CAD/OmnifloCAD/TEFBogen/0_BG080090_TEF_Bogen_Weiche_S_90_700_ rechts.dwg differ diff --git a/CAD/OmnifloCAD/TEFBogen/TEFBogen.dwg b/CAD/OmnifloCAD/TEFBogen/TEFBogen.dwg index 8147e14..6c8d180 100644 Binary files a/CAD/OmnifloCAD/TEFBogen/TEFBogen.dwg and b/CAD/OmnifloCAD/TEFBogen/TEFBogen.dwg differ diff --git a/Editor2DLibrary/SSG/Init/omniflo_weichen.json b/Editor2DLibrary/SSG/Init/omniflo_weichen.json index 027a5f6..165393e 100644 --- a/Editor2DLibrary/SSG/Init/omniflo_weichen.json +++ b/Editor2DLibrary/SSG/Init/omniflo_weichen.json @@ -153,6 +153,17 @@ "KurvenRichtung": 1, "SivasnrTEF": null }, + { + "Sivasnr": "834372028+0_B10080+0_B10090", + "ProfilTyp": "WEICHE S 90°-L-700/700, KPL. MIT P mit TEF Innen", + "WeichenTyp": "Einzelweiche", + "KurvenWinkel": 90, + "Schaltungstyp": "P", + "Breite": 700, + "Länge": 700, + "KurvenRichtung": 1, + "SivasnrTEF": "0_B10080+0_B10090" + } , { "Sivasnr": 834372030, "ProfilTyp": "WEICHE S 90°-R-700/700, KPL. MIT M", @@ -175,6 +186,17 @@ "KurvenRichtung": 2, "SivasnrTEF": null }, + { + "Sivasnr": "834372031+0_B10080+0_B10090", + "ProfilTyp": "WEICHE S 90°-R-700/700, KPL. MIT P mit TEF Innen", + "WeichenTyp": "Einzelweiche", + "KurvenWinkel": 90, + "Schaltungstyp": "P", + "Breite": 700, + "Länge": 700, + "KurvenRichtung": 2, + "SivasnrTEF": "0_B10080+0_B10090" + }, { "Sivasnr": 834372047, "ProfilTyp": "WEICHE S PARALLEL-L-200/750, KPL. MIT M", diff --git a/Editor2DLibrary/SSG/shapes/img/0_BG080090_TEF_Bogen_Weiche_S_90_700_links_32px.png b/Editor2DLibrary/SSG/shapes/img/0_BG080090_TEF_Bogen_Weiche_S_90_700_links_32px.png new file mode 100644 index 0000000..0ab0f39 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/0_BG080090_TEF_Bogen_Weiche_S_90_700_links_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/0_BG080090_TEF_Bogen_Weiche_S_90_700_links_64px.png b/Editor2DLibrary/SSG/shapes/img/0_BG080090_TEF_Bogen_Weiche_S_90_700_links_64px.png new file mode 100644 index 0000000..c82b3d2 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/0_BG080090_TEF_Bogen_Weiche_S_90_700_links_64px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/0_BG080090_TEF_Bogen_Weiche_S_90_700_rechts_32px.png b/Editor2DLibrary/SSG/shapes/img/0_BG080090_TEF_Bogen_Weiche_S_90_700_rechts_32px.png new file mode 100644 index 0000000..250d07d Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/0_BG080090_TEF_Bogen_Weiche_S_90_700_rechts_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/0_BG080090_TEF_Bogen_Weiche_S_90_700_rechts_64px.png b/Editor2DLibrary/SSG/shapes/img/0_BG080090_TEF_Bogen_Weiche_S_90_700_rechts_64px.png new file mode 100644 index 0000000..f7d61b4 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/0_BG080090_TEF_Bogen_Weiche_S_90_700_rechts_64px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/APB_110_R550_67_5_432_821104027_32px.png b/Editor2DLibrary/SSG/shapes/img/APB_110_R550_67_5_432_821104027_32px.png index 43cb1ef..9e25b2b 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/APB_110_R550_67_5_432_821104027_32px.png and b/Editor2DLibrary/SSG/shapes/img/APB_110_R550_67_5_432_821104027_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloWeiche.xml b/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloWeiche.xml index 1e9c576..9ef839a 100644 --- a/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloWeiche.xml +++ b/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloWeiche.xml @@ -1,7 +1,9 @@ 
Einfach 90° 700/700 links M
Einfach 90° 700/700 rechts M
Einfach 90° 700/700 links P
+
Einfach 90° 700/700 links P mit TEF Innen
Einfach 90° 700/700 rechts P
+
Einfach 90° 700/700 rechs P mit TEF Innen
Einfach 90° 500/600 links M
Einfach 90° 500/600 rechts M
Einfach 90° 500/600 links P
diff --git a/Editor2DLibrary/SSG/shapes/props/834372028+0_B10080+0_B10090.txt b/Editor2DLibrary/SSG/shapes/props/834372028+0_B10080+0_B10090.txt new file mode 100644 index 0000000..f73699b --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/props/834372028+0_B10080+0_B10090.txt @@ -0,0 +1,110 @@ +{ + "shapeMode": 0, + "name": "Einfach 90° 700/700 links P mit TEF Innen", + "family": "OFWeiche", + "icon": "SSG/shapes/img/_x0030__BG080090_TEF_Bogen_Weiche_S_90_700_links_32px.png", + "iconBig": "SSG/shapes/img/_x0030__BG080090_TEF_Bogen_Weiche_S_90_700__x0020_links_64px.png", + "srcSVG": "SSG/shapes/svg/834372028+0_B10080+0_B10090.xml", + "width": 2645.6693, + "height": 3169.5874, + "depth": 415.748, + "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", + "connectionPoints": [ + { + "id": "cp1", + "x": 1.989, + "y": 0.0, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 270.0, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp2", + "x": 1000.0, + "y": 833.744, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 180.0, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp3", + "x": 1000.0, + "y": 403.13, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 0.0, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp4", + "x": 0.0, + "y": 117.143, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 270.0, + "linkClass": "OmnifloTEF", + "label": "", + "isDimension": true + }, + { + "id": "cp5", + "x": 720.471, + "y": 1000.0, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 180.0, + "linkClass": "OmnifloTEF", + "label": "", + "isDimension": true + } + ], + "eventClass": "OnDoubleclick,OnPasted,OnInserted,OnLinked,OnRemoved" +} \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/834372031+0_B10080+0_B10090.txt b/Editor2DLibrary/SSG/shapes/props/834372031+0_B10080+0_B10090.txt new file mode 100644 index 0000000..8bf458c --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/props/834372031+0_B10080+0_B10090.txt @@ -0,0 +1,110 @@ +{ + "shapeMode": 0, + "name": "Einfach 90° 700/700 rechs P mit TEF Innen", + "family": "OFWeiche", + "icon": "SSG/shapes/img/_x0030__BG080090_TEF_Bogen_Weiche_S_90_700_rechts_32px.png", + "iconBig": "SSG/shapes/img/_x0030__BG080090_TEF_Bogen_Weiche_S_90_700_rechts_64px.png", + "srcSVG": "SSG/shapes/svg/834372031+0_B10080+0_B10090.xml", + "width": 2645.6693, + "height": 3169.5874, + "depth": 415.748, + "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", + "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": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp2", + "x": 0.0, + "y": 833.744, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 180.0, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp3", + "x": 0.0, + "y": 403.13, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 0.0, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp4", + "x": 914.28, + "y": 116.676, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 90.0, + "linkClass": "OmnifloTEF", + "label": "", + "isDimension": true + }, + { + "id": "cp5", + "x": 141.266, + "y": 1000.0, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 180.0, + "linkClass": "OmnifloTEF", + "label": "", + "isDimension": true + } + ], + "eventClass": "OnDoubleclick,OnPasted,OnInserted,OnLinked,OnRemoved" +} \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/834372028+0_B10080+0_B10090.xml b/Editor2DLibrary/SSG/shapes/svg/834372028+0_B10080+0_B10090.xml new file mode 100644 index 0000000..e7a966e --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/svg/834372028+0_B10080+0_B10090.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/834372031+0_B10080+0_B10090.xml b/Editor2DLibrary/SSG/shapes/svg/834372031+0_B10080+0_B10090.xml new file mode 100644 index 0000000..08eb8f2 --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/svg/834372031+0_B10080+0_B10090.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index 2dc6f46..f5e9bf4 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -212,7 +212,7 @@ - + @@ -244,7 +244,7 @@ - + @@ -267,7 +267,7 @@ - + @@ -13146,7 +13146,7 @@ SSGConnectionPoint.x_M - + @@ -14231,9 +14231,9 @@ SSGConnectionPoint.x_M - + - + diff --git a/SVGs/Omniflo/TEFWeichen/0_BG080090_TEF_Bogen_Weiche_S_90_700_ links.svg b/SVGs/Omniflo/TEFWeichen/0_BG080090_TEF_Bogen_Weiche_S_90_700_ links.svg new file mode 100644 index 0000000..6b7848b --- /dev/null +++ b/SVGs/Omniflo/TEFWeichen/0_BG080090_TEF_Bogen_Weiche_S_90_700_ links.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/SVGs/Omniflo/TEFWeichen/0_BG080090_TEF_Bogen_Weiche_S_90_700_ rechts.svg b/SVGs/Omniflo/TEFWeichen/0_BG080090_TEF_Bogen_Weiche_S_90_700_ rechts.svg new file mode 100644 index 0000000..5b69146 --- /dev/null +++ b/SVGs/Omniflo/TEFWeichen/0_BG080090_TEF_Bogen_Weiche_S_90_700_ rechts.svg @@ -0,0 +1,9 @@ + + + + + + + +