Update utils.py

utils.py

@@ -18,28 +18,24 @@ def calculate_reduced_dimensions(width, height, unit, selection, object_item_val
         reduction_width = object_item_value[selection][item_type]['width']
         reduction_height = object_item_value[selection][item_type]['height']
 
+    divider_h = object_item_value['divider'][item_type]['height']
+    divider_w = object_item_value['divider'][item_type]['width']
+
     # Calculate the reduced dimensions based on the width and height
-    reduced_width = (width - reduction_width) / 2.0
-    reduced_height = height - reduction_height
+    reduced_width = (width - reduction_width) / divider_w
+    reduced_height = (height - reduction_height) / divider_h
     return reduced_width, reduced_height
 
 # Functions for door and window area/frame calculation
 def calculate_area_and_frame(width, height, unit, item_type="Door"):
     # Convert width and height to meters for area and frame calculation
-    width_in_meters = convert_to_meters(width, unit)
-    height_in_meters = convert_to_meters(height, unit)
-    area = width_in_meters * height_in_meters
+    if unit == 'Inches':
+        width = convert_inches_to_feet(width)
+        height = convert_inches_to_feet(height)
+
+    area = int(width * height)
     frame_thickness = {'Door': 0.1, 'Window': 0.05}
-    frame_area = 2 * (width_in_meters + height_in_meters) * frame_thickness.get(item_type, 0.1)
-    
-    # Convert area to square feet if necessary
-    if unit == "Feet":
-        area = area * 10.7639  # Convert square meters to square feet
-        frame_area = frame_area * 10.7639  # Convert frame area to square feet
-    # If the unit is inches, convert to square feet
-    elif unit == "Inches":
-        area = (area * 0.092903) * 10.7639  # Convert inches squared to square feet
-        frame_area = (frame_area * 0.092903) * 10.7639  # Convert frame area to square feet
+    frame_area = 2 * (width + height) * frame_thickness.get(item_type, 0.1)
     
     return area, frame_area