Update app.py

app.py

@@ -81,52 +81,47 @@ class DicomAnalyzer:
             print(f"Error analyzing point: {str(e)}")
             return None
 
-    def draw_circle(self, image, x, y, is_image1=True):
-        try:
-            image_copy = image.copy()
-            
-            # Draw all previous marks
-            marks = self.marks1 if is_image1 else self.marks2
-            for mark_x, mark_y in marks:
-                cv2.circle(image_copy, 
-                          (int(mark_x), int(mark_y)), 
-                          int(self.circle_diameter/2), 
-                          (0, 255, 255), 
-                          1, 
-                          lineType=cv2.LINE_AA)
-            
-            # Draw new mark
+def draw_circle(self, image, x, y, is_image1=True):
+    try:
+        image_copy = image.copy()
+        
+        # Draw all previous marks
+        marks = self.marks1 if is_image1 else self.marks2
+        for mark_x, mark_y in marks:
             cv2.circle(image_copy, 
-                      (int(x), int(y)), 
-                      int(self.circle_diameter/2), 
-                      (0, 255, 255), 
-                      1, 
+                      (int(mark_x), int(mark_y)), 
+                      int(self.circle_diameter / 2), 
+                      (0, 255, 255), 2,  # Yellow outer ring
+                      lineType=cv2.LINE_AA)
+            cv2.circle(image_copy,
+                      (int(mark_x), int(mark_y)),
+                      int(self.circle_diameter / 2) - 2,
+                      (255, 255, 255), 1,  # White inner ring
                       lineType=cv2.LINE_AA)
-            
-            # Store new mark
-            if is_image1:
-                self.marks1.append((x, y))
-            else:
-                self.marks2.append((x, y))
-                
-            return image_copy
-        except Exception as e:
-            print(f"Error drawing circle: {str(e)}")
-            return image
 
-    def process_image1(self, file):
-        image, image_display, dicom_data = self.load_dicom(file)
-        self.current_image1 = image
-        self.image_display1 = image_display
-        self.dicom_data1 = dicom_data
-        return image_display
+        # Draw the new mark
+        cv2.circle(image_copy, 
+                  (int(x), int(y)), 
+                  int(self.circle_diameter / 2), 
+                  (0, 255, 255), 2,  # Yellow outer ring
+                  lineType=cv2.LINE_AA)
+        cv2.circle(image_copy, 
+                  (int(x), int(y)), 
+                  int(self.circle_diameter / 2) - 2, 
+                  (255, 255, 255), 1,  # White inner ring
+                  lineType=cv2.LINE_AA)
+        
+        # Store the new mark
+        if is_image1:
+            self.marks1.append((x, y))
+        else:
+            self.marks2.append((x, y))
+            
+        return image_copy
+    except Exception as e:
+        print(f"Error drawing circle: {str(e)}")
+        return image
 
-    def process_image2(self, file):
-        image, image_display, dicom_data = self.load_dicom(file)
-        self.current_image2 = image
-        self.image_display2 = image_display
-        self.dicom_data2 = dicom_data
-        return image_display
 
     def handle_click1(self, evt: gr.SelectData):
         if self.current_image1 is None: