remove add/remove objects for view-range (#139)

* remove add/remove objects for view-range

* move addItem for Scene into init of Qt-objects for annotations and events

Author: marsipu

mne_qt_browser/_pg_figure.py

@@ -1233,8 +1233,6 @@ def mouseDragEvent(self, event, axis=None):
                                                     description=description,
                                                     values=(self._drag_start,
                                                             drag_stop))
-                    self.mne.plt.addItem(self._drag_region)
-                    self.mne.plt.addItem(self._drag_region.label_item)
                 elif event.isFinish():
                     drag_stop = self.mapSceneToView(event.scenePos()).x()
                     self._drag_region.setRegion((self._drag_start, drag_stop))
@@ -1368,15 +1366,18 @@ def _q_font(point_size, bold=False):
 class EventLine(InfiniteLine):
     """Displays Events inside Trace-Plot"""
 
-    def __init__(self, pos, label, color):
+    def __init__(self, mne, pos, label, color):
         super().__init__(pos, pen=color, movable=False,
                          label=str(label), labelOpts={'position': 0.98,
                                                       'color': color,
                                                       'anchors': [(0, 0.5),
                                                                   (0, 0.5)]})
+        self.mne = mne
         self.label.setFont(_q_font(10, bold=True))
         self.setZValue(0)
 
+        self.mne.plt.addItem(self)
+
 
 class Crosshair(InfiniteLine):
     """Continously updating marker inside the Trace-Plot."""
@@ -1991,6 +1992,9 @@ def __init__(self, mne, description, values):
 
         self.update_color()
 
+        self.mne.plt.addItem(self)
+        self.mne.plt.addItem(self.label_item)
+
     def _region_changed(self):
         self.regionChangeFinished.emit(self)
         self.old_onset = self.getRegion()[0]
@@ -2869,11 +2873,8 @@ def _hidpi_mkPen(*args, **kwargs):
                                       self.mne.event_nums):
                 color = self.mne.event_color_dict[ev_id]
                 label = self.mne.event_id_rev.get(ev_id, ev_id)
-                event_line = EventLine(ev_time, label, color)
+                event_line = EventLine(self.mne, ev_time, label, color)
                 self.mne.event_lines.append(event_line)
-
-                if 0 < ev_time < self.mne.duration:
-                    self.mne.plt.addItem(event_line)
         else:
             self.mne.events_visible = False
 
@@ -3607,13 +3608,6 @@ def _xrange_changed(self, _, xrange):
 
         self._redraw(update_data=True)
 
-        # Update annotations
-        if not self.mne.is_epochs:
-            self._update_annotations_xrange(xrange)
-
-        # Update Events
-        self._update_events_xrange(xrange)
-
         # Update Time-Bar
         self.mne.ax_hscroll.update_value(xrange[0])
 
@@ -3623,47 +3617,6 @@ def _xrange_changed(self, _, xrange):
         # Update Scalebars
         self._update_scalebar_x_positions()
 
-    def _update_events_xrange(self, xrange):
-        """Add or remove event-lines depending on view-range.
-
-        This has proven to be more performant (and scalable)
-        than adding all event-lines to plt(the Scene)
-        and letting pyqtgraph/Qt handle it.
-        """
-        if self.mne.events_visible:
-            for ev_line in self.mne.event_lines:
-                if xrange[0] < ev_line.pos().x() < xrange[1]:
-                    if ev_line not in self.mne.plt.items:
-                        self.mne.plt.addItem(ev_line)
-                else:
-                    if ev_line in self.mne.plt.items:
-                        self.mne.plt.removeItem(ev_line)
-
-    def _update_annotations_xrange(self, xrange):
-        """Add or remove annotation-regions depending on view-range.
-
-        This has proven to be more performant (and scalable)
-        than adding all annotations to plt(the Scene)
-        and letting pyqtgraph/Qt handle it.
-        """
-        if self.mne.annotations_visible:
-            for region in self.mne.regions:
-                if self.mne.visible_annotations[region.description]:
-                    rmin, rmax = region.getRegion()
-                    xmin, xmax = xrange
-                    comparisons = [rmin < xmin,
-                                   rmin < xmax,
-                                   rmax < xmin,
-                                   rmax < xmax]
-                    if all(comparisons) or not any(comparisons):
-                        if region in self.mne.plt.items:
-                            self.mne.plt.removeItem(region)
-                            self.mne.plt.removeItem(region.label_item)
-                    else:
-                        if region not in self.mne.plt.items:
-                            self.mne.plt.addItem(region)
-                            self.mne.plt.addItem(region.label_item)
-
     def _yrange_changed(self, _, yrange):
         if not self.mne.butterfly:
             if not self.mne.fig_selection:
@@ -3973,17 +3926,14 @@ def _add_region(self, plot_onset, duration, description, region=None):
         if not region:
             region = AnnotRegion(self.mne, description=description,
                                  values=(plot_onset, plot_onset + duration))
-        if (any([self.mne.t_start < v < self.mne.t_start + self.mne.duration
-                 for v in [plot_onset, plot_onset + duration]]) and
-                region not in self.mne.plt.items):
-            self.mne.plt.addItem(region)
-            self.mne.plt.addItem(region.label_item)
+        # Add region to list and plot
+        self.mne.regions.append(region)
+
+        # Connect signals of region
         region.regionChangeFinished.connect(self._region_changed)
         region.gotSelected.connect(self._region_selected)
         region.removeRequested.connect(self._remove_region)
         self.mne.viewbox.sigYRangeChanged.connect(region.update_label_pos)
-        self.mne.regions.append(region)
-
         region.update_label_pos()
 
     def _remove_region(self, region, from_annot=True):
@@ -4108,17 +4058,6 @@ def _set_annotations_visible(self, visible):
             self.mne.visible_annotations[descr] = visible
         self._update_regions_visible()
 
-        # Update Plot
-        if visible:
-            self._update_annotations_xrange((self.mne.t_start,
-                                             self.mne.t_start +
-                                             self.mne.duration))
-        else:
-            for region in [r for r in self.mne.regions
-                           if r in self.mne.plt.items]:
-                self.mne.plt.removeItem(region)
-                self.mne.plt.removeItem(region.label_item)
-
     def _toggle_annotations(self):
         self.mne.annotations_visible = not self.mne.annotations_visible
         self._set_annotations_visible(self.mne.annotations_visible)
@@ -4231,15 +4170,6 @@ def _set_events_visible(self, visible):
         for event_line in self.mne.event_lines:
             event_line.setVisible(visible)
 
-        # Update Plot
-        if visible:
-            self._update_events_xrange((self.mne.t_start,
-                                        self.mne.t_start +
-                                        self.mne.duration))
-        else:
-            for event_line in [evl for evl in self.mne.event_lines
-                               if evl in self.mne.plt.items]:
-                self.mne.plt.removeItem(event_line)
         self.mne.overview_bar.update_events()
 
     def _toggle_events(self):