Update app.py

app.py

@@ -4,7 +4,9 @@ import numpy as np
 import pandas as pd
 import pydicom
 import io
+import os
 from PIL import Image
+import tempfile
 
 class DicomAnalyzer:
     def __init__(self):
@@ -43,9 +45,6 @@ class DicomAnalyzer:
             if len(image_display.shape) == 2:
                 image_display = cv2.cvtColor(image_display, cv2.COLOR_GRAY2BGR)
             
-            print(f"DICOM image loaded. Shape: {image.shape}, Data type: {image.dtype}")
-            print(f"Pixel spacing: {dicom_data.PixelSpacing}")
-            
             return original_image, image_display, dicom_data
         except Exception as e:
             print(f"Error loading DICOM file: {str(e)}")
@@ -71,8 +70,6 @@ class DicomAnalyzer:
             min_val = np.min(pixels)
             max_val = np.max(pixels)
 
-            print(f"Analysis results - Area: {area_mm2:.3f}, Mean: {mean:.3f}, StdDev: {stddev:.3f}")
-
             return {
                 'Area (mm²)': f"{area_mm2:.3f}",
                 'Mean': f"{mean:.3f}",
@@ -137,18 +134,16 @@ class DicomAnalyzer:
         
         try:
             x, y = evt.index
-            print(f"Clicked at ({x}, {y}) on Image 1")
-            
             marked_image = self.draw_circle(self.image_display1, x, y, is_image1=True)
+            self.image_display1 = marked_image
             
             results = self.analyze_point(self.current_image1, self.dicom_data1, x, y)
             if results:
                 results['Image'] = "Image 1"
                 results['Point'] = f"({x}, {y})"
                 self.results.append(results)
-                print(f"Added results for Image 1: {results}")
                 
-            return marked_image, self.format_results()
+            return self.image_display1, self.format_results()
         except Exception as e:
             print(f"Error in handle_click1: {str(e)}")
             return self.image_display1, f"Error: {str(e)}"
@@ -159,18 +154,16 @@ class DicomAnalyzer:
         
         try:
             x, y = evt.index
-            print(f"Clicked at ({x}, {y}) on Image 2")
-            
             marked_image = self.draw_circle(self.image_display2, x, y, is_image1=False)
+            self.image_display2 = marked_image
             
             results = self.analyze_point(self.current_image2, self.dicom_data2, x, y)
             if results:
                 results['Image'] = "Image 2"
                 results['Point'] = f"({x}, {y})"
                 self.results.append(results)
-                print(f"Added results for Image 2: {results}")
                 
-            return marked_image, self.format_results()
+            return self.image_display2, self.format_results()
         except Exception as e:
             print(f"Error in handle_click2: {str(e)}")
             return self.image_display2, f"Error: {str(e)}"
@@ -185,17 +178,17 @@ class DicomAnalyzer:
         self.results = []
         self.marks1 = []
         self.marks2 = []
-        if self.image_display1 is not None:
+        if self.current_image1 is not None:
             self.image_display1 = cv2.cvtColor(
                 cv2.normalize(self.current_image1, None, 0, 255, cv2.NORM_MINMAX).astype(np.uint8),
                 cv2.COLOR_GRAY2BGR
             )
-        if self.image_display2 is not None:
+        if self.current_image2 is not None:
             self.image_display2 = cv2.cvtColor(
                 cv2.normalize(self.current_image2, None, 0, 255, cv2.NORM_MINMAX).astype(np.uint8),
                 cv2.COLOR_GRAY2BGR
             )
-        return "Results cleared"
+        return "Results cleared", self.image_display1, self.image_display2
 
     def add_blank_row(self):
         self.results.append({
@@ -211,7 +204,6 @@ class DicomAnalyzer:
 
     def update_circle_diameter(self, value):
         self.circle_diameter = value
-        print(f"Circle diameter updated to: {value}")
         return f"Circle diameter set to {value}"
 
     def save_results(self):
@@ -221,13 +213,14 @@ class DicomAnalyzer:
                 
             df = pd.DataFrame(self.results)
             
-            # Create Excel file in memory
-            output = io.BytesIO()
-            with pd.ExcelWriter(output, engine='openpyxl') as writer:
-                df.to_excel(writer, index=False)
-            output.seek(0)
+            # Create temporary file
+            temp_dir = tempfile.gettempdir()
+            temp_file = os.path.join(temp_dir, "analysis_results.xlsx")
+            
+            # Save to Excel
+            df.to_excel(temp_file, index=False, engine='openpyxl')
             
-            return output, "Results ready for download"
+            return temp_file, "Results saved successfully. Click to download."
         except Exception as e:
             print(f"Error saving results: {str(e)}")
             return None, f"Error saving results: {str(e)}"
@@ -241,12 +234,12 @@ def create_interface():
         with gr.Row():
             with gr.Column():
                 file1 = gr.File(label="Upload first DICOM file")
-                image1 = gr.Image(label="Image 1", interactive=True)
+                image1 = gr.Image(label="Image 1", interactive=True, type="numpy")
                 file1.change(fn=analyzer.process_image1, inputs=file1, outputs=image1)
             
             with gr.Column():
                 file2 = gr.File(label="Upload second DICOM file")
-                image2 = gr.Image(label="Image 2", interactive=True)
+                image2 = gr.Image(label="Image 2", interactive=True, type="numpy")
                 file2.change(fn=analyzer.process_image2, inputs=file2, outputs=image2)
         
         with gr.Row():
@@ -257,11 +250,6 @@ def create_interface():
                 step=1, 
                 label="Circle Diameter"
             )
-            circle_diameter.change(
-                fn=analyzer.update_circle_diameter, 
-                inputs=circle_diameter, 
-                outputs=gr.Textbox(label="Status")
-            )
         
         with gr.Row():
             clear_btn = gr.Button("Clear Results")
@@ -269,15 +257,40 @@ def create_interface():
             save_btn = gr.Button("Save Results")
         
         results = gr.Textbox(label="Results", interactive=False)
-        download_file = gr.File(label="Download Results", visible=True)
-        status = gr.Textbox(label="Status", visible=True)
+        file_output = gr.File(label="Download Results")
+        status = gr.Textbox(label="Status")
         
         # Connect events
-        image1.select(fn=analyzer.handle_click1, outputs=[image1, results])
-        image2.select(fn=analyzer.handle_click2, outputs=[image2, results])
-        clear_btn.click(fn=analyzer.clear_results, outputs=[results])
-        blank_row_btn.click(fn=analyzer.add_blank_row, outputs=results)
-        save_btn.click(fn=analyzer.save_results, outputs=[download_file, status])
+        circle_diameter.change(
+            fn=analyzer.update_circle_diameter, 
+            inputs=circle_diameter, 
+            outputs=status
+        )
+        
+        image1.select(
+            fn=analyzer.handle_click1, 
+            outputs=[image1, results]
+        )
+        
+        image2.select(
+            fn=analyzer.handle_click2, 
+            outputs=[image2, results]
+        )
+        
+        clear_btn.click(
+            fn=analyzer.clear_results, 
+            outputs=[status, image1, image2]
+        )
+        
+        blank_row_btn.click(
+            fn=analyzer.add_blank_row, 
+            outputs=results
+        )
+        
+        save_btn.click(
+            fn=analyzer.save_results, 
+            outputs=[file_output, status]
+        )
 
     return interface