fix handling of trials

nwbwidgets/misc.py

@@ -6,7 +6,7 @@
 import plotly.graph_objects as go
 import pynwb
 import scipy
-from ipywidgets import widgets, fixed, FloatProgress, Layout
+from ipywidgets import widgets, fixed, FloatProgress, Layout, HTML
 from matplotlib.collections import PatchCollection
 from matplotlib.patches import Rectangle
 from pynwb.misc import AnnotationSeries, Units, DecompositionSeries
@@ -297,29 +297,36 @@ def __init__(
 
         if intervals is None:
             all_intervals_tables = self.units.get_ancestor("NWBFile").intervals
+            trials = self.units.get_ancestor("NWBFile").trials
+            if trials is not None:
+                all_intervals_tables.add(trials)
             if len(all_intervals_tables) == 0:
-                self.children = [HTMLWidget("could not find intervals")]
+                self.children = [HTML("could not find intervals")]
                 return
             elif len(all_intervals_tables) == 1:
-                self.intervals = next(all_intervals_tables.values())
+                self.intervals = list(all_intervals_tables.values())[0]
                 self.intervals_dropdown = None
             else:
                 self.intervals_dropdown = widgets.Dropdown(
                     options=list(all_intervals_tables),
                     description="intervals",
                 )
                 self.intervals_dropdown.observe(self.intervals_selector_callback)
-                self.intervals = list(all_intervals_tables.values())[0]
+                self.intervals = next(all_intervals_tables.values())
         else:
             if isinstance(intervals, str):
+                if intervals not in self.units.get_ancestor("NWBFile").intervals:
+                    raise ValueError("'{intervals}' not in NWBFile.intervals")
                 self.intervals = self.units.get_ancestor("NWBFile").intervals[intervals]
                 self.intervals_dropdown = None
             elif isinstance(intervals, widgets.Dropdown):
                 self.intervals_dropdown = intervals
                 self.intervals = self.units.get_ancestor("NWBFile").intervals[self.intervals_dropdown.value]
-            else:
+            elif isinstance(intervals, pynwb.epoch.TimeIntervals):
                 self.intervals = intervals
                 self.intervals_dropdown = None
+            else:
+                raise ValueError("intervals is not an allowable type")
 
         if unit_controller is None:
             self.unit_ids = self.units.id.data[:]

test/test_misc.py

@@ -93,7 +93,6 @@ def test_psth_widget(self):
 
     def test_multipsth_widget(self):
         psth_widget = PSTHWidget(self.nwbfile.units)
-        assert isinstance(psth_widget, widgets.Widget)
         start_labels = ('start_time', 'stop_time')
         fig = psth_widget.update(index=0, start_labels=start_labels)
         assert len(fig.axes) == 2 * len(start_labels)