Update app.py

app.py

@@ -5,6 +5,9 @@ import pandas as pd
 import matplotlib.pyplot as plt
 from fpdf import FPDF
 from tempfile import NamedTemporaryFile
+import matplotlib.pyplot as plt
+import matplotlib.patches as patches
+import tempfile
 
 # Constants
 BRICK_VOLUME_CFT = (9/12) * (4.5/12) * (3/12)
@@ -78,16 +81,72 @@ def estimate(rooms, wall_thickness, openings, floors):
     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
+    return number_of_bricks, sand_volume, cement_bags, {
+        "Wall Volume (cft)": wall_volume,
+        "Opening Volume (cft)": opening_volume,
+        "Beam Volume (cft)": beam_volume,
+        "Net Volume (cft)": net_volume,
+        "Mortar Volume (cft)": mortar_volume,
+        "Cement Volume (cft)": cement_volume,
+        "Sand Volume (cft)": sand_volume,
+        "Cement Bag Volume (cft)": cement_bag_volume_cft,
+        "Brick Volume (cft)": BRICK_VOLUME_CFT
+    }
+
+def draw_plan_image(room_shapes):
+    fig, ax = plt.subplots()
+    for x0, y0, x1, y1 in room_shapes:
+        width = x1 - x0
+        height = y1 - y0
+        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
+
+def generate_pdf(data_dict, calc_details, room_shapes):
+    image_path = draw_plan_image(room_shapes)
 
-def generate_pdf(data_dict):
     pdf = FPDF()
     pdf.add_page()
-    pdf.set_font("Arial", size=12)
+    pdf.set_font("Arial", 'B', size=14)
     pdf.cell(200, 10, "Estimation Report", ln=True, align='C')
-    pdf.ln(10)
+    pdf.ln(5)
+
+    pdf.set_font("Arial", 'B', size=12)
+    pdf.cell(200, 10, "Summary of Quantities", ln=True)
+    pdf.set_font("Arial", '', size=11)
     for key, value in data_dict.items():
         pdf.cell(200, 10, f"{key}: {value}", ln=True)
+
+    pdf.ln(8)
+    pdf.set_font("Arial", 'B', size=12)
+    pdf.cell(200, 10, "Step-by-Step Calculations with Formulas", ln=True)
+
+    pdf.set_font("Arial", '', size=10)
+    pdf.multi_cell(0, 8, f"""
+1. Wall Volume = 2 × (L + W) × H × t = {round(calc_details['Wall Volume (cft)'], 2)} cft
+2. Opening Volume = L × H × t = {round(calc_details['Opening Volume (cft)'], 2)} cft
+3. Beam Volume = (L+1) × 0.75 × 0.75 = {round(calc_details['Beam Volume (cft)'], 2)} cft
+4. Net Volume = (Wall - Opening - Beam) × Floors = {round(calc_details['Net Volume (cft)'], 2)} cft
+5. Brick Volume = 9" × 4.5" × 3" = {round(calc_details['Brick Volume (cft)'], 4)} cft
+6. Bricks = Net Volume / Brick Vol × 1.05 = {data_dict['Bricks Required']}
+7. Mortar = Net Volume × 0.25 = {round(calc_details['Mortar Volume (cft)'], 2)} cft
+8. Cement = Mortar × 1/6 = {round(calc_details['Cement Volume (cft)'], 2)} cft
+9. Sand = Mortar × 5/6 = {round(calc_details['Sand Volume (cft)'], 2)} cft
+10. Cement Bags = Cement / Bag Volume = {data_dict['Cement Bags']}
+    """)
+
+    pdf.ln(5)
+    pdf.set_font("Arial", 'B', size=12)
+    pdf.cell(200, 10, "2D Plan with Dimensions (in ft)", ln=True)
+    pdf.image(image_path, x=10, y=None, w=180)
+
     tmp = NamedTemporaryFile(delete=False, suffix=".pdf")
     pdf.output(tmp.name)
     return tmp.name
@@ -99,7 +158,7 @@ def plot_rooms(shapes):
         height = (y1 - y0)
         rect = plt.Rectangle((x0, y0), width, height, fill=False, edgecolor='blue', linewidth=2)
         ax.add_patch(rect)
-    ax.set_title("🧭 2D Floor Plan")
+    ax.set_title("🗏️ 2D Floor Plan")
     ax.set_aspect("equal")
     ax.axis("off")
     st.pyplot(fig)
@@ -111,9 +170,9 @@ if uploaded_file:
     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)
+    bricks, sand, cement, calc_details = estimate(rooms, wall_thickness, openings, floors)
 
-    st.subheader("📐 Room Dimensions")
+    st.subheader("📊 Room Dimensions")
     df_rooms = pd.DataFrame(rooms, columns=["Length (ft)", "Width (ft)", "Height (ft)"])
     st.dataframe(df_rooms)
 
@@ -127,7 +186,7 @@ if uploaded_file:
     st.subheader("🖼️ 2D Floor Plan")
     plot_rooms(room_shapes)
 
-    st.subheader("📤 Export")
+    st.subheader("📄 Export")
     col1, col2 = st.columns(2)
     with col1:
         st.download_button("⬇️ Download Excel", df_result.to_csv(index=False).encode(), "estimates.csv", "text/csv")
@@ -136,9 +195,7 @@ if uploaded_file:
             "Bricks Required": f"{bricks:,}",
             "Sand Volume": f"{sand:.2f} cft",
             "Cement Bags": f"{cement} bags"
-        })
+        }, calc_details, room_shapes)
         with open(pdf_file, "rb") as f:
             st.download_button("⬇️ Download PDF", f.read(), "estimates.pdf", "application/pdf")
 
-
-