Merge pull request #1023 from annie-xd-wang/Catch-Displaying-TclError

TheDeanLab · Oct 24, 2024 · 895e9bb · 895e9bb
2 parents 6aa7625 + 05c5283
commit 895e9bb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/navigate/controller/controller.py b/src/navigate/controller/controller.py
@@ -1219,6 +1219,7 @@ def display_images(
             if microscope_name not in self.additional_microscopes:
                 self.additional_microscopes[microscope_name] = {}
 
+            if "camera_view_controller" not in self.additional_microscopes[microscope_name]:
                 popup_window = CameraViewPopupWindow(self.view, microscope_name)
                 camera_view_controller = CameraViewController(
                     popup_window.camera_view, self

diff --git a/src/navigate/controller/sub_controllers/camera_view.py b/src/navigate/controller/sub_controllers/camera_view.py
@@ -906,12 +906,15 @@ def populate_image(self, image):
             Image data.
         """
         temp_img = self.array_to_image(image)
-        if self.image_cache_flag:
-            self.tk_image = ImageTk.PhotoImage(temp_img)
-            self.canvas.create_image(0, 0, image=self.tk_image, anchor="nw")
-        else:
-            self.tk_image2 = ImageTk.PhotoImage(temp_img)
-            self.canvas.create_image(0, 0, image=self.tk_image2, anchor="nw")
+        try:
+            if self.image_cache_flag:
+                self.tk_image = ImageTk.PhotoImage(temp_img)
+                self.canvas.create_image(0, 0, image=self.tk_image, anchor="nw")
+            else:
+                self.tk_image2 = ImageTk.PhotoImage(temp_img)
+                self.canvas.create_image(0, 0, image=self.tk_image2, anchor="nw")
+        except tk.TclError:
+            return
         self.image_cache_flag = not self.image_cache_flag
 
     def process_image(self):