From 31084defdb797b18756d90b20905d08bcd0341ac Mon Sep 17 00:00:00 2001 From: mistangl Date: Wed, 4 Feb 2026 16:39:52 +0100 Subject: [PATCH] Positionen von Elementen und Dimensionen von MA und POT korrigiert --- .vscode/launch.json | 29 ++++++++++++++++++--- cfg/create_tests.json | 60 +++++++++++++++++++++++++++++++------------ lib/create_numbers.py | 2 -- 3 files changed, 68 insertions(+), 23 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index ce92a78..a78761b 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -367,10 +367,20 @@ "args": [ "--filename", "BGMG.dxf", "--errorfile", "BGMG_errors.json", - "--write", "BGMG_symbols.json" + "--info", "BGMG_symbols.json" ] - }, - { + },{ + "name": "create_numbers.py with Nummerierung1.dxf", + "type": "debugpy", + "request": "launch", + "program": "${file}", + "console": "integratedTerminal", + "args": [ + "--filename", "Nummerierung1.dxf", + "--errorfile", "Nummerierung1_errors.json", + "--info", "Nummerierung1_symbols.json" + ] + }, { "name": "create_numbers.py with BGMG-UndefSymbols.dxf", "type": "debugpy", "request": "launch", @@ -379,7 +389,18 @@ "args": [ "--filename", "BGMG-UndefSymbols.dxf", "--errorfile", "BGMG-UndefSymbols_errors.json", - "--write", "BGMG-UndefSymbols_symbols.json" + "--info", "BGMG-UndefSymbols_symbols.json" + ] + }, { + "name": "create_numbers.py with POT.dxf", + "type": "debugpy", + "request": "launch", + "program": "${file}", + "console": "integratedTerminal", + "args": [ + "--filename", "POT.dxf", + "--errorfile", "POT_errors.json", + "--info", "POT_symbols.json" ] } ] diff --git a/cfg/create_tests.json b/cfg/create_tests.json index bcac278..074cb1b 100644 --- a/cfg/create_tests.json +++ b/cfg/create_tests.json @@ -25,7 +25,7 @@ "name": "MA-2@@_bottom", "count": 3, "layout_type": "horizontal_offset", - "base_x": 2000, + "base_x": 1800, "base_y": 400, "spacing": 1450 } @@ -37,10 +37,10 @@ "kennzeichnung": "A01+UH00", "layer_name": "ILS_MOTOR", "direction": "LEFT_RIGHT", - "x": 800, - "y": 900, + "x": 1400, + "y": 1200, "width": 4000, - "height": 450, + "height": 680, "use_polyline": false }, { @@ -61,9 +61,9 @@ "kennzeichnung": "A01+UH00", "layer_name": "ILS_MOTOR", "direction": "TOP_BOTTOM", - "x": 1400, + "x": 1600, "y": 250, - "width": 3600, + "width": 4000, "height": 680, "use_polyline": false } @@ -335,28 +335,28 @@ "description": "Test-Szene für POT-Erdungssymbole mit drei verschiedenen Typen (POT-RA30@@, POT-MA30@@, POT-UC30@@)", "pot_groups": [ { - "name": "POT-RA30@@", + "name": "POT-RA30@@_RA", "count": 3, "layout_type": "horizontal", "base_x": 1000, "base_y": 3000, - "spacing": 2000 + "spacing": 2500 }, { - "name": "POT-MA30@@", + "name": "POT-MA30@@_MA", "count": 3, "layout_type": "horizontal", "base_x": 1000, "base_y": 2000, - "spacing": 2000 + "spacing": 2500 }, { - "name": "POT-UC30@@", + "name": "POT-UC30@@_UC", "count": 3, "layout_type": "horizontal", "base_x": 1000, "base_y": 1000, - "spacing": 2000 + "spacing": 2500 } ], "renaming_frames": [ @@ -372,7 +372,7 @@ "direction": "LEFT_RIGHT", "x": 800, "y": 800, - "width": 5500, + "width": 7200, "height": 2800, "use_polyline": false } @@ -387,7 +387,7 @@ "attributes": { "SPS": "1", "IO": "MA0000", - "VERW": "ILSMotor", + "VERW": "ILS-M03@@", "BEZEICHNUNG": "Motor MA0000", "ARTIKELNR": "790902001", "ARTIKELBEZEICHN": "E-Teile für SEW Motor ASE1-HAN10ES-BG", @@ -418,9 +418,35 @@ }, "dimensions": { "_comment": "Symbol-Dimensionen für POT-Erdung. Basiert auf Block-Analyse: 816 × 618", - "width": 820, - "height": 620 - } + "width": 1400, + "height": 300 + }, + "attrib_defs": [ + { + "tag": "REALE_POSITION", + "insert": [0.0, 200.0, 0.0], + "height": 50.0, + "default": "x", + "layer": "ILS_POT-Erdung", + "invisible": false + }, + { + "tag": "NAME", + "insert": [50, 100, 0.0], + "height": 128.0, + "default": "POT-1@@@", + "layer": "ILS_POT-Erdung", + "invisible": false + }, + { + "tag": "KENNZEICHNUNG", + "insert": [0.0, -150, 0.0], + "height": 128.0, + "default": "=A01+UH00-X01", + "layer": "ILS_POT-Erdung", + "invisible": true + } + ] }, "bg_defaults": { "_description": "Standard-Werte für BG/MB-Symbole (Eingänge/Ausgänge). Basiert auf Analyse von BG3240 aus easy.dxf", diff --git a/lib/create_numbers.py b/lib/create_numbers.py index 16d3dc4..da9322c 100644 --- a/lib/create_numbers.py +++ b/lib/create_numbers.py @@ -1105,8 +1105,6 @@ if __name__ == '__main__': error_data = error_collector.get_all_issues() write_json_file(error_data, dxf_path.parent, error_filename) print(f"Fehler/Warnungen gespeichert: {dxf_path.parent / error_filename}") - else: - print("\nKeine Fehler oder Warnungen - keine Fehlerdatei wird geschrieben") # Exit-Code basierend auf Fehlern if error_collector.has_errors():