Prevent drawing when interacting

Signed-off-by: Brianna Major <[email protected]>
HEXRD · Sep 20, 2023 · af3796a · af3796a
1 parent ec58684
commit af3796a
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/hexrd/ui/mask_regions_dialog.py b/hexrd/ui/mask_regions_dialog.py
@@ -178,16 +178,22 @@ def snap_rectangle_to_edges(self, event):
             self.drag_motion(event)
 
     def check_pick(self, event):
+        pick_found = False
         for templates in self.interactive_templates.values():
             for it in templates:
                 it.static_mode = True
                 transformed_click = it.template.get_transform().transform(
                     (event.xdata, event.ydata))
-                if it.template.contains_point(transformed_click):
+                if (not pick_found and
+                        it.template.contains_point(transformed_click) and
+                        event.inaxes.get_title() == it.detector):
                     if self.interactive_template:
                         self.interactive_template.disconnect()
                     self.interactive_template = it
                     self.interactive_template.static_mode = False
+                    self.interactive_template.on_press(event)
+                    pick_found = True
+        return pick_found
 
     def button_pressed(self, event):
         if self.image_mode not in (ViewType.raw, ViewType.polar):
@@ -199,9 +205,10 @@ def button_pressed(self, event):
 
         if event.button == 1:
             # Determine if selecting an existing template or drawing a new one
-            self.check_pick(event)
+            pick_found = self.check_pick(event)
 
-            if (self.interactive_template and
+            if (pick_found or
+                    self.interactive_template and
                     not self.interactive_template.static_mode):
                 return