m.stangl/kabellaengen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://gitea.schoenenberger.de/mistangl/kabellaengen

Browse Source
This commit is contained in:
lertlmaier
2025-07-14 14:45:38 +02:00
parent 20025a8327 9cff95a396
commit 08a9800002
7 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/dropItem_create.bat
+1 -1
View File
@@ -9,7 +9,7 @@ set TARGET1=%PROJECT_BIN%\getexdraw.bat
set ICON1=%PROJECT_DOC%\img\Icons\Icon_getex.ico set ICON1=%PROJECT_DOC%\img\Icons\Icon_getex.ico
set SHORTCUT2=%INSTALL_DIR%\IOconverter.lnk 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 set ICON2=%PROJECT_DOC%\img\Icons\Icon_portal.ico
REM ersetze die Zeile mit setenv.bat durch die mit dem neuen Pfad REM ersetze die Zeile mit setenv.bat durch die mit dem neuen Pfad
bin/getexdraw.bat
+1 -1
View File
@@ -58,7 +58,7 @@ if not exist "%PROJECT_WORK%\%EXCEL_RES%" (
echo. echo.
mkdir %INSTALL_DIR%\%FILENAME% mkdir %INSTALL_DIR%\%FILENAME%
move %PROJECT_WORK%\%FILENAME%_* %INSTALL_DIR%\%FILENAME% move %PROJECT_WORK%\%FILENAME%_* %BOM_RESULTS_DIR%\%FILENAME%
pause pause
bin/ioconverter.bat
+2 -1
View File
@@ -44,7 +44,8 @@ if not exist %RESULT_TIA% (
goto :eof goto :eof
) )
mkdir %INSTALL_DIR%\%FILENAME% mkdir %INSTALL_DIR%\%FILENAME%
move %PROJECT_WORK%\%FILENAME%_* %INSTALL_DIR%\%FILENAME% move %PROJECT_WORK%\%FILENAME%-* %IO_RESULTS_DIR%\%FILENAME%
pause
goto :eof goto :eof
bin/setenv.bat
+3 -3
View File
@@ -1,8 +1,6 @@
@echo off @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_BIN=%PROJECT%\bin
set PROJECT_CFG=%PROJECT%\cfg set PROJECT_CFG=%PROJECT%\cfg
set PROJECT_DOC=%PROJECT%\doc 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%\work mkdir %PROJECT%\work
if not exist %PROJECT%\data mkdir %PROJECT%\data 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 INSTALL_DIR="%ONEDRIVE%\Desktop\Kabeltool"
set PATH=%PROJECT_BIN%;%PATH% set PATH=%PROJECT_BIN%;%PATH%
cfg/BMK.cfg
+3
View File
@@ -21,6 +21,9 @@ PF
DI DI
QA QA
SF 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!) # 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!!) # Mapping of Equipment-Prefixes to Cable Types found in kabel.cfg (Cable-Section must be included in kabel.cfg!!)
lib/getpositions.py
+4 -2
View File
@@ -6,8 +6,8 @@ import sys
import json import json
import re import re
from ezdxf.addons import iterdxf from ezdxf.addons import iterdxf
import re
from pathlib import Path from pathlib import Path
import ezdxf.filemanagement
from shapely.geometry import Point from shapely.geometry import Point
@@ -68,6 +68,8 @@ def get_attributes_of_insert(dinsert, dpos):
if "NAME" in dinsert: if "NAME" in dinsert:
typ = get_type_of_name_cfg(dinsert["NAME"]) typ = get_type_of_name_cfg(dinsert["NAME"])
id = dinsert["NAME"] id = dinsert["NAME"]
pos = dpos["NAME"]
ld["pos"] = (pos[0], pos[1])
if "IO" in dinsert: if "IO" in dinsert:
attr_text = dinsert["IO"] attr_text = dinsert["IO"]
@@ -523,7 +525,7 @@ def get_dxf_file(filepath):
""" """
try: try:
print("reading file ..", end='') print("reading file ..", end='')
doc = ezdxf.readfile(filepath) doc = ezdxf.filemanagement.readfile(filepath)
print("done") print("done")
except IOError: except IOError:
print(f"Not a DXF file or a generic I/O error.") print(f"Not a DXF file or a generic I/O error.")
lib/portalexport.py
+2 -2
View File
@@ -89,8 +89,8 @@ def do_exports(converter, export_mode, output_dir, base_input, lines):
if __name__ == "__main__": if __name__ == "__main__":
parser = argparse.ArgumentParser(description="Excel-Konverter für BMK-Daten") parser = argparse.ArgumentParser(description="Excel-Konverter für BMK-Daten")
parser.add_argument("--mode", type=str, choices=["EA", "TIA", "WSCAD", "WSCAD_OBZG"], parser.add_argument("--mode", type=str, choices=["EA", "TIA", "WSCAD"],
help="Art des Exports (EA, TIA, WSCAD, WSCAD_OBZG). Wenn nicht gesetzt, werden die ersten drei erzeugt.") 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("--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)") parser.add_argument("--input", type=str, help="Pfad zur Eingabedatei in Form einer Kommaseparierten .csv Datei (.txt)")