diff --git a/CAD/OmnifloCAD/Bogen45/APB_110_R630_45_400_821104031_new.dwg b/CAD/OmnifloCAD/Bogen45/APB_110_R630_45_400_821104031_new.dwg index 58ec9cd..e2351b6 100644 Binary files a/CAD/OmnifloCAD/Bogen45/APB_110_R630_45_400_821104031_new.dwg and b/CAD/OmnifloCAD/Bogen45/APB_110_R630_45_400_821104031_new.dwg differ diff --git a/CAD/OmnifloCAD/Bogen67_5/APB_110_R550_67_5_432_821104027_new.dwg b/CAD/OmnifloCAD/Bogen67_5/APB_110_R550_67_5_432_821104027_new.dwg index b312151..15052f7 100644 Binary files a/CAD/OmnifloCAD/Bogen67_5/APB_110_R550_67_5_432_821104027_new.dwg and b/CAD/OmnifloCAD/Bogen67_5/APB_110_R550_67_5_432_821104027_new.dwg differ diff --git a/CAD/OmnifloCAD/OmnifloBogen.dwg b/CAD/OmnifloCAD/OmnifloBogen.dwg index 317f2d3..77ec71a 100644 Binary files a/CAD/OmnifloCAD/OmnifloBogen.dwg and b/CAD/OmnifloCAD/OmnifloBogen.dwg differ diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_Gerade.xml b/Editor2DLibrary/SSG/shapes/palettes/c_Gerade.xml index 1372ab2..04ace5b 100644 --- a/Editor2DLibrary/SSG/shapes/palettes/c_Gerade.xml +++ b/Editor2DLibrary/SSG/shapes/palettes/c_Gerade.xml @@ -1,2 +1,2 @@ -
AP 110
+
AP 110
 \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/821106002.txt b/Editor2DLibrary/SSG/shapes/props/821106002.txt new file mode 100644 index 0000000..b334649 --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/props/821106002.txt @@ -0,0 +1,69 @@ +{ + "shapeMode": 0, + "name": "AP 110", + "family": "OFGerade", + "icon": "SSG/shapes/img/AP_32px.png", + "iconBig": "SSG/shapes/img/AP_64px.png", + "srcSVG": "SSG/shapes/svg/821106002.xml", + "width": 158.7402, + "height": 3779.5276, + "depth": 415.748, + "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", + "group3d": [ + { + "source": "s_ap110", + "id": "g0", + "width": 158.7402, + "height": 3779.5276, + "depth": 415.748, + "x": 0.0, + "y": 0.0, + "z": 207.874, + "rotation": "0;0;0", + "data": "", + "color": "#FFFF00", + "colorOpacity": 1.0 + } + ], + "connectionPoints": [ + { + "id": "cp1", + "x": 500.0, + "y": 0.0, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 0.0, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp2", + "x": 500.0, + "y": 1000.0, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 180.0, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + } + ], + "eventClass": "OnInserted,OnDoubleclick,OnPasted,OnLinked,OnRemoved" +} \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821106002.xml b/Editor2DLibrary/SSG/shapes/svg/821106002.xml new file mode 100644 index 0000000..cc7f729 --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/svg/821106002.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/SVGs/Omniflo/Bogen/Mittellinie/APB_110_R550_67_5_432_821104027.svg b/SVGs/Omniflo/Bogen/Mittellinie/APB_110_R550_67_5_432_821104027.svg index 97968df..e0b298b 100644 --- a/SVGs/Omniflo/Bogen/Mittellinie/APB_110_R550_67_5_432_821104027.svg +++ b/SVGs/Omniflo/Bogen/Mittellinie/APB_110_R550_67_5_432_821104027.svg @@ -1,6 +1,6 @@ - + - + diff --git a/SVGs/Omniflo/Bogen/Mittellinie/APB_110_R630_45_400_821104031.svg b/SVGs/Omniflo/Bogen/Mittellinie/APB_110_R630_45_400_821104031.svg index 0c14d0a..3cddedd 100644 --- a/SVGs/Omniflo/Bogen/Mittellinie/APB_110_R630_45_400_821104031.svg +++ b/SVGs/Omniflo/Bogen/Mittellinie/APB_110_R630_45_400_821104031.svg @@ -1,6 +1,6 @@ - + - + diff --git a/SVGs/Omniflo/Bogen/NewSVG/Optimiert/APB_110_R550_67_5_432_821104027_optimiert.svg b/SVGs/Omniflo/Bogen/NewSVG/Optimiert/APB_110_R550_67_5_432_821104027_optimiert.svg index d4df4ec..e8cbd05 100644 --- a/SVGs/Omniflo/Bogen/NewSVG/Optimiert/APB_110_R550_67_5_432_821104027_optimiert.svg +++ b/SVGs/Omniflo/Bogen/NewSVG/Optimiert/APB_110_R550_67_5_432_821104027_optimiert.svg @@ -1,6 +1,6 @@ - + - + diff --git a/SVGs/Omniflo/Bogen/NewSVG/Optimiert/APB_110_R630_45_400_821104031_optimiert.svg b/SVGs/Omniflo/Bogen/NewSVG/Optimiert/APB_110_R630_45_400_821104031_optimiert.svg index e3687a1..68f6850 100644 --- a/SVGs/Omniflo/Bogen/NewSVG/Optimiert/APB_110_R630_45_400_821104031_optimiert.svg +++ b/SVGs/Omniflo/Bogen/NewSVG/Optimiert/APB_110_R630_45_400_821104031_optimiert.svg @@ -1,6 +1,6 @@ - + - + diff --git a/SVGs/Omniflo/Bogen/NewSVG/Original/APB_110_R550_67_5_432_821104027_new.svg b/SVGs/Omniflo/Bogen/NewSVG/Original/APB_110_R550_67_5_432_821104027_new.svg index 7e276d1..20585c9 100644 --- a/SVGs/Omniflo/Bogen/NewSVG/Original/APB_110_R550_67_5_432_821104027_new.svg +++ b/SVGs/Omniflo/Bogen/NewSVG/Original/APB_110_R550_67_5_432_821104027_new.svg @@ -7,10 +7,10 @@ - - - - - + + + + + diff --git a/SVGs/Omniflo/Bogen/NewSVG/Original/APB_110_R630_45_400_821104031_new.svg b/SVGs/Omniflo/Bogen/NewSVG/Original/APB_110_R630_45_400_821104031_new.svg index 55248d4..45c676c 100644 --- a/SVGs/Omniflo/Bogen/NewSVG/Original/APB_110_R630_45_400_821104031_new.svg +++ b/SVGs/Omniflo/Bogen/NewSVG/Original/APB_110_R630_45_400_821104031_new.svg @@ -7,10 +7,10 @@ - - - - - + + + + + diff --git a/SVGs/Omniflo/python/1_SVGErfassung_updated_new_input.json b/SVGs/Omniflo/python/1_SVGErfassung_updated_new_input.json index 026c25f..e8ba356 100644 --- a/SVGs/Omniflo/python/1_SVGErfassung_updated_new_input.json +++ b/SVGs/Omniflo/python/1_SVGErfassung_updated_new_input.json @@ -84,10 +84,10 @@ "SVGname": "APB_110_R550_67_5_432_821104027.svg", "Sivasnr": "821104027", "Winkel":67.5, - "center_line_width_mm": 776.437, - "center_line_height_mm": 488.731, - "Objekt_width_mm":795.875, - "Objekt_height_mm":517.821 + "center_line_width_mm": 748.658, + "center_line_height_mm": 530.305, + "Objekt_width_mm":768.095, + "Objekt_height_mm":559.396 }, { "SVGname": "APB_110_R550_67_5_L_185_170_821104065.svg", @@ -111,10 +111,10 @@ "SVGname": "APB_110_R630_45_400_821104031.svg", "Sivasnr": "821104031", "Winkel":45, - "center_line_width_mm": 824.608, - "center_line_height_mm": 399.554, - "Objekt_width_mm":839.485, - "Objekt_height_mm":435.470 + "center_line_width_mm": 865.613, + "center_line_height_mm": 300.559, + "Objekt_width_mm":880.491, + "Objekt_height_mm":336.475 }, { "SVGname": "APB_110_R630_90_800_800_821104033.svg", diff --git a/SVGs/Omniflo/python/1_SVGErfassung_updated_new_output.json b/SVGs/Omniflo/python/1_SVGErfassung_updated_new_output.json index 283bf63..a23ed9f 100644 --- a/SVGs/Omniflo/python/1_SVGErfassung_updated_new_output.json +++ b/SVGs/Omniflo/python/1_SVGErfassung_updated_new_output.json @@ -102,12 +102,12 @@ "SVGname": "APB_110_R550_67_5_432_821104027.svg", "Sivasnr": "821104027", "Winkel": 67.5, - "center_line_width_mm": 776.437, - "center_line_height_mm": 488.731, - "Objekt_width_mm": 795.875, - "Objekt_height_mm": 517.821, - "calculated_objekt_width_mm": 795.875, - "calculated_objekt_height_mm": 517.823 + "center_line_width_mm": 748.658, + "center_line_height_mm": 530.305, + "Objekt_width_mm": 768.095, + "Objekt_height_mm": 559.396, + "calculated_objekt_width_mm": 768.096, + "calculated_objekt_height_mm": 559.397 }, { "SVGname": "APB_110_R550_67_5_L_185_170_821104065.svg", @@ -135,12 +135,12 @@ "SVGname": "APB_110_R630_45_400_821104031.svg", "Sivasnr": "821104031", "Winkel": 45.0, - "center_line_width_mm": 824.608, - "center_line_height_mm": 399.554, - "Objekt_width_mm": 839.485, - "Objekt_height_mm": 435.47, - "calculated_objekt_width_mm": 839.486, - "calculated_objekt_height_mm": 435.472 + "center_line_width_mm": 865.613, + "center_line_height_mm": 300.559, + "Objekt_width_mm": 880.491, + "Objekt_height_mm": 336.475, + "calculated_objekt_width_mm": 880.491, + "calculated_objekt_height_mm": 336.477 }, { "SVGname": "APB_110_R630_90_800_800_821104033.svg", diff --git a/SVGs/Omniflo/python/2_calculated_px_cps_output.json b/SVGs/Omniflo/python/2_calculated_px_cps_output.json index 4f681a5..f90d6a0 100644 --- a/SVGs/Omniflo/python/2_calculated_px_cps_output.json +++ b/SVGs/Omniflo/python/2_calculated_px_cps_output.json @@ -273,28 +273,28 @@ "SVGname": "APB_110_R550_67_5_432_821104027.svg", "Sivasnr": "821104027", "Winkel": 67.5, - "center_line_width_mm": 776.437, - "center_line_height_mm": 488.731, - "Objekt_width_mm": 795.875, - "Objekt_height_mm": 517.821, - "calculated_objekt_width_mm": 795.875, - "calculated_objekt_height_mm": 517.823, - "Objekt_width_px": 3008.01, - "Objekt_height_px": 1957.104, + "center_line_width_mm": 748.658, + "center_line_height_mm": 530.305, + "Objekt_width_mm": 768.095, + "Objekt_height_mm": 559.396, + "calculated_objekt_width_mm": 768.096, + "calculated_objekt_height_mm": 559.397, + "Objekt_width_px": 2903.015, + "Objekt_height_px": 2114.237, "calculated_SVG_width_px": 1000, - "calculated_SVG_height_px": 650.631, - "scale_factor": 1.256479, + "calculated_SVG_height_px": 728.29, + "scale_factor": 1.301922, "connectionPoints": [ { "id": "cp1", "x": 0, - "y": 40.632, + "y": 37.612, "direction": 270.0 }, { "id": "cp2", - "x": 975.577, - "y": 984.454, + "x": 974.694, + "y": 985.608, "direction": 157.5 } ] @@ -363,28 +363,28 @@ "SVGname": "APB_110_R630_45_400_821104031.svg", "Sivasnr": "821104031", "Winkel": 45.0, - "center_line_width_mm": 824.608, - "center_line_height_mm": 399.554, - "Objekt_width_mm": 839.485, - "Objekt_height_mm": 435.47, - "calculated_objekt_width_mm": 839.486, - "calculated_objekt_height_mm": 435.472, - "Objekt_width_px": 3172.834, - "Objekt_height_px": 1645.859, + "center_line_width_mm": 865.613, + "center_line_height_mm": 300.559, + "Objekt_width_mm": 880.491, + "Objekt_height_mm": 336.475, + "calculated_objekt_width_mm": 880.491, + "calculated_objekt_height_mm": 336.477, + "Objekt_width_px": 3327.816, + "Objekt_height_px": 1271.707, "calculated_SVG_width_px": 1000, - "calculated_SVG_height_px": 518.735, - "scale_factor": 1.191207, + "calculated_SVG_height_px": 382.145, + "scale_factor": 1.13573, "connectionPoints": [ { "id": "cp1", "x": 0, - "y": 48.316, + "y": 62.531, "direction": 270.0 }, { "id": "cp2", - "x": 982.279, - "y": 965.839, + "x": 983.103, + "y": 955.788, "direction": 135.0 } ]