From d928f858ba1bdbf694297467409eca6224cbef50 Mon Sep 17 00:00:00 2001 From: "g.jahn" Date: Thu, 5 Jun 2025 14:48:15 +0200 Subject: [PATCH 1/3] =?UTF-8?q?Pfade=20angepasst,=20so=20dass=20es=20aufgr?= =?UTF-8?q?und=20der=20Rechte=20auf=20meinem=20Rechner=20l=C3=A4uft?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/install.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/install.bat b/bin/install.bat index ee2ef08..998c9f9 100644 --- a/bin/install.bat +++ b/bin/install.bat @@ -1,10 +1,10 @@ @echo on -set TARGETDIR="%ONEDRIVE%\Desktop\Kabeltool" +set TARGETDIR="%USERPROFILE%\Desktop\Kabeltool" mkdir %TARGETDIR% set SHORTCUT=%TARGETDIR%\create_cables.lnk -set CHECKOUT_DIR="C:\10-Develop\gitrepos\kabellaengen" +set CHECKOUT_DIR="C:\kabellaengen" set TARGET=%CHECKOUT_DIR%\bin\run.bat set ICON=%CHECKOUT_DIR%\doc\img\Icons\Icon_Gemini2.ico From a3656faf6da9b2dc129e5d8d761bdc75a75044b3 Mon Sep 17 00:00:00 2001 From: "g.jahn" Date: Thu, 5 Jun 2025 15:51:21 +0200 Subject: [PATCH 2/3] Checkout Directory ist aufgrund der Rechte direkt auf C: Installation des Icons und Hotfolders ist jetzt nicht auf ONEDRIVE sondern auf dem lokalem Desktop --- bin/install_py.bat | 2 +- bin/run.bat | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/install_py.bat b/bin/install_py.bat index e57772f..ca9b59f 100644 --- a/bin/install_py.bat +++ b/bin/install_py.bat @@ -1,7 +1,7 @@ call setenv.bat if not exist %PROJECT%\.venv ( ECHO Initialisiere Python virtual environment... - python -m venv %PROJECT%\.venv --upgrade-deps + py -m venv %PROJECT%\.venv --upgrade-deps ECHO Erfolgreich. call %PROJECT%\.venv\Scripts\activate.bat diff --git a/bin/run.bat b/bin/run.bat index 803b90e..e3e360a 100644 --- a/bin/run.bat +++ b/bin/run.bat @@ -2,8 +2,8 @@ echo Datei wurde übergeben: %1 for /F %%i in ("%1") do set FILENAME=%%~ni -set TARGET="%ONEDRIVE%\Desktop\Kabeltool" -set CHECKOUT_DIR=C:\10-Develop\gitrepos\kabellaengen +set TARGET="%USERPROFILE%\Desktop\Kabeltool" +set CHECKOUT_DIR=C:\kabellaengen call %CHECKOUT_DIR%\bin\setenv.bat call %CHECKOUT_DIR%\bin\getexdraw.bat %1 From a0e7fdfa5b89d82c67808b94a3b5ad35dc5fa035 Mon Sep 17 00:00:00 2001 From: "g.jahn" Date: Thu, 5 Jun 2025 15:58:29 +0200 Subject: [PATCH 3/3] =?UTF-8?q?Runden=20der=20Kabel=20jetzt=20auf=205m=20L?= =?UTF-8?q?=C3=A4ngen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/drawdxf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/drawdxf.py b/lib/drawdxf.py index 08931a4..32bbf53 100644 --- a/lib/drawdxf.py +++ b/lib/drawdxf.py @@ -137,7 +137,7 @@ def write_excel_from_json(plines:Polylines, outpath:str): for pl in plines.kabel: length = pl.length /1000 # Umrechnung von mm in m - rounded_len = math.ceil(length/10)*10 + rounded_len = math.ceil(length/5)*5 length_summary[rounded_len] +=1 ws1.append([pl.id, length, int(rounded_len)])