diff --git a/CAD/OmnifloCAD/OmnifloBogen.dwg b/CAD/OmnifloCAD/OmnifloBogen.dwg index c3be147..f2e0202 100644 Binary files a/CAD/OmnifloCAD/OmnifloBogen.dwg and b/CAD/OmnifloCAD/OmnifloBogen.dwg differ diff --git a/Editor2DLibrary/SSG/Init/tef_bögen.json b/Editor2DLibrary/SSG/Init/tef_bögen.json index 46bc747..edf59c2 100644 --- a/Editor2DLibrary/SSG/Init/tef_bögen.json +++ b/Editor2DLibrary/SSG/Init/tef_bögen.json @@ -1,62 +1,62 @@ [ { - "Sivasnr": "0_B10040", + "Sivasnr": 0_B10040, "Beschreibung": "TEF Bogen 90° R725", "Radius": 725, "KurvenWinkel": 90, "innen": false }, { - "Sivasnr": "0_B10050", + "Sivasnr": 0_B10050, "Beschreibung": "TEF Bogen 90° R535", "Radius": 535, "KurvenWinkel": 90, "innen": true }, { - "Sivasnr": "0_B10060", + "Sivasnr": 0_B10060, "Beschreibung": "TEF Bogen 45° R725", "Radius": 725, "KurvenWinkel": 45, "innen": false }, { - "Sivasnr": "0_B10070", + "Sivasnr": 0_B10070, "Beschreibung": "TEF Bogen 45° R535", "Radius": 535, "KurvenWinkel": 45, "innen": true }, { - "Sivasnr": "0_B10071", + "Sivasnr": 0_B10071, "Beschreibung": "TEF Bogen 45° R450 für S C Delta 1600", "Radius": 450, "KurvenWinkel": 45, "innen": true }, { - "Sivasnr": "0_B10080", + "Sivasnr": 0_B10080, "Beschreibung": "TEF Bogen 67.5° R400", "Radius": 400, "KurvenWinkel": 67.5, "innen": true }, { - "Sivasnr": "0_B10081", + "Sivasnr": 0_B10081, "Beschreibung": "TEF Bogen 67.5° R250", "Radius": 250, "KurvenWinkel": 67.5, "innen": true }, { - "Sivasnr": "0_B10090", + "Sivasnr": 0_B10090, "Beschreibung": "TEF Bogen 22.5° R450", "Radius": 450, "KurvenWinkel": 22.5, "innen": true }, { - "Sivasnr": "0_B10091", + "Sivasnr": 0_B10091, "Beschreibung": "TEF Bogen 22.5° R650", "Radius": 650, "KurvenWinkel": 22.5, diff --git a/Editor2DLibrary/SSG/shapes/obj/821104021.stl b/Editor2DLibrary/SSG/shapes/obj/821104021.stl index d096acb..9825f52 100644 Binary files a/Editor2DLibrary/SSG/shapes/obj/821104021.stl and b/Editor2DLibrary/SSG/shapes/obj/821104021.stl differ diff --git a/Editor2DLibrary/SSG/shapes/obj/821104025.stl b/Editor2DLibrary/SSG/shapes/obj/821104025.stl new file mode 100644 index 0000000..fb114f4 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/obj/821104025.stl differ diff --git a/Editor2DLibrary/SSG/shapes/obj/821104026.stl b/Editor2DLibrary/SSG/shapes/obj/821104026.stl new file mode 100644 index 0000000..e10167c Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/obj/821104026.stl differ diff --git a/Editor2DLibrary/SSG/shapes/obj/821104027.stl b/Editor2DLibrary/SSG/shapes/obj/821104027.stl new file mode 100644 index 0000000..62b8880 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/obj/821104027.stl differ diff --git a/Editor2DLibrary/SSG/shapes/obj/821104028.stl b/Editor2DLibrary/SSG/shapes/obj/821104028.stl new file mode 100644 index 0000000..c2bfc02 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/obj/821104028.stl differ diff --git a/Editor2DLibrary/SSG/shapes/obj/821104029.stl b/Editor2DLibrary/SSG/shapes/obj/821104029.stl new file mode 100644 index 0000000..7b9dc09 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/obj/821104029.stl differ diff --git a/Editor2DLibrary/SSG/shapes/obj/821104030.stl b/Editor2DLibrary/SSG/shapes/obj/821104030.stl new file mode 100644 index 0000000..b74f58a Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/obj/821104030.stl differ diff --git a/Editor2DLibrary/SSG/shapes/obj/821104031.stl b/Editor2DLibrary/SSG/shapes/obj/821104031.stl new file mode 100644 index 0000000..2db9d64 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/obj/821104031.stl differ diff --git a/Editor2DLibrary/SSG/shapes/obj/821104033.stl b/Editor2DLibrary/SSG/shapes/obj/821104033.stl new file mode 100644 index 0000000..cc6ed0c Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/obj/821104033.stl differ diff --git a/Editor2DLibrary/SSG/shapes/obj/821104034.stl b/Editor2DLibrary/SSG/shapes/obj/821104034.stl new file mode 100644 index 0000000..6e2b7b8 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/obj/821104034.stl differ diff --git a/Editor2DLibrary/SSG/shapes/obj/821104035.stl b/Editor2DLibrary/SSG/shapes/obj/821104035.stl new file mode 100644 index 0000000..57075c7 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/obj/821104035.stl differ diff --git a/Editor2DLibrary/SSG/shapes/obj/821104037.stl b/Editor2DLibrary/SSG/shapes/obj/821104037.stl new file mode 100644 index 0000000..706ce47 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/obj/821104037.stl differ diff --git a/Editor2DLibrary/SSG/shapes/obj/821104041.stl b/Editor2DLibrary/SSG/shapes/obj/821104041.stl new file mode 100644 index 0000000..3bb9d3b Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/obj/821104041.stl differ diff --git a/Editor2DLibrary/SSG/shapes/obj/821104043.stl b/Editor2DLibrary/SSG/shapes/obj/821104043.stl new file mode 100644 index 0000000..bab2d47 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/obj/821104043.stl differ diff --git a/Editor2DLibrary/SSG/shapes/obj/821104065.stl b/Editor2DLibrary/SSG/shapes/obj/821104065.stl new file mode 100644 index 0000000..c03acf6 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/obj/821104065.stl differ diff --git a/Editor2DLibrary/SSG/shapes/obj/821104066.stl b/Editor2DLibrary/SSG/shapes/obj/821104066.stl new file mode 100644 index 0000000..51b6d90 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/obj/821104066.stl differ diff --git a/Editor2DLibrary/SSG/shapes/obj/OFBogen180.stl b/Editor2DLibrary/SSG/shapes/obj/OFBogen180.stl new file mode 100644 index 0000000..bab2d47 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/obj/OFBogen180.stl differ diff --git a/Editor2DLibrary/SSG/shapes/obj/OFBogen22.stl b/Editor2DLibrary/SSG/shapes/obj/OFBogen22.stl new file mode 100644 index 0000000..fb114f4 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/obj/OFBogen22.stl differ diff --git a/Editor2DLibrary/SSG/shapes/obj/OFBogen45.stl b/Editor2DLibrary/SSG/shapes/obj/OFBogen45.stl new file mode 100644 index 0000000..2db9d64 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/obj/OFBogen45.stl differ diff --git a/Editor2DLibrary/SSG/shapes/obj/OFBogen67.stl b/Editor2DLibrary/SSG/shapes/obj/OFBogen67.stl new file mode 100644 index 0000000..62b8880 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/obj/OFBogen67.stl differ diff --git a/Editor2DLibrary/SSG/shapes/obj/OFBogen90.stl b/Editor2DLibrary/SSG/shapes/obj/OFBogen90.stl new file mode 100644 index 0000000..cc6ed0c Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/obj/OFBogen90.stl differ diff --git a/Editor2DLibrary/SSG/shapes/props/821104021.txt b/Editor2DLibrary/SSG/shapes/props/821104021.txt index f1fc0d5..a00c55b 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104021.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104021.txt @@ -1,4 +1,4 @@ -{ +{ "shapeMode": 0, "name": "APB 110 R 400/45 400", "family": "OFBogen", @@ -13,7 +13,7 @@ "connectionPoints": [ { "id": "cp1", - "x": 0.0, + "x": 0, "y": 48.321, "z": 0.0, "xMin": "", diff --git a/Editor2DLibrary/SSG/shapes/props/821104022.txt b/Editor2DLibrary/SSG/shapes/props/821104022.txt index 9e36e81..6dc955c 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104022.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104022.txt @@ -1,4 +1,4 @@ -{ +{ "shapeMode": 0, "name": "APB 110 R 400/90 500/500", "family": "OFBogen", @@ -13,7 +13,7 @@ "connectionPoints": [ { "id": "cp1", - "x": 0.0, + "x": 0, "y": 40.381, "z": 0.0, "xMin": "", diff --git a/Editor2DLibrary/SSG/shapes/props/821104024.txt b/Editor2DLibrary/SSG/shapes/props/821104024.txt index d0744e9..93e6e3b 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104024.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104024.txt @@ -1,4 +1,4 @@ -{ +{ "shapeMode": 0, "name": "APB 110 R 400/67.5 339", "family": "OFBogen", @@ -13,7 +13,7 @@ "connectionPoints": [ { "id": "cp1", - "x": 0.0, + "x": 0, "y": 57.111, "z": 0.0, "xMin": "", diff --git a/Editor2DLibrary/SSG/shapes/props/821104025.txt b/Editor2DLibrary/SSG/shapes/props/821104025.txt index bbdbf8b..aeadcbb 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104025.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104025.txt @@ -5,6 +5,7 @@ "icon": "SSG/shapes/img/APB_110_R550_22_5_84_821104025_32px.png", "iconBig": "SSG/shapes/img/APB_110_R550_22_5_84_821104025_64px.png", "srcSVG": "SSG/shapes/svg/821104025.xml", + "src3D": "SSG/shapes/obj/821104025.stl", "width": 1974.947, "height": 614.951, "depth": 415.748, diff --git a/Editor2DLibrary/SSG/shapes/props/821104026.txt b/Editor2DLibrary/SSG/shapes/props/821104026.txt index 6128e97..73fd418 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104026.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104026.txt @@ -5,6 +5,7 @@ "icon": "SSG/shapes/img/APB_110_R550_45_232_821104026_32px.png", "iconBig": "SSG/shapes/img/APB_110_R550_45_232_821104026_64px.png", "srcSVG": "SSG/shapes/svg/821104026.xml", + "src3D": "SSG/shapes/obj/821104026.stl", "width": 2306.032, "height": 1141.084, "depth": 415.748, diff --git a/Editor2DLibrary/SSG/shapes/props/821104027.txt b/Editor2DLibrary/SSG/shapes/props/821104027.txt index cdc50ad..c2cfecb 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104027.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104027.txt @@ -5,15 +5,16 @@ "icon": "SSG/shapes/img/APB_110_R550_67_5_432_821104027_32px.png", "iconBig": "SSG/shapes/img/APB_110_R550_67_5_432_821104027_64px.png", "srcSVG": "SSG/shapes/svg/821104027.xml", - "width": 3008.01, - "height": 1957.104, + "src3D": "SSG/shapes/obj/821104027.stl", + "width": 2903.015, + "height": 2114.237, "depth": 415.748, "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", "connectionPoints": [ { "id": "cp1", "x": 0, - "y": 40.632, + "y": 37.612, "z": 0.0, "xMin": "", "xMax": "", @@ -31,8 +32,8 @@ }, { "id": "cp2", - "x": 975.577, - "y": 984.454, + "x": 974.694, + "y": 985.608, "z": 0.0, "xMin": "", "xMax": "", diff --git a/Editor2DLibrary/SSG/shapes/props/821104028.txt b/Editor2DLibrary/SSG/shapes/props/821104028.txt index 1574f88..51e2095 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104028.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104028.txt @@ -5,6 +5,7 @@ "icon": "SSG/shapes/img/APB_110_R550_67_5_420_821104028_32px.png", "iconBig": "SSG/shapes/img/APB_110_R550_67_5_420_821104028_64px.png", "srcSVG": "SSG/shapes/svg/821104028.xml", + "src3D": "SSG/shapes/obj/821104028.stl", "width": 2274.749, "height": 1696.965, "depth": 415.748, diff --git a/Editor2DLibrary/SSG/shapes/props/821104029.txt b/Editor2DLibrary/SSG/shapes/props/821104029.txt index 7a79efa..65879e1 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104029.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104029.txt @@ -5,6 +5,7 @@ "icon": "SSG/shapes/img/APB_110_R550_45_191_821104029_32px.png", "iconBig": "SSG/shapes/img/APB_110_R550_45_191_821104029_64px.png", "srcSVG": "SSG/shapes/svg/821104029.xml", + "src3D": "SSG/shapes/obj/821104029.stl", "width": 2141.022, "height": 856.847, "depth": 415.748, diff --git a/Editor2DLibrary/SSG/shapes/props/821104030.txt b/Editor2DLibrary/SSG/shapes/props/821104030.txt index 568f8f0..587ebca 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104030.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104030.txt @@ -5,6 +5,7 @@ "icon": "SSG/shapes/img/APB_110_R500_90_550_550_821104030_32px.png", "iconBig": "SSG/shapes/img/APB_110_R500_90_550_550_821104030_64px.png", "srcSVG": "SSG/shapes/svg/821104030.xml", + "src3D": "SSG/shapes/obj/821104030.stl", "width": 2158.246, "height": 2158.246, "depth": 415.748, diff --git a/Editor2DLibrary/SSG/shapes/props/821104031.txt b/Editor2DLibrary/SSG/shapes/props/821104031.txt index daf6e3c..c830573 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104031.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104031.txt @@ -5,15 +5,16 @@ "icon": "SSG/shapes/img/APB_110_R630_45_400_821104031_32px.png", "iconBig": "SSG/shapes/img/APB_110_R630_45_400_821104031_64px.png", "srcSVG": "SSG/shapes/svg/821104031.xml", - "width": 3172.834, - "height": 1645.859, + "src3D": "SSG/shapes/obj/821104031.stl", + "width": 3327.816, + "height": 1271.707, "depth": 415.748, "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", "connectionPoints": [ { "id": "cp1", "x": 0, - "y": 48.316, + "y": 62.531, "z": 0.0, "xMin": "", "xMax": "", @@ -31,8 +32,8 @@ }, { "id": "cp2", - "x": 982.279, - "y": 965.839, + "x": 983.103, + "y": 955.788, "z": 0.0, "xMin": "", "xMax": "", diff --git a/Editor2DLibrary/SSG/shapes/props/821104033.txt b/Editor2DLibrary/SSG/shapes/props/821104033.txt index 7b492ca..4c66c53 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104033.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104033.txt @@ -5,6 +5,7 @@ "icon": "SSG/shapes/img/APB_110_R630_D90_800_800_821104033_32px.png", "iconBig": "SSG/shapes/img/APB_110_R630_D90_800_800_821104033_64px.png", "srcSVG": "SSG/shapes/svg/821104033.xml", + "src3D": "SSG/shapes/obj/821104033.stl", "width": 3103.121, "height": 3103.121, "depth": 415.748, @@ -47,44 +48,6 @@ "linkClass": "Omniflo", "label": "", "isDimension": true - }, - { - "id": "TEFAussen1", - "x": 21.69, - "y": 0.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 270.0, - "linkClass": "OmnifloTEF", - "label": "", - "isDimension": true - }, - { - "id": "TEFAussen2", - "x": 1000.0, - "y": 978.31, - "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" diff --git a/Editor2DLibrary/SSG/shapes/props/821104034.txt b/Editor2DLibrary/SSG/shapes/props/821104034.txt index 91ba495..362130e 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104034.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104034.txt @@ -5,6 +5,7 @@ "icon": "SSG/shapes/img/APB_110_R630_90_850_870_821104035_32px.png", "iconBig": "SSG/shapes/img/APB_110_R630_90_850_870_821104035_64px.png", "srcSVG": "SSG/shapes/svg/821104034.xml", + "src3D": "SSG/shapes/obj/821104034.stl", "width": 3443.276, "height": 3292.096, "depth": 415.748, diff --git a/Editor2DLibrary/SSG/shapes/props/821104035.txt b/Editor2DLibrary/SSG/shapes/props/821104035.txt index 77dfd89..02ffa92 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104035.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104035.txt @@ -5,6 +5,7 @@ "icon": "SSG/shapes/img/APB_110_R630_90_850_870_821104035_32px.png", "iconBig": "SSG/shapes/img/APB_110_R630_90_850_870_821104035_64px.png", "srcSVG": "SSG/shapes/svg/821104035.xml", + "src3D": "SSG/shapes/obj/821104035.stl", "width": 3292.096, "height": 3367.686, "depth": 415.748, diff --git a/Editor2DLibrary/SSG/shapes/props/821104037.txt b/Editor2DLibrary/SSG/shapes/props/821104037.txt index b54c902..96232cd 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104037.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104037.txt @@ -5,6 +5,7 @@ "icon": "SSG/shapes/img/APB_110_R550_45_191_821104029_32px.png", "iconBig": "SSG/shapes/img/APB_110_R550_45_191_821104029_64px.png", "srcSVG": "SSG/shapes/svg/821104037.xml", + "src3D": "SSG/shapes/obj/821104037.stl", "width": 2086.76, "height": 910.289, "depth": 415.748, diff --git a/Editor2DLibrary/SSG/shapes/props/821104041.txt b/Editor2DLibrary/SSG/shapes/props/821104041.txt index 4a1a4b0..196112f 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104041.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104041.txt @@ -5,6 +5,7 @@ "icon": "SSG/shapes/img/APB_110_R630_90_850_690_821104041_32px.png", "iconBig": "SSG/shapes/img/APB_110_R630_90_850_690_821104041_64px.png", "srcSVG": "SSG/shapes/svg/821104041.xml", + "src3D": "SSG/shapes/obj/821104041.stl", "width": 2687.376, "height": 3292.096, "depth": 415.748, diff --git a/Editor2DLibrary/SSG/shapes/props/821104043.txt b/Editor2DLibrary/SSG/shapes/props/821104043.txt index 9cc637c..81cf7ac 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104043.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104043.txt @@ -5,6 +5,7 @@ "icon": "SSG/shapes/img/APB_110_R650_180_L_150_821104043_32px.png", "iconBig": "SSG/shapes/img/APB_110_R650_180_L_150_821104043_64px.png", "srcSVG": "SSG/shapes/svg/821104043.xml", + "src3D": "SSG/shapes/obj/821104043.stl", "width": 3023.6, "height": 5072.391, "depth": 415.748, diff --git a/Editor2DLibrary/SSG/shapes/props/821104065.txt b/Editor2DLibrary/SSG/shapes/props/821104065.txt index 5fdfc7c..aa62ab0 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104065.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104065.txt @@ -5,6 +5,7 @@ "icon": "SSG/shapes/img/APB_110_R550_67_5_L_185_170_821104065_32px.png", "iconBig": "SSG/shapes/img/APB_110_R550_67_5_L_185_170_821104065_64px.png", "srcSVG": "SSG/shapes/svg/821104065.xml", + "src3D": "SSG/shapes/obj/821104065.stl", "width": 2939.045, "height": 1986.785, "depth": 415.748, diff --git a/Editor2DLibrary/SSG/shapes/props/821104066.txt b/Editor2DLibrary/SSG/shapes/props/821104066.txt index d3b975e..a7fa75e 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104066.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104066.txt @@ -5,6 +5,7 @@ "icon": "SSG/shapes/img/APB_110_R550_90_900_605_821104066_32px.png", "iconBig": "SSG/shapes/img/APB_110_R550_90_900_605_821104066_64px.png", "srcSVG": "SSG/shapes/svg/821104066.xml", + "src3D": "SSG/shapes/obj/821104066.stl", "width": 3481.071, "height": 2366.118, "depth": 415.748, diff --git a/Editor2DLibrary/SSG/shapes/props/OFBogen180.txt b/Editor2DLibrary/SSG/shapes/props/OFBogen180.txt index b45e2cf..1da8814 100644 --- a/Editor2DLibrary/SSG/shapes/props/OFBogen180.txt +++ b/Editor2DLibrary/SSG/shapes/props/OFBogen180.txt @@ -1,10 +1,11 @@ -{ +{ "shapeMode": 0, "name": "APB 110 R 650/180 L=150", "family": "OFBogen", "icon": "SSG/shapes/img/APB_110_R650_180_L_150_821104043_32px.png", "iconBig": "SSG/shapes/img/APB_110_R650_180_L_150_821104043_64px.png", "srcSVG": "SSG/shapes/svg/OFBogen180.xml", + "src3D": "SSG/shapes/obj/OFBogen180.stl", "width": 3023.6, "height": 5072.391, "depth": 415.748, @@ -12,7 +13,7 @@ "connectionPoints": [ { "id": "cp1", - "x": 0.0, + "x": 0, "y": 15.677, "z": 0.0, "xMin": "", @@ -31,7 +32,7 @@ }, { "id": "cp2", - "x": 1000.0, + "x": 0, "y": 984.323, "z": 0.0, "xMin": "", diff --git a/Editor2DLibrary/SSG/shapes/props/OFBogen22.txt b/Editor2DLibrary/SSG/shapes/props/OFBogen22.txt index 62a6389..5efad62 100644 --- a/Editor2DLibrary/SSG/shapes/props/OFBogen22.txt +++ b/Editor2DLibrary/SSG/shapes/props/OFBogen22.txt @@ -1,10 +1,11 @@ -{ +{ "shapeMode": 0, "name": "APB 110 R 550/22.5 84", "family": "OFBogen", "icon": "SSG/shapes/img/APB_110_R550_22_5_84_821104025_32px.png", "iconBig": "SSG/shapes/img/APB_110_R550_22_5_84_821104025_64px.png", "srcSVG": "SSG/shapes/svg/OFBogen22.xml", + "src3D": "SSG/shapes/obj/OFBogen22.stl", "width": 1974.947, "height": 614.951, "depth": 415.748, @@ -12,8 +13,8 @@ "connectionPoints": [ { "id": "cp1", - "x": 0.0, - "y": 40.265, + "x": 0, + "y": 129.312, "z": 0.0, "xMin": "", "xMax": "", diff --git a/Editor2DLibrary/SSG/shapes/props/OFBogen45.txt b/Editor2DLibrary/SSG/shapes/props/OFBogen45.txt index 7680b0a..f3294d9 100644 --- a/Editor2DLibrary/SSG/shapes/props/OFBogen45.txt +++ b/Editor2DLibrary/SSG/shapes/props/OFBogen45.txt @@ -1,19 +1,20 @@ -{ +{ "shapeMode": 0, "name": "APB 110 R 630/45 400", "family": "OFBogen", "icon": "SSG/shapes/img/APB_110_R630_45_400_821104031_32px.png", "iconBig": "SSG/shapes/img/APB_110_R630_45_400_821104031_64px.png", "srcSVG": "SSG/shapes/svg/OFBogen45.xml", - "width": 3172.834, - "height": 1645.859, + "src3D": "SSG/shapes/obj/OFBogen45.stl", + "width": 3327.816, + "height": 1271.707, "depth": 415.748, "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", "connectionPoints": [ { "id": "cp1", - "x": 0.0, - "y": 25.063, + "x": 0, + "y": 62.531, "z": 0.0, "xMin": "", "xMax": "", @@ -31,8 +32,8 @@ }, { "id": "cp2", - "x": 982.279, - "y": 965.839, + "x": 983.103, + "y": 955.788, "z": 0.0, "xMin": "", "xMax": "", diff --git a/Editor2DLibrary/SSG/shapes/props/OFBogen67.txt b/Editor2DLibrary/SSG/shapes/props/OFBogen67.txt index 408523d..c2236e9 100644 --- a/Editor2DLibrary/SSG/shapes/props/OFBogen67.txt +++ b/Editor2DLibrary/SSG/shapes/props/OFBogen67.txt @@ -1,19 +1,20 @@ -{ +{ "shapeMode": 0, "name": "APB 110 R 550/67.5 432", "family": "OFBogen", "icon": "SSG/shapes/img/APB_110_R550_67_5_432_821104027_32px.png", "iconBig": "SSG/shapes/img/APB_110_R550_67_5_432_821104027_64px.png", "srcSVG": "SSG/shapes/svg/OFBogen67.xml", - "width": 3008.01, - "height": 1957.104, + "src3D": "SSG/shapes/obj/OFBogen67.stl", + "width": 2903.015, + "height": 2114.237, "depth": 415.748, "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", "connectionPoints": [ { "id": "cp1", - "x": 0.0, - "y": 26.436, + "x": 0, + "y": 37.612, "z": 0.0, "xMin": "", "xMax": "", @@ -31,8 +32,8 @@ }, { "id": "cp2", - "x": 975.577, - "y": 984.454, + "x": 974.694, + "y": 985.608, "z": 0.0, "xMin": "", "xMax": "", diff --git a/Editor2DLibrary/SSG/shapes/props/OFBogen90.txt b/Editor2DLibrary/SSG/shapes/props/OFBogen90.txt index 45e2a64..021ba26 100644 --- a/Editor2DLibrary/SSG/shapes/props/OFBogen90.txt +++ b/Editor2DLibrary/SSG/shapes/props/OFBogen90.txt @@ -1,10 +1,11 @@ -{ +{ "shapeMode": 0, "name": "APB 110 R 630/90 800/800", "family": "OFBogen", "icon": "SSG/shapes/img/APB_110_R630_D90_800_800_821104033_32px.png", "iconBig": "SSG/shapes/img/APB_110_R630_D90_800_800_821104033_64px.png", "srcSVG": "SSG/shapes/svg/OFBogen90.xml", + "src3D": "SSG/shapes/obj/OFBogen90.stl", "width": 3103.121, "height": 3103.121, "depth": 415.748, @@ -12,7 +13,7 @@ "connectionPoints": [ { "id": "cp1", - "x": 0.0, + "x": 0, "y": 25.626, "z": 0.0, "xMin": "", @@ -47,44 +48,6 @@ "linkClass": "Omniflo", "label": "", "isDimension": true - }, - { - "id": "TEFAussen1", - "x": 21.69, - "y": 0.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 270.0, - "linkClass": "OmnifloTEF", - "label": "", - "isDimension": true - }, - { - "id": "TEFAussen2", - "x": 1000.0, - "y": 978.31, - "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" diff --git a/Editor2DLibrary/SSG/shapes/svg/821104021.xml b/Editor2DLibrary/SSG/shapes/svg/821104021.xml index 51a9478..b8eaeb3 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104021.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104021.xml @@ -2,11 +2,9 @@ - - - - - - + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104025.xml b/Editor2DLibrary/SSG/shapes/svg/821104025.xml index fc56ba7..6382b6a 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104025.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104025.xml @@ -2,9 +2,11 @@ - - - - + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104026.xml b/Editor2DLibrary/SSG/shapes/svg/821104026.xml index 81b2c95..46c9d87 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104026.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104026.xml @@ -2,10 +2,11 @@ - - - - - + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104027.xml b/Editor2DLibrary/SSG/shapes/svg/821104027.xml index d22678a..da7f611 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104027.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104027.xml @@ -2,9 +2,11 @@ - - - - + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104028.xml b/Editor2DLibrary/SSG/shapes/svg/821104028.xml index 0d2f9fd..5774ea4 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104028.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104028.xml @@ -2,9 +2,11 @@ - - - - + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104029.xml b/Editor2DLibrary/SSG/shapes/svg/821104029.xml index 61a16cb..c27310b 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104029.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104029.xml @@ -2,9 +2,11 @@ - - - - + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104030.xml b/Editor2DLibrary/SSG/shapes/svg/821104030.xml index a5c1274..d434478 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104030.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104030.xml @@ -2,9 +2,11 @@ - - - - + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104031.xml b/Editor2DLibrary/SSG/shapes/svg/821104031.xml index 759d498..b2dd90b 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104031.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104031.xml @@ -1,10 +1,12 @@  - - - - - + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104033.xml b/Editor2DLibrary/SSG/shapes/svg/821104033.xml index c397f53..bf395e7 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104033.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104033.xml @@ -2,9 +2,11 @@ - - - - + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104034.xml b/Editor2DLibrary/SSG/shapes/svg/821104034.xml index 26c8739..76121db 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104034.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104034.xml @@ -2,9 +2,11 @@ - - - - + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104035.xml b/Editor2DLibrary/SSG/shapes/svg/821104035.xml index d531dbb..1cabccc 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104035.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104035.xml @@ -2,9 +2,11 @@ - - - - + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104037.xml b/Editor2DLibrary/SSG/shapes/svg/821104037.xml index c561bf5..aa2bdad 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104037.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104037.xml @@ -2,9 +2,11 @@ - - - - + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104041.xml b/Editor2DLibrary/SSG/shapes/svg/821104041.xml index 3528d56..3dde0b2 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104041.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104041.xml @@ -2,9 +2,11 @@ - - - - + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104043.xml b/Editor2DLibrary/SSG/shapes/svg/821104043.xml index a213290..cc1b82f 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104043.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104043.xml @@ -2,9 +2,11 @@ - - - - + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104065.xml b/Editor2DLibrary/SSG/shapes/svg/821104065.xml index c1801e6..097abb9 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104065.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104065.xml @@ -2,9 +2,11 @@ - - - - + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104066.xml b/Editor2DLibrary/SSG/shapes/svg/821104066.xml index 3938fb7..c48e970 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104066.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104066.xml @@ -2,9 +2,11 @@ - - - - + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/OFBogen180.xml b/Editor2DLibrary/SSG/shapes/svg/OFBogen180.xml index a213290..cc1b82f 100644 --- a/Editor2DLibrary/SSG/shapes/svg/OFBogen180.xml +++ b/Editor2DLibrary/SSG/shapes/svg/OFBogen180.xml @@ -2,9 +2,11 @@ - - - - + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/OFBogen22.xml b/Editor2DLibrary/SSG/shapes/svg/OFBogen22.xml index fc56ba7..6382b6a 100644 --- a/Editor2DLibrary/SSG/shapes/svg/OFBogen22.xml +++ b/Editor2DLibrary/SSG/shapes/svg/OFBogen22.xml @@ -2,9 +2,11 @@ - - - - + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/OFBogen45.xml b/Editor2DLibrary/SSG/shapes/svg/OFBogen45.xml index 759d498..b2dd90b 100644 --- a/Editor2DLibrary/SSG/shapes/svg/OFBogen45.xml +++ b/Editor2DLibrary/SSG/shapes/svg/OFBogen45.xml @@ -1,10 +1,12 @@  - - - - - + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/OFBogen67.xml b/Editor2DLibrary/SSG/shapes/svg/OFBogen67.xml index d22678a..da7f611 100644 --- a/Editor2DLibrary/SSG/shapes/svg/OFBogen67.xml +++ b/Editor2DLibrary/SSG/shapes/svg/OFBogen67.xml @@ -2,9 +2,11 @@ - - - - + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/OFBogen90.xml b/Editor2DLibrary/SSG/shapes/svg/OFBogen90.xml index c397f53..bf395e7 100644 --- a/Editor2DLibrary/SSG/shapes/svg/OFBogen90.xml +++ b/Editor2DLibrary/SSG/shapes/svg/OFBogen90.xml @@ -2,9 +2,11 @@ - - - - + + + + + + \ No newline at end of file diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index 6ce2281..7006d81 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -1010,7 +1010,7 @@ - + @@ -1020,7 +1020,7 @@ - + @@ -7005,6 +7005,9 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + + + @@ -7100,6 +7103,9 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + + + @@ -7125,7 +7131,9 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - + + + @@ -7171,9 +7179,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - - - @@ -23206,6 +23211,15 @@ SSGConnectionPoint.x_M + + + + + + + + + @@ -23958,6 +23972,9 @@ SSGConnectionPoint.x_M + + + @@ -23977,7 +23994,9 @@ SSGConnectionPoint.x_M - + + + @@ -24021,9 +24040,6 @@ SSGConnectionPoint.x_M - - - @@ -51252,9 +51268,7 @@ ShapeList["id="+Param.Input[1].shapeID].name - - - +