Update app.py

app.py

@@ -59,21 +59,21 @@ class DicomAnalyzer:
             return None, f"Error loading DICOM file: {str(e)}"
 
     def normalize_image(self, image):
-    try:
-        normalized = cv2.normalize(
-            image, 
-            None, 
-            alpha=0,
-            beta=255,
-            norm_type=cv2.NORM_MINMAX,
-            dtype=cv2.CV_8U
-        )
-        if len(normalized.shape) == 2:
-            normalized = cv2.cvtColor(normalized, cv2.COLOR_GRAY2BGR)
-        return normalized
-    except Exception as e:
-        print(f"Error normalizing image: {str(e)}")
-        return None
+        try:
+            normalized = cv2.normalize(
+                image, 
+                None, 
+                alpha=0,
+                beta=255,
+                norm_type=cv2.NORM_MINMAX,
+                dtype=cv2.CV_8U
+            )
+            if len(normalized.shape) == 2:
+                normalized = cv2.cvtColor(normalized, cv2.COLOR_GRAY2BGR)
+            return normalized
+        except Exception as e:
+            print(f"Error normalizing image: {str(e)}")
+            return None
 
     def reset_view(self):
         self.zoom_factor = 1.0
@@ -94,32 +94,32 @@ class DicomAnalyzer:
         return self.update_display()
 
     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
-        
-        original_pan_x = self.pan_x
-        original_pan_y = self.pan_y
-        
-        if key == 'ArrowLeft':
-            self.pan_x = max(0, self.pan_x - pan_amount)
-        elif key == 'ArrowRight':
-            self.pan_x = min(self.max_pan_x, self.pan_x + pan_amount)
-        elif key == 'ArrowUp':
-            self.pan_y = max(0, self.pan_y - pan_amount)
-        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}")
-        print(f"Max Pan Y: {self.max_pan_y}")
-        
-        return self.update_display()
-    except Exception as e:
-        print(f"Error handling keyboard input: {str(e)}")
-        return self.display_image
+        try:
+            print(f"Handling key press: {key}")
+            pan_amount = int(5 * self.zoom_factor)  # Reduced pan amount for smoother movement
+            
+            original_pan_x = self.pan_x
+            original_pan_y = self.pan_y
+            
+            if key == 'ArrowLeft':
+                self.pan_x = max(0, self.pan_x - pan_amount)
+            elif key == 'ArrowRight':
+                self.pan_x = min(self.max_pan_x, self.pan_x + pan_amount)
+            elif key == 'ArrowUp':
+                self.pan_y = max(0, self.pan_y - pan_amount)
+            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}")
+            print(f"Max Pan Y: {self.max_pan_y}")
+            
+            return self.update_display()
+        except Exception as e:
+            print(f"Error handling keyboard input: {str(e)}")
+            return self.display_image
 
     def analyze_roi(self, evt: gr.SelectData):
         try:
@@ -171,63 +171,63 @@ 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)
 
-        # 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
-            cv2.circle(zoomed,
-                      (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
                 cv2.circle(zoomed,
-                          (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,
+                              (point_x, point_y),
+                              1,
+                              (0, 255, 255),  # BGR: Yellow
+                              -1,
+                              lineType=cv2.LINE_AA)
 
-        # 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)
-        ]
+            # 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: