From 09d597f627b9b7850ebaeba0dd069e88e711c560 Mon Sep 17 00:00:00 2001 From: mistangl Date: Thu, 26 Jun 2025 12:50:56 +0200 Subject: [PATCH] =?UTF-8?q?Bugfix=20im=20Pfad=20der=20Fehlerabfrage.=20Vol?= =?UTF-8?q?lst=C3=A4ndiger=20Pfad=20zu=20den=20Zwischendateien=20n=C3=B6ti?= =?UTF-8?q?g.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/getexdraw.bat | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/bin/getexdraw.bat b/bin/getexdraw.bat index cbf2858..3dd6c2a 100644 --- a/bin/getexdraw.bat +++ b/bin/getexdraw.bat @@ -10,29 +10,37 @@ for %%i in ("%~1") do ( REM echo Dateiname ohne Erweiterung: %FILENAME% REM echo Erweiterung: %EXT% REM echo Verzeichnis: %DIR% +REM +REM Namen der Zwischenergebnis Dateien +set JSON_POS=%FILENAME%_positions.json +set JSON_TODRAW=%FILENAME%_todraw.json +REM Namen der Ergebnisdateien +set EXCEL_RES=%FILENAME%_cables.xlsx +set DXF_RES=%FILENAME%_cables.dxf -call C:\kabellaengen\bin\setenv.bat +call C:\10-Develop\gitrepos\kabellaengen\bin\setenv.bat echo --hole Positionen -call getpositions.bat --filename %1 -s -r -w %FILENAME%_positions.json -if not exist "%FILENAME%_positions.json" ( - @echo getpositions failed +call getpositions.bat --filename %1 -s -r -w %JSON_POS% + +if not exist "%PROJECT_WORK%\%JSON_POS%" ( + @echo -failed- getpositions pause goto :eof ) echo --erzeuge Graph mit Routing -call routing.bat --filename %FILENAME%_positions.json -w %FILENAME%_todraw.json -if not exist "%FILENAME%_todraw.json" ( - @echo routing failed +call routing.bat --filename %JSON_POS% -w %JSON_TODRAW% +if not exist "%PROJECT_WORK%\%JSON_TODRAW%" ( + @echo -failed- routing pause goto :eof ) echo --zeichne Kabel in dxf Datei -call draw_dxf.bat --filename %FILENAME%_todraw.json --new %FILENAME%_cables.dxf -x %FILENAME%_cables.xlsx -if not exist "%FILENAME%_cables.xlsx" ( - @echo draw_dxf failed +call draw_dxf.bat --filename %JSON_TODRAW% --new %DXF_RES% -x %EXCEL_RES% +if not exist "%PROJECT_WORK%\%EXCEL_RES%" ( + @echo -failed- draw_dxf pause goto :eof )