Merge branch 'main' of github.com:SpikeInterface/spikeinterface-gui into handle-times

Author: alejoe91

spikeinterface_gui/backend_panel.py

@@ -199,10 +199,9 @@ def listen_setting_changes(view):
 
 class PanelMainWindow:
 
-    def __init__(self, controller, layout_preset=None, layout=None, user_settings=None):
+    def __init__(self, controller, layout_dict=None, user_settings=None):
         self.controller = controller
-        self.layout_preset = layout_preset
-        self.layout = layout
+        self.layout_dict = layout_dict
         self.verbose = controller.verbose
 
         self.make_views(user_settings)
@@ -272,7 +271,7 @@ def create_main_layout(self):
 
         pn.extension("gridstack")
 
-        preset = get_layout_description(self.layout_preset, self.layout)
+        preset = self.layout_dict
 
         layout_zone = {}
         for zone, view_names in preset.items():

spikeinterface_gui/backend_qt.py

@@ -155,13 +155,12 @@ def stop_listen_setting_changes(view):
 class QtMainWindow(QT.QMainWindow):
     main_window_closed = QT.pyqtSignal(object)
 
-    def __init__(self, controller, parent=None, layout_preset=None, layout=None, user_settings=None):
+    def __init__(self, controller, parent=None, layout_dict=None, user_settings=None):
         QT.QMainWindow.__init__(self, parent)
 
         self.controller = controller
         self.verbose = controller.verbose
-        self.layout_preset = layout_preset
-        self.layout = layout
+        self.layout_dict = layout_dict
 
         self.make_views(user_settings)
         self.create_main_layout()
@@ -220,7 +219,7 @@ def create_main_layout(self):
 
         self.setDockNestingEnabled(True)
 
-        preset = get_layout_description(self.layout_preset, self.layout)
+        preset = self.layout_dict
 
         widgets_zone = {}
         for zone, view_names in preset.items():

spikeinterface_gui/layout_presets.py

@@ -34,7 +34,7 @@ def _check_valid_layout_dict(layout_dict):
             list_of_possible_class_views = list(possible_class_views.keys())
             if class_view not in list_of_possible_class_views:
                 raise KeyError(f"View '{class_view}' in layout dictionary not equal to a valid View. "\
-                                "Valid views are {list_of_possible_class_views}")
+                                f"Valid views are {list_of_possible_class_views}")
 
 def get_layout_description(preset_name, layout=None):
     if isinstance(layout, dict):
@@ -53,7 +53,7 @@ def get_layout_description(preset_name, layout=None):
 
 default_layout = dict(
     zone1=['curation', 'spikelist'],
-    zone2=['unitlist', 'mergelist'],
+    zone2=['unitlist', 'merge'],
     zone3=['trace', 'tracemap',  'spikeamplitude', 'spikedepth', 'spikerate'],
     zone4=[],
     zone5=['probe'],
@@ -67,7 +67,7 @@ def get_layout_description(preset_name, layout=None):
 # legacy layout for nostalgic people like me
 legacy_layout = dict(
     zone1=['curation', 'spikelist'],
-    zone2=['unitlist', 'mergelist'],
+    zone2=['unitlist', 'merge'],
     zone3=['trace', 'tracemap', 'waveform', 'waveformheatmap', 'isi', 'correlogram', 'spikeamplitude'],
     zone4=[],
     zone5=['probe'],
@@ -78,7 +78,7 @@ def get_layout_description(preset_name, layout=None):
 _presets['legacy'] = legacy_layout
 
 unit_focus_layout = dict(
-    zone1=['unitlist', 'mergelist', 'curation', 'spikelist'],
+    zone1=['unitlist', 'merge', 'curation', 'spikelist'],
     zone2=[],
     zone3=['trace', 'tracemap',  'spikeamplitude', 'spikedepth'],
     zone4=[],

spikeinterface_gui/main.py

@@ -7,11 +7,13 @@
 
 from spikeinterface import load_sorting_analyzer, load
 from spikeinterface.core.core_tools import is_path_remote
+from spikeinterface.core.sortinganalyzer import get_available_analyzer_extensions
 from .utils_global import get_config_folder
+from spikeinterface_gui.layout_presets import get_layout_description
 
 import spikeinterface_gui
 from spikeinterface_gui.controller import Controller
-
+from spikeinterface_gui.viewlist import possible_class_views
 
 def run_mainwindow(
     analyzer,
@@ -121,6 +123,11 @@ def run_mainwindow(
     if verbose:
         import time
         t0 = time.perf_counter()
+
+    layout_dict = get_layout_description(layout_preset, layout)
+    if skip_extensions is None:
+        skip_extensions = find_skippable_extensions(layout_dict)
+
     controller = Controller(
         analyzer, backend=backend, verbose=verbose,
         curation=curation, curation_data=curation_dict,
@@ -146,7 +153,7 @@ def run_mainwindow(
 
         app = mkQApp()
 
-        win = QtMainWindow(controller, layout_preset=layout_preset, layout=layout, user_settings=user_settings)
+        win = QtMainWindow(controller, layout_dict=layout_dict, user_settings=user_settings)
         win.setWindowTitle('SpikeInterface GUI')
         # Set window icon
         icon_file = Path(__file__).absolute().parent / 'img' / 'si.png'
@@ -158,7 +165,7 @@ def run_mainwindow(
 
     elif backend == "panel":
         from .backend_panel import PanelMainWindow, start_server
-        win = PanelMainWindow(controller, layout_preset=layout_preset, layout=layout, user_settings=user_settings)
+        win = PanelMainWindow(controller, layout_dict=layout_dict, user_settings=user_settings)
 
         if start_app or panel_window_servable:
             win.main_layout.servable(title='SpikeInterface GUI')
@@ -349,3 +356,25 @@ def run_mainwindow_cli():
             disable_save_settings_button=disable_save_settings_button,
         )
 
+def find_skippable_extensions(layout_dict):
+    """
+    Returns the extensions which don't need to be loaded, depending on which views the user
+    wants to load. Does this by taking all possible extensions, then removing any which are
+    needed by a view.
+    """
+    
+    all_extensions = set(get_available_analyzer_extensions())
+
+    view_per_zone = list(layout_dict.values())
+    list_of_views = [view for zone_views in view_per_zone for view in zone_views]
+
+    needed_extensions = ['unit_locations']
+
+    for view in list_of_views:
+        extensions_view_depend_on = possible_class_views[view]._depend_on
+        if extensions_view_depend_on is not None:
+            needed_extensions += extensions_view_depend_on
+
+    skippable_extensions = list(all_extensions.difference(set(needed_extensions)))
+
+    return skippable_extensions

spikeinterface_gui/mainsettingsview.py

@@ -60,6 +60,9 @@ def save_current_settings(self, event=None):
             view_class_name = view.__class__.__name__
             view_name = view_class_name.replace("View", "").lower()
 
+            if view_name == "unitlist":
+                continue
+
             settings_dict[view_name] = {}
 
             if backend == "panel":

spikeinterface_gui/probeview.py

@@ -180,6 +180,7 @@ def _qt_refresh(self):
             for label in self.channel_labels:
                 label.hide()
 
+        self._qt_highlight_visible_units()
 
     def _qt_update_channel_visibility_from_roi(self, emit_signals=False):
         r, x, y = circle_from_roi(self.roi_channel)
@@ -224,6 +225,9 @@ def _qt_on_roi_units_changed(self, emit_signals=True):
         self._qt_on_roi_channel_changed(emit_signals=False)
 
     def _qt_on_unit_visibility_changed(self, auto_zoom=None):
+        self._qt_highlight_visible_units(auto_zoom=auto_zoom)
+
+    def _qt_highlight_visible_units(self, auto_zoom=None):
         import pyqtgraph as pg
 
         # this change the ROI and so change also channel_visibility

spikeinterface_gui/utils_qt.py

@@ -193,12 +193,16 @@ class ViewBoxHandlingDoubleclickAndGain(pg.ViewBox):
     doubleclicked = QT.pyqtSignal()
     gain_zoom = QT.pyqtSignal(float)
     widen_narrow = QT.pyqtSignal(float)
+    heighten_shorten = QT.pyqtSignal(float)
     limit_zoom = QT.pyqtSignal(float)
     def mouseDoubleClickEvent(self, ev):
         self.doubleclicked.emit()
         ev.accept()
     def wheelEvent(self, ev, axis=None):
-        if ev.modifiers() == QT.Qt.AltModifier:
+        if (ev.modifiers() & QT.Qt.AltModifier) and (ev.modifiers() & QT.Qt.ShiftModifier):
+            z = 1.3 if ev.delta()>0 else 1/1.3
+            self.heighten_shorten.emit(z)
+        elif ev.modifiers() == QT.Qt.AltModifier:
             z = 1.3 if ev.delta()>0 else 1/1.3
             self.widen_narrow.emit(z)
         elif ev.modifiers() == QT.Qt.ShiftModifier:
@@ -243,11 +247,6 @@ def mouseDragEvent(self, ev):
         self.xsize_zoom.emit((ev.pos()-ev.lastPos()).x())
 
 
-
-
-
-
-
 class TimeSeeker(QT.QWidget) :
 
     time_changed = QT.pyqtSignal(float)