From c022a9240c5f394104591b37df2eea3ad2048c6f Mon Sep 17 00:00:00 2001
From: mistangl <m.stangl@schoenenberger.de>
Date: Tue, 29 Jul 2025 09:13:41 +0200
Subject: [PATCH] merge konflikt bereinigt

---
 .vscode/launch.json   | 48 +++++++++++++++++++++++++++++++++++++++++++
 .vscode/settings.json |  2 +-
 bin/ioconverter.bat   |  4 ++--
 bin/setenv.bat        | 11 +++++-----
 cfg/bezeichner.cfg    |  1 -
 5 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 6e44043..eb82f85 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -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",
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 8b1c6ca..5b30f74 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
-    "python.languageServer": "Pylance",
+    "python.languageServer": "None",
     "cSpell.words": [
         "DXFATTRIBS",
         "ezdxf"
diff --git a/bin/ioconverter.bat b/bin/ioconverter.bat
index 02f4e05..80e2c43 100644
--- a/bin/ioconverter.bat
+++ b/bin/ioconverter.bat
@@ -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%
@@ -18,8 +19,6 @@ REM Namen der Ergebnisdateien
 set ERROR_DOUBLE=%FILENAME%_errors.json
 set RESULT_TIA=%FILENAME%-*_TIA.xlsx
 
-    
-call C:\kabellaengen\bin\setenv.bat
 
 
 echo.
@@ -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
diff --git a/bin/setenv.bat b/bin/setenv.bat
index 01ec355..d52e067 100644
--- a/bin/setenv.bat
+++ b/bin/setenv.bat
@@ -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
-
-
-
diff --git a/cfg/bezeichner.cfg b/cfg/bezeichner.cfg
index 3ceeb24..e2a7977 100644
--- a/cfg/bezeichner.cfg
+++ b/cfg/bezeichner.cfg
@@ -84,4 +84,3 @@
 829434306 = INKREMENTALGEBER 800 5V KPL.
 
 [Missing]
-