Update app.py

app.py

@@ -1,18 +1,15 @@
 import streamlit as st
 import ezdxf
+import tempfile
 import pandas as pd
 import os
 
+# ---------- Function to extract data from DXF ----------
 def extract_entities(uploaded_file):
-    import ezdxf
-    import tempfile
-
-    # Save the uploaded file to a temporary file
     with tempfile.NamedTemporaryFile(delete=False, suffix=".dxf") as tmp:
         tmp.write(uploaded_file.read())
         tmp_path = tmp.name
 
-    # Read using ezdxf.readfile (expects a path, and handles binary too)
     doc = ezdxf.readfile(tmp_path)
     msp = doc.modelspace()
 
@@ -20,7 +17,7 @@ def extract_entities(uploaded_file):
     section_data = {"slabs": [], "beams": [], "columns": []}
 
     for e in msp:
-        if e.dxftype() == "LWPOLYLINE" and e.dxf.layer.lower() == "plan":
+        if e.dxftype() == "LWPOLYLINE" and "plan" in e.dxf.layer.lower():
             points = e.get_points()
             plan_data["rooms"].append({"points": points})
         elif e.dxftype() == "LINE" and "door" in e.dxf.layer.lower():
@@ -37,72 +34,111 @@ def extract_entities(uploaded_file):
 
     return plan_data, section_data
 
+# ---------- Function to estimate quantities ----------
+def estimate_quantities(plan_data, section_data):
+    items = []
 
-def calculate_quantities(plan_data, section_data):
-    results = []
-
-    # Sample calculation — replace with real parsing logic
+    # Room brickwork (assuming wall height 10 ft, thickness 9 in)
     for room in plan_data["rooms"]:
-        length = 15
-        width = 12
-        height = 10
-        volume = length * width * height
-
-        opening_volume = len(plan_data["doors"]) * 21 + len(plan_data["windows"]) * 15
-        net_volume = volume - opening_volume
-        brick_volume = 9 * 4.5 * 3 / 1728  # in ft³
-        num_bricks = int(net_volume / brick_volume)
-
-        results.append({
-            "Component": "Wall",
-            "Length (ft)": length,
-            "Width (ft)": 0.75,
-            "Height (ft)": height,
-            "Total Bricks": num_bricks,
-            "Unit": "Bricks"
+        points = room["points"]
+        if len(points) < 2:
+            continue
+        perimeter = 0
+        for i in range(len(points)):
+            x1, y1 = points[i][0:2]
+            x2, y2 = points[(i+1) % len(points)][0:2]
+            dist = ((x2 - x1)**2 + (y2 - y1)**2)**0.5
+            perimeter += dist
+
+        # Convert from inches (assuming drawing in inches)
+        height = 10 * 12
+        thickness = 9
+        volume = perimeter * height * thickness  # cubic inches
+        volume_cft = volume / 1728  # to cubic feet
+        bricks = volume / (9 * 4.5 * 3)  # number of bricks
+
+        items.append({
+            "Item": "Brick Masonry (Room)",
+            "Length": round(perimeter, 2),
+            "Width": 9,
+            "Height": height,
+            "Quantity": round(volume_cft, 2),
+            "Unit": "CFT"
+        })
+        items.append({
+            "Item": "Bricks (Room)",
+            "Length": "-",
+            "Width": "-",
+            "Height": "-",
+            "Quantity": round(bricks, 0),
+            "Unit": "No"
         })
 
+    # Basic concrete estimation (dummy logic, assuming 1 slab = 12'x12'x6")
     for slab in section_data["slabs"]:
-        slab_volume = 20 * 10 * 0.5
-        results.append({
-            "Component": "Slab",
-            "Length (ft)": 20,
-            "Width (ft)": 10,
-            "Depth (ft)": 0.5,
-            "Volume (cu ft)": slab_volume,
-            "Unit": "cu ft"
+        length = 12
+        width = 12
+        depth = 0.5
+        volume = length * width * depth
+        cement_bags = volume * 1.54 / 5.5  # assuming M20 mix
+        sand = volume * 1.54 * (1.5 / 5.5)
+        crush = volume * 1.54 * (3 / 5.5)
+
+        items.append({
+            "Item": "Concrete Slab",
+            "Length": length,
+            "Width": width,
+            "Height": depth,
+            "Quantity": round(volume, 2),
+            "Unit": "CFT"
+        })
+        items.append({
+            "Item": "Cement Bags (Slab)",
+            "Length": "-",
+            "Width": "-",
+            "Height": "-",
+            "Quantity": round(cement_bags, 1),
+            "Unit": "Bags"
+        })
+        items.append({
+            "Item": "Sand (Slab)",
+            "Length": "-",
+            "Width": "-",
+            "Height": "-",
+            "Quantity": round(sand, 1),
+            "Unit": "CFT"
+        })
+        items.append({
+            "Item": "Crush (Slab)",
+            "Length": "-",
+            "Width": "-",
+            "Height": "-",
+            "Quantity": round(crush, 1),
+            "Unit": "CFT"
         })
 
-    return pd.DataFrame(results)
-
-def save_to_excel(df):
-    os.makedirs("output", exist_ok=True)
-    output_path = os.path.join("output", "quantities.xlsx")
-    df.to_excel(output_path, index=False)
-    return output_path
+    return pd.DataFrame(items)
 
-# Streamlit UI
-st.set_page_config(page_title="Construction Estimator", layout="wide")
-st.title("🏗️ Construction Material Estimator (Australian Standards)")
+# ---------- Streamlit App UI ----------
+st.set_page_config(layout="centered")
+st.title("🏗️ AutoCAD Drawing Estimator (AU Standards)")
 
-uploaded_file = st.file_uploader("📂 Upload AutoCAD DXF File", type=["dxf"])
+uploaded_file = st.file_uploader("Upload AutoCAD DXF File", type=["dxf"])
 
 if uploaded_file:
-    st.info("⏳ Processing DXF file...")
-    plan_data, section_data = extract_entities(uploaded_file)
-
-    st.success("✅ DXF parsed successfully.")
-
-    st.write("### 📐 Plan View Summary")
-    st.json(plan_data)
+    with st.spinner("Reading and analyzing the drawing..."):
+        try:
+            plan_data, section_data = extract_entities(uploaded_file)
+            df = estimate_quantities(plan_data, section_data)
 
-    st.write("### 🧮 Estimating Materials...")
-    result_df = calculate_quantities(plan_data, section_data)
+            st.success("✅ Drawing processed and estimate generated.")
+            st.dataframe(df)
 
-    st.write("### 📊 Final Quantities")
-    st.dataframe(result_df)
+            output_path = "Construction_Estimate.xlsx"
+            df.to_excel(output_path, index=False)
 
-    excel_path = save_to_excel(result_df)
+            with open(output_path, "rb") as f:
+                st.download_button("📥 Download Estimate (Excel)", f, file_name=output_path)
 
-    with open(excel_path, "rb") as f:
-        st.download_button("📥 Download Excel Report", f, "quantities.xlsx")
+        except Exception as e:
+            st.error(f"Error processing file: {e}")