From 8cce5dea26eebbac038627d4e8bc649ca46aaf00 Mon Sep 17 00:00:00 2001 From: mistangl Date: Tue, 8 Jul 2025 13:37:30 +0200 Subject: [PATCH 1/5] =?UTF-8?q?FIX:=20Die=20Dateien=20enthalten=20jetzt=20?= =?UTF-8?q?ein=20-=20anstatt=20von=20=5F=20wegen=20des=20SPS=20Pr=C3=A4fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/ioconverter.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ioconverter.bat b/bin/ioconverter.bat index c99de9a..231ab8b 100644 --- a/bin/ioconverter.bat +++ b/bin/ioconverter.bat @@ -44,7 +44,7 @@ if not exist %RESULT_TIA% ( goto :eof ) mkdir %INSTALL_DIR%\%FILENAME% -move %PROJECT_WORK%\%FILENAME%_* %INSTALL_DIR%\%FILENAME% +move %PROJECT_WORK%\%FILENAME%-* %INSTALL_DIR%\%FILENAME% goto :eof From 0679186a6e1177a1fab70215f3643b46716af073 Mon Sep 17 00:00:00 2001 From: "g.jahn" Date: Thu, 10 Jul 2025 09:20:26 +0200 Subject: [PATCH 2/5] - TARGET2 war nicht definiert --- bin/dropItem_create.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/dropItem_create.bat b/bin/dropItem_create.bat index fc8c373..999f917 100644 --- a/bin/dropItem_create.bat +++ b/bin/dropItem_create.bat @@ -9,7 +9,7 @@ set TARGET1=%PROJECT_BIN%\getexdraw.bat set ICON1=%PROJECT_DOC%\img\Icons\Icon_getex.ico set SHORTCUT2=%INSTALL_DIR%\IOconverter.lnk -set TARGET1=%PROJECT_BIN%\ioconverter.bat +set TARGET2=%PROJECT_BIN%\ioconverter.bat set ICON2=%PROJECT_DOC%\img\Icons\Icon_portal.ico REM ersetze die Zeile mit setenv.bat durch die mit dem neuen Pfad From 0b98271ebcbd15b9f1b58e13dbd053395ff1e164 Mon Sep 17 00:00:00 2001 From: mistangl Date: Thu, 10 Jul 2025 13:30:24 +0200 Subject: [PATCH 3/5] =?UTF-8?q?small=20fix=20f=C3=BCr=20Erdungsbeispiel.?= =?UTF-8?q?=20Position=20aus=20NAME=20ableiten.=20setenv=20enth=C3=A4lt=20?= =?UTF-8?q?die=20Position=20des=20REPOS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/setenv.bat | 4 +--- lib/getpositions.py | 6 ++++-- lib/portalexport.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/setenv.bat b/bin/setenv.bat index c5aeb2d..aba3275 100644 --- a/bin/setenv.bat +++ b/bin/setenv.bat @@ -1,8 +1,6 @@ @echo off -REM ~dp0 steht für das Verzeichnis, in der diese Datei liegt -pushd %~dp0\.. -set PROJECT=C:\kabellaengen +for /f "delims=" %%i in ('git rev-parse --show-toplevel') do set PROJECT=%%i set PROJECT_BIN=%PROJECT%\bin set PROJECT_CFG=%PROJECT%\cfg set PROJECT_DOC=%PROJECT%\doc diff --git a/lib/getpositions.py b/lib/getpositions.py index 2efcbfb..dc05ef4 100644 --- a/lib/getpositions.py +++ b/lib/getpositions.py @@ -6,8 +6,8 @@ import sys import json import re from ezdxf.addons import iterdxf -import re from pathlib import Path +import ezdxf.filemanagement from shapely.geometry import Point @@ -68,6 +68,8 @@ def get_attributes_of_insert(dinsert, dpos): if "NAME" in dinsert: typ = get_type_of_name_cfg(dinsert["NAME"]) id = dinsert["NAME"] + pos = dpos["NAME"] + ld["pos"] = (pos[0], pos[1]) if "IO" in dinsert: attr_text = dinsert["IO"] @@ -523,7 +525,7 @@ def get_dxf_file(filepath): """ try: print("reading file ..", end='') - doc = ezdxf.readfile(filepath) + doc = ezdxf.filemanagement.readfile(filepath) print("done") except IOError: print(f"Not a DXF file or a generic I/O error.") diff --git a/lib/portalexport.py b/lib/portalexport.py index ac53869..aafdfbd 100644 --- a/lib/portalexport.py +++ b/lib/portalexport.py @@ -89,8 +89,8 @@ def do_exports(converter, export_mode, output_dir, base_input, lines): if __name__ == "__main__": parser = argparse.ArgumentParser(description="Excel-Konverter für BMK-Daten") - parser.add_argument("--mode", type=str, choices=["EA", "TIA", "WSCAD", "WSCAD_OBZG"], - help="Art des Exports (EA, TIA, WSCAD, WSCAD_OBZG). Wenn nicht gesetzt, werden die ersten drei erzeugt.") + parser.add_argument("--mode", type=str, choices=["EA", "TIA", "WSCAD"], + help="Art des Exports (EA, TIA, WSCAD). Wenn nicht gesetzt, werden die ersten drei erzeugt.") parser.add_argument("--no_bezug", action="store_true", help="(Nur bei WSCAD) Export ohne Bezugsinformationen") parser.add_argument("--input", type=str, help="Pfad zur Eingabedatei in Form einer Kommaseparierten .csv Datei (.txt)") From 1983696644f9ac5a40520fc04163936f6451f871 Mon Sep 17 00:00:00 2001 From: mistangl Date: Mon, 14 Jul 2025 14:23:05 +0200 Subject: [PATCH 4/5] =?UTF-8?q?weitere=20K=C3=BCrzel=20zur=20Suche=20im=20?= =?UTF-8?q?Layout=20mit=20aufgenommen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cfg/BMK.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cfg/BMK.cfg b/cfg/BMK.cfg index 102acaa..e746e52 100644 --- a/cfg/BMK.cfg +++ b/cfg/BMK.cfg @@ -21,6 +21,9 @@ PF DI QA SF +UH +UC +UZ # Zuordnung von Kürzeln zu Kabeltypen in kabel.cfg (ier zugewiesene Kabel-Sektion muss in kabel.cfg vorhanden sein und SIVAS-Nummern enthalten!) # Mapping of Equipment-Prefixes to Cable Types found in kabel.cfg (Cable-Section must be included in kabel.cfg!!) From 9cff95a396093fb2174a2260147ed8bf21fb4602 Mon Sep 17 00:00:00 2001 From: Marcus Schellhammer Date: Mon, 14 Jul 2025 14:37:59 +0200 Subject: [PATCH 5/5] - Die Auslieferungsorte der Ergebnisse sollen immer auf Z: liegen. ioconverter.bat und getexdraw.bat haben jeweils eigene Zielverzeichnisse. setenv.bat entsprechend angepasst --- bin/getexdraw.bat | 2 +- bin/ioconverter.bat | 3 ++- bin/setenv.bat | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bin/getexdraw.bat b/bin/getexdraw.bat index d398659..c1951c6 100644 --- a/bin/getexdraw.bat +++ b/bin/getexdraw.bat @@ -58,7 +58,7 @@ if not exist "%PROJECT_WORK%\%EXCEL_RES%" ( echo. mkdir %INSTALL_DIR%\%FILENAME% -move %PROJECT_WORK%\%FILENAME%_* %INSTALL_DIR%\%FILENAME% +move %PROJECT_WORK%\%FILENAME%_* %BOM_RESULTS_DIR%\%FILENAME% pause diff --git a/bin/ioconverter.bat b/bin/ioconverter.bat index 231ab8b..734c4e0 100644 --- a/bin/ioconverter.bat +++ b/bin/ioconverter.bat @@ -44,7 +44,8 @@ if not exist %RESULT_TIA% ( goto :eof ) mkdir %INSTALL_DIR%\%FILENAME% -move %PROJECT_WORK%\%FILENAME%-* %INSTALL_DIR%\%FILENAME% +move %PROJECT_WORK%\%FILENAME%-* %IO_RESULTS_DIR%\%FILENAME% +pause goto :eof diff --git a/bin/setenv.bat b/bin/setenv.bat index aba3275..c91ceb3 100644 --- a/bin/setenv.bat +++ b/bin/setenv.bat @@ -1,6 +1,6 @@ @echo off -for /f "delims=" %%i in ('git rev-parse --show-toplevel') do set PROJECT=%%i +set PROJECT=c:\Kabellaengen set PROJECT_BIN=%PROJECT%\bin set PROJECT_CFG=%PROJECT%\cfg set PROJECT_DOC=%PROJECT%\doc @@ -15,6 +15,8 @@ set SIVAS_EXCEL_EXPORT_DIR=%PROJECT_DATA% if not exist %PROJECT%\work mkdir %PROJECT%\work if not exist %PROJECT%\data mkdir %PROJECT%\data +set IO_RESULTS_DIR=Z:\Automatisierung\Konvertierungstools\4_io-Konvertierer +set BOM_RESULTS_DIR=Z:\Automatisierung\Konvertierungstools\3_Kabellängen-Konvertierer set INSTALL_DIR="%ONEDRIVE%\Desktop\Kabeltool" set PATH=%PROJECT_BIN%;%PATH%