Update scalingtestupdated.py

scalingtestupdated.py

@@ -198,6 +198,7 @@ PAPER_SIZES = {
 }
 
 
+
 def calculate_paper_scaling_factor(
     paper_contour: np.ndarray, 
     paper_size: str, 
@@ -205,12 +206,17 @@ def calculate_paper_scaling_factor(
 ) -> Tuple[float, str]:
     """
     Calculate scaling factor based on detected paper dimensions with proper unit handling.
+    Includes empirical correction factor for improved accuracy.
     
     :param paper_contour: Detected paper contour
     :param paper_size: Paper size identifier ("A4", "A3", "US Letter")
     :param output_unit: Desired unit for scaling factor ("mm" or "inches")
     :return: Tuple of (scaling_factor, unit_string)
     """
+    # Empirical correction factor based on measurement analysis
+    # Your measurements show DXF is ~79% of original size, so we need to reduce scaling by this factor
+    CORRECTION_FACTOR = 0.79  # Adjust this value if needed based on more measurements
+    
     # Get paper dimensions in the desired unit
     if output_unit == "inches":
         expected_width = PAPER_SIZES[paper_size]["width_inches"]
@@ -230,12 +236,38 @@ def calculate_paper_scaling_factor(
     scale_x = expected_width / detected_width_px
     scale_y = expected_height / detected_height_px
     
-    # Use the minimum scale to ensure the object fits within expected dimensions
-    scaling_factor = min(scale_x, scale_y)
+    # Try different approaches to find the best scaling factor
+    
+    # Method 1: Use minimum scale (your current approach)
+    scaling_factor_min = min(scale_x, scale_y)
+    
+    # Method 2: Use average scale (often more accurate for real-world images)
+    scaling_factor_avg = (scale_x + scale_y) / 2
+    
+    # Method 3: Use aspect ratio to determine orientation and pick appropriate scale
+    detected_aspect_ratio = detected_width_px / detected_height_px
+    expected_aspect_ratio = expected_width / expected_height
+    
+    if abs(detected_aspect_ratio - expected_aspect_ratio) < abs(detected_aspect_ratio - (1/expected_aspect_ratio)):
+        # Same orientation
+        scaling_factor_oriented = (scale_x + scale_y) / 2
+    else:
+        # Rotated 90 degrees
+        scale_x_rot = expected_height / detected_width_px
+        scale_y_rot = expected_width / detected_height_px
+        scaling_factor_oriented = (scale_x_rot + scale_y_rot) / 2
+    
+    # Choose the best method (you can experiment with different methods)
+    base_scaling_factor = scaling_factor_avg  # Changed from min to avg
+    
+    # Apply correction factor
+    scaling_factor = base_scaling_factor * CORRECTION_FACTOR
     
     print(f"Paper detection: {detected_width_px}x{detected_height_px} px")
     print(f"Expected paper size: {expected_width}x{expected_height} {output_unit}")
     print(f"Scale X: {scale_x:.6f}, Scale Y: {scale_y:.6f}")
+    print(f"Base scaling (avg): {base_scaling_factor:.6f}")
+    print(f"Correction factor: {CORRECTION_FACTOR}")
     print(f"Final scaling factor: {scaling_factor:.6f} {unit_string}")
     
     return scaling_factor, unit_string