From 291b2eaec5da9539e187f3303a64bae82a0adb46 Mon Sep 17 00:00:00 2001 From: Paul Wolok Date: Mon, 15 Sep 2025 17:04:45 +0200 Subject: [PATCH] =?UTF-8?q?Bei=20plant2dxf=20wird=20die=20h=C3=B6he=20nun?= =?UTF-8?q?=20mittgenommen=20und=20bei=20dxf2lib=20wird=20wieder=20der=20r?= =?UTF-8?q?ichtige=20Ordner=20benutzt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/dxf2lib.py | 2 +- lib/plant2dxf.py | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/dxf2lib.py b/lib/dxf2lib.py index 51c9199..14e7d06 100644 --- a/lib/dxf2lib.py +++ b/lib/dxf2lib.py @@ -749,7 +749,7 @@ if __name__ == "__main__": INPUT_DIR = Path(args.input) print(f"Verwende Input-Verzeichnis: {INPUT_DIR} \n") else: - INPUT_DIR = check_environment_var("PROJECT_DATA") / "dxf" + INPUT_DIR = check_environment_var("PROJECT_DATA") / "omniflo" print(f"Kein Input-Verzeichnis angegeben, verwende Standard: {INPUT_DIR} \n") OUTPUT_FILE = check_environment_var("PROJECT_DATA") / "block_libraries" / f"{args.name}.dxf" diff --git a/lib/plant2dxf.py b/lib/plant2dxf.py index 6c73022..1fc0267 100644 --- a/lib/plant2dxf.py +++ b/lib/plant2dxf.py @@ -344,9 +344,8 @@ def handle_omniflo(msp, teileid, merkmale, x, y, doc, lib_doc, verbose, symbols) dx = halbe_laenge * math.sin(winkel_rad) dy = halbe_laenge * math.cos(winkel_rad) - - start = (x + dx, y + dy) - ende = (x - dx, y - dy) + start = (x + dx, y + dy, float(merkmale.get("Höhe oben"))*1000 ) + ende = (x - dx, y - dy, float(merkmale.get("Höhe unten"))*1000 ) msp.add_line(start, ende) if verbose: @@ -367,13 +366,12 @@ def handle_omniflo(msp, teileid, merkmale, x, y, doc, lib_doc, verbose, symbols) blockref_layer = get_layer(doc, lib_doc, blockname) drehung = merkmale.get("Drehung") - bref = msp.add_blockref(blockname, (x, y), dxfattribs={"xscale": 1.0, "yscale":1.0,"rotation": drehung, "layer": blockref_layer}) + bref = msp.add_blockref(blockname, (x, y,float(merkmale.get("Höhe"))), dxfattribs={"xscale": 1.0, "yscale":1.0,"rotation": drehung, "layer": blockref_layer}) bref.add_attrib( tag= "NAME", text= merkmale.get("bezeichner"), - insert = (x,y), - + insert = (x,y) )