Speed up highlight artist plotting

Signed-off-by: Brianna Major <[email protected]>

Author: bnmajor

hexrdgui/image_canvas.py

@@ -82,7 +82,6 @@ def __init__(self, parent=None, image_names=None):
         self.blit_manager = BlitManager(self)
         self.raw_view_images_dict = {}
         self._mask_boundary_artists = []
-        self._mask_highlight_artists = []
         self._latest_compute_view_worker = None
         self._waterfall_plot_dialog = None
 
@@ -397,6 +396,10 @@ def blit_artists(self):
     def overlay_artists(self):
         return self.blit_artists.setdefault('overlays', {})
 
+    @property
+    def mask_highlight_artists(self):
+        return self.blit_artists.setdefault('mask_highlights', {})
+
     def remove_all_overlay_artists(self):
         self.blit_manager.remove_artists('overlays')
         self.blit_manager.artists['overlays'] = {}
@@ -2219,10 +2222,7 @@ def update_mask_highlights(self, axis):
         self.highlight_masks(axis)
 
     def clear_mask_highlights(self):
-        for artist in self._mask_highlight_artists:
-            artist.remove()
-
-        self._mask_highlight_artists.clear()
+        self.remove_all_mask_highlight_artists()
 
     def get_mask_verts(self, visible_attr, det=None):
         # Create an instrument once that we will re-use
@@ -2325,9 +2325,23 @@ def highlight_masks(self, axis, det=None):
             'edgecolor': 'none',
             'fill': True,
         }
+
+        highlight_artists = self.mask_highlight_artists.setdefault(det or 'default', [])
+
         for vert in all_verts:
             polygon = Polygon(vert, **kwargs)
-            self._mask_highlight_artists.append(axis.add_patch(polygon))
+            polygon.set_animated(True)
+            axis.add_patch(polygon)
+            highlight_artists.append(polygon)
+
+        self.blit_manager.update()
+
+    def remove_all_mask_highlight_artists(self):
+        self.blit_manager.remove_artists('mask_highlights')
+        self.blit_manager.artists['mask_highlights'] = {}
+
+    def remove_mask_highlight_artists(self, key):
+        self.blit_manager.remove_artists('mask_highlights', key)
 
 
 class PolarXAxisTickLocator(AutoLocator):

hexrdgui/masking/mask_manager_dialog.py

@@ -6,7 +6,7 @@
 from operator import attrgetter
 import re
 
-from PySide6.QtCore import QObject, Qt
+from PySide6.QtCore import QObject, Qt, QTimer
 from PySide6.QtWidgets import (
     QComboBox, QDialog, QDialogButtonBox, QFileDialog, QMenu,
     QMessageBox, QTreeWidgetItem, QVBoxLayout
@@ -425,8 +425,16 @@ def selected_changed(self):
                 mask.highlight = False
             for mask in masks_from_names:
                 mask.highlight = True
-            self.selected_masks = masks_from_names
-            MaskManager().masks_changed()
+            if set(self.selected_masks) != set(masks_from_names):
+                # Only update the mask highlights if the selected masks have changed
+                # Debounce the update to avoid re-drawing too often
+                self.selected_masks = masks_from_names
+                if not hasattr(self, '_mask_highlight_update_timer'):
+                    timer = QTimer()
+                    timer.setSingleShot(True)
+                    timer.timeout.connect(MaskManager().masks_changed)
+                    self._mask_highlight_update_timer = timer
+                self._mask_highlight_update_timer.start(100)
 
             if len(selected) == 0:
                 return