Update app.py

app.py

@@ -83,7 +83,6 @@ class DicomAnalyzer:
         return self.update_display()
 
     def update_display(self):
-        """Update display with current zoom and pan"""
         try:
             if self.original_display is None:
                 return None
@@ -93,33 +92,35 @@ class DicomAnalyzer:
             new_height = int(height * self.zoom_factor)
             new_width = int(width * self.zoom_factor)
 
-            # Update max pan values
-            self.max_pan_x = max(0, new_width - width)
-            self.max_pan_y = max(0, new_height - height)
-
             # Create zoomed image
             zoomed = cv2.resize(self.original_display, (new_width, new_height), 
                               interpolation=cv2.INTER_CUBIC)
 
-            # Draw marks
+            # Draw marks on the zoomed image
             for x, y, diameter in self.marks:
-                display_x = int(x * self.zoom_factor - self.pan_x)
-                display_y = int(y * self.zoom_factor - self.pan_y)
-                display_diameter = int(diameter * self.zoom_factor)
+                # Calculate zoomed coordinates
+                zoomed_x = int(x * self.zoom_factor)
+                zoomed_y = int(y * self.zoom_factor)
+                zoomed_diameter = int(diameter * self.zoom_factor)
                 
-                # Only draw if mark is in view
-                if (0 <= display_x < width and 0 <= display_y < height):
-                    cv2.circle(zoomed,
-                             (display_x, display_y),
-                             display_diameter // 2,
-                             (0, 255, 255),  # Yellow in BGR
-                             2,  # Increased thickness
-                             lineType=cv2.LINE_AA)
+                cv2.circle(zoomed,
+                          (zoomed_x, zoomed_y),
+                          zoomed_diameter // 2,
+                          (255, 255, 0),  # BGR: Yellow
+                          2,
+                          lineType=cv2.LINE_AA)
 
-            # Extract visible portion
+            # Extract visible portion considering pan
+            visible_height = min(height, new_height)
+            visible_width = min(width, new_width)
+            
+            # Ensure pan values don't exceed bounds
+            self.pan_x = min(self.pan_x, max(0, new_width - width))
+            self.pan_y = min(self.pan_y, max(0, new_height - height))
+            
             visible = zoomed[
-                self.pan_y:self.pan_y + height,
-                self.pan_x:self.pan_x + width
+                self.pan_y:self.pan_y + visible_height,
+                self.pan_x:self.pan_x + visible_width
             ]
 
             return visible
@@ -131,8 +132,8 @@ class DicomAnalyzer:
         """Handle keyboard inputs for pan"""
         try:
             print(f"Handling key press: {key}")  # Debug print
-            # Pan amount depends on zoom level
-            pan_amount = int(20 * self.zoom_factor)
+            # Reduce pan amount for finer control
+            pan_amount = int(10 * self.zoom_factor)
             
             if key == 'ArrowLeft':
                 self.pan_x = max(0, self.pan_x - pan_amount)
@@ -147,8 +148,7 @@ 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"
@@ -275,7 +275,7 @@ def create_interface():
             
         results_display = gr.Textbox(label="Results", interactive=False)
         file_output = gr.File(label="Download Results")
-        key_press = gr.Textbox(visible=False, elem_id="key_press")  # Added elem_id
+        key_press = gr.Textbox(visible=False, elem_id="key_press")
         
         # Instructions
         gr.Markdown("""
@@ -368,11 +368,4 @@ def create_interface():
                 }
             }
         });
-        </script>
-        """)
-    
-    return interface
-
-if __name__ == "__main__":
-    interface = create_interface()
-    interface.launch()
+        </script><span class="ml-2" /><span class="inline-block w-3 h-3 rounded-full bg-neutral-a12 align-middle mb-[0.1rem]" />