Skip to content

Commit fea7e1a

Browse files
committed
Fix duplicated event source
1 parent e16e2c9 commit fea7e1a

2 files changed

Lines changed: 6 additions & 18 deletions

File tree

spikeinterface_gui/tracemapview.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -252,18 +252,12 @@ def _panel_make_layout(self):
252252
x="x", y="y", size=10, fill_color="color", fill_alpha=self.settings['alpha'], source=self.spike_source
253253
)
254254

255-
self.event_source = ColumnDataSource({"x": [], "y": []})
256-
self.event_renderer = self.figure.line(
257-
x="x", y="y", source=self.event_source, line_color="yellow", line_width=2, line_dash='dashed'
258-
)
259255
if self.chan_group_offsets is not None:
260256
self.figure.hspan(y=list(self.chan_group_offsets), line_color="yellow")
261257

262258
# # Add hover tool for spikes
263-
# hover_spikes = HoverTool(renderers=[self.spike_renderer], tooltips=[("Unit", "@unit_id")])
264259
# self.figure.add_tools(hover_spikes)
265-
self.toolbar = self._panel_create_toolbar()
266-
self.bottom_toolbar = self._panel_create_bottom_toolbar()
260+
self._panel_create_toolbars()
267261

268262
self.layout = pn.Column(
269263
pn.Column( # Main content area

spikeinterface_gui/traceview.py

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -366,13 +366,13 @@ def _panel_create_toolbars(self):
366366
self.xsize_spinner.param.watch(self._panel_on_xsize_changed, "value")
367367
self.auto_scale_button.on_click(self._panel_auto_scale)
368368

369-
toolbar = pn.Row(
369+
self.toolbar = pn.Row(
370370
self.segment_selector,
371371
xsize,
372372
self.auto_scale_button,
373373
sizing_mode="stretch_width",
374374
)
375-
return toolbar
375+
self.bottom_toolbar = self._panel_create_bottom_toolbar()
376376

377377
def _panel_create_bottom_toolbar(self):
378378
import panel as pn
@@ -572,10 +572,10 @@ def _panel_add_event_line(self):
572572
# get yspan from self.figure
573573
fig = self.figure
574574
yspan = [fig.y_range.start, fig.y_range.end]
575-
self.event_source.data = dict(x=[evt_time, evt_time], y=yspan)
575+
self.event_source.data = {"xs": [[evt_time, evt_time]], "ys": [yspan]}
576576

577577
def _panel_remove_event_line(self):
578-
self.event_source.data = dict(x=[], y=[])
578+
self.event_source.data = {"xs": [], "ys": []}
579579

580580
# TODO: pan behavior like Qt?
581581
# def _panel_on_pan_start(self, event):
@@ -822,15 +822,9 @@ def _panel_make_layout(self):
822822
x="x", y="y", size=10, fill_color="color", fill_alpha=self.settings['alpha'], source=self.spike_source
823823
)
824824

825-
self.event_source = ColumnDataSource({"x": [], "y": []})
826-
self.event_renderer = self.figure.line(
827-
x="x", y="y", source=self.event_source, line_color="yellow", line_width=2, line_dash='dashed'
828-
)
829-
830825
self.figure.on_event(DoubleTap, self._panel_on_double_tap)
831826

832-
self.toolbar = self._panel_create_toolbar()
833-
self.bottom_toolbar = self._panel_create_bottom_toolbar()
827+
self._panel_create_toolbars()
834828

835829
self.layout = pn.Column(
836830
self.toolbar,

0 commit comments

Comments
 (0)