Update app.py

app.py

@@ -7,6 +7,7 @@ from fpdf import FPDF
 import matplotlib.patches as patches
 import tempfile
 import math
+from io import BytesIO
 
 # Constants for estimation
 BRICK_VOLUME_CFT = (9 / 12) * (4.5 / 12) * (3 / 12)  # Brick Volume in Cubic Feet
@@ -26,10 +27,11 @@ uploaded_file = st.file_uploader("Upload your DXF file", type=["dxf"])
 @st.cache_data
 def extract_geometry(file_bytes):
     try:
-        doc = ezdxf.read(io.BytesIO(file_bytes))
+        # Use BytesIO to read the uploaded file bytes properly
+        doc = ezdxf.read(file_bytes)
     except Exception as e:
         st.error(f"Error reading DXF file: {e}")
-        return [], 0.75, [], [], []
+        return [], 0.75, [], [], [], []
 
     msp = doc.modelspace()
     rooms = []
@@ -37,6 +39,7 @@ def extract_geometry(file_bytes):
     doors = []
     windows = []
     wall_thickness = DEFAULT_WALL_THICKNESS
+    wall_pairs = []
 
     # Detecting walls (parallel lines that represent wall edges)
     wall_lines = []
@@ -45,7 +48,6 @@ def extract_geometry(file_bytes):
             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):
@@ -182,44 +184,43 @@ def draw_plan_image(room_shapes):
         rect = patches.Rectangle((x0, y0), width, height, linewidth=1, edgecolor='black', facecolor='none')
         ax.add_patch(rect)
         ax.text(x0 + width / 2, y0 - 2, f"{round(width / 12, 1)} ft", ha='center', fontsize=8)
-        ax.text(x1 + 2, y0 + height / 2, f"{round(height / 12, 1)} ft", va='center', fontsize=8, rotation=90)
-    ax.set_aspect('equal')
-    ax.axis('off')
-    temp_file = tempfile.NamedTemporaryFile(delete=False, suffix=".png")
-    fig.savefig(temp_file.name, bbox_inches='tight')
-    plt.close(fig)
-    return temp_file.name
-
-
-# Streamlit logic to display results
-if uploaded_file:
-    file_bytes = io.BytesIO(uploaded_file.read())
-    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")
-
-    # Estimate the materials
-    bricks, sand, cement, calc_details = estimate(rooms, wall_thickness, doors, windows)
-
-    # Display Room Dimensions
-    st.subheader("📊 Room Dimensions")
-    df_rooms = pd.DataFrame(rooms, columns=["Length (ft)", "Width (ft)", "Height (ft)"])
-    st.dataframe(df_rooms)
-
-    # Display Estimation Results
-    st.subheader("🧱 Estimation Result")
-    st.write(f"Total Bricks Required: {bricks}")
-    st.write(f"Total Sand Volume: {sand} cft")
-    st.write(f"Total Cement Bags: {cement}")
-
-    # Generate and provide download link for the PDF
-    st.subheader("📄 Export")
-    pdf_file = generate_pdf(
-        {"Bricks Required": bricks, "Sand Volume (cft)": sand, "Cement Bags": cement},
-        calc_details,
-        room_shapes
-    )
-    with open(pdf_file, "rb") as f:
-        st.download_button("Download Estimation PDF", f, file_name="estimation_report.pdf")
+        ax.text(x1 + 2, y0 + height / 2, f"{round(height / 12, 1)} ft", va='center', fontsize=8)
+    
+    ax.set_aspect('equal', 'box')
+    ax.set_title("2D Room Layout")
+    ax.set_xlabel("X (ft)")
+    ax.set_ylabel("Y (ft)")
+    plt.axis('off')
+    
+    img_path = "/tmp/room_layout.png"
+    plt.savefig(img_path)
+    plt.close()
+    return img_path
+
+
+# Main function to handle Streamlit interface
+if uploaded_file is not None:
+    file_bytes = uploaded_file.read()
+
+    try:
+        rooms, wall_thickness, doors, windows, room_shapes, wall_pairs = extract_geometry(file_bytes)
+        st.write(f"Found {len(rooms)} rooms, {len(doors)} doors, {len(windows)} windows.")
+        
+        if rooms:
+            number_of_bricks, sand_volume, cement_bags, calc_details = estimate(rooms, wall_thickness, doors, windows)
 
+            st.write(f"Estimated Bricks Required: {number_of_bricks}")
+            st.write(f"Estimated Cement Bags: {cement_bags}")
+            st.write(f"Estimated Sand Volume (cft): {sand_volume}")
+
+            pdf_file = generate_pdf({
+                "Bricks Required": number_of_bricks,
+                "Cement Bags": cement_bags,
+                "Sand Volume (cft)": sand_volume
+            }, calc_details, room_shapes)
+
+            with open(pdf_file, "rb") as f:
+                st.download_button("Download Estimation PDF", f, file_name="estimation_report.pdf")
+
+    except Exception as e:
+        st.error(f"Error: {str(e)}")