do layout before controller

Author: chrishalcrow

spikeinterface_gui/backend_panel.py

@@ -185,10 +185,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)
@@ -258,7 +257,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

@@ -141,13 +141,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()
@@ -206,7 +205,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):

spikeinterface_gui/main.py

@@ -8,6 +8,7 @@
 from spikeinterface import load_sorting_analyzer, load
 from spikeinterface.core.core_tools import is_path_remote
 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
@@ -122,7 +123,9 @@ def run_mainwindow(
         import time
         t0 = time.perf_counter()
 
-    skip_extensions = find_skippable_extensions(layout_preset=layout_preset, layout=layout)
+    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,
@@ -149,7 +152,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'
@@ -161,7 +164,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')
@@ -352,10 +355,8 @@ def run_mainwindow_cli():
             disable_save_settings_button=disable_save_settings_button,
         )
 
-def find_skippable_extensions(layout_preset, layout=None):
+def find_skippable_extensions(layout_dict):
 
-    from spikeinterface_gui.layout_presets import get_layout_description
-    layout_dict = get_layout_description(layout_preset, layout)
     view_per_zone = list(layout_dict.values())
     list_of_views = [view for zone_views in view_per_zone for view in zone_views]
 
@@ -368,5 +369,9 @@ def find_skippable_extensions(layout_preset, layout=None):
         skippable_extensions.append('waveforms')
     if 'ndscatter' not in list_of_views:
         skippable_extensions.append('principal_components')
+    if 'isi' not in list_of_views:
+        skippable_extensions.append('isi_histograms')
+    if 'correlogram' not in list_of_views:
+        skippable_extensions.append('correlograms')
 
     return skippable_extensions