Update app.py

app.py

@@ -1,54 +1,63 @@
 import streamlit as st
 import ezdxf
 import io
+import pandas as pd
+from fpdf import FPDF
+from tempfile import NamedTemporaryFile
 
 # Constants
-BRICK_VOLUME_CFT = (9/12) * (4.5/12) * (3/12)  # in cft
+BRICK_VOLUME_CFT = (9/12) * (4.5/12) * (3/12)
 CEMENT_SAND_RATIO = 1 / 6
 SAND_RATIO = 5 / 6
 CEMENT_DENSITY_KG_PER_CFT = 1440 / 35.3147
 CEMENT_BAG_WEIGHT_KG = 50
+DEFAULT_WALL_THICKNESS = 0.75
 
-st.set_page_config(page_title="CAD-based Quantity Estimator", page_icon="📐")
-st.title("📐 Brick, Cement & Sand Estimation from AutoCAD (.dxf)")
+st.set_page_config(page_title="Building Estimator from CAD", layout="wide")
+st.title("🏗️ Auto Estimation from AutoCAD (.dxf) Drawing")
 
-uploaded_file = st.file_uploader("Upload your .dxf AutoCAD file", type=["dxf"])
+# Upload DXF file
+uploaded_file = st.file_uploader("Upload your DXF file", type=["dxf"])
 
-def extract_from_dxf(file):
-    doc = ezdxf.read(file)
+@st.cache_data
+def extract_geometry(file_bytes):
+    doc = ezdxf.read_binary(file_bytes)
     msp = doc.modelspace()
 
     rooms = []
-    wall_thickness = 0.75  # Default
     openings = []
+    floors = 1
+    wall_thickness = DEFAULT_WALL_THICKNESS
 
     for entity in msp:
         if entity.dxftype() == "TEXT":
             content = entity.dxf.text.lower()
-            if "room" in content and "x" in content:
+            if "wall thickness" in content:
                 try:
-                    dims = content.split(":")[1].strip().split("x")
-                    l, w, h = map(float, dims)
-                    rooms.append((l, w, h))
+                    wall_thickness = float(content.split(":")[1].strip())
                 except:
                     continue
-            elif "wall thickness" in content:
+            elif "floor" in content:
                 try:
-                    wt = float(content.split(":")[1].strip())
-                    wall_thickness = wt
+                    floors = int(content.split(":")[1].strip())
                 except:
                     continue
-            elif any(x in content for x in ["door", "window", "opening"]):
-                try:
-                    dims = content.split(":")[1].strip().split("x")
-                    l, h = map(float, dims)
-                    openings.append(("opening", l, h))
-                except:
-                    continue
-
-    return rooms, wall_thickness, openings
 
-def estimate(rooms, wall_thickness, openings):
+        elif entity.dxftype() == "LWPOLYLINE":
+            if entity.closed and len(entity) == 4:
+                points = entity.get_points()
+                x_vals = [p[0] for p in points]
+                y_vals = [p[1] for p in points]
+                length = abs(max(x_vals) - min(x_vals)) / 12  # inches to ft
+                width = abs(max(y_vals) - min(y_vals)) / 12
+                height = 10  # default wall height in ft unless labeled
+                if length > 2 and width > 2:  # Room
+                    rooms.append((length, width, height))
+                else:
+                    openings.append(("opening", length, height))
+    return rooms, wall_thickness, openings, floors
+
+def estimate(rooms, wall_thickness, openings, floors):
     wall_volume = 0
     for length, width, height in rooms:
         wall_area = 2 * (length + width) * height
@@ -56,41 +65,69 @@ def estimate(rooms, wall_thickness, openings):
 
     opening_volume = sum(l * h * wall_thickness for _, l, h in openings)
 
-    beam_volume = 0
-    for _, l, _ in openings:
-        beam_len = l + 1  # add 1ft
-        beam_volume += beam_len * 0.75 * 0.75
+    beam_volume = sum((l + 1) * 0.75 * 0.75 for _, l, _ in openings)
 
-    net_volume = wall_volume - opening_volume - beam_volume
+    net_volume = (wall_volume - opening_volume - beam_volume) * floors
 
     number_of_bricks = round((net_volume / BRICK_VOLUME_CFT) * 1.05)
     mortar_volume = net_volume * 0.25
     cement_volume = mortar_volume * CEMENT_SAND_RATIO
     sand_volume = mortar_volume * SAND_RATIO
-
     cement_bag_volume_cft = CEMENT_BAG_WEIGHT_KG / CEMENT_DENSITY_KG_PER_CFT
     cement_bags = round(cement_volume / cement_bag_volume_cft)
 
     return number_of_bricks, sand_volume, cement_bags
 
+def generate_pdf(data_dict):
+    pdf = FPDF()
+    pdf.add_page()
+    pdf.set_font("Arial", size=12)
+    pdf.cell(200, 10, "Estimation Report", ln=True, align='C')
+    pdf.ln(10)
+
+    for key, value in data_dict.items():
+        pdf.cell(200, 10, f"{key}: {value}", ln=True)
+
+    tmp = NamedTemporaryFile(delete=False, suffix=".pdf")
+    pdf.output(tmp.name)
+    return tmp.name
+
 if uploaded_file:
-    st.success("✅ File uploaded. Parsing...")
-    rooms, wall_thickness, openings = extract_from_dxf(io.BytesIO(uploaded_file.read()))
+    file_bytes = uploaded_file.read()
+    rooms, wall_thickness, openings, floors = extract_geometry(io.BytesIO(file_bytes))
+
+    st.success(f"✔️ Parsed {len(rooms)} rooms and {len(openings)} openings across {floors} floor(s).")
+    st.write(f"📏 Wall Thickness: {wall_thickness} ft")
+
+    bricks, sand, cement = estimate(rooms, wall_thickness, openings, floors)
+
+    st.subheader("📊 Estimation Result")
+    st.write(f"🧱 **Bricks Required:** {bricks:,}")
+    st.write(f"🏖️ **Sand Volume:** {sand:.2f} cft")
+    st.write(f"🪣 **Cement Bags:** {cement} (50kg each)")
+
+    # Display table
+    df = pd.DataFrame({
+        "Item": ["Bricks", "Sand (cft)", "Cement (bags)"],
+        "Quantity": [bricks, round(sand, 2), cement]
+    })
+
+    st.dataframe(df)
 
-    if rooms:
-        st.write(f"🧱 Rooms Detected: {len(rooms)}")
-        for i, r in enumerate(rooms, 1):
-            st.write(f"Room {i}: {r[0]}x{r[1]}x{r[2]} ft")
+    # Export buttons
+    st.subheader("📤 Export")
+    col1, col2 = st.columns(2)
 
-        st.write(f"📏 Wall Thickness: {wall_thickness} ft")
-        st.write(f"🚪 Openings Detected: {len(openings)}")
+    with col1:
+        st.download_button("📥 Download as Excel", df.to_csv(index=False).encode(), "estimates.csv", "text/csv")
 
-        bricks, sand, cement = estimate(rooms, wall_thickness, openings)
+    with col2:
+        pdf_file = generate_pdf({
+            "Bricks Required": f"{bricks:,}",
+            "Sand Volume": f"{sand:.2f} cft",
+            "Cement Bags": f"{cement} bags"
+        })
+        with open(pdf_file, "rb") as f:
+            st.download_button("📄 Download as PDF", f.read(), "estimates.pdf", "application/pdf")
 
-        st.subheader("📊 Estimated Quantities:")
-        st.write(f"🧱 **Bricks Needed:** {bricks:,} bricks")
-        st.write(f"🏖️ **Sand Needed:** {sand:.2f} cft")
-        st.write(f"🪣 **Cement Needed:** {cement} bags (50kg each)")
-    else:
-        st.warning("No room data found. Please check the .dxf text format.")