Update app.py

app.py

@@ -96,7 +96,7 @@ class DicomAnalyzer:
     def handle_keyboard(self, key):
         try:
             print(f"Handling key press: {key}")
-            pan_amount = int(5 * self.zoom_factor)  # Reduced pan amount for smoother movement
+            pan_amount = int(5 * self.zoom_factor)
             
             original_pan_x = self.pan_x
             original_pan_y = self.pan_y
@@ -110,7 +110,6 @@ class DicomAnalyzer:
             elif key == 'ArrowDown':
                 self.pan_y = min(self.max_pan_y, self.pan_y + pan_amount)
             
-            # Print debug info
             print(f"Pan X: {self.pan_x} (was {original_pan_x})")
             print(f"Pan Y: {self.pan_y} (was {original_pan_y})")
             print(f"Max Pan X: {self.max_pan_x}")
@@ -126,11 +125,9 @@ class DicomAnalyzer:
             if self.current_image is None:
                 return None, "No image loaded"
 
-            # Convert clicked coordinates considering zoom and pan
             x = int((evt.index[0] + self.pan_x) / self.zoom_factor)
             y = int((evt.index[1] + self.pan_y) / self.zoom_factor)
 
-            # Ensure coordinates are within image bounds
             height, width = self.current_image.shape[:2]
             x = max(0, min(x, width-1))
             y = max(0, min(y, height-1))
@@ -171,69 +168,69 @@ class DicomAnalyzer:
             return self.display_image, f"Error analyzing ROI: {str(e)}"
 
     def update_display(self):
-    try:
-        if self.original_display is None:
-            return None
+        try:
+            if self.original_display is None:
+                return None
 
-        height, width = self.original_display.shape[:2]
-        new_height = int(height * self.zoom_factor)
-        new_width = int(width * self.zoom_factor)
+            height, width = self.original_display.shape[:2]
+            new_height = int(height * self.zoom_factor)
+            new_width = int(width * self.zoom_factor)
 
-        # Create zoomed image
-        zoomed = cv2.resize(self.original_display, (new_width, new_height), 
-                          interpolation=cv2.INTER_CUBIC)
+            # Create zoomed image
+            zoomed = cv2.resize(self.original_display, (new_width, new_height), 
+                              interpolation=cv2.INTER_CUBIC)
 
-        # Convert to BGR for drawing
-        zoomed_bgr = cv2.cvtColor(zoomed, cv2.COLOR_RGB2BGR)
+            # Convert to BGR for drawing
+            zoomed_bgr = cv2.cvtColor(zoomed, cv2.COLOR_RGB2BGR)
 
-        # Draw marks
-        for x, y, diameter in self.marks:
-            zoomed_x = int(x * self.zoom_factor)
-            zoomed_y = int(y * self.zoom_factor)
-            zoomed_diameter = int(diameter * self.zoom_factor)
-            
-            # Draw main circle in BGR color space
-            cv2.circle(zoomed_bgr,
-                      (zoomed_x, zoomed_y),
-                      zoomed_diameter // 2,
-                      (0, 255, 255),  # BGR: Yellow
-                      1,
-                      lineType=cv2.LINE_AA)
-            
-            # Draw dots on circle
-            num_points = 8
-            for i in range(num_points):
-                angle = 2 * np.pi * i / num_points
-                point_x = int(zoomed_x + (zoomed_diameter/2) * np.cos(angle))
-                point_y = int(zoomed_y + (zoomed_diameter/2) * np.sin(angle))
+            # Draw marks
+            for x, y, diameter in self.marks:
+                zoomed_x = int(x * self.zoom_factor)
+                zoomed_y = int(y * self.zoom_factor)
+                zoomed_diameter = int(diameter * self.zoom_factor)
+                
+                # Draw main circle in BGR color space
                 cv2.circle(zoomed_bgr,
-                          (point_x, point_y),
-                          1,
+                          (zoomed_x, zoomed_y),
+                          zoomed_diameter // 2,
                           (0, 255, 255),  # BGR: Yellow
-                          -1,
+                          1,
                           lineType=cv2.LINE_AA)
+                
+                # Draw dots on circle
+                num_points = 8
+                for i in range(num_points):
+                    angle = 2 * np.pi * i / num_points
+                    point_x = int(zoomed_x + (zoomed_diameter/2) * np.cos(angle))
+                    point_y = int(zoomed_y + (zoomed_diameter/2) * np.sin(angle))
+                    cv2.circle(zoomed_bgr,
+                              (point_x, point_y),
+                              1,
+                              (0, 255, 255),  # BGR: Yellow
+                              -1,
+                              lineType=cv2.LINE_AA)
+
+            # Convert back to RGB for display
+            zoomed = cv2.cvtColor(zoomed_bgr, cv2.COLOR_BGR2RGB)
+
+            # Calculate pan limits
+            self.max_pan_x = max(0, new_width - width)
+            self.max_pan_y = max(0, new_height - height)
+            
+            # Ensure pan values are within bounds
+            self.pan_x = min(max(0, self.pan_x), self.max_pan_x)
+            self.pan_y = min(max(0, self.pan_y), self.max_pan_y)
+            
+            # Extract visible portion
+            visible = zoomed[
+                int(self.pan_y):int(self.pan_y + height),
+                int(self.pan_x):int(self.pan_x + width)
+            ]
 
-        # Convert back to RGB for display
-        zoomed = cv2.cvtColor(zoomed_bgr, cv2.COLOR_BGR2RGB)
-
-        # Calculate pan limits
-        self.max_pan_x = max(0, new_width - width)
-        self.max_pan_y = max(0, new_height - height)
-        
-        # Ensure pan values are within bounds
-        self.pan_x = min(max(0, self.pan_x), self.max_pan_x)
-        self.pan_y = min(max(0, self.pan_y), self.max_pan_y)
-        
-        # Extract visible portion
-        visible = zoomed[
-            int(self.pan_y):int(self.pan_y + height),
-            int(self.pan_x):int(self.pan_x + width)
-        ]
-
-        return visible
-    except Exception as e:
-        print(f"Error updating display: {str(e)}")
-        return self.original_display
+            return visible
+        except Exception as e:
+            print(f"Error updating display: {str(e)}")
+            return self.original_display
 
     def format_results(self):
         if not self.results: