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 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 c99de9a..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 c5aeb2d..c91ceb3 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 +set PROJECT=c:\Kabellaengen set PROJECT_BIN=%PROJECT%\bin set PROJECT_CFG=%PROJECT%\cfg set PROJECT_DOC=%PROJECT%\doc @@ -17,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% 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!!) 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)")