Update app.py (#3)

- Update app.py (d4086ea136f80bca6b6edfdd840ee6d66bf1d33b)


Co-authored-by: Nonpawith Phoommanee <nonpawith@users.noreply.huggingface.co>

app.py

@@ -100,22 +100,65 @@ def generate_led_html(score, diagnosis):
     </div>
     """
 
-def create_medical_report(pt_name, pt_id, diagnosis, conf):
+def create_medical_report(pt_name, pt_id, diagnosis, conf, img_det, img_seg, img_crop):
     try:
         filename = tempfile.mktemp(suffix=".pdf")
         c = canvas.Canvas(filename, pagesize=A4)
-        font_name = 'THSarabun-Bold' if 'THSarabun-Bold' in pdfmetrics.getRegisteredFontNames() else 'Helvetica-Bold'
+        width, height = A4
         
-        c.setFont(font_name, 24)
-        c.drawString(2*cm, 27*cm, "Medical Image Analysis Report")
+        # Font settings
+        font_regular = 'THSarabun' if 'THSarabun' in pdfmetrics.getRegisteredFontNames() else 'Helvetica'
+        font_bold = 'THSarabun-Bold' if 'THSarabun-Bold' in pdfmetrics.getRegisteredFontNames() else 'Helvetica-Bold'
         
-        c.setFont(font_name, 16)
-        c.drawString(2*cm, 25*cm, f"Patient Name: {pt_name}")
-        c.drawString(2*cm, 24*cm, f"Patient ID: {pt_id}")
-        c.drawString(2*cm, 22*cm, f"Diagnosis Result: {diagnosis}")
-        c.drawString(2*cm, 21*cm, f"Confidence Score: {conf}%")
-        c.drawString(2*cm, 20*cm, f"Date: {datetime.datetime.now().strftime('%Y-%m-%d %H:%M')}")
+        # --- Header Section ---
+        c.setFont(font_bold, 24)
+        c.drawString(2*cm, height - 3*cm, "Medical Image Analysis Report")
+        c.setLineWidth(2)
+        c.line(2*cm, height - 3.2*cm, 19*cm, height - 3.2*cm)
         
+        # --- Patient Info ---
+        c.setFont(font_bold, 16)
+        c.drawString(2*cm, height - 5*cm, f"Patient Name: {pt_name}")
+        c.drawString(11*cm, height - 5*cm, f"Patient ID: {pt_id}")
+        c.drawString(2*cm, height - 6*cm, f"Date: {datetime.datetime.now().strftime('%Y-%m-%d %H:%M')}")
+        
+        # --- Diagnosis Result ---
+        c.setFillColorRGB(0.9, 0.9, 0.95)
+        c.rect(1.5*cm, height - 9*cm, 18*cm, 2*cm, fill=1, stroke=0)
+        c.setFillColorRGB(0, 0, 0)
+        c.drawString(2*cm, height - 8*cm, f"Diagnosis: {diagnosis}")
+        c.drawString(11*cm, height - 8*cm, f"Confidence: {conf}%")
+        
+        # --- Image Helper ---
+        def draw_temp_image(img_array, x, y, w, h, title):
+            if img_array is not None:
+                try:
+                    # Convert RGB (Gradio) to BGR (OpenCV) for saving
+                    img_bgr = cv2.cvtColor(img_array, cv2.COLOR_RGB2BGR)
+                    tmp_img_path = tempfile.mktemp(suffix=".jpg")
+                    cv2.imwrite(tmp_img_path, img_bgr)
+                    
+                    # Draw Image
+                    c.drawImage(tmp_img_path, x, y, width=w, height=h, preserveAspectRatio=True)
+                    
+                    # Draw Title
+                    c.setFont(font_bold, 14)
+                    c.drawCentredString(x + w/2, y - 0.5*cm, title)
+                except Exception as e:
+                    print(f"Error drawing image: {e}")
+
+        # --- Draw Images ---
+        # Row 1: Detection & Segmentation
+        draw_temp_image(img_det, 2*cm, height - 16*cm, 8*cm, 6*cm, "AI Detection")
+        draw_temp_image(img_seg, 11*cm, height - 16*cm, 8*cm, 6*cm, "Segmentation Mask")
+        
+        # Row 2: Focused Lesion
+        draw_temp_image(img_crop, 6.5*cm, height - 23*cm, 8*cm, 6*cm, "Focused Lesion")
+
+        # --- Footer ---
+        c.setFont(font_regular, 12)
+        c.drawCentredString(width/2, 2*cm, "Report generated by AI Ovarian Tumor Diagnosis System (KMUTNB & Ramathibodi)")
+
         c.save()
         return filename
     except Exception as e:
@@ -369,11 +412,15 @@ with gr.Blocks(theme=gr.themes.Soft(), css=css, title="Ovarian Tumor AI") as dem
         [img_det, img_seg, img_crop, state_fig, txt_log, html_led, aud, state_crop, state_diag, state_conf, gallery_ui, state_gallery, state_img_orig, state_img_det, state_img_seg]
     )
 
-    def pdf_wrapper(name, pid, diag, conf):
+    def pdf_wrapper(name, pid, diag, conf, det_img, seg_img, crop_img):
         if not diag: return None
-        return create_medical_report(name, pid, diag, conf)
+        return create_medical_report(name, pid, diag, conf, det_img, seg_img, crop_img)
 
-    btn_pdf.click(pdf_wrapper, [inp_pt_name, inp_pt_id, state_diag, state_conf], out_pdf)
+    btn_pdf.click(
+        pdf_wrapper, 
+        [inp_pt_name, inp_pt_id, state_diag, state_conf, state_img_det, state_img_seg, state_crop], 
+        out_pdf
+    )
 
     # Chat interactions
     btn_send.click(chat_fn, [msg, chatbot, state_crop, state_info, state_diag], [chatbot, msg])