Update src/ui_components_original.py

src/ui_components_original.py

@@ -1324,11 +1324,15 @@ button.gr-button:hover, button.gr-button-primary:hover {
         return app
 
     def _format_comprehensive_analysis_results(self, analysis_result, image_path, questionnaire_data):
-        """Format comprehensive analysis results with enhanced visual presentation"""
+        """Format comprehensive analysis results with enhanced visual presentation
+           - Shows 'Manual Segmentation' card if a manual mask/overlay was used
+           - Removes the Measurements card from the Visual Analysis Gallery
+        """
+        import os
         try:
-            visual_analysis = analysis_result.get("visual_analysis", {})
+            visual_analysis = analysis_result.get("visual_analysis", {}) or {}
             report = analysis_result.get("report", "")
-
+    
             # Extract key metrics
             wound_type = visual_analysis.get("wound_type", "Unknown")
             length_cm = visual_analysis.get("length_cm", 0)
@@ -1337,14 +1341,45 @@ button.gr-button:hover, button.gr-button-primary:hover {
             skin_tone_label = visual_analysis.get("skin_tone_label", "Unknown")
             ita_deg = visual_analysis.get("ita_degrees")
             tissue_type = visual_analysis.get("tissue_type", "Unknown")
-
+    
+            # Detect if manual mask was used (look across common keys/flags)
+            manual_used = bool(
+                analysis_result.get("manual_mask_used")
+                or visual_analysis.get("manual_mask_used")
+            )
+    
+            # Try to discover manual overlay/binary mask paths (handle multiple possible keys)
+            manual_overlay_path = None
+            for k in [
+                "manual_segmentation_image_path",
+                "manual_overlay_path",
+                "manual_segmentation_overlay_path",
+            ]:
+                p = visual_analysis.get(k)
+                if p and os.path.exists(p):
+                    manual_overlay_path = p
+                    manual_used = True
+                    break
+    
+            manual_binary_path = None
+            for k in [
+                "manual_roi_mask_path",
+                "manual_mask_binary_path",
+                "manual_mask_path",
+            ]:
+                p = visual_analysis.get(k)
+                if p and os.path.exists(p):
+                    manual_binary_path = p
+                    manual_used = True
+                    break
+    
             # Generate risk assessment
             risk_assessment = self._generate_risk_assessment(questionnaire_data)
             risk_level = risk_assessment.get("risk_level", "Unknown")
             risk_score = risk_assessment.get("risk_score", 0)
             risk_factors = risk_assessment.get("risk_factors", [])
             risk_class = risk_level.lower().replace(" ", "_")
-
+    
             # Format risk factors
             if risk_factors:
                 risk_factors_html = "<ul style='margin: 10px 0; padding-left: 20px;'>"
@@ -1353,10 +1388,10 @@ button.gr-button:hover, button.gr-button-primary:hover {
                 risk_factors_html += "</ul>"
             else:
                 risk_factors_html = "<p style='color: #4a5568; font-style: italic;'>No specific risk factors identified.</p>"
-
-            # Create image gallery
+    
+            # ---------------------- Image Gallery ----------------------
             image_gallery_html = "<div class='image-gallery'>"
-            
+    
             # Original image
             if image_path and os.path.exists(image_path):
                 img_b64 = self.image_to_base64(image_path)
@@ -1368,21 +1403,44 @@ button.gr-button:hover, button.gr-button-primary:hover {
                         <p>Uploaded wound photograph for analysis</p>
                     </div>
                     """
-
+    
             # Detection visualization
             detection_path = visual_analysis.get("detection_image_path")
             if detection_path and os.path.exists(detection_path):
                 img_b64 = self.image_to_base64(detection_path)
                 if img_b64:
+                    conf = visual_analysis.get('detection_confidence', 0.0)
+                    try:
+                        conf_str = f"{float(conf):.1%}"
+                    except Exception:
+                        conf_str = str(conf)
                     image_gallery_html += f"""
                     <div class="image-item">
                         <img src="{img_b64}" alt="Wound Detection">
                         <h4>🎯 Wound Detection</h4>
-                        <p>AI-powered wound boundary detection with confidence: {visual_analysis.get('detection_confidence', 0):.1%}</p>
+                        <p>AI-powered wound boundary detection with confidence: {conf_str}</p>
                     </div>
                     """
-
-            # Segmentation visualization
+    
+            # Show MANUAL segmentation card if available/used
+            if manual_overlay_path or manual_binary_path:
+                if manual_overlay_path and os.path.exists(manual_overlay_path):
+                    img_b64 = self.image_to_base64(manual_overlay_path)
+                elif manual_binary_path and os.path.exists(manual_binary_path):
+                    img_b64 = self.image_to_base64(manual_binary_path)
+                else:
+                    img_b64 = None
+    
+                if img_b64:
+                    image_gallery_html += f"""
+                    <div class="image-item">
+                        <img src="{img_b64}" alt="Manual Segmentation">
+                        <h4>✏️ Manual Segmentation</h4>
+                        <p>Clinician-adjusted wound boundary used for this report</p>
+                    </div>
+                    """
+    
+            # Automatic segmentation (still show if present)
             seg_path = visual_analysis.get("segmentation_image_path")
             if seg_path and os.path.exists(seg_path):
                 img_b64 = self.image_to_base64(seg_path)
@@ -1394,25 +1452,21 @@ button.gr-button:hover, button.gr-button-primary:hover {
                         <p>Precise wound boundary identification and tissue analysis</p>
                     </div>
                     """
-
-            # Annotated measurements
-            annotated_path = visual_analysis.get("segmentation_annotated_path")
-            if annotated_path and os.path.exists(annotated_path):
-                img_b64 = self.image_to_base64(annotated_path)
-                if img_b64:
-                    image_gallery_html += f"""
-                    <div class="image-item">
-                        <img src="{img_b64}" alt="Annotated Measurements">
-                        <h4>📏 Measurements</h4>
-                        <p>Calibrated dimensional analysis with length and width indicators</p>
-                    </div>
-                    """
-
+    
+            # NOTE: Measurements card intentionally REMOVED from gallery as requested
+            # (Do NOT add segmentation_annotated_path card)
+    
             image_gallery_html += "</div>"
-
+    
             # Convert report markdown to HTML
             report_html = self.markdown_to_html(report) if report else ""
-
+    
+            status_line = (
+                "Analysis completed successfully with <strong>manual</strong> segmentation"
+                if manual_used else
+                "Analysis completed successfully with comprehensive wound assessment"
+            )
+    
             html_output = f"""
             <div style="max-width: 1200px; margin: 0 auto; background: white; border-radius: 16px; box-shadow: 0 8px 32px rgba(0,0,0,0.1); overflow: hidden;">
                 <div style="background: linear-gradient(135deg, #3182ce 0%, #2c5aa0 100%); color: white; padding: 40px; text-align: center;">
@@ -1422,18 +1476,18 @@ button.gr-button:hover, button.gr-button-primary:hover {
                         <p style="margin: 0; font-size: 16px;"><strong>Patient:</strong> {html.escape(str(questionnaire_data.get('patient_name', 'Unknown')))} | <strong>Analysis Date:</strong> {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}</p>
                     </div>
                 </div>
-
+    
                 <div style="padding: 40px;">
                     <div class="status-success" style="margin-bottom: 30px;">
-                        <strong>✅ Analysis Status:</strong> Analysis completed successfully with comprehensive wound assessment
+                        <strong>✅ Analysis Status:</strong> {status_line}
                     </div>
-
+    
                     <!-- Image Gallery Section -->
                     <div style="margin-bottom: 40px;">
                         <h2 style="color: #2d3748; font-size: 24px; margin-bottom: 20px; border-bottom: 2px solid #e53e3e; padding-bottom: 10px;">🖼️ Visual Analysis Gallery</h2>
                         {image_gallery_html}
                     </div>
-
+    
                     <!-- Wound Detection & Classification -->
                     <div style="background: #f8f9fa; padding: 30px; border-radius: 12px; margin-bottom: 30px;">
                         <h2 style="color: #2d3748; margin-top: 0;">🔍 Wound Detection & Classification</h2>
@@ -1456,8 +1510,8 @@ button.gr-button:hover, button.gr-button-primary:hover {
                             </div>
                         </div>
                     </div>
-
-                    <!-- Wound Measurements -->
+    
+                    <!-- Wound Measurements (numeric section remains) -->
                     <div style="background: #e7f5ff; padding: 30px; border-radius: 12px; margin-bottom: 30px;">
                         <h2 style="color: #2d3748; margin-top: 0;">📏 Wound Measurements</h2>
                         <div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(150px, 1fr)); gap: 20px; margin: 20px 0;">
@@ -1475,33 +1529,7 @@ button.gr-button:hover, button.gr-button-primary:hover {
                             </div>
                         </div>
                     </div>
-
-                    <!-- Risk Assessment -->
-                    <div style="background: #fff4e6; padding: 30px; border-radius: 12px; margin-bottom: 30px;">
-                        <h2 style="color: #2d3748; margin-top: 0;">⚠️ Risk Assessment</h2>
-                        <div style="display: flex; align-items: center; margin: 20px 0; flex-wrap: wrap;">
-                            <div style="background: {'#d4edda' if risk_class == 'low' else '#fff3cd' if risk_class == 'moderate' else '#f8d7da'}; 
-                                    color: {'#155724' if risk_class == 'low' else '#856404' if risk_class == 'moderate' else '#721c24'}; 
-                                    padding: 15px 30px; 
-                                    border-radius: 30px; 
-                                    font-weight: 700; 
-                                    font-size: 20px;
-                                    text-transform: uppercase;
-                                    letter-spacing: 1px;
-                                    margin-right: 20px;
-                                    margin-bottom: 10px;">
-                                {risk_level} RISK
-                            </div>
-                            <div style="font-size: 18px; color: #2d3748;">
-                                <strong>Risk Score:</strong> {risk_score}/10
-                            </div>
-                        </div>
-                        <div style="background: white; padding: 25px; border-radius: 8px; margin: 15px 0; box-shadow: 0 2px 8px rgba(0,0,0,0.05);">
-                            <h3 style="margin-top: 0; color: #2d3748;">Identified Risk Factors:</h3>
-                            {risk_factors_html}
-                        </div>
-                    </div>
-
+    
                     <!-- Patient Information Summary -->
                     <div style="background: #f0f8f0; padding: 30px; border-radius: 12px; margin-bottom: 30px;">
                         <h2 style="color: #2d3748; margin-top: 0;">👤 Patient Information Summary</h2>
@@ -1517,10 +1545,10 @@ button.gr-button:hover, button.gr-button-primary:hover {
                         {f"<div style='margin-top: 10px;'><strong>Current Medications:</strong> {html.escape(str(questionnaire_data.get('medications', 'None listed')))}</div>" if questionnaire_data.get('medications') else ""}
                         {f"<div style='margin-top: 10px;'><strong>Known Allergies:</strong> {html.escape(str(questionnaire_data.get('allergies', 'None listed')))}</div>" if questionnaire_data.get('allergies') else ""}
                     </div>
-
+    
                     <!-- AI Generated Report -->
                     {f'<div style="background: #f8f9fa; padding: 30px; border-radius: 12px; margin-bottom: 30px;"><h2 style="color: #2d3748; margin-top: 0;">🤖 AI-Generated Clinical Report</h2><div style="background: white; padding: 25px; border-radius: 8px; box-shadow: 0 2px 8px rgba(0,0,0,0.05);">{report_html}</div></div>' if report_html else ''}
-
+    
                     <!-- Important Disclaimers -->
                     <div style="background: #fff5f5; border: 2px solid #feb2b2; padding: 25px; border-radius: 12px; margin: 30px 0;">
                         <h3 style="color: #c53030; margin-top: 0;">⚠️ Important Medical Disclaimers</h3>
@@ -1531,7 +1559,7 @@ button.gr-button:hover, button.gr-button-primary:hover {
                             <li><strong>Risk Assessment Limitations:</strong> Risk factors are based on provided information and may not reflect the complete clinical picture.</li>
                         </ul>
                     </div>
-
+    
                     <!-- Footer -->
                     <div style="text-align: center; padding: 30px 0; border-top: 2px solid #e2e8f0; margin-top: 30px;">
                         <p style="color: #6c757d; font-style: italic; font-size: 16px; margin: 0;">
@@ -1543,11 +1571,12 @@ button.gr-button:hover, button.gr-button-primary:hover {
             </div>
             """
             return html_output
-
+    
         except Exception as e:
             logging.error(f"Error formatting comprehensive results: {e}")
             return f"<div class='status-error'>❌ Error displaying results: {str(e)}</div>"
 
+
     def _generate_risk_assessment(self, questionnaire_data):
         """Generate risk assessment based on questionnaire data"""
         if not questionnaire_data: