Update app.py

app.py

@@ -97,82 +97,6 @@ class DicomAnalyzer:
             print(f"Error drawing circle: {str(e)}")
             return image
 
-    def process_image1(self, file):
-        image, image_display, dicom_data = self.load_dicom(file)
-        self.current_image1 = image
-        self.image_display1 = image_display
-        self.dicom_data1 = dicom_data
-        return image_display
-
-    def process_image2(self, file):
-        image, image_display, dicom_data = self.load_dicom(file)
-        self.current_image2 = image
-        self.image_display2 = image_display
-        self.dicom_data2 = dicom_data
-        return image_display
-
-    def handle_click(self, evt: gr.SelectData, is_image1=True):
-        if is_image1 and self.current_image1 is None:
-            return self.image_display1, "Please load Image 1 first"
-        elif not is_image1 and self.current_image2 is None:
-            return self.image_display2, "Please load Image 2 first"
-
-        try:
-            x, y = evt.index
-            if is_image1:
-                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)
-            else:
-                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 1" if is_image1 else "Image 2"
-                results['Point'] = f"({x}, {y})"
-                self.results.append(results)
-
-            return marked_image, self.format_results()
-        except Exception as e:
-            print(f"Error in handle_click: {str(e)}")
-            return (self.image_display1 if is_image1 else self.image_display2), f"Error: {str(e)}"
-
-    def format_results(self):
-        if not self.results:
-            return "No results yet"
-        df = pd.DataFrame(self.results)
-        return df.to_string()
-
-    def clear_results(self):
-        self.results = []
-        self.marks1 = []
-        self.marks2 = []
-        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.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", self.image_display1, self.image_display2
-
-    def save_results(self):
-        try:
-            if not self.results:
-                return None, "No results to save"
-
-            df = pd.DataFrame(self.results)
-            temp_file = os.path.join(tempfile.gettempdir(), "analysis_results.xlsx")
-            df.to_excel(temp_file, index=False, engine='openpyxl')
-            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)}"
-
     def update_circle_diameter(self, value):
         self.circle_diameter = value
         return f"Circle diameter set to {value}"
@@ -184,25 +108,14 @@ def create_interface():
         gr.Markdown("# CT DICOM Image Analyzer")
 
         with gr.Row():
-            file1 = gr.File(label="Upload first DICOM file")
-            image1 = gr.Image(label="Image 1", interactive=True, type="numpy")
-            file1.change(fn=analyzer.process_image1, inputs=file1, outputs=image1)
-
-            file2 = gr.File(label="Upload second DICOM file")
-            image2 = gr.Image(label="Image 2", interactive=True, type="numpy")
-            file2.change(fn=analyzer.process_image2, inputs=file2, outputs=image2)
+            file1 = gr.File(label="Upload DICOM file")
+            image1 = gr.Image(label="DICOM Image", interactive=True, type="numpy")
+            file1.change(fn=analyzer.load_dicom, inputs=file1, outputs=image1)
 
         circle_diameter = gr.Slider(minimum=1, maximum=20, value=9, step=1, label="Circle Diameter")
-        circle_diameter.change(fn=analyzer.update_circle_diameter, inputs=circle_diameter, outputs="status")
-
-        results = gr.Textbox(label="Results", interactive=False)
-        clear_btn = gr.Button("Clear Results")
-        save_btn = gr.Button("Save Results")
+        status = gr.Textbox(label="Status", interactive=False)
 
-        image1.select(fn=lambda evt: analyzer.handle_click(evt, is_image1=True), outputs=[image1, results])
-        image2.select(fn=lambda evt: analyzer.handle_click(evt, is_image1=False), outputs=[image2, results])
-        clear_btn.click(fn=analyzer.clear_results, outputs=[results, image1, image2])
-        save_btn.click(fn=analyzer.save_results, outputs=["file", results])
+        circle_diameter.change(fn=analyzer.update_circle_diameter, inputs=circle_diameter, outputs=status)
 
     return interface