mehrere oft verwendete Routinen in eigene utils.py eingebaut
This commit is contained in:
+13
-27
@@ -12,12 +12,12 @@ REM echo Dateiname ohne Erweiterung: %FILENAME%
|
||||
REM echo Erweiterung: %EXT%
|
||||
REM echo Verzeichnis: %DIR%
|
||||
REM
|
||||
REM Namen der Zwischenergebnis Dateien
|
||||
set JSON_POS=%FILENAME%_positionsconv.json
|
||||
set JSON_TODRAW=%FILENAME%_todraw.json
|
||||
REM Namen der Ergebnisdateien
|
||||
set ERROR_DOUBLE=%FILENAME%_errors.json
|
||||
set RESULT_TIA=%FILENAME%-*_TIA.xlsx
|
||||
REM Namen der auf dem RENAMER Layer gefundenen Symbole, die überschrieben werden sollen
|
||||
set JSON_SYMBOLS=%FILENAME%_symbols.json
|
||||
|
||||
REM Fehlerdatei
|
||||
set ERROR_FILE=%FILENAME%_errors.json
|
||||
|
||||
|
||||
if exist "%~dp0_setenv.bat" (
|
||||
echo Lade lokale Umgebungseinstellungen aus _setenv.bat...
|
||||
@@ -27,31 +27,17 @@ REM Zielverzeichnis
|
||||
set TARGET_DIR=%PROJECT_IO_RESULTS%\%FILENAME%
|
||||
mkdir "%TARGET_DIR%"
|
||||
REM lösche alte Fehlermeldungen
|
||||
del "%PROJECT_WORK%\%ERROR_DOUBLE%"
|
||||
del "%PROJECT_WORK%\%ERROR_FILE%"
|
||||
|
||||
|
||||
|
||||
echo.
|
||||
echo === Fetching Positions ===
|
||||
call getpositions.bat --filename %1 -s -r -w %JSON_POS% -e %ERROR_DOUBLE%
|
||||
if exist "%PROJECT_WORK%\%ERROR_DOUBLE%" (
|
||||
@echo == failed: errors, e.g. duplicate IDs in given layout
|
||||
pause
|
||||
move %PROJECT_WORK%\%ERROR_DOUBLE% %TARGET_DIR%
|
||||
move %PROJECT_WORK%\%JSON_TODRAW% %TARGET_DIR%
|
||||
|
||||
goto :eof
|
||||
)
|
||||
if not exist "%PROJECT_WORK%\%JSON_POS%" (
|
||||
@echo == failed: getpositions
|
||||
pause
|
||||
goto :eof
|
||||
)
|
||||
echo === Creating Excel Files for TIA, WSCAD, .. ===
|
||||
call portalexport.bat --filename %JSON_POS% --outname %FILENAME%
|
||||
if not exist "%PROJECT_WORK%\%RESULT_TIA%" (
|
||||
@echo == failed: creating .xlsx files
|
||||
echo === Creating enriched dxf file ===
|
||||
call create_numbers.bat --filename %1 --errorfile %PROJECT_WORK%\%ERROR_FILE% --write %PROJECT_WORK%\%JSON_SYMBOLS%
|
||||
if exist "%PROJECT_WORK%\%ERROR_FILE%" (
|
||||
@echo -failed- errors found during processing!
|
||||
pause
|
||||
move %PROJECT_WORK%\%ERROR_FILE% %TARGET_DIR%
|
||||
move %PROJECT_WORK%\%JSON_SYMBOLS% %TARGET_DIR%
|
||||
goto :eof
|
||||
)
|
||||
echo move %PROJECT_WORK%\%FILENAME%-* %TARGET_DIR%
|
||||
|
||||
Reference in New Issue
Block a user