CPs für Dreiwegeweichen und 180°Bogen sind angepasst.

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}]
+[{"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}]

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": "",

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": "",

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": "",

Editor2DLibrary/SSG/shapes/props/834372206.txt

@@ -1,4 +1,4 @@
-{
+{
     "shapeMode": 0,
     "name": "Dreiwege 90° 500/600 M",
     "family": "OFWeiche",
@@ -44,7 +44,7 @@
             "zMin": "",
             "zMax": "",
             "zStep": "",
-      "direction": 270.0,
+            "direction": 270,
             "linkClass": "Omniflo",
             "label": "",
             "isDimension": true
@@ -63,7 +63,7 @@
             "zMin": "",
             "zMax": "",
             "zStep": "",
-      "direction": 90.0,
+            "direction": 90,
             "linkClass": "Omniflo",
             "label": "",
             "isDimension": true

Editor2DLibrary/SSG/shapes/props/834372207.txt

@@ -1,4 +1,4 @@
-{
+{
     "shapeMode": 0,
     "name": "Dreiwege 90° 500/600 P",
     "family": "OFWeiche",
@@ -44,7 +44,7 @@
             "zMin": "",
             "zMax": "",
             "zStep": "",
-      "direction": 270.0,
+            "direction": 270,
             "linkClass": "Omniflo",
             "label": "",
             "isDimension": true
@@ -63,7 +63,7 @@
             "zMin": "",
             "zMax": "",
             "zStep": "",
-      "direction": 90.0,
+            "direction": 90,
             "linkClass": "Omniflo",
             "label": "",
             "isDimension": true

Editor2DLibrary/SSG/shapes/props/834372209.txt

@@ -1,4 +1,4 @@
-{
+{
     "shapeMode": 0,
     "name": "Dreiwege 90° 700/700 M",
     "family": "OFWeiche",
@@ -44,7 +44,7 @@
             "zMin": "",
             "zMax": "",
             "zStep": "",
-      "direction": 270.0,
+            "direction": 270,
             "linkClass": "Omniflo",
             "label": "",
             "isDimension": true
@@ -63,7 +63,7 @@
             "zMin": "",
             "zMax": "",
             "zStep": "",
-      "direction": 90.0,
+            "direction": 90,
             "linkClass": "Omniflo",
             "label": "",
             "isDimension": true

Editor2DLibrary/SSG/shapes/props/834372210.txt

@@ -1,4 +1,4 @@
-{
+{
     "shapeMode": 0,
     "name": "Dreiwege 90° 700/700 P",
     "family": "OFWeiche",
@@ -44,7 +44,7 @@
             "zMin": "",
             "zMax": "",
             "zStep": "",
-      "direction": 270.0,
+            "direction": 270,
             "linkClass": "Omniflo",
             "label": "",
             "isDimension": true
@@ -63,7 +63,7 @@
             "zMin": "",
             "zMax": "",
             "zStep": "",
-      "direction": 90.0,
+            "direction": 90,
             "linkClass": "Omniflo",
             "label": "",
             "isDimension": true

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":{}}
+{"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":{}}

Editor2DLibrary/SSG/shapes/svg/821104035.xml

@@ -6,6 +6,22 @@
         <path d="m1.8903 25.938h251.62c191.1 4.14e-4 374.37 75.871 509.49 210.92 135.13 135.05 211.04 318.22 211.04 509.21v274.34" stroke-width="1px" />
         <path d="m949.98 1020.4h48.132" stroke-width="1px" />
       </g>
+    
+
+
+
+
+
+
+
 </svg>
   </g>
+
+
+
+
+
+
+
+
 </svg>

Editor2DLibrary/SSG/shapes/svg/821104041.xml

@@ -6,6 +6,22 @@
         <path d="m1.8899 25.951h68.628c191.14-0.002126 374.45 75.911 509.61 211.04 135.16 135.13 211.09 318.4 211.09 509.5v251.62" stroke-width="1px" />
         <path d="m767.14 998.11h48.142" stroke-width="1px" />
       </g>
+    
+
+
+
+
+
+
+
 </svg>
   </g>
+
+
+
+
+
+
+
+
 </svg>

Editor2DLibrary/SSG/shapes/svg/821104043.xml

@@ -6,22 +6,6 @@
         <path d="m1.9032 17.496h112.94c129.65 0.21286 253.92 51.14 345.52 141.6 91.602 90.461 143.05 213.06 143.05 340.89s-51.449 250.43-143.05 340.89c-91.602 90.461-215.87 141.39-345.52 141.6h-112.94" stroke-width="1px" />
         <path d="m1.9032 966.86v31.24" stroke-width="1px" />
       </g>
-    
-
-
-
-
-
-
-
     </svg>
   </g>
-
-
-
-
-
-
-
-
 </svg>

Editor2DLibrary/SSG/shapes/svg/834372206.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg">
   <g transform="rotate(0)">
     <svg viewBox="0 0 1000.000 620.951" preserveAspectRatio="none" position="absolute" overflow="visible">

Editor2DLibrary/SSG/shapes/svg/834372207.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg">
   <g transform="rotate(0)">
     <svg viewBox="0 0 1000.000 620.951" preserveAspectRatio="none" position="absolute" overflow="visible">

Editor2DLibrary/SSG/shapes/svg/834372209.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg">
   <g transform="rotate(0)">
     <svg viewBox="0 0 1000.000 514.885" preserveAspectRatio="none" position="absolute" overflow="visible">

Editor2DLibrary/SSG/shapes/svg/834372210.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg">
   <g transform="rotate(0)">
     <svg viewBox="0 0 1000.000 514.885" preserveAspectRatio="none" position="absolute" overflow="visible">

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

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
     },
     {

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
     },
     {

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": [
             {

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)

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") 
     

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"

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")           

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",