Update app.py

app.py

@@ -14,9 +14,6 @@ class DicomAnalyzer:
         self.image_display1 = None
         self.dicom_data1 = None
         self.marks1 = []
-        self.zoom_factor = 1.0
-        self.offset_x = 0
-        self.offset_y = 0
 
     def load_dicom(self, file):
         try:
@@ -48,10 +45,6 @@ class DicomAnalyzer:
 
     def analyze_point(self, image, dicom_data, x, y):
         try:
-            # Map coordinates to original image
-            x = int((x - self.offset_x) / self.zoom_factor)
-            y = int((y - self.offset_y) / self.zoom_factor)
-
             # Create a circular mask
             mask = np.zeros_like(image, dtype=np.uint8)
             y_indices, x_indices = np.ogrid[:image.shape[0], :image.shape[1]]
@@ -85,23 +78,29 @@ class DicomAnalyzer:
         try:
             image_copy = image.copy()
 
-            # Map coordinates to original image
-            x = int((x - self.offset_x) / self.zoom_factor)
-            y = int((y - self.offset_y) / self.zoom_factor)
-
             # Draw all previous marks
             for mark_x, mark_y in self.marks1:
                 cv2.circle(image_copy, 
-                          (int(mark_x * self.zoom_factor + self.offset_x), int(mark_y * self.zoom_factor + self.offset_y)), 
-                          int(self.circle_diameter / 2 * self.zoom_factor), 
-                          (255, 255, 0), 1,  # Thinner yellow outline
+                          (int(mark_x), int(mark_y)), 
+                          int(self.circle_diameter / 2), 
+                          (255, 255, 0), 1,  # Yellow outer ring (thin)
+                          lineType=cv2.LINE_AA)
+                cv2.circle(image_copy,
+                          (int(mark_x), int(mark_y)),
+                          int(self.circle_diameter / 2) - 1,
+                          (255, 255, 255), 1,  # White inner ring (thin)
                           lineType=cv2.LINE_AA)
 
             # Draw the new mark
             cv2.circle(image_copy, 
-                      (int(x * self.zoom_factor + self.offset_x), int(y * self.zoom_factor + self.offset_y)), 
-                      int(self.circle_diameter / 2 * self.zoom_factor), 
-                      (255, 255, 0), 1,  # Thinner yellow outline
+                      (int(x), int(y)), 
+                      int(self.circle_diameter / 2), 
+                      (255, 255, 0), 1,  # Yellow outer ring (thin)
+                      lineType=cv2.LINE_AA)
+            cv2.circle(image_copy, 
+                      (int(x), int(y)), 
+                      int(self.circle_diameter / 2) - 1, 
+                      (255, 255, 255), 1,  # White inner ring (thin)
                       lineType=cv2.LINE_AA)
 
             # Store the new mark
@@ -187,16 +186,6 @@ class DicomAnalyzer:
         self.circle_diameter = value
         return f"Circle diameter set to {value}"
 
-    def update_zoom(self, zoom_factor):
-        self.zoom_factor = zoom_factor
-        if self.current_image1 is not None:
-            height, width = self.current_image1.shape
-            resized = cv2.resize(self.image_display1, None, fx=self.zoom_factor, fy=self.zoom_factor, interpolation=cv2.INTER_LINEAR)
-            self.offset_x = (resized.shape[1] - width * self.zoom_factor) // 2
-            self.offset_y = (resized.shape[0] - height * self.zoom_factor) // 2
-            return resized
-        return self.image_display1
-
     def save_results(self):
         try:
             if not self.results:
@@ -237,14 +226,6 @@ def create_interface():
                 label="Circle Diameter"
             )
 
-            zoom_slider = gr.Slider(
-                minimum=1.0, 
-                maximum=5.0, 
-                value=1.0, 
-                step=0.1, 
-                label="Zoom Factor"
-            )
-
         with gr.Row():
             clear_btn = gr.Button("Clear Results")
             blank_row_btn = gr.Button("Add Blank Row")
@@ -263,12 +244,6 @@ def create_interface():
             outputs=status
         )
 
-        zoom_slider.change(
-            fn=analyzer.update_zoom,
-            inputs=zoom_slider,
-            outputs=image1
-        )
-
         image1.select(
             fn=analyzer.handle_click, 
             outputs=[image1, results]
@@ -303,4 +278,4 @@ def create_interface():
 
 if __name__ == "__main__":
     interface = create_interface()
-    interface.launch()
+    interface.launch()