Update app.py

app.py

@@ -26,15 +26,10 @@ uploaded_file = st.file_uploader("Upload your DXF file", type=["dxf"])
 @st.cache_data
 def extract_geometry(file_bytes):
     try:
-        # Try to open the file as ASCII first
-        doc = ezdxf.read(io.TextIOWrapper(file_bytes, encoding='utf-8', errors='ignore'))
+        doc = ezdxf.read(io.BytesIO(file_bytes))
     except Exception as e:
-        try:
-            # If ASCII fails, attempt to read as binary DXF
-            doc = ezdxf.read(file_bytes)
-        except Exception as ex:
-            st.error(f"Error reading DXF file: {ex}")
-            return [], 0.75, [], [], []
+        st.error(f"Error reading DXF file: {e}")
+        return [], 0.75, [], [], []
 
     msp = doc.modelspace()
     rooms = []
@@ -43,7 +38,22 @@ def extract_geometry(file_bytes):
     windows = []
     wall_thickness = DEFAULT_WALL_THICKNESS
 
-    # Loop through entities in the model space
+    # Detecting walls (parallel lines that represent wall edges)
+    wall_lines = []
+    for entity in msp:
+        if entity.dxftype() == "LINE":
+            wall_lines.append(entity)
+
+    # Check for parallel lines representing a wall (detect double lines)
+    wall_pairs = []
+    for i, line1 in enumerate(wall_lines):
+        for line2 in wall_lines[i + 1:]:
+            if are_lines_parallel(line1, line2):
+                # Calculate the distance between the two parallel lines
+                wall_thickness = calculate_wall_thickness(line1, line2)
+                wall_pairs.append((line1, line2, wall_thickness))
+
+    # Process rooms, doors, and windows from entities
     for entity in msp:
         if entity.dxftype() == "TEXT":
             content = entity.dxf.text.lower()
@@ -54,7 +64,7 @@ def extract_geometry(file_bytes):
                     continue
 
         elif entity.dxftype() == "LWPOLYLINE":
-            # Check if it's a closed polyline representing a wall
+            # Check if it's a closed polyline representing a room
             if entity.closed:
                 points = entity.get_points()
                 x_vals = [p[0] for p in points]
@@ -72,7 +82,25 @@ def extract_geometry(file_bytes):
             elif entity.dxf.layer.lower() == "windows":
                 windows.append(("window", entity.dxf.start.x, entity.dxf.start.y))
 
-    return rooms, wall_thickness, doors, windows, room_shapes
+    return rooms, wall_thickness, doors, windows, room_shapes, wall_pairs
+
+
+# Function to Check if Lines are Parallel
+def are_lines_parallel(line1, line2):
+    dx1, dy1 = line1.dxf.end.x - line1.dxf.start.x, line1.dxf.end.y - line1.dxf.start.y
+    dx2, dy2 = line2.dxf.end.x - line2.dxf.start.x, line2.dxf.end.y - line2.dxf.start.y
+    # Check if the direction vectors are nearly parallel (with some tolerance)
+    tolerance = 0.1
+    return abs(dx1 * dy2 - dy1 * dx2) < tolerance
+
+
+# Function to Calculate the Thickness Between Two Parallel Lines
+def calculate_wall_thickness(line1, line2):
+    x1, y1 = line1.dxf.start.x, line1.dxf.start.y
+    x2, y2 = line2.dxf.start.x, line2.dxf.start.y
+    # Calculate distance between the two lines using the distance formula
+    distance = math.sqrt((x2 - x1) ** 2 + (y2 - y1) ** 2)
+    return distance / 12  # Convert to feet
 
 
 # Estimation Function
@@ -100,6 +128,7 @@ def estimate(rooms, wall_thickness, doors, windows):
         "Brick Volume (cft)": BRICK_VOLUME_CFT
     }
 
+
 # Function to Generate PDF with Estimation
 def generate_pdf(data_dict, calc_details, room_shapes):
     image_path = draw_plan_image(room_shapes)
@@ -143,6 +172,7 @@ def generate_pdf(data_dict, calc_details, room_shapes):
     pdf.output(tmp.name)
     return tmp.name
 
+
 # Function to Draw Plan Image
 def draw_plan_image(room_shapes):
     fig, ax = plt.subplots()
@@ -164,7 +194,7 @@ def draw_plan_image(room_shapes):
 # Streamlit logic to display results
 if uploaded_file:
     file_bytes = io.BytesIO(uploaded_file.read())
-    rooms, wall_thickness, doors, windows, room_shapes = extract_geometry(file_bytes)
+    rooms, wall_thickness, doors, windows, room_shapes, wall_pairs = extract_geometry(file_bytes)
 
     st.success(f"✔️ Parsed {len(rooms)} rooms, {len(doors)} doors, and {len(windows)} windows.")
     st.write(f"📏 Wall Thickness: {wall_thickness} ft")
@@ -191,4 +221,5 @@ if uploaded_file:
         room_shapes
     )
     with open(pdf_file, "rb") as f:
-        st.download_button("Download Estimation Report", f, file_name="Estimation_Report.pdf")
+        st.download_button("Download Estimation PDF", f, file_name="estimation_report.pdf")
+