From 8f201788901e86cacaa5a4d2c2270a9915fa81df Mon Sep 17 00:00:00 2001 From: Paul Wolok Date: Tue, 30 Sep 2025 10:38:19 +0200 Subject: [PATCH 1/3] Direction der Cps von Sternweiche korregiert --- Editor2DLibrary/SSG/shapes/props/834372420.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Editor2DLibrary/SSG/shapes/props/834372420.txt b/Editor2DLibrary/SSG/shapes/props/834372420.txt index d668444..997cd27 100644 --- a/Editor2DLibrary/SSG/shapes/props/834372420.txt +++ b/Editor2DLibrary/SSG/shapes/props/834372420.txt @@ -1,4 +1,4 @@ -{ +{ "shapeMode": 0, "name": "Star 1400/1400 M", "family": "OFWeiche", @@ -25,7 +25,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 180, + "direction": 180.0, "linkClass": "Omniflo", "label": "", "isDimension": true @@ -44,7 +44,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 0, + "direction": 270.0, "linkClass": "Omniflo", "label": "", "isDimension": true @@ -63,7 +63,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 0, + "direction": 90.0, "linkClass": "Omniflo", "label": "", "isDimension": true @@ -82,7 +82,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 0, + "direction": 0.0, "linkClass": "Omniflo", "label": "", "isDimension": true From 29b4a963657efc9ea964dac999ae19f5bd4ded1a Mon Sep 17 00:00:00 2001 From: Yuelin Wang Date: Tue, 30 Sep 2025 13:17:12 +0200 Subject: [PATCH 2/3] =?UTF-8?q?einige=20Fehler=20f=C3=BCr=20cps=20wurden?= =?UTF-8?q?=20korrigiert.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CAD/OmnifloCAD/dwg/834372400.dwg | Bin 39436 -> 39151 bytes .../SSG/shapes/props/834342100.txt | 4 +-- .../SSG/shapes/props/834342101.txt | 4 +-- .../SSG/shapes/props/834372002+0_BG090090.txt | 2 +- .../SSG/shapes/props/834372008+0_BG190090.txt | 2 +- .../SSG/shapes/props/834372420.txt | 4 +-- .../SSG/shapes/props/834372421.txt | 4 +-- .../shapes/props/OFWeichenkoerperDoppel.txt | 4 +-- .../DeltaWeiche_1400_700_M_834372400.svg | 28 +++++++-------- .../DeltaWeiche_1400_700_P_834372401.svg | 28 +++++++-------- .../DeltaWeiche_1400_700_M_834372400.svg | 26 +++++++------- .../01_props_step1_omniflo_weichen.py | 2 +- ...he_dimensions_and_add_connection_points.py | 4 +-- ...svg_step2_find_and_mark_auxiliary_lines.py | 20 +++++------ .../OFWeiche/json/omniflo_weichen_new.json | 12 +++---- .../OFWeiche/json/omniflo_weichen_output.json | 32 +++++++++--------- .../TEFWeiche/json/omniflo_TEF_weichen.json | 4 +-- .../json/omniflo_TEF_weichen_output.json | 8 ++--- 18 files changed, 94 insertions(+), 94 deletions(-) diff --git a/CAD/OmnifloCAD/dwg/834372400.dwg b/CAD/OmnifloCAD/dwg/834372400.dwg index 4b5fdc7934b40ea4129e399167689d547812faf5..7dcb376921581f56919a378fd96ea7a8f7eee833 100644 GIT binary patch delta 4805 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 LebxW-d(?jbM+pAK delta 5079 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 VJv$V}GB`MsKuW8=`Tri!{RevVHHiQK diff --git a/Editor2DLibrary/SSG/shapes/props/834342100.txt b/Editor2DLibrary/SSG/shapes/props/834342100.txt index ade4245..84121de 100644 --- a/Editor2DLibrary/SSG/shapes/props/834342100.txt +++ b/Editor2DLibrary/SSG/shapes/props/834342100.txt @@ -33,7 +33,7 @@ { "id": "cp2", "x": 80.365, - "y": 57.463, + "y": 23.134, "z": 0.0, "xMin": "", "xMax": "", @@ -52,7 +52,7 @@ { "id": "cp3", "x": 919.635, - "y": 57.463, + "y": 23.134, "z": 0.0, "xMin": "", "xMax": "", diff --git a/Editor2DLibrary/SSG/shapes/props/834342101.txt b/Editor2DLibrary/SSG/shapes/props/834342101.txt index d8d39b9..9341087 100644 --- a/Editor2DLibrary/SSG/shapes/props/834342101.txt +++ b/Editor2DLibrary/SSG/shapes/props/834342101.txt @@ -33,7 +33,7 @@ { "id": "cp2", "x": 80.365, - "y": 57.463, + "y": 23.134, "z": 0.0, "xMin": "", "xMax": "", @@ -52,7 +52,7 @@ { "id": "cp3", "x": 919.635, - "y": 57.463, + "y": 23.134, "z": 0.0, "xMin": "", "xMax": "", diff --git a/Editor2DLibrary/SSG/shapes/props/834372002+0_BG090090.txt b/Editor2DLibrary/SSG/shapes/props/834372002+0_BG090090.txt index 99e32b2..fb930ea 100644 --- a/Editor2DLibrary/SSG/shapes/props/834372002+0_BG090090.txt +++ b/Editor2DLibrary/SSG/shapes/props/834372002+0_BG090090.txt @@ -32,7 +32,7 @@ }, { "id": "cp2", - "x": 187.049, + "x": 186.794, "y": 17.334, "z": 0.0, "xMin": "", diff --git a/Editor2DLibrary/SSG/shapes/props/834372008+0_BG190090.txt b/Editor2DLibrary/SSG/shapes/props/834372008+0_BG190090.txt index 6626496..1ac0a0d 100644 --- a/Editor2DLibrary/SSG/shapes/props/834372008+0_BG190090.txt +++ b/Editor2DLibrary/SSG/shapes/props/834372008+0_BG190090.txt @@ -51,7 +51,7 @@ }, { "id": "cp4", - "x": 892.894, + "x": 891.31, "y": 447.899, "z": 0.0, "xMin": "", diff --git a/Editor2DLibrary/SSG/shapes/props/834372420.txt b/Editor2DLibrary/SSG/shapes/props/834372420.txt index d668444..c525436 100644 --- a/Editor2DLibrary/SSG/shapes/props/834372420.txt +++ b/Editor2DLibrary/SSG/shapes/props/834372420.txt @@ -44,7 +44,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 0, + "direction": 270, "linkClass": "Omniflo", "label": "", "isDimension": true @@ -63,7 +63,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 0, + "direction": 90, "linkClass": "Omniflo", "label": "", "isDimension": true diff --git a/Editor2DLibrary/SSG/shapes/props/834372421.txt b/Editor2DLibrary/SSG/shapes/props/834372421.txt index 921de5f..2cc62f4 100644 --- a/Editor2DLibrary/SSG/shapes/props/834372421.txt +++ b/Editor2DLibrary/SSG/shapes/props/834372421.txt @@ -43,7 +43,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 0, + "direction": 270, "linkClass": "Omniflo", "label": "", "isDimension": true @@ -62,7 +62,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 0, + "direction": 90, "linkClass": "Omniflo", "label": "", "isDimension": true diff --git a/Editor2DLibrary/SSG/shapes/props/OFWeichenkoerperDoppel.txt b/Editor2DLibrary/SSG/shapes/props/OFWeichenkoerperDoppel.txt index 74f82c4..25ca737 100644 --- a/Editor2DLibrary/SSG/shapes/props/OFWeichenkoerperDoppel.txt +++ b/Editor2DLibrary/SSG/shapes/props/OFWeichenkoerperDoppel.txt @@ -34,7 +34,7 @@ { "id": "cp2", "x": 80.365, - "y": 57.463, + "y": 23.134, "z": 0.0, "xMin": "", "xMax": "", @@ -53,7 +53,7 @@ { "id": "cp3", "x": 919.635, - "y": 57.463, + "y": 23.134, "z": 0.0, "xMin": "", "xMax": "", diff --git a/SVGs/Omniflo/OFWeichen/Optimiert/DeltaWeiche_1400_700_M_834372400.svg b/SVGs/Omniflo/OFWeichen/Optimiert/DeltaWeiche_1400_700_M_834372400.svg index 9118dcc..829dbde 100644 --- a/SVGs/Omniflo/OFWeichen/Optimiert/DeltaWeiche_1400_700_M_834372400.svg +++ b/SVGs/Omniflo/OFWeichen/Optimiert/DeltaWeiche_1400_700_M_834372400.svg @@ -1,18 +1,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/SVGs/Omniflo/OFWeichen/Optimiert/DeltaWeiche_1400_700_P_834372401.svg b/SVGs/Omniflo/OFWeichen/Optimiert/DeltaWeiche_1400_700_P_834372401.svg index a12acfd..1aaed3c 100644 --- a/SVGs/Omniflo/OFWeichen/Optimiert/DeltaWeiche_1400_700_P_834372401.svg +++ b/SVGs/Omniflo/OFWeichen/Optimiert/DeltaWeiche_1400_700_P_834372401.svg @@ -1,18 +1,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/SVGs/Omniflo/OFWeichen/Original/DeltaWeiche_1400_700_M_834372400.svg b/SVGs/Omniflo/OFWeichen/Original/DeltaWeiche_1400_700_M_834372400.svg index 843d917..7405ba5 100644 --- a/SVGs/Omniflo/OFWeichen/Original/DeltaWeiche_1400_700_M_834372400.svg +++ b/SVGs/Omniflo/OFWeichen/Original/DeltaWeiche_1400_700_M_834372400.svg @@ -7,18 +7,18 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + 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 7f2f0fc..975bad8 100644 --- a/SVGs/Omniflo/lib/OFWeiche/01_props_step1_omniflo_weichen.py +++ b/SVGs/Omniflo/lib/OFWeiche/01_props_step1_omniflo_weichen.py @@ -217,7 +217,7 @@ def process_doppelweiche_items(data, BogenProfileWidth, WeichenGerade): item["OFWeiche_CP1_y_mm"] = round(item["Objekt_height_mm"], 4) item["OFWeiche_CP2_x_mm"] = round(round(BogenProfileWidth/2,7) * cos_value, 4) if item["KurvenWinkel"] == 22.5: - item["OFWeiche_CP2_y_mm"] =20 + item["OFWeiche_CP2_y_mm"] =round(round(BogenProfileWidth/2,7) * sin_value, 4) else: item["OFWeiche_CP2_y_mm"] = round(round(BogenProfileWidth/2,7) * sin_value, 4) item["OFWeiche_CP3_x_mm"] = round(round(BogenProfileWidth/2,7) * cos_value + item["OFWeiche_center_line_width_mm"], 4) 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 919976e..0c57b75 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 @@ -237,8 +237,8 @@ def process_json_file(input_file, output_file): cp4_y = round(item["OFWeiche_CP4_y_mm"] * scale*scale_RD_H, 3) cp1_dir = 180 - cp2_dir = round(360 - kurven_winkel, 1) - cp3_dir = round(kurven_winkel, 1) + cp2_dir = 270 + cp3_dir = 90 cp4_dir = 0 connection_points.extend([ diff --git a/SVGs/Omniflo/lib/OFWeiche/02_svg_step2_find_and_mark_auxiliary_lines.py b/SVGs/Omniflo/lib/OFWeiche/02_svg_step2_find_and_mark_auxiliary_lines.py index 61e56eb..3d0ae0e 100644 --- a/SVGs/Omniflo/lib/OFWeiche/02_svg_step2_find_and_mark_auxiliary_lines.py +++ b/SVGs/Omniflo/lib/OFWeiche/02_svg_step2_find_and_mark_auxiliary_lines.py @@ -69,8 +69,8 @@ def process_lr_file(filepath, filename, stats): # Print all straight paths print("\n 🔍 All straight path details:") for line in straight_lines: - print(f" Path{line['index']}: ({line['p1'][0]:.2f},{line['p1'][1]:.2f})→" - f"({line['p2'][0]:.2f},{line['p2'][1]:.2f}) length={line['length']:.4f}mm") + print(f" Path{line['index']}: ({line['p1'][0]:.3f},{line['p1'][1]:.3f})→" + f"({line['p2'][0]:.3f},{line['p2'][1]:.3f}) length={line['length']:.4f}mm") # Group by length length_groups = group_lines_by_length(straight_lines) @@ -81,8 +81,8 @@ def process_lr_file(filepath, filename, stats): for group in perfect_pairs: print(f" ┌ Length group ({group[0]['length']:.4f}mm, 2 paths)") for line in group: - print(f" │ Path{line['index']}: ({line['p1'][0]:.2f},{line['p1'][1]:.2f})→" - f"({line['p2'][0]:.2f},{line['p2'][1]:.2f})") + print(f" │ Path{line['index']}: ({line['p1'][0]:.3f},{line['p1'][1]:.3f})→" + f"({line['p2'][0]:.3f},{line['p2'][1]:.3f})") print(" └" + "─" * 40) if len(perfect_pairs) == 1: @@ -130,8 +130,8 @@ def process_delta_file(filepath, filename, stats): # Print all straight paths print("\n 🔍 All straight path details:") for line in straight_lines: - print(f" Path{line['index']}: ({line['p1'][0]:.2f},{line['p1'][1]:.2f})→" - f"({line['p2'][0]:.2f},{line['p2'][1]:.2f}) length={line['length']:.4f}mm") + print(f" Path{line['index']}: ({line['p1'][0]:.3f},{line['p1'][1]:.3f})→" + f"({line['p2'][0]:.3f},{line['p2'][1]:.3f}) length={line['length']:.4f}mm") # Group by length length_groups = group_lines_by_length(straight_lines) @@ -142,8 +142,8 @@ def process_delta_file(filepath, filename, stats): for group in perfect_triples: print(f" ┌ Length group ({group[0]['length']:.4f}mm, 3 paths)") for line in group: - print(f" │ Path{line['index']}: ({line['p1'][0]:.2f},{line['p1'][1]:.2f})→" - f"({line['p2'][0]:.2f},{line['p2'][1]:.2f})") + print(f" │ Path{line['index']}: ({line['p1'][0]:.3f},{line['p1'][1]:.3f})→" + f"({line['p2'][0]:.3f},{line['p2'][1]:.3f})") print(" └" + "─" * 40) if len(perfect_triples) == 1: @@ -202,8 +202,8 @@ def find_straight_lines(root): 'index': i, 'element': path, 'length': round(length, 4), # Keep 4 decimal places - 'p1': (round(p1[0], 2), round(p1[1], 2)), # Coordinates rounded to 2 decimals - 'p2': (round(p2[0], 2), round(p2[1], 2)) + 'p1': (round(p1[0], 3), round(p1[1], 3)), # Coordinates rounded to 2 decimals + 'p2': (round(p2[0], 3), round(p2[1], 3)) }) return lines diff --git a/SVGs/Omniflo/lib/OFWeiche/json/omniflo_weichen_new.json b/SVGs/Omniflo/lib/OFWeiche/json/omniflo_weichen_new.json index 4466dda..5209993 100644 --- a/SVGs/Omniflo/lib/OFWeiche/json/omniflo_weichen_new.json +++ b/SVGs/Omniflo/lib/OFWeiche/json/omniflo_weichen_new.json @@ -1203,9 +1203,9 @@ "OFWeiche_CP1_x_mm": 120.9385, "OFWeiche_CP1_y_mm": 348.0517, "OFWeiche_CP2_x_mm": 19.4385, - "OFWeiche_CP2_y_mm": 20, + "OFWeiche_CP2_y_mm": 8.0517, "OFWeiche_CP3_x_mm": 222.4385, - "OFWeiche_CP3_y_mm": 20 + "OFWeiche_CP3_y_mm": 8.0517 }, { "Sivasnr": "OFWeichenkoerperDoppel", @@ -1222,9 +1222,9 @@ "OFWeiche_CP1_x_mm": 120.9385, "OFWeiche_CP1_y_mm": 348.0517, "OFWeiche_CP2_x_mm": 19.4385, - "OFWeiche_CP2_y_mm": 20, + "OFWeiche_CP2_y_mm": 8.0517, "OFWeiche_CP3_x_mm": 222.4385, - "OFWeiche_CP3_y_mm": 20 + "OFWeiche_CP3_y_mm": 8.0517 }, { "Sivasnr": 834342101, @@ -1241,9 +1241,9 @@ "OFWeiche_CP1_x_mm": 120.9385, "OFWeiche_CP1_y_mm": 348.0517, "OFWeiche_CP2_x_mm": 19.4385, - "OFWeiche_CP2_y_mm": 20, + "OFWeiche_CP2_y_mm": 8.0517, "OFWeiche_CP3_x_mm": 222.4385, - "OFWeiche_CP3_y_mm": 20 + "OFWeiche_CP3_y_mm": 8.0517 }, { "Sivasnr": 834342200, diff --git a/SVGs/Omniflo/lib/OFWeiche/json/omniflo_weichen_output.json b/SVGs/Omniflo/lib/OFWeiche/json/omniflo_weichen_output.json index e63da9d..095b27e 100644 --- a/SVGs/Omniflo/lib/OFWeiche/json/omniflo_weichen_output.json +++ b/SVGs/Omniflo/lib/OFWeiche/json/omniflo_weichen_output.json @@ -2625,13 +2625,13 @@ "id": "cp2", "x": 0.0, "y": 500.0, - "direction": 360 + "direction": 270 }, { "id": "cp3", "x": 1000.0, "y": 500.0, - "direction": 0 + "direction": 90 }, { "id": "cp4", @@ -2679,13 +2679,13 @@ "id": "cp2", "x": 0.0, "y": 500.0, - "direction": 360 + "direction": 270 }, { "id": "cp3", "x": 1000.0, "y": 500.0, - "direction": 0 + "direction": 90 }, { "id": "cp4", @@ -2940,9 +2940,9 @@ "OFWeiche_CP1_x_mm": 120.9385, "OFWeiche_CP1_y_mm": 348.0517, "OFWeiche_CP2_x_mm": 19.4385, - "OFWeiche_CP2_y_mm": 20, + "OFWeiche_CP2_y_mm": 8.0517, "OFWeiche_CP3_x_mm": 222.4385, - "OFWeiche_CP3_y_mm": 20, + "OFWeiche_CP3_y_mm": 8.0517, "Objekt_width_px": 914.1804, "Objekt_height_px": 1315.471, "calculated_SVG_width_px": 694.9453257, @@ -2960,13 +2960,13 @@ { "id": "cp2", "x": 80.365, - "y": 57.463, + "y": 23.134, "direction": 337.5 }, { "id": "cp3", "x": 919.635, - "y": 57.463, + "y": 23.134, "direction": 22.5 } ] @@ -2986,9 +2986,9 @@ "OFWeiche_CP1_x_mm": 120.9385, "OFWeiche_CP1_y_mm": 348.0517, "OFWeiche_CP2_x_mm": 19.4385, - "OFWeiche_CP2_y_mm": 20, + "OFWeiche_CP2_y_mm": 8.0517, "OFWeiche_CP3_x_mm": 222.4385, - "OFWeiche_CP3_y_mm": 20, + "OFWeiche_CP3_y_mm": 8.0517, "Objekt_width_px": 914.1804, "Objekt_height_px": 1315.471, "calculated_SVG_width_px": 694.9453257, @@ -3006,13 +3006,13 @@ { "id": "cp2", "x": 80.365, - "y": 57.463, + "y": 23.134, "direction": 337.5 }, { "id": "cp3", "x": 919.635, - "y": 57.463, + "y": 23.134, "direction": 22.5 } ] @@ -3032,9 +3032,9 @@ "OFWeiche_CP1_x_mm": 120.9385, "OFWeiche_CP1_y_mm": 348.0517, "OFWeiche_CP2_x_mm": 19.4385, - "OFWeiche_CP2_y_mm": 20, + "OFWeiche_CP2_y_mm": 8.0517, "OFWeiche_CP3_x_mm": 222.4385, - "OFWeiche_CP3_y_mm": 20, + "OFWeiche_CP3_y_mm": 8.0517, "Objekt_width_px": 914.1804, "Objekt_height_px": 1315.471, "calculated_SVG_width_px": 694.9453257, @@ -3052,13 +3052,13 @@ { "id": "cp2", "x": 80.365, - "y": 57.463, + "y": 23.134, "direction": 337.5 }, { "id": "cp3", "x": 919.635, - "y": 57.463, + "y": 23.134, "direction": 22.5 } ] diff --git a/SVGs/Omniflo/lib/TEFWeiche/json/omniflo_TEF_weichen.json b/SVGs/Omniflo/lib/TEFWeiche/json/omniflo_TEF_weichen.json index 7ec033b..04673ee 100644 --- a/SVGs/Omniflo/lib/TEFWeiche/json/omniflo_TEF_weichen.json +++ b/SVGs/Omniflo/lib/TEFWeiche/json/omniflo_TEF_weichen.json @@ -13,7 +13,7 @@ "TEFWeiche_center_line_height_mm": 722.5864, "OFWeiche_CP1_x_mm": 442.8527, "OFWeiche_CP1_y_mm": 715.0010, - "OFWeiche_CP2_x_mm": 92.8502, + "OFWeiche_CP2_x_mm": 92.7237, "OFWeiche_CP2_y_mm": 14.8776, "OFWeiche_CP4_x_mm": 442.8527, "OFWeiche_CP4_y_mm": 355.0010, @@ -65,7 +65,7 @@ "OFWeiche_CP1_y_mm": 764.8776, "OFWeiche_CP2_x_mm": 39.0827, "OFWeiche_CP2_y_mm": 14.8776, - "OFWeiche_CP4_x_mm": 439.8627, + "OFWeiche_CP4_x_mm": 439.0827, "OFWeiche_CP4_y_mm": 404.8776, "TEFWeiche_CPL1_x_mm": 339.0727, "TEFWeiche_CPL1_y_mm": 903.9492, diff --git a/SVGs/Omniflo/lib/TEFWeiche/json/omniflo_TEF_weichen_output.json b/SVGs/Omniflo/lib/TEFWeiche/json/omniflo_TEF_weichen_output.json index 0534ad8..e94e26e 100644 --- a/SVGs/Omniflo/lib/TEFWeiche/json/omniflo_TEF_weichen_output.json +++ b/SVGs/Omniflo/lib/TEFWeiche/json/omniflo_TEF_weichen_output.json @@ -13,7 +13,7 @@ "TEFWeiche_center_line_height_mm": 722.5864, "OFWeiche_CP1_x_mm": 442.8527, "OFWeiche_CP1_y_mm": 715.001, - "OFWeiche_CP2_x_mm": 92.8502, + "OFWeiche_CP2_x_mm": 92.7237, "OFWeiche_CP2_y_mm": 14.8776, "OFWeiche_CP4_x_mm": 442.8527, "OFWeiche_CP4_y_mm": 355.001, @@ -40,7 +40,7 @@ }, { "id": "cp2", - "x": 187.049, + "x": 186.794, "y": 17.334, "direction": 315, "linkClass": "Omniflo" @@ -153,7 +153,7 @@ "OFWeiche_CP1_y_mm": 764.8776, "OFWeiche_CP2_x_mm": 39.0827, "OFWeiche_CP2_y_mm": 14.8776, - "OFWeiche_CP4_x_mm": 439.8627, + "OFWeiche_CP4_x_mm": 439.0827, "OFWeiche_CP4_y_mm": 404.8776, "TEFWeiche_CPL1_x_mm": 339.0727, "TEFWeiche_CPL1_y_mm": 903.9492, @@ -185,7 +185,7 @@ }, { "id": "cp4", - "x": 892.894, + "x": 891.31, "y": 447.899, "direction": 0, "linkClass": "Omniflo" From 1053783fdcfd66fedb3321f3068e8c06e7462170 Mon Sep 17 00:00:00 2001 From: Paul Wolok Date: Tue, 30 Sep 2025 14:25:45 +0200 Subject: [PATCH 3/3] Kopieren der Gefaellestrecke korrigiert --- MAIN_SSG.rdx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index a7684ae..cb1595b 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -38287,7 +38287,7 @@ me.x - +