merge fix

bin/getexdraw.bat

@@ -4,7 +4,7 @@ if [%1]==[] goto usage
 for /F %%i in ("%1") do set FILENAME=%%~ni
 
     
-call setenv.bat
+call C:\10-Develop\gitrepos\kabellaengen\bin\setenv.bat
 
 
 echo --hole Positionen

bin/install.bat

@@ -7,5 +7,38 @@ set SHORTCUT=%INSTALL_DIR%\create_cables.lnk
 
 set TARGET=%PROJECT_BIN%\getexdraw.bat
 set ICON=%PROJECT_DOC%\img\Icons\Icon_Gemini2.ico
- 
-powershell -Command "$s=(New-Object -COM WScript.Shell).CreateShortcut('%SHORTCUT%');$s.TargetPath='%TARGET%';$s.IconLocation='%ICON%';$s.Save()"
+
+@echo off
+setlocal enabledelayedexpansion
+
+@echo off
+(
+if [%1]==[] goto usage
+for /F %%i in ("%1") do set FILENAME=%%~ni
+
+    
+call %%PROJECT_BIN%%\setenv.bat
+
+
+echo --hole Positionen
+call getpositions.bat --filename %1 -s -r -w  %FILENAME%_positions.json
+echo --erzeuge Graph mit Routing
+call routing.bat --filename %FILENAME%_positions.json -w %FILENAME%_todraw.json 
+echo --zeichne Kabel in dxf Datei 
+call draw_dxf.bat --filename %FILENAME%_todraw.json --new %FILENAME%_cables.dxf -x %FILENAME%_cables.xlsx --copy_layer %FILENAME%_reduziert.dxf --origin %1
+
+move %PROJECT_WORK%\%FILENAME%_* %INSTALL_DIR%
+pause
+endlocal
+
+goto :eof
+
+
+:usage
+@echo Usage: %0 ^<dxfinWorkOrdner.dxf^>
+exit /B 1
+goto :eof
+) > _getexdraw.bat
+
+REM Icon anlegen
+REM powershell -Command "$s=(New-Object -COM WScript.Shell).CreateShortcut('%SHORTCUT%');$s.TargetPath='%TARGET%';$s.IconLocation='%ICON%';$s.Save()"

bin/setenv.bat

@@ -2,7 +2,7 @@
 REM ~dp0 steht für das Verzeichnis, in der diese Datei liegt 
 pushd %~dp0\..
 
-set PROJECT=C:\10-Develop\kabellaengen
+set PROJECT=C:\10-Develop\gitrepos\kabellaengen
 set PROJECT_BIN=%PROJECT%\bin
 set PROJECT_CFG=%PROJECT%\cfg
 set PROJECT_DOC=%PROJECT%\doc