Update app.py

app.py

@@ -64,7 +64,6 @@ class DicomAnalyzer:
             return None
 
     def reset_view(self):
-        """Reset zoom and center the image"""
         self.zoom_factor = 1.0
         self.pan_x = 0
         self.pan_y = 0
@@ -73,12 +72,10 @@ class DicomAnalyzer:
         return None
 
     def zoom_in(self, image):
-        """Increase zoom factor"""
         self.zoom_factor = min(20.0, self.zoom_factor + 0.5)
         return self.update_display()
 
     def zoom_out(self, image):
-        """Decrease zoom factor"""
         self.zoom_factor = max(1.0, self.zoom_factor - 0.5)
         return self.update_display()
 
@@ -129,10 +126,8 @@ class DicomAnalyzer:
             return self.original_display
 
     def handle_keyboard(self, key):
-        """Handle keyboard inputs for pan"""
         try:
-            print(f"Handling key press: {key}")  # Debug print
-            # Reduce pan amount for finer control
+            print(f"Handling key press: {key}")
             pan_amount = int(10 * self.zoom_factor)
             
             if key == 'ArrowLeft':
@@ -148,12 +143,12 @@ class DicomAnalyzer:
         except Exception as e:
             print(f"Error handling keyboard input: {str(e)}")
             return self.display_image
-        def analyze_roi(self, evt: gr.SelectData):
+
+    def analyze_roi(self, evt: gr.SelectData):
         try:
             if self.current_image is None:
                 return None, "No image loaded"
 
-            # Convert clicked coordinates to original image coordinates
             x = int((evt.index[0] + self.pan_x) / self.zoom_factor)
             y = int((evt.index[1] + self.pan_y) / self.zoom_factor)
 
@@ -258,7 +253,6 @@ def create_interface():
                     label="ROI Diameter (pixels)"
                 )
                 
-                # Zoom controls
                 with gr.Row():
                     zoom_in_btn = gr.Button("Zoom In (+)")
                     zoom_out_btn = gr.Button("Zoom Out (-)")
@@ -277,7 +271,6 @@ def create_interface():
         file_output = gr.File(label="Download Results")
         key_press = gr.Textbox(visible=False, elem_id="key_press")
         
-        # Instructions
         gr.Markdown("""
         ### Controls:
         - Use arrow keys to pan when zoomed in
@@ -286,71 +279,23 @@ def create_interface():
         """)
         
         # Event handlers
-        file_input.change(
-            fn=analyzer.load_dicom,
-            inputs=file_input,
-            outputs=[image_display, results_display]
-        )
-        
-        image_display.select(
-            fn=analyzer.analyze_roi,
-            outputs=[image_display, results_display]
-        )
-        
-        diameter_slider.change(
-            fn=lambda x: (analyzer.circle_diameter := x, f"Diameter set to {x} pixels")[1],
-            inputs=diameter_slider,
-            outputs=gr.Textbox(label="Status")
-        )
-        
-        zoom_in_btn.click(
-            fn=analyzer.zoom_in,
-            inputs=image_display,
-            outputs=image_display
-        )
-        
-        zoom_out_btn.click(
-            fn=analyzer.zoom_out,
-            inputs=image_display,
-            outputs=image_display
-        )
-        
-        reset_btn.click(
-            fn=analyzer.reset_view,
-            outputs=image_display
-        )
-        
-        key_press.change(
-            fn=analyzer.handle_keyboard,
-            inputs=key_press,
-            outputs=image_display,
-            api_name="handle_keyboard"
-        )
-        
-        blank_btn.click(
-            fn=analyzer.add_blank_row,
-            inputs=image_display,
-            outputs=[image_display, results_display]
-        )
+        file_input.change(fn=analyzer.load_dicom, inputs=file_input, outputs=[image_display, results_display])
+        image_display.select(fn=analyzer.analyze_roi, outputs=[image_display, results_display])
+        diameter_slider.change(fn=lambda x: (analyzer.circle_diameter := x, f"Diameter set to {x} pixels")[1],
+                             inputs=diameter_slider,
+                             outputs=gr.Textbox(label="Status"))
         
-        zero_btn.click(
-            fn=analyzer.add_zero_row,
-            inputs=image_display,
-            outputs=[image_display, results_display]
-        )
+        zoom_in_btn.click(fn=analyzer.zoom_in, inputs=image_display, outputs=image_display)
+        zoom_out_btn.click(fn=analyzer.zoom_out, inputs=image_display, outputs=image_display)
+        reset_btn.click(fn=analyzer.reset_view, outputs=image_display)
         
-        undo_btn.click(
-            fn=analyzer.undo_last,
-            inputs=image_display,
-            outputs=[image_display, results_display]
-        )
+        key_press.change(fn=analyzer.handle_keyboard, inputs=key_press, outputs=image_display)
         
-        save_btn.click(
-            fn=analyzer.save_results,
-            outputs=[file_output, results_display]
-        )
+        blank_btn.click(fn=analyzer.add_blank_row, inputs=image_display, outputs=[image_display, results_display])
+        zero_btn.click(fn=analyzer.add_zero_row, inputs=image_display, outputs=[image_display, results_display])
+        undo_btn.click(fn=analyzer.undo_last, inputs=image_display, outputs=[image_display, results_display])
+        save_btn.click(fn=analyzer.save_results, outputs=[file_output, results_display])
 
-        # JavaScript for keyboard handling
         js = """
         <script>
         document.addEventListener('keydown', function(e) {