diff --git a/CAD/Code/bin/get_all_differences.bat b/CAD/Code/bin/get_all_differences.bat index a842619..615ad2f 100644 --- a/CAD/Code/bin/get_all_differences.bat +++ b/CAD/Code/bin/get_all_differences.bat @@ -1,4 +1,26 @@ @echo off -REM ~dp0 steht für das Verzeichnis, in der diese Datei liegt +REM ~dp0 steht für das Verzeichnis, in der diese Datei liegt -call diff_dimensions.bat --type WEICHE --json_2d omniflo_weichen.json --json_dimensions dimensions.json --tolerance 0.05 \ No newline at end of file +REM Standardwerte setzen +set "DEFAULT_TYPE=WEICHE" +set "DEFAULT_JSON2D=omniflo_weichen.json" +set "DEFAULT_JSONDIM=dimensions.json" +set "DEFAULT_TOLERANCE=0.05" + +echo Mögliche Werte für --type: BOGEN, WEICHE, TEFBOGEN, TEFWEICHE + +REM Benutzereingaben mit Standardwerten +set /p TYPE=Gib den Typ ein (Standard: %DEFAULT_TYPE%): +if "%TYPE%"=="" set "TYPE=%DEFAULT_TYPE%" + +set /p JSON2D=Gib den Namen der 2D-JSON-Datei ein (Standard: %DEFAULT_JSON2D%): +if "%JSON2D%"=="" set "JSON2D=%DEFAULT_JSON2D%" + +set /p JSONDIM=Gib den Namen der Dimensions-JSON-Datei ein (Standard: %DEFAULT_JSONDIM%): +if "%JSONDIM%"=="" set "JSONDIM=%DEFAULT_JSONDIM%" + +set /p TOLERANCE=Gib die Toleranz ein (Standard: %DEFAULT_TOLERANCE%): +if "%TOLERANCE%"=="" set "TOLERANCE=%DEFAULT_TOLERANCE%" + +REM Aufruf des Skripts mit den eingegebenen oder Standardwerten +call diff_dimensions.bat --type %TYPE% --json_2d %JSON2D% --json_dimensions %JSONDIM% --tolerance %TOLERANCE% diff --git a/CAD/Code/bin/setenv.bat b/CAD/Code/bin/setenv.bat index 7d89d19..876b56d 100644 --- a/CAD/Code/bin/setenv.bat +++ b/CAD/Code/bin/setenv.bat @@ -2,16 +2,17 @@ REM ~dp0 steht für das Verzeichnis, in der diese Datei liegt pushd %~dp0\.. -for /f "delims=" %%i in ('git rev-parse --show-toplevel') do set SSG_RD_DIR=%%i +REM for /f "delims=" %%i in ('git rev-parse --show-toplevel') do set SSG_RD_DIR=%%i -set PROJECT_DIR=%SSG_RD_DIR%\CAD\Code +set PROJECT_DIR=%cd% set PROJECT_BIN=%PROJECT_DIR%\bin set PROJECT_LIB=%PROJECT_DIR%\lib set PROJECT_WORK=%PROJECT_DIR%\work set PROJECT_DATA=%PROJECT_DIR%\data set PROJECT_INPUT=%PROJECT_DIR%\input +set PROJECT_TEMPLATE=\\ssg.local\freigaben\RuleDesigner\Templates\CreateAssemblies if not exist %PROJECT_WORK% mkdir %PROJECT_WORK% if not exist %PROJECT_INPUT% mkdir %PROJECT_INPUT% diff --git a/CAD/Code/data/dummy.asm b/CAD/Code/data/dummy.asm deleted file mode 100644 index e651758..0000000 Binary files a/CAD/Code/data/dummy.asm and /dev/null differ diff --git a/CAD/Code/data/dummy.cfg b/CAD/Code/data/dummy.cfg deleted file mode 100644 index 2edbded..0000000 Binary files a/CAD/Code/data/dummy.cfg and /dev/null differ diff --git a/CAD/Code/data/dummy.par b/CAD/Code/data/dummy.par deleted file mode 100644 index ec5b007..0000000 Binary files a/CAD/Code/data/dummy.par and /dev/null differ diff --git a/CAD/Code/lib/create_assemblies.py b/CAD/Code/lib/create_assemblies.py index 1929480..479bddf 100644 --- a/CAD/Code/lib/create_assemblies.py +++ b/CAD/Code/lib/create_assemblies.py @@ -84,6 +84,7 @@ if __name__ == "__main__": # Umgebungsvariablen & Ordner work_dir = os.environ.get("PROJECT_WORK", "../work") data_dir = os.environ.get("PROJECT_DATA", "../data") + template_dir = os.environ.get("PROJECT_TEMPLATE", "//ssg.local/freigaben/RuleDesigner/Templates/CreateAssemblies") if args.input_dir: input_dir = args.input_dir @@ -100,7 +101,7 @@ if __name__ == "__main__": os.makedirs(work_dir, exist_ok=True) os.makedirs(output_dir, exist_ok=True) - dummy_asm_path = os.path.join(data_dir, "dummy.asm") + dummy_asm_path = os.path.join(template_dir, "dummy.asm") placeholder_name = "dummy.par" documents = start_solid_edge() diff --git a/CAD/OmnifloCAD/WeichenTEFBogenTEFWeichen.dwg b/CAD/OmnifloCAD/WeichenTEFBogenTEFWeichen.dwg index 7110c78..e5dea6a 100644 Binary files a/CAD/OmnifloCAD/WeichenTEFBogenTEFWeichen.dwg and b/CAD/OmnifloCAD/WeichenTEFBogenTEFWeichen.dwg differ diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index 0e3012e..2469b9c 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -8511,7 +8511,7 @@ SSGConnectionPoint.x_M - + @@ -17108,7 +17108,7 @@ SSGConnectionPoint.x_M - + @@ -17117,21 +17117,22 @@ SSGConnectionPoint.x_M + - + - + - + = 0]]> - + @@ -17139,10 +17140,167 @@ SSGConnectionPoint.x_M + + + + + + + + + + + + + + + + + + + + + + + + = 0]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -29219,11 +29377,90 @@ me.x + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -30937,7 +31174,16 @@ me.x - + + + + + + + + + + @@ -33064,7 +33310,7 @@ me.x - + @@ -37397,6 +37643,10 @@ ShapeList["id="+Param.Input[1].shapeID].name + + + + @@ -54219,4 +54469,4 @@ ShapeList["id="+Param.Input[1].shapeID].name - \ No newline at end of file +