Update app.py

app.py

@@ -1541,6 +1541,109 @@ with gr.Blocks(title="🧪 Toilet Segmentation & Measurement App") as full_app_i
         out_image = gr.Image(label="🔝 Top Rim Width", height=600, width=800)
     with gr.Row():
         top_width_str = gr.Textbox(label="🔝 Top Width:", interactive=False, elem_id='pretty-box')
+        
+    import gradio as gr
+    
+    def get_predictions_by_unit(unit, closed_remaining_in, top_to_hole_line_inch,
+                            hole_width_inch, out_rimellipse_inch, rim_height_inch, out_dist_in):
+        # Compute values in inches
+        a1 = abs(closed_remaining_in - top_to_hole_line_inch)
+        b1 = top_to_hole_line_inch
+        c1 = hole_width_inch
+        d1 = float(out_rimellipse_inch["right_inner"]) * 2
+        e1 = float(out_rimellipse_inch["down_inner"]) * 2
+        f1 = float(out_rimellipse_inch["right_outer"]) * 2
+        g1 = rim_height_inch
+        h1 = out_dist_in
+
+        if unit == "in":
+            return [a1, b1, c1, d1, e1, f1, g1, h1]
+        elif unit == "cm":
+            return [x * 2.54 for x in [a1, b1, c1, d1, e1, f1, g1, h1]]
+        else:
+            return [0.0] * 8
+
+    def compare_measurements(a1, b1, c1, d1, e1, f1, g1, h1, a2, b2, c2, d2, e2, f2, g2, h2):
+        a2, b2, c2, d2, e2, f2, g2, h2 = float(a2), float(b2), float(c2), float(d2), float(e2), float(f2), float(g2), float(h2)
+        a1, b1, c1, d1, e1, f1, g1, h1 = float(a1), float(b1), float(c1), float(d1), float(e1), float(f1), float(g1), float(h1)
+        def error(gt, pred):
+            if gt == 0:
+                return "N/A"
+            return f"{abs(gt - pred) / gt * 100:.2f}%"
+
+        errors = {
+            "a": error(a2, a1),
+            "b": error(b2, b1),
+            "c": error(c2, c1),
+            "d": error(d2, d1),
+            "e": error(e2, e1),
+            "f": error(f2, f1),
+            "g": error(g2, g1),
+            "h": error(h2, h1)
+        }
+
+        valid_errors = [
+            abs(gt - pred) / gt * 100
+            for gt, pred in [
+                (a2, a1), (b2, b1), (c2, c1), (d2, d1), (e2, e1), (f2, f1), (g2, g1), (h2, h1)
+            ] if gt != 0
+        ]
+
+        avg_error = f"{sum(valid_errors)/len(valid_errors):.2f}%" if valid_errors else "N/A"
+
+        return errors, f"✅ Average Error: {avg_error}"
+    
+    gr.Markdown("## 📐 Ground Truth vs Predicted Measurements Comparison")
+
+    with gr.Row():
+        gr.Markdown("### 🖼️ Reference Diagram")
+        ref_image = gr.Image(value="./static/reference.jpg", interactive=False, label="Measurement Guide")
+
+    unit_dropdown = gr.Radio(choices=["in", "cm"], label="Select Unit", value="in")
+
+    with gr.Row():
+        with gr.Column():
+            gr.Markdown("### 📊 Predicted Values")
+            a1 = gr.Number(label="a", interactive=False)
+            b1 = gr.Number(label="b", interactive=False)
+            c1 = gr.Number(label="c", interactive=False)
+            d1 = gr.Number(label="d", interactive=False)
+            e1 = gr.Number(label="e", interactive=False)
+            f1 = gr.Number(label="f", interactive=False)
+            g1 = gr.Number(label="g", interactive=False)
+            h1 = gr.Number(label="h", interactive=False)
+
+        with gr.Column():
+            gr.Markdown("### ✅ Enter True Values")
+            a2 = gr.Number(label="a")
+            b2 = gr.Number(label="b")
+            c2 = gr.Number(label="c")
+            d2 = gr.Number(label="d")
+            e2 = gr.Number(label="e")
+            f2 = gr.Number(label="f")
+            g2 = gr.Number(label="g")
+            h2 = gr.Number(label="h")
+    
+    def update_preds(unit, closed_remaining_in_p11, top_to_hole_line_inch_p10, hole_width_inch_p9, out_rimellipse_inch_p7, rim_height_inch_p8, out_dist_in):
+        return get_predictions_by_unit(unit, closed_remaining_in_p11, top_to_hole_line_inch_p10,hole_width_inch_p9, out_rimellipse_inch_p7,rim_height_inch_p8, out_dist_in)
+    
+    unit_dropdown.change(
+        fn=update_preds,
+        inputs=[unit_dropdown, closed_remaining_in_p11, top_to_hole_line_inch_p10, hole_width_inch_p9, out_rimellipse_inch_p7, rim_height_inch_p8, out_dist_in],
+        outputs=[a1, b1, c1, d1, e1, f1, g1, h1]
+    )
+
+    submit_btn = gr.Button("📈 Compare & Calculate Error")
+
+    with gr.Row():
+        result_json = gr.JSON(label="📉 Individual Error %")
+        avg_error_text = gr.Textbox(label="📊 Average Error %")
+
+    submit_btn.click(
+        fn=compare_measurements,
+        inputs=[a1, b1, c1, d1, e1, f1, g1, h1, a2, b2, c2, d2, e2, f2, g2, h2],
+        outputs=[result_json, avg_error_text]
+    )
 
     # 🔗 Pipeline chaining starting from Part 4
     run_pipeline_btn.click(fn=segment_and_overlay_all_p4,
@@ -1724,110 +1827,10 @@ with gr.Blocks(title="🧪 Toilet Segmentation & Measurement App") as full_app_i
             out_dist_in,
             out_angle_deg,
             top_width_str
-        ])
-    
-    import gradio as gr
-    
-    def get_predictions_by_unit(unit, closed_remaining_in, top_to_hole_line_inch,
-                            hole_width_inch, out_rimellipse_inch, rim_height_inch, out_dist_in):
-        # Compute values in inches
-        a1 = abs(closed_remaining_in - top_to_hole_line_inch)
-        b1 = top_to_hole_line_inch
-        c1 = hole_width_inch
-        d1 = float(out_rimellipse_inch["right_inner"]) * 2
-        e1 = float(out_rimellipse_inch["down_inner"]) * 2
-        f1 = float(out_rimellipse_inch["right_outer"]) * 2
-        g1 = rim_height_inch
-        h1 = out_dist_in
-
-        if unit == "in":
-            return [a1, b1, c1, d1, e1, f1, g1, h1]
-        elif unit == "cm":
-            return [x * 2.54 for x in [a1, b1, c1, d1, e1, f1, g1, h1]]
-        else:
-            return [0.0] * 8
-
-    def compare_measurements(a1, b1, c1, d1, e1, f1, g1, h1, a2, b2, c2, d2, e2, f2, g2, h2):
-        a2, b2, c2, d2, e2, f2, g2, h2 = float(a2), float(b2), float(c2), float(d2), float(e2), float(f2), float(g2), float(h2)
-        a1, b1, c1, d1, e1, f1, g1, h1 = float(a1), float(b1), float(c1), float(d1), float(e1), float(f1), float(g1), float(h1)
-        def error(gt, pred):
-            if gt == 0:
-                return "N/A"
-            return f"{abs(gt - pred) / gt * 100:.2f}%"
-
-        errors = {
-            "a": error(a2, a1),
-            "b": error(b2, b1),
-            "c": error(c2, c1),
-            "d": error(d2, d1),
-            "e": error(e2, e1),
-            "f": error(f2, f1),
-            "g": error(g2, g1),
-            "h": error(h2, h1)
-        }
-
-        valid_errors = [
-            abs(gt - pred) / gt * 100
-            for gt, pred in [
-                (a2, a1), (b2, b1), (c2, c1), (d2, d1), (e2, e1), (f2, f1), (g2, g1), (h2, h1)
-            ] if gt != 0
-        ]
-
-        avg_error = f"{sum(valid_errors)/len(valid_errors):.2f}%" if valid_errors else "N/A"
-
-        return errors, f"✅ Average Error: {avg_error}"
-    
-    gr.Markdown("## 📐 Ground Truth vs Predicted Measurements Comparison")
-
-    with gr.Row():
-        gr.Markdown("### 🖼️ Reference Diagram")
-        ref_image = gr.Image(value="./static/reference.jpg", interactive=False, label="Measurement Guide")
-
-    unit_dropdown = gr.Radio(choices=["in", "cm"], label="Select Unit", value="in")
-
-    with gr.Row():
-        with gr.Column():
-            gr.Markdown("### 📊 Predicted Values")
-            a1 = gr.Number(label="a", interactive=False)
-            b1 = gr.Number(label="b", interactive=False)
-            c1 = gr.Number(label="c", interactive=False)
-            d1 = gr.Number(label="d", interactive=False)
-            e1 = gr.Number(label="e", interactive=False)
-            f1 = gr.Number(label="f", interactive=False)
-            g1 = gr.Number(label="g", interactive=False)
-            h1 = gr.Number(label="h", interactive=False)
-
-        with gr.Column():
-            gr.Markdown("### ✅ Enter True Values")
-            a2 = gr.Number(label="a")
-            b2 = gr.Number(label="b")
-            c2 = gr.Number(label="c")
-            d2 = gr.Number(label="d")
-            e2 = gr.Number(label="e")
-            f2 = gr.Number(label="f")
-            g2 = gr.Number(label="g")
-            h2 = gr.Number(label="h")
-    
-    def update_preds(unit, closed_remaining_in_p11, top_to_hole_line_inch_p10, hole_width_inch_p9, out_rimellipse_inch_p7, rim_height_inch_p8, out_dist_in):
-        return get_predictions_by_unit(unit, closed_remaining_in_p11, top_to_hole_line_inch_p10,hole_width_inch_p9, out_rimellipse_inch_p7,rim_height_inch_p8, out_dist_in)
-    
-    unit_dropdown.change(
-        fn=update_preds,
+        ]).\
+        then(fn=update_preds,
         inputs=[unit_dropdown, closed_remaining_in_p11, top_to_hole_line_inch_p10, hole_width_inch_p9, out_rimellipse_inch_p7, rim_height_inch_p8, out_dist_in],
-        outputs=[a1, b1, c1, d1, e1, f1, g1, h1]
-    )
-
-    submit_btn = gr.Button("📈 Compare & Calculate Error")
-
-    with gr.Row():
-        result_json = gr.JSON(label="📉 Individual Error %")
-        avg_error_text = gr.Textbox(label="📊 Average Error %")
-
-    submit_btn.click(
-        fn=compare_measurements,
-        inputs=[a1, b1, c1, d1, e1, f1, g1, h1, a2, b2, c2, d2, e2, f2, g2, h2],
-        outputs=[result_json, avg_error_text]
-    )
+        outputs=[a1, b1, c1, d1, e1, f1, g1, h1])
     
     with gr.Row():
         gr.Markdown(