Update app.py

app.py

@@ -72,6 +72,16 @@ class DicomAnalyzer:
             return self.update_display()
         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()
+
     def update_display(self):
         """Update display with current zoom and pan"""
         try:
@@ -98,12 +108,12 @@ class DicomAnalyzer:
                 display_diameter = int(diameter * self.zoom_factor)
                 
                 # Only draw if mark is in view
-                if (0 <= display_x < new_width and 0 <= display_y < new_height):
+                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,  # Increase thickness for better visibility
+                             1,
                              lineType=cv2.LINE_AA)
 
             # Extract visible portion
@@ -121,7 +131,7 @@ class DicomAnalyzer:
         """Handle keyboard inputs for pan"""
         try:
             # Pan amount depends on zoom level
-            pan_amount = int(50 / self.zoom_factor)
+            pan_amount = int(20 * self.zoom_factor)
             
             if key == 'ArrowLeft':
                 self.pan_x = max(0, self.pan_x - pan_amount)
@@ -177,17 +187,6 @@ class DicomAnalyzer:
             print(f"Error analyzing ROI: {str(e)}")
             return self.display_image, f"Error analyzing ROI: {str(e)}"
 
-    def update_zoom(self, zoom_factor, image):
-        try:
-            if self.original_display is None:
-                return image
-
-            self.zoom_factor = zoom_factor
-            return self.update_display()
-        except Exception as e:
-            print(f"Error updating zoom: {str(e)}")
-            return image
-
     def format_results(self):
         if not self.results:
             return "No measurements yet"
@@ -257,14 +256,12 @@ def create_interface():
                     step=1,
                     label="ROI Diameter (pixels)"
                 )
-                zoom_slider = gr.Slider(
-                    minimum=1.0,
-                    maximum=20.0,
-                    value=1.0,
-                    step=0.5,
-                    label="Zoom Factor"
-                )
-                reset_btn = gr.Button("Reset View")
+                
+                # Zoom controls
+                with gr.Row():
+                    zoom_in_btn = gr.Button("Zoom In (+)")
+                    zoom_out_btn = gr.Button("Zoom Out (-)")
+                    reset_btn = gr.Button("Reset View")
                 
             with gr.Column():
                 image_display = gr.Image(label="DICOM Image", interactive=True, elem_id="image_display")
@@ -284,7 +281,7 @@ def create_interface():
         ### Controls:
         - Use arrow keys to pan when zoomed in
         - Click points to measure
-        - Press 'Reset View' to center image and reset zoom
+        - Use Zoom In/Out buttons or Reset View to adjust zoom level
         """)
         
         def update_diameter(x):
@@ -309,9 +306,16 @@ def create_interface():
             outputs=gr.Textbox(label="Status")
         )
         
-        zoom_slider.change(
-            fn=analyzer.update_zoom,
-            inputs=[zoom_slider, image_display],
+        # Zoom button handlers
+        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
         )
         
@@ -367,4 +371,4 @@ def create_interface():
 
 if __name__ == "__main__":
     interface = create_interface()
-    interface.launch()
+    interface.launch()