From f7331611fd6bd18e5068959028c50ce2027701ab Mon Sep 17 00:00:00 2001
From: Simon Hensch <s.hensch@schoenenberger.de>
Date: Fri, 11 Jul 2025 10:46:12 +0200
Subject: [PATCH] =?UTF-8?q?Fehlende=20.bat=20f=C3=BCr=20den=20Aufruf=20von?=
 =?UTF-8?q?=20diff=5Fdimensions.bat=20hinzugef=C3=BCgt.=20Differenz=20wird?=
 =?UTF-8?q?=20nun=20zus=C3=A4tzlich=20f=C3=BCr=20jedes=20Element=20in=20di?=
 =?UTF-8?q?e=20Ergebnisdatei=20geschrieben?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bin/{merge_dimensions.bat => diff_dimensions.bat}     | 2 +-
 CAD/Code/bin/get_all_differences.bat                      | 4 ++++
 CAD/Code/lib/{merge_dimensions.py => diff_dimensions.py}  | 8 +++++---
 3 files changed, 10 insertions(+), 4 deletions(-)
 rename CAD/Code/bin/{merge_dimensions.bat => diff_dimensions.bat} (66%)
 create mode 100644 CAD/Code/bin/get_all_differences.bat
 rename CAD/Code/lib/{merge_dimensions.py => diff_dimensions.py} (97%)

diff --git a/CAD/Code/bin/merge_dimensions.bat b/CAD/Code/bin/diff_dimensions.bat
similarity index 66%
rename from CAD/Code/bin/merge_dimensions.bat
rename to CAD/Code/bin/diff_dimensions.bat
index 3ca1630..adecbf9 100644
--- a/CAD/Code/bin/merge_dimensions.bat
+++ b/CAD/Code/bin/diff_dimensions.bat
@@ -3,4 +3,4 @@ REM ~dp0 steht für das Verzeichnis, in der diese Datei liegt
 
 call setenv.bat
 
-python "%PROJECT_LIB%\merge_dimensions.py" %*
\ No newline at end of file
+python "%PROJECT_LIB%\diff_dimensions.py" %*
\ No newline at end of file
diff --git a/CAD/Code/bin/get_all_differences.bat b/CAD/Code/bin/get_all_differences.bat
new file mode 100644
index 0000000..a842619
--- /dev/null
+++ b/CAD/Code/bin/get_all_differences.bat
@@ -0,0 +1,4 @@
+@echo off
+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
diff --git a/CAD/Code/lib/merge_dimensions.py b/CAD/Code/lib/diff_dimensions.py
similarity index 97%
rename from CAD/Code/lib/merge_dimensions.py
rename to CAD/Code/lib/diff_dimensions.py
index aa4ee1f..aa3b80d 100644
--- a/CAD/Code/lib/merge_dimensions.py
+++ b/CAD/Code/lib/diff_dimensions.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """
 JSON Integration Script
-Integriert Daten aus JSON_1 in JSON_2 über die Sivasnr
+Erzeugt neue JSON Datei mit den SIVAS-Nummern, dessen Maße von 3D (.par) und 2D (.dwg) nicht übereinstimmen.
 """
 
 import json
@@ -104,13 +104,15 @@ def integrate_json_data(json_dimensions_data, json_2d_data, tolerance):
                 integrated_item = {
                     'Sivasnr': sivasnr,  # Verwende die ursprüngliche Sivasnr aus json_2d_data
                     'Objekt_width_mm': dimensions_width,
-                    'Objekt_height_mm': dimensions_height
+                    'Objekt_height_mm': dimensions_height,
+                    'w_diff': round(width_diff, 3),
+                    'h_diff': round(height_diff,3),
+                    'tolerance': tolerance
                 }
                 # Weitere Attribute aus json_dimensions_data hinzufügen (falls vorhanden)
                 for key, value in json_dimensions_item.items():
                     if key not in ['breite', 'hoehe']:
                         integrated_item[key] = value
-                
                 integrated_data.append(integrated_item)
                 updated_count += 1
             else: