From 64858e8a50cc49d91950ee119ac369ecf7fcb03a Mon Sep 17 00:00:00 2001 From: Yuelin Wang Date: Wed, 17 Sep 2025 10:11:50 +0200 Subject: [PATCH] =?UTF-8?q?CPs=20f=C3=BCr=20Dreiwegeweichen=20und=20180?= =?UTF-8?q?=C2=B0Bogen=20sind=20angepasst.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Editor2DLibrary/SSG/shapes/categories.txt | 2 +- .../SSG/shapes/props/821104035.txt | 4 +- .../SSG/shapes/props/821104041.txt | 4 +- .../SSG/shapes/props/821104043.txt | 8 +- .../SSG/shapes/props/834372206.txt | 182 +++++++++--------- .../SSG/shapes/props/834372207.txt | 182 +++++++++--------- .../SSG/shapes/props/834372209.txt | 182 +++++++++--------- .../SSG/shapes/props/834372210.txt | 182 +++++++++--------- Editor2DLibrary/SSG/shapes/settings.txt | 2 +- Editor2DLibrary/SSG/shapes/svg/821104035.xml | 18 +- Editor2DLibrary/SSG/shapes/svg/821104041.xml | 18 +- Editor2DLibrary/SSG/shapes/svg/821104043.xml | 18 +- Editor2DLibrary/SSG/shapes/svg/834372206.xml | 28 +-- Editor2DLibrary/SSG/shapes/svg/834372207.xml | 28 +-- Editor2DLibrary/SSG/shapes/svg/834372209.xml | 28 +-- Editor2DLibrary/SSG/shapes/svg/834372210.xml | 28 +-- SVGs/Omniflo/bin/setenv.bat | 4 +- .../1_SVGErfassung_updated_new_input.json | 2 +- .../1_SVGErfassung_updated_new_output.json | 4 +- .../json/2_calculated_px_cps_output.json | 8 +- .../01_props_step1_omniflo_weichen.py | 2 +- ...he_dimensions_and_add_connection_points.py | 4 +- ...mensions_and_connection_points_in_props.py | 2 +- ...automatic_svg_generation_for_P_switches.py | 2 +- .../OFWeiche/json/omniflo_weichen_output.json | 6 +- 25 files changed, 483 insertions(+), 465 deletions(-) diff --git a/Editor2DLibrary/SSG/shapes/categories.txt b/Editor2DLibrary/SSG/shapes/categories.txt index 6600442..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":"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 +[{"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/props/821104035.txt b/Editor2DLibrary/SSG/shapes/props/821104035.txt index 0e9261d..8ecc1da 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104035.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104035.txt @@ -1,4 +1,4 @@ -{ +{ "shapeMode": 0, "name": "APB 110 R 630/90 850/870", "family": "OFBogen", @@ -13,7 +13,7 @@ "connectionPoints": [ { "id": "cp1", - "x": 0.0, + "x": 0, "y": 23.613, "z": 0.0, "xMin": "", diff --git a/Editor2DLibrary/SSG/shapes/props/821104041.txt b/Editor2DLibrary/SSG/shapes/props/821104041.txt index e1001c2..0856d77 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104041.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104041.txt @@ -1,4 +1,4 @@ -{ +{ "shapeMode": 0, "name": "APB 110 R 630/90 850/690", "family": "OFBogen", @@ -13,7 +13,7 @@ "connectionPoints": [ { "id": "cp1", - "x": 0.0, + "x": 0, "y": 24.155, "z": 0.0, "xMin": "", diff --git a/Editor2DLibrary/SSG/shapes/props/821104043.txt b/Editor2DLibrary/SSG/shapes/props/821104043.txt index 12c8146..c268d73 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104043.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104043.txt @@ -1,4 +1,4 @@ -{ +{ "shapeMode": 0, "name": "APB 110 R 650/180 L=150", "family": "OFBogen", @@ -6,14 +6,14 @@ "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": 3103.121, + "width": 3023.622, "height": 5072.391, "depth": 415.748, "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", "connectionPoints": [ { "id": "cp1", - "x": 0, + "x": 0.0, "y": 15.677, "z": 0.0, "xMin": "", @@ -32,7 +32,7 @@ }, { "id": "cp2", - "x": 0, + "x": 0.0, "y": 984.323, "z": 0.0, "xMin": "", diff --git a/Editor2DLibrary/SSG/shapes/props/834372206.txt b/Editor2DLibrary/SSG/shapes/props/834372206.txt index dc5e744..da60b4b 100644 --- a/Editor2DLibrary/SSG/shapes/props/834372206.txt +++ b/Editor2DLibrary/SSG/shapes/props/834372206.txt @@ -1,92 +1,92 @@ -{ - "shapeMode": 0, - "name": "Dreiwege 90° 500/600 M", - "family": "OFWeiche", - "icon": "SSG/shapes/img/Weiche_90_500_600_T_M_834372206_32px.png", - "iconBig": "SSG/shapes/img/Weiche_90_500_600_T_M_834372206_64px.png", - "srcSVG": "SSG/shapes/svg/834372206.xml", - "src3D": "SSG/shapes/obj/834372206.stl", - "width": 3781.239, - "height": 2347.965, - "depth": 415.748, - "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", - "connectionPoints": [ - { - "id": "cp1", - "x": 500.0, - "y": 1000.001, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 180.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp2", - "x": 0.0, - "y": 33.868, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 270.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp3", - "x": 1000.0, - "y": 33.868, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 90.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp4", - "x": 500.0, - "y": 420.511, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 0.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - } - ], - "eventClass": "OnDoubleclick,OnPasted,OnInserted,OnLinked,OnRemoved" +{ + "shapeMode": 0, + "name": "Dreiwege 90° 500/600 M", + "family": "OFWeiche", + "icon": "SSG/shapes/img/Weiche_90_500_600_T_M_834372206_32px.png", + "iconBig": "SSG/shapes/img/Weiche_90_500_600_T_M_834372206_64px.png", + "srcSVG": "SSG/shapes/svg/834372206.xml", + "src3D": "SSG/shapes/obj/834372206.stl", + "width": 3781.239, + "height": 2347.965, + "depth": 415.748, + "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", + "connectionPoints": [ + { + "id": "cp1", + "x": 500.0, + "y": 1000.001, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 180.0, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp2", + "x": 0.0, + "y": 33.868, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 270, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp3", + "x": 1000.0, + "y": 33.868, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 90, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp4", + "x": 500.0, + "y": 420.511, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 0.0, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + } + ], + "eventClass": "OnDoubleclick,OnPasted,OnInserted,OnLinked,OnRemoved" } \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/834372207.txt b/Editor2DLibrary/SSG/shapes/props/834372207.txt index d9bc7b4..da226bc 100644 --- a/Editor2DLibrary/SSG/shapes/props/834372207.txt +++ b/Editor2DLibrary/SSG/shapes/props/834372207.txt @@ -1,92 +1,92 @@ -{ - "shapeMode": 0, - "name": "Dreiwege 90° 500/600 P", - "family": "OFWeiche", - "icon": "SSG/shapes/img/Weiche_90_500_600_T_P_834372207_32px.png", - "iconBig": "SSG/shapes/img/Weiche_90_500_600_T_P_834372207_64px.png", - "srcSVG": "SSG/shapes/svg/834372207.xml", - "src3D": "SSG/shapes/obj/834372207.stl", - "width": 3781.239, - "height": 2347.965, - "depth": 415.748, - "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", - "connectionPoints": [ - { - "id": "cp1", - "x": 500.0, - "y": 1000.001, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 180.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp2", - "x": 0.0, - "y": 33.868, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 270.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp3", - "x": 1000.0, - "y": 33.868, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 90.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp4", - "x": 500.0, - "y": 420.511, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 0.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - } - ], - "eventClass": "OnDoubleclick,OnPasted,OnInserted,OnLinked,OnRemoved" +{ + "shapeMode": 0, + "name": "Dreiwege 90° 500/600 P", + "family": "OFWeiche", + "icon": "SSG/shapes/img/Weiche_90_500_600_T_P_834372207_32px.png", + "iconBig": "SSG/shapes/img/Weiche_90_500_600_T_P_834372207_64px.png", + "srcSVG": "SSG/shapes/svg/834372207.xml", + "src3D": "SSG/shapes/obj/834372207.stl", + "width": 3781.239, + "height": 2347.965, + "depth": 415.748, + "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", + "connectionPoints": [ + { + "id": "cp1", + "x": 500.0, + "y": 1000.001, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 180.0, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp2", + "x": 0.0, + "y": 33.868, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 270, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp3", + "x": 1000.0, + "y": 33.868, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 90, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp4", + "x": 500.0, + "y": 420.511, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 0.0, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + } + ], + "eventClass": "OnDoubleclick,OnPasted,OnInserted,OnLinked,OnRemoved" } \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/834372209.txt b/Editor2DLibrary/SSG/shapes/props/834372209.txt index 04cec16..3f48d06 100644 --- a/Editor2DLibrary/SSG/shapes/props/834372209.txt +++ b/Editor2DLibrary/SSG/shapes/props/834372209.txt @@ -1,92 +1,92 @@ -{ - "shapeMode": 0, - "name": "Dreiwege 90° 700/700 M", - "family": "OFWeiche", - "icon": "SSG/shapes/img/Weiche_90_700_700_T_M_834372209_32px.png", - "iconBig": "SSG/shapes/img/Weiche_90_700_700_T_M_834372209_64px.png", - "srcSVG": "SSG/shapes/svg/834372209.xml", - "src3D": "SSG/shapes/obj/834372209.stl", - "width": 5294.093, - "height": 2725.836, - "depth": 415.748, - "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", - "connectionPoints": [ - { - "id": "cp1", - "x": 500.0, - "y": 999.999, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 180.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp2", - "x": 0.0, - "y": 29.173, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 270.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp3", - "x": 1000.0, - "y": 29.173, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 90.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp4", - "x": 500.0, - "y": 500.843, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 0.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - } - ], - "eventClass": "OnDoubleclick,OnPasted,OnInserted,OnLinked,OnRemoved" +{ + "shapeMode": 0, + "name": "Dreiwege 90° 700/700 M", + "family": "OFWeiche", + "icon": "SSG/shapes/img/Weiche_90_700_700_T_M_834372209_32px.png", + "iconBig": "SSG/shapes/img/Weiche_90_700_700_T_M_834372209_64px.png", + "srcSVG": "SSG/shapes/svg/834372209.xml", + "src3D": "SSG/shapes/obj/834372209.stl", + "width": 5294.093, + "height": 2725.836, + "depth": 415.748, + "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", + "connectionPoints": [ + { + "id": "cp1", + "x": 500.0, + "y": 999.999, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 180.0, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp2", + "x": 0.0, + "y": 29.173, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 270, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp3", + "x": 1000.0, + "y": 29.173, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 90, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp4", + "x": 500.0, + "y": 500.843, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 0.0, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + } + ], + "eventClass": "OnDoubleclick,OnPasted,OnInserted,OnLinked,OnRemoved" } \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/834372210.txt b/Editor2DLibrary/SSG/shapes/props/834372210.txt index 135bb12..58b4772 100644 --- a/Editor2DLibrary/SSG/shapes/props/834372210.txt +++ b/Editor2DLibrary/SSG/shapes/props/834372210.txt @@ -1,92 +1,92 @@ -{ - "shapeMode": 0, - "name": "Dreiwege 90° 700/700 P", - "family": "OFWeiche", - "icon": "SSG/shapes/img/Weiche_90_700_700_T_P_834372210_32px.png", - "iconBig": "SSG/shapes/img/Weiche_90_700_700_T_P_834372210_64px.png", - "srcSVG": "SSG/shapes/svg/834372210.xml", - "src3D": "SSG/shapes/obj/834372210.stl", - "width": 5294.093, - "height": 2725.836, - "depth": 415.748, - "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", - "connectionPoints": [ - { - "id": "cp1", - "x": 500.0, - "y": 999.999, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 180.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp2", - "x": 0.0, - "y": 29.173, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 270.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp3", - "x": 1000.0, - "y": 29.173, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 90.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp4", - "x": 500.0, - "y": 500.843, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 0.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - } - ], - "eventClass": "OnDoubleclick,OnPasted,OnInserted,OnLinked,OnRemoved" +{ + "shapeMode": 0, + "name": "Dreiwege 90° 700/700 P", + "family": "OFWeiche", + "icon": "SSG/shapes/img/Weiche_90_700_700_T_P_834372210_32px.png", + "iconBig": "SSG/shapes/img/Weiche_90_700_700_T_P_834372210_64px.png", + "srcSVG": "SSG/shapes/svg/834372210.xml", + "src3D": "SSG/shapes/obj/834372210.stl", + "width": 5294.093, + "height": 2725.836, + "depth": 415.748, + "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", + "connectionPoints": [ + { + "id": "cp1", + "x": 500.0, + "y": 999.999, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 180.0, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp2", + "x": 0.0, + "y": 29.173, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 270, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp3", + "x": 1000.0, + "y": 29.173, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 90, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp4", + "x": 500.0, + "y": 500.843, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 0.0, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + } + ], + "eventClass": "OnDoubleclick,OnPasted,OnInserted,OnLinked,OnRemoved" } \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/settings.txt b/Editor2DLibrary/SSG/shapes/settings.txt index 9f9ea5f..f7a766d 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":false},"c_Foerderer":{"expanded":true},"c_Kurven":{"expanded":true},"c_Background":{"expanded":true},"c_Parts":{"expanded":true},"c_Session":{"expanded":true},"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":true},"c_OmnifloWeiche":{"expanded":true}},"shapes":{}} \ No newline at end of file +{"categories":{"c_ILS":{"expanded":true},"c_Kreiselmodule":{"expanded":true},"c_Zusatzmodul":{"expanded":false},"c_Foerderer":{"expanded":true},"c_Kurven":{"expanded":true},"c10":{"expanded":true},"c_Background":{"expanded":true},"c_Parts":{"expanded":true},"c_Session":{"expanded":true},"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":true},"c_OmnifloWeiche":{"expanded":true}},"shapes":{}} \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104035.xml b/Editor2DLibrary/SSG/shapes/svg/821104035.xml index d3b8714..2220c81 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104035.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104035.xml @@ -6,6 +6,22 @@ - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104041.xml b/Editor2DLibrary/SSG/shapes/svg/821104041.xml index 3de4d45..5940b49 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104041.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104041.xml @@ -6,6 +6,22 @@ - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104043.xml b/Editor2DLibrary/SSG/shapes/svg/821104043.xml index 8980fe4..75fc550 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104043.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104043.xml @@ -6,22 +6,6 @@ - - - - - - - - - + - - - - - - - - \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/834372206.xml b/Editor2DLibrary/SSG/shapes/svg/834372206.xml index a56f237..91bda30 100644 --- a/Editor2DLibrary/SSG/shapes/svg/834372206.xml +++ b/Editor2DLibrary/SSG/shapes/svg/834372206.xml @@ -1,29 +1,29 @@ - + - - + + - - - + + + - - - + + + - - - + + + - - + + diff --git a/Editor2DLibrary/SSG/shapes/svg/834372207.xml b/Editor2DLibrary/SSG/shapes/svg/834372207.xml index 44a6807..d7014e7 100644 --- a/Editor2DLibrary/SSG/shapes/svg/834372207.xml +++ b/Editor2DLibrary/SSG/shapes/svg/834372207.xml @@ -1,29 +1,29 @@ - + - - + + - - - + + + - - - + + + - - - + + + - - + + diff --git a/Editor2DLibrary/SSG/shapes/svg/834372209.xml b/Editor2DLibrary/SSG/shapes/svg/834372209.xml index ef93436..c7f076f 100644 --- a/Editor2DLibrary/SSG/shapes/svg/834372209.xml +++ b/Editor2DLibrary/SSG/shapes/svg/834372209.xml @@ -1,29 +1,29 @@ - + - + - - + + - + - - - - + + + + - - - - - + + + + + diff --git a/Editor2DLibrary/SSG/shapes/svg/834372210.xml b/Editor2DLibrary/SSG/shapes/svg/834372210.xml index 7eda36c..1e93722 100644 --- a/Editor2DLibrary/SSG/shapes/svg/834372210.xml +++ b/Editor2DLibrary/SSG/shapes/svg/834372210.xml @@ -1,29 +1,29 @@ - + - + - - + + - + - - - - + + + + - - - - - + + + + + diff --git a/SVGs/Omniflo/bin/setenv.bat b/SVGs/Omniflo/bin/setenv.bat index d257882..7e24d71 100644 --- a/SVGs/Omniflo/bin/setenv.bat +++ b/SVGs/Omniflo/bin/setenv.bat @@ -12,9 +12,11 @@ set RD_CONF_LIB=%RD_CONF%\lib set "OFWeiche_PATH=%RD_CONF%\lib\OFWeiche" +set "TEFWeiche_PATH=%RD_CONF%\lib\TEFWeiche" set "PROPS_PATH=C:\Program Files\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\props" set "SVG_PATH=C:\Program Files\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\svg" -set "JSON_PATH=%OFWeiche_PATH%\json" +set "JSON_PATH_OFWEICHE=%OFWeiche_PATH%\json" +set "JSON_PATH_TEFWEICHE=%TEFWeiche_PATH%\json" set RD_CONF_BOGEN=%RD_CONF%\Bogen diff --git a/SVGs/Omniflo/lib/OFBogen/json/1_SVGErfassung_updated_new_input.json b/SVGs/Omniflo/lib/OFBogen/json/1_SVGErfassung_updated_new_input.json index 835eb0b..047b73f 100644 --- a/SVGs/Omniflo/lib/OFBogen/json/1_SVGErfassung_updated_new_input.json +++ b/SVGs/Omniflo/lib/OFBogen/json/1_SVGErfassung_updated_new_input.json @@ -195,7 +195,7 @@ "Winkel":180, "center_line_width_mm": 800, "center_line_height_mm": 1300, - "Objekt_width_mm":821.040, + "Objekt_width_mm":800, "Objekt_height_mm":1342.080 }, { diff --git a/SVGs/Omniflo/lib/OFBogen/json/1_SVGErfassung_updated_new_output.json b/SVGs/Omniflo/lib/OFBogen/json/1_SVGErfassung_updated_new_output.json index 96adb4e..ce84d15 100644 --- a/SVGs/Omniflo/lib/OFBogen/json/1_SVGErfassung_updated_new_output.json +++ b/SVGs/Omniflo/lib/OFBogen/json/1_SVGErfassung_updated_new_output.json @@ -236,9 +236,9 @@ "Winkel": 180.0, "center_line_width_mm": 800.0, "center_line_height_mm": 1300.0, - "Objekt_width_mm": 821.04, + "Objekt_width_mm": 800, "Objekt_height_mm": 1342.08, - "calculated_objekt_width_mm": 821.04, + "calculated_objekt_width_mm": 800, "calculated_objekt_height_mm": 1342.08 }, { diff --git a/SVGs/Omniflo/lib/OFBogen/json/2_calculated_px_cps_output.json b/SVGs/Omniflo/lib/OFBogen/json/2_calculated_px_cps_output.json index d6b8341..a35206b 100644 --- a/SVGs/Omniflo/lib/OFBogen/json/2_calculated_px_cps_output.json +++ b/SVGs/Omniflo/lib/OFBogen/json/2_calculated_px_cps_output.json @@ -635,14 +635,14 @@ "Winkel": 180.0, "center_line_width_mm": 800.0, "center_line_height_mm": 1300.0, - "Objekt_width_mm": 821.04, + "Objekt_width_mm": 800, "Objekt_height_mm": 1342.08, - "calculated_objekt_width_mm": 821.04, + "calculated_objekt_width_mm": 800, "calculated_objekt_height_mm": 1342.08, - "Objekt_width_px": 3103.121, + "Objekt_width_px": 3023.5998, "Objekt_height_px": 5072.391, "calculated_SVG_height_px": 1000, - "calculated_SVG_width_px": 613.657, + "calculated_SVG_width_px": 596.0897, "scale_factor": 0.7451121, "connectionPoints": [ { diff --git a/SVGs/Omniflo/lib/OFWeiche/01_props_step1_omniflo_weichen.py b/SVGs/Omniflo/lib/OFWeiche/01_props_step1_omniflo_weichen.py index 3891f22..637a7c2 100644 --- a/SVGs/Omniflo/lib/OFWeiche/01_props_step1_omniflo_weichen.py +++ b/SVGs/Omniflo/lib/OFWeiche/01_props_step1_omniflo_weichen.py @@ -507,7 +507,7 @@ def process_sternweiche_items(data): for field in fields_to_copy: similar[field] = item[field] if __name__ == "__main__": - json_path = os.environ.get("JSON_PATH", "JSON") + json_path = os.environ.get("JSON_PATH_OFWEICHE", "JSON") input_filename = os.path.join(json_path, "omniflo_weichen.json") modify_json_values(input_filename) \ No newline at end of file diff --git a/SVGs/Omniflo/lib/OFWeiche/01_props_step2_calculations_to_standardize_the_dimensions_and_add_connection_points.py b/SVGs/Omniflo/lib/OFWeiche/01_props_step2_calculations_to_standardize_the_dimensions_and_add_connection_points.py index 7bbab53..f4a387f 100644 --- a/SVGs/Omniflo/lib/OFWeiche/01_props_step2_calculations_to_standardize_the_dimensions_and_add_connection_points.py +++ b/SVGs/Omniflo/lib/OFWeiche/01_props_step2_calculations_to_standardize_the_dimensions_and_add_connection_points.py @@ -88,7 +88,7 @@ def process_json_file(input_file, output_file): # CP4 exists for Dreiwegeweiche cp4_x = round(item["OFWeiche_CP4_x_mm"] * scale*scale_RD_W, 3) cp4_y = round(item["OFWeiche_CP4_y_mm"] * scale*scale_RD_H, 3) - cp4_dir = 90.0 + cp4_dir = 0.0 connection_points.append({ "id": "cp4", @@ -142,7 +142,7 @@ def process_json_file(input_file, output_file): json.dump(data, f, indent=2, ensure_ascii=False) if __name__ == "__main__": - json_path = os.environ.get("JSON_PATH", "JSON") + json_path = os.environ.get("JSON_PATH_OFWEICHE", "JSON") input_filename = os.path.join(json_path, "omniflo_weichen.json") output_filename = os.path.join(json_path, "omniflo_weichen_output.json") diff --git a/SVGs/Omniflo/lib/OFWeiche/01_props_step3_update_dimensions_and_connection_points_in_props.py b/SVGs/Omniflo/lib/OFWeiche/01_props_step3_update_dimensions_and_connection_points_in_props.py index aa535ff..deda2a9 100644 --- a/SVGs/Omniflo/lib/OFWeiche/01_props_step3_update_dimensions_and_connection_points_in_props.py +++ b/SVGs/Omniflo/lib/OFWeiche/01_props_step3_update_dimensions_and_connection_points_in_props.py @@ -183,7 +183,7 @@ def process_files(json_file_path, txt_files_dir): f.write("\n".join(report_content)) if __name__ == "__main__": - json_path = os.environ.get("JSON_PATH", "JSON") + json_path = os.environ.get("JSON_PATH_OFWEICHE", "JSON") json_file_path = os.path.join(json_path, "omniflo_weichen_output.json") # txt_files_dir = r"C:\Program Files\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\props" diff --git a/SVGs/Omniflo/lib/OFWeiche/02_svg_step5_automatic_svg_generation_for_P_switches.py b/SVGs/Omniflo/lib/OFWeiche/02_svg_step5_automatic_svg_generation_for_P_switches.py index 83554de..b146ee3 100644 --- a/SVGs/Omniflo/lib/OFWeiche/02_svg_step5_automatic_svg_generation_for_P_switches.py +++ b/SVGs/Omniflo/lib/OFWeiche/02_svg_step5_automatic_svg_generation_for_P_switches.py @@ -108,7 +108,7 @@ def process_svg_files(svg_folder, json_file_path): if __name__ == "__main__": # Configure paths (update these with your actual paths) svg_folder = os.environ.get('RD_CONF_OUTPUT_OFWEICHEN') - json_path = os.environ.get("JSON_PATH", "JSON") + json_path = os.environ.get("JSON_PATH_OFWEICHE", "JSON") input_filename = os.path.join(json_path, "omniflo_weichen_output.json") process_svg_files(svg_folder, input_filename) print("Processing complete") diff --git a/SVGs/Omniflo/lib/OFWeiche/json/omniflo_weichen_output.json b/SVGs/Omniflo/lib/OFWeiche/json/omniflo_weichen_output.json index 5d5deb8..1704cf6 100644 --- a/SVGs/Omniflo/lib/OFWeiche/json/omniflo_weichen_output.json +++ b/SVGs/Omniflo/lib/OFWeiche/json/omniflo_weichen_output.json @@ -2847,7 +2847,7 @@ "id": "cp2", "x": 47.592, "y": 0.0, - "direction": 360 + "direction": 0 }, { "id": "cp3", @@ -2901,7 +2901,7 @@ "id": "cp2", "x": 47.592, "y": 0.0, - "direction": 360 + "direction": 0 }, { "id": "cp3", @@ -2955,7 +2955,7 @@ "id": "cp2", "x": 47.592, "y": 0.0, - "direction": 360 + "direction": 0 }, { "id": "cp3",