Update src/ui_components_original.py

src/ui_components_original.py

@@ -58,25 +58,11 @@ def standalone_run_analysis(
     database_manager,
     wound_analyzer,
     # UI inputs
-    mode,
-    existing_label,
-    np_name,
-    np_age,
-    np_gender,
-    w_loc,
-    w_dur,
-    pain,
-    moist,
-    infect,
-    diabetic,
-    prev_tx,
-    med_hist,
-    meds,
-    alls,
-    notes,
-    img_path,
-    manual_mask_path=None,
-    mask_adjustment=0,
+    mode, existing_label,
+    np_name, np_age, np_gender,
+    w_loc, w_dur, pain, moist, infect, diabetic,
+    prev_tx, med_hist, meds, alls, notes, img_path
+    , seg_adjust=0.0, manual_mask=None
 ):
     """Runs in the ZeroGPU worker; returns HTML for the UI."""
     def _label_to_id(label: str):
@@ -197,13 +183,14 @@ def standalone_run_analysis(
             'medications': meds,
             'additional_notes': notes
         }
-        # Include optional manual mask and adjustment in questionnaire data
-        if manual_mask_path:
-            q_for_ai['manual_mask_path'] = manual_mask_path
-        q_for_ai['mask_adjustment'] = mask_adjustment
 
-        # Run AI
-        analysis_result = wound_analyzer.analyze_wound(img_path, q_for_ai)
+        # Run AI with optional segmentation adjustment and manual mask
+        analysis_result = wound_analyzer.analyze_wound(
+            img_path,
+            q_for_ai,
+            seg_adjust=seg_adjust or 0.0,
+            manual_mask_path=manual_mask if manual_mask else None
+        )
         if not analysis_result or not analysis_result.get("success"):
             err = (analysis_result or {}).get("error", "Unknown analysis error")
             return f"<div class='status-error'>❌ AI Analysis failed: {html.escape(str(err))}</div>"
@@ -688,26 +675,31 @@ button.gr-button:hover, button.gr-button-primary:hover {
                                 with gr.Column(scale=1):
                                     gr.HTML("<h3>📸 Wound Image</h3>")
                                     wound_image = gr.Image(label="Upload Wound Image", type="filepath")
-                                    gr.HTML("<h3>📝 Medical History</h3>")
-                                    previous_treatment = gr.Textbox(label="Previous Treatment", lines=3)
-                                    medical_history = gr.Textbox(label="Medical History", lines=3)
-                                    medications = gr.Textbox(label="Current Medications", lines=2)
-                                    allergies = gr.Textbox(label="Known Allergies", lines=2)
-                                    additional_notes = gr.Textbox(label="Additional Notes", lines=3)
-
-                                    # Optional manual segmentation mask and adjustment
-                                    manual_mask = gr.Image(
+                                    # Optional manual segmentation mask provided by the clinician. This allows clinicians
+                                    # to manually mark the wound boundary after the automatic segmentation has run.
+                                    manual_mask_input = gr.Image(
                                         label="Manual Segmentation Mask (optional)",
                                         type="filepath",
-                                        interactive=True
+                                        optional=True,
+                                        interactive=True,
                                     )
-                                    mask_adjustment = gr.Slider(
-                                        -10,
-                                        10,
+                                    # Slider to adjust the automatic segmentation mask. Positive values dilate
+                                    # (expand) the mask, negative values erode (shrink) it. The value represents
+                                    # roughly percentage change where each 5 units corresponds to one iteration.
+                                    seg_adjust_slider = gr.Slider(
+                                        minimum=-20,
+                                        maximum=20,
                                         value=0,
                                         step=1,
-                                        label="Segmentation Adjustment (neg = shrink, pos = expand)"
+                                        label="Segmentation Adjustment",
+                                        info="Adjust the automatic segmentation (negative shrinks, positive expands)"
                                     )
+                                    gr.HTML("<h3>📝 Medical History</h3>")
+                                    previous_treatment = gr.Textbox(label="Previous Treatment", lines=3)
+                                    medical_history = gr.Textbox(label="Medical History", lines=3)
+                                    medications = gr.Textbox(label="Current Medications", lines=2)
+                                    allergies = gr.Textbox(label="Known Allergies", lines=2)
+                                    additional_notes = gr.Textbox(label="Additional Notes", lines=3)
 
                             analyze_btn = gr.Button("🔬 Analyze Wound", variant="primary", elem_id="analyze-btn")
                             analysis_output = gr.HTML("")
@@ -899,54 +891,21 @@ button.gr-button:hover, button.gr-button-primary:hover {
 
             # --- IMPORTANT: call standalone GPU function via lambda to pass instance/ctx ---
             analyze_btn.click(
-                fn=lambda mode, ex_lbl, np_n, np_a, np_g, wl, wd, p, m, i, d, pt, mh, med, al, nt, img, man_mask, mask_adj: \
+                fn=lambda mode, ex_lbl, np_n, np_a, np_g, wl, wd, p, m, i, d, pt, mh, med, al, nt,
+                                 img, manual_mask, seg_adj: \
                     standalone_run_analysis(
-                        self,
-                        self.current_user,
-                        self.database_manager,
-                        self.wound_analyzer,
-                        mode,
-                        ex_lbl,
-                        np_n,
-                        np_a,
-                        np_g,
-                        wl,
-                        wd,
-                        p,
-                        m,
-                        i,
-                        d,
-                        pt,
-                        mh,
-                        med,
-                        al,
-                        nt,
-                        img,
-                        man_mask,
-                        mask_adj
+                        self, self.current_user, self.database_manager, self.wound_analyzer,
+                        mode, ex_lbl, np_n, np_a, np_g, wl, wd, p, m, i, d, pt, mh, med, al, nt,
+                        img, seg_adj, manual_mask
                     ),
                 inputs=[
-                    patient_mode,
-                    existing_patient_dd,
-                    new_patient_name,
-                    new_patient_age,
-                    new_patient_gender,
-                    wound_location,
-                    wound_duration,
-                    pain_level,
-                    moisture_level,
-                    infection_signs,
-                    diabetic_status,
-                    previous_treatment,
-                    medical_history,
-                    medications,
-                    allergies,
-                    additional_notes,
-                    wound_image,
-                    manual_mask,
-                    mask_adjustment,
+                    patient_mode, existing_patient_dd,
+                    new_patient_name, new_patient_age, new_patient_gender,
+                    wound_location, wound_duration, pain_level, moisture_level, infection_signs, diabetic_status,
+                    previous_treatment, medical_history, medications, allergies, additional_notes,
+                    wound_image, manual_mask_input, seg_adjust_slider
                 ],
-                outputs=[analysis_output],
+                outputs=[analysis_output]
             )
 
             history_btn.click(load_history, outputs=[patient_history_output])
@@ -972,10 +931,7 @@ button.gr-button:hover, button.gr-button-primary:hover {
             length_cm = visual_analysis.get('length_cm', 0)
             breadth_cm = visual_analysis.get('breadth_cm', 0)
             area_cm2 = visual_analysis.get('surface_area_cm2', 0)
-            # Skin tone and tissue classification
-            skin_tone_label = visual_analysis.get('skin_tone_label', 'Unknown')
-            ita_degrees = visual_analysis.get('ita_degrees', 0.0)
-            tissue_type = visual_analysis.get('tissue_type', 'Unknown')
+            detection_confidence = visual_analysis.get('detection_confidence', 0)
 
             detection_image_path = visual_analysis.get('detection_image_path', '')
             segmentation_image_path = visual_analysis.get('segmentation_image_path', '')
@@ -1067,26 +1023,14 @@ button.gr-button:hover, button.gr-button-primary:hover {
                     <div style="background: #f8f9fa; padding: 30px; border-radius: 12px; margin-bottom: 30px;">
                         <h2 style="color: #2d3748; margin-top: 0;">🔍 Wound Detection & Classification</h2>
                         <div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(200px, 1fr)); gap: 20px; margin: 20px 0;">
-                            <!-- Wound Type -->
                             <div style="background: white; padding: 20px; border-radius: 8px; text-align: center; box-shadow: 0 2px 8px rgba(0,0,0,0.1);">
                                 <h3 style="color: #3182ce; margin: 0 0 10px 0;">Wound Type</h3>
                                 <p style="font-weight: 600; font-size: 18px; color: #2d3748; margin: 0;">{html.escape(str(wound_type))}</p>
                             </div>
-                            <!-- Location -->
                             <div style="background: white; padding: 20px; border-radius: 8px; text-align: center; box-shadow: 0 2px 8px rgba(0,0,0,0.1);">
                                 <h3 style="color: #3182ce; margin: 0 0 10px 0;">Location</h3>
                                 <p style="font-weight: 600; font-size: 18px; color: #2d3748; margin: 0;">{html.escape(str(questionnaire_data.get('wound_location', 'Not specified')))}</p>
                             </div>
-                            <!-- Skin Tone -->
-                            <div style="background: white; padding: 20px; border-radius: 8px; text-align: center; box-shadow: 0 2px 8px rgba(0,0,0,0.1);">
-                                <h3 style="color: #3182ce; margin: 0 0 10px 0;">Skin Tone</h3>
-                                <p style="font-weight: 600; font-size: 18px; color: #2d3748; margin: 0;">{html.escape(str(skin_tone_label))} ({ita_degrees:.1f}°)</p>
-                            </div>
-                            <!-- Tissue Type -->
-                            <div style="background: white; padding: 20px; border-radius: 8px; text-align: center; box-shadow: 0 2px 8px rgba(0,0,0,0.1);">
-                                <h3 style="color: #3182ce; margin: 0 0 10px 0;">Tissue Type</h3>
-                                <p style="font-weight: 600; font-size: 18px; color: #2d3748; margin: 0;">{html.escape(str(tissue_type))}</p>
-                            </div>
                         </div>
                     </div>