merge konflikt bereinigt
This commit is contained in:
Vendored
+48
@@ -40,6 +40,54 @@
|
||||
"easy_positions.json"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "getpositions with easyhoehe.dxf",
|
||||
"type": "debugpy",
|
||||
"request": "launch",
|
||||
"program": "${file}",
|
||||
"console": "integratedTerminal",
|
||||
"args": [
|
||||
"--filename",
|
||||
"easyhoehe.dxf",
|
||||
"--sensors",
|
||||
"--rack",
|
||||
"--console",
|
||||
"--write",
|
||||
"easyhoehe_positions.json"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "getpositions with easysps.dxf",
|
||||
"type": "debugpy",
|
||||
"request": "launch",
|
||||
"program": "${file}",
|
||||
"console": "integratedTerminal",
|
||||
"args": [
|
||||
"--filename",
|
||||
"easysps.dxf",
|
||||
"--sensors",
|
||||
"--rack",
|
||||
"--console",
|
||||
"--write",
|
||||
"easysps_positions.json"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "getpositions with easy_hdiff_nb.dxf",
|
||||
"type": "debugpy",
|
||||
"request": "launch",
|
||||
"program": "${file}",
|
||||
"console": "integratedTerminal",
|
||||
"args": [
|
||||
"--filename",
|
||||
"easy_hdiff_nb.dxf",
|
||||
"--sensors",
|
||||
"--rack",
|
||||
"--console",
|
||||
"--write",
|
||||
"easy_hdiff_nb_positions.json"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "getpositions with ST500592_Omniflo.dxf",
|
||||
"type": "debugpy",
|
||||
|
||||
Vendored
+1
-1
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"python.languageServer": "Pylance",
|
||||
"python.languageServer": "None",
|
||||
"cSpell.words": [
|
||||
"DXFATTRIBS",
|
||||
"ezdxf"
|
||||
|
||||
+2
-2
@@ -6,6 +6,7 @@ for %%i in ("%~1") do (
|
||||
set "EXT=%%~xi"
|
||||
set "DIR=%%~dpi"
|
||||
)
|
||||
call C:\10-Develop\gitrepos\kabellaengen\bin\setenv.bat
|
||||
|
||||
REM echo Dateiname ohne Erweiterung: %FILENAME%
|
||||
REM echo Erweiterung: %EXT%
|
||||
@@ -19,8 +20,6 @@ set ERROR_DOUBLE=%FILENAME%_errors.json
|
||||
set RESULT_TIA=%FILENAME%-*_TIA.xlsx
|
||||
|
||||
|
||||
call C:\kabellaengen\bin\setenv.bat
|
||||
|
||||
|
||||
echo.
|
||||
echo === Fetching Positions ===
|
||||
@@ -44,6 +43,7 @@ if not exist "%PROJECT_WORK%\%RESULT_TIA%" (
|
||||
goto :eof
|
||||
)
|
||||
mkdir %PROJECT_IO_RESULTS%\%FILENAME%
|
||||
echo move %PROJECT_WORK%\%FILENAME%-* %PROJECT_IO_RESULTS%\%FILENAME%
|
||||
move %PROJECT_WORK%\%FILENAME%-* %PROJECT_IO_RESULTS%\%FILENAME%
|
||||
pause
|
||||
goto :eof
|
||||
|
||||
+5
-6
@@ -1,6 +1,8 @@
|
||||
@echo off
|
||||
REM falls Umlaute in den Pfaden sind:
|
||||
chcp 65001 > nul
|
||||
|
||||
set PROJECT=c:\Kabellaengen
|
||||
set PROJECT=c:\10-Develop\gitrepos\Kabellaengen
|
||||
set PROJECT_BIN=%PROJECT%\bin
|
||||
set PROJECT_CFG=%PROJECT%\cfg
|
||||
set PROJECT_DOC=%PROJECT%\doc
|
||||
@@ -15,8 +17,8 @@ set SIVAS_EXCEL_EXPORT_DIR=%PROJECT_DATA%
|
||||
if not exist %PROJECT%\work mkdir %PROJECT%\work
|
||||
if not exist %PROJECT%\data mkdir %PROJECT%\data
|
||||
|
||||
set PROJECT_IO_RESULTS=Z:\Automatisierung\Konvertierungstools\4_io-Konvertierer
|
||||
set PROJECT_BOM_RESULTS=Z:\Automatisierung\Konvertierungstools\3_Kabellaengen-Konvertierer
|
||||
set PROJECT_IO_RESULTS=%PROJECT_WORK%
|
||||
set PROJECT_BOM_RESULTS=%PROJECT_WORK%
|
||||
set INSTALL_DIR="%ONEDRIVE%\Desktop\Kabeltool"
|
||||
|
||||
set PATH=%PROJECT_BIN%;%PATH%
|
||||
@@ -24,6 +26,3 @@ set PATH=%PROJECT_BIN%;%PATH%
|
||||
|
||||
popd
|
||||
goto :eof
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -84,4 +84,3 @@
|
||||
829434306 = INKREMENTALGEBER 800 5V KPL.
|
||||
|
||||
[Missing]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user