fix update file_list

Author: danielparthier

ephys/GUI/sessioninfo.py

@@ -1,5 +1,6 @@
 import uuid
 import numpy as np
+from ephys import MetaData
 
 
 class SessionInfo:
@@ -12,18 +13,52 @@ def __init__(self):
         self.theme = ""
         self.session_id = str(uuid.uuid4())
 
-    def set_file_list(self, file_list: list[str] | str | np.ndarray) -> None:
-        if isinstance(file_list, str):
-            self.file_list = [file_list]
-        elif isinstance(file_list, np.ndarray):
-            self.file_list = file_list.tolist()
+    def set_attribute(
+        self, attr_name: str, value: str | list[str] | np.ndarray
+    ) -> None:
+        if hasattr(self, attr_name):
+            if isinstance(value, str):
+                value_list = [value]
+            elif isinstance(value, np.ndarray):
+                value_list = value.tolist()
+            elif isinstance(value, list):
+                value_list = value
+            else:
+                raise ValueError(
+                    "Value must be a string, list of strings, or numpy array."
+                )
+            setattr(self, attr_name, value_list)
         else:
-            self.file_list = file_list
+            raise AttributeError(
+                f"Attribute '{attr_name}' does not exist in SessionInfo."
+            )
 
     def set_file_path(self, file_path: list[str] | str | np.ndarray) -> None:
-        if isinstance(file_path, str):
-            self.file_path = file_path
-        elif isinstance(file_path, np.ndarray):
-            self.file_path = file_path.tolist()
-        else:
-            self.file_path = file_path
+        self.set_attribute("file_path", file_path)
+
+    def set_file_list(self, file_list: list[str] | str | np.ndarray) -> None:
+        self.set_attribute("file_list", file_list)
+
+    def set_experimenter_name(
+        self, experimenter_name: str | list[str] | np.ndarray
+    ) -> None:
+        self.set_attribute("experimenter_name_val", experimenter_name)
+
+    def set_exp_date(self, exp_date: str | list[str] | np.ndarray) -> None:
+        self.set_attribute("exp_date", exp_date)
+
+    def set_theme(self, theme: str) -> None:
+        self.theme: str = theme
+
+    def set_current_user(self, current_user: str) -> None:
+        self.current_user: str = current_user
+
+    def sync_metadata(self, meta_data: MetaData) -> None:
+        if hasattr(meta_data, "experimenter"):
+            self.set_experimenter_name(meta_data.get_experimenter())
+        if hasattr(meta_data, "exp_date"):
+            self.set_exp_date(meta_data.get_date_of_experiment())
+        if hasattr(meta_data, "file_name"):
+            self.set_file_list(meta_data.get_file_name())
+        if hasattr(meta_data, "file_path"):
+            self.set_file_path(meta_data.get_file_path())

ephys/GUI/sidemenu.py

@@ -11,16 +11,17 @@
     QLabel,
 )
 
-from PySide6.QtGui import QPainter, QColor, QBrush
+from PySide6.QtGui import QPainter, QColor
 from PySide6.QtSvg import QSvgRenderer
 
-from PySide6.QtCore import Qt, QDate
-from ephys.GUI.labfolder import LabfolderWindow, LabfolderLoginWindow
+from PySide6.QtCore import Qt, QDate, Signal, QObject, QRunnable, Slot
+from ephys.GUI.labfolder import LabfolderWindow
 from ephys.GUI.meta_data import MetaDataWindow
 from ephys.GUI.styles import apply_style
 from ephys.GUI.trace_view import TracePlotWindow
-from ephys.classes.experiment_objects import ExpData
+from ephys.classes.experiment_objects import ExpData, MetaData
 import ephys.GUI.GUI_config as config
+import numpy as np
 
 if TYPE_CHECKING:
     from ephys.GUI.gui_app import MainWindow
@@ -149,6 +150,7 @@ def change_style(self) -> None:
             header_format.setBackground(QColor("blue"))
             header_format.setForeground(QColor("white"))
         self.main_window.session_info.theme = self.theme
+        self.main_window.highlight_switch.setChecked(False)
 
     def connect_to_main_window(self) -> None:
         self.main_window.session_info.current_user = self.current_user_label.text()
@@ -159,50 +161,75 @@ def connect_to_main_window(self) -> None:
 
     def file_loading(
         self,
-        file_path: list | str = "data/WCP/WholeCell/180207_005.cc_step_40_comp.1.wcp",
+        file_path: list | str = "",
     ):
+        if file_path == "":
+            print("No files selected")
+            return None
         self.clicked_status = True
         experimenter_name = self.main_window.session_info.experimenter_name_val
         print(f"Experimenter name: {experimenter_name}")
         print("Date of experiment: ", self.main_window.session_info.exp_date)
-
+        # if isinstance(self.main_window.session_info.file_path, list):
+        # new_files = np.array(file_path)[
+        #     np.invert(np.isin(file_path, self.main_window.session_info.file_list))
+        # ].tolist()
+        print(f"File: {file_path}")
         if self.main_window.data is None:
-            data = ExpData(file_path=file_path, experimenter=experimenter_name)
+            # to do add worker with slot
+            data_worker = DataLoader(
+                file_path=file_path, experimenter=experimenter_name
+            )
+            data_worker.signals.result.connect(self.on_data_loaded)
+            self.main_window.threadpool.start(data_worker)
+            print("DataWorker is an instance of DataLoader")
+            # data = ExpData(file_path=file_path, experimenter=experimenter_name)
         else:
             print("Data already loaded, adding file to existing data")
-            print(self.main_window.data.meta_data_summary())
-            data: ExpData = self.main_window.data
-            data.add_file(file_path=file_path, experimenter=experimenter_name)
+            new_files = self.main_window.data.new_file_paths(file_path)
+            print("New files to add: ", new_files)
+            self.main_window.data.add_file(
+                file_path=new_files, experimenter=experimenter_name
+            )
+        if isinstance(self.main_window.data, ExpData):
+            self.main_window.session_info.sync_metadata(self.main_window.data.meta_data)
 
         # data = DataLoader(file_path=file_path, experimenter_name=experimenter_name)
         # self.main_window.threadpool.start(data)
-        if data is None:
-            print("Data could not be loaded")
-        self.combobox.clear()
-
-        # data = data.get_data()
-        self.file_list = [
-            file_info["file_name"] for file_info in data.meta_data.file_info
+        # The rest of the logic is now handled in on_data_loaded for new data
+        if self.main_window.data is not None and isinstance(
+            self.main_window.data, ExpData
+        ):
+            # does clearing not work?
+            self.combobox.clear()
+            self.file_list = self.main_window.data.meta_data.get_file_name()
+            self.file_paths = self.main_window.data.meta_data.get_file_path()
+
+            print("Data loaded successfully")
+            print(f"File list: {self.file_list}")
+            print("File_path:", file_path)
+            if isinstance(self.main_window.data, ExpData):
+                print(self.main_window.data.meta_data_summary())
+
+            # make for every file a new tab on the main window
+            # check if tab already exists
+            self.update_plot_tab()
+            self.refresh_file_list()
+
+    def check_new_tabs(self, file_list: list[str] | str) -> list[str]:
+        """Check which files in file_list do not have a tab yet.
+        Args:
+            file_list (list[str] | str): List of file names to check.
+        Returns:
+            list[str]: List of file names that do not have a tab yet.
+        """
+        if isinstance(file_list, str):
+            file_list = [file_list]
+        tabl_list = [
+            self.main_window.trace_plot.tabText(tab_index)
+            for tab_index in range(self.main_window.trace_plot.count())
         ]
-        self.main_window.data = data
-        print("Data loaded successfully")
-        print(f"File list: {self.file_list}")
-        print(f"Clicked status: {self.clicked_status}")
-        if isinstance(self.main_window.data, ExpData):
-            print(self.main_window.data.meta_data_summary())
-
-        # make for every file a new tab on the main window
-        for i, file_name in enumerate(self.file_list):
-            print(f"File {i}: {file_name}")
-            # Create a new tab for each file
-
-            trace_plot = TracePlotWindow(
-                main_window=self.main_window, file_name=file_name
-            )
-            trace_plot.add_trace_plot(trace=self.main_window.data.protocols[i])
-            self.main_window.trace_plot.addTab(trace_plot, file_name)
-
-        self.refresh_file_list()
+        return list(set(file_list) - set(tabl_list))
 
     def choose_file(self) -> None:
         # Store the dialog as an instance attribute to prevent it from being deleted
@@ -214,13 +241,9 @@ def choose_file(self) -> None:
             "data/WCP/WholeCell",
             "All supported (*.wcp and *.abf);;WCP files (*.wcp);;ABF files (*.abf)",
         )[0]
-        # if not file_path:
-        #     print("No files selected")
-        #     return None
+
+        print("choose files: ", file_path)
         self.file_loading(file_path)
-        if isinstance(file_path, str):
-            file_path = [file_path]
-        self.main_window.session_info.file_list = file_path
 
     def add_meta_data(self) -> None:
         from ephys.GUI.meta_data import MetaDataWindow
@@ -253,11 +276,52 @@ def refresh_file_list(self) -> None:
         """
         self.combobox.clear()
         if self.main_window.data is not None:
-            self.combobox.addItems(
-                self.main_window.data.meta_data_summary()["file_name"]
+            self.combobox.addItems(self.main_window.data.meta_data.get_file_name())
+
+        # get current tab
+        self.combobox.setCurrentText(
+            self.main_window.trace_plot.tabText(
+                self.main_window.trace_plot.currentIndex()
             )
+        )
+
         print("File list refreshed")
 
+    def on_data_loaded(self, data: ExpData) -> None:
+        # find why it is duplicate
+        """
+        Slot to handle the result from DataLoader.
+        """
+
+        self.main_window.data = data
+        self.combobox.clear()
+        self.file_list = data.meta_data.get_file_name()
+        self.file_paths = data.meta_data.get_file_path()
+        print("Data loaded successfully")
+        print(f"File list: {self.file_list}")
+        print(f"Clicked status: {getattr(self, 'clicked_status', None)}")
+        if isinstance(self.main_window.data, ExpData):
+            print(self.main_window.data.meta_data_summary())
+            self.update_plot_tab()
+        self.refresh_file_list()
+
+    def update_plot_tab(self) -> None:
+        if isinstance(self.main_window.data, ExpData):
+            new_tabs = self.check_new_tabs(self.file_list)
+            for i, file_name in enumerate(self.file_list):
+                if file_name not in new_tabs:
+                    continue
+                print(f"File {i}: {file_name}")
+                # Create a new tab for each file
+                print(self.file_paths[i])
+                trace_plot = TracePlotWindow(
+                    main_window=self.main_window, file_name=self.file_paths[i]
+                )
+                trace_plot.add_trace_plot(trace=self.main_window.data.protocols[i])
+                self.main_window.trace_plot.addTab(trace_plot, file_name)
+        else:
+            print("No data loaded yet.")
+
 
 class SideMenuContainer(QWidget):
     def __init__(self) -> None:
@@ -274,3 +338,36 @@ def paintEvent(self, event) -> None:
             self.svg_renderer.render(painter, self.rect())
         else:
             super().paintEvent(event)
+
+
+class DataLoaderSignals(QObject):
+
+    finished = Signal()
+    error = Signal(object)
+    result = Signal(object)
+    progress = Signal(int)
+
+
+class DataLoader(QRunnable):
+
+    def __init__(self, file_path: str | list[str], experimenter: str):
+        super().__init__()
+        self.file_path = file_path
+        self.experimenter = experimenter
+        self.signals = DataLoaderSignals()
+
+    @Slot()
+    def run(self):
+        # Load data from the file
+        try:
+            data = self.load_data(self.file_path, self.experimenter)
+        except Exception as e:
+            self.signals.error.emit(e)
+        else:
+            self.signals.result.emit(data)
+        finally:
+            self.signals.finished.emit()
+
+    def load_data(self, file_path: str | list[str], experimenter: str) -> object:
+        # Implement the data loading logic here
+        return ExpData(file_path=file_path, experimenter=experimenter)

ephys/classes/experiment_objects.py

@@ -399,7 +399,9 @@ def get_experiment_attribute(self, attribute: str) -> list[str]:
             list[str]: The values of the specified attribute(s) from the ExperimentInfo object.
         """
         # check that attribute exists
-        if attribute not in self.experiment_info[0]:
+        if self.experiment_info.size == 0:
+            return []
+        elif attribute not in self.experiment_info[0]:
             raise ValueError(f"Attribute '{attribute}' not found in experiment_info.")
         else:
             return [
@@ -418,7 +420,9 @@ def get_file_attribute(self, attribute: str) -> list[str]:
             list[str]: The values of the specified attribute(s) from the MetaData object.
         """
         # check that attribute exists
-        if attribute not in self.file_info[0]:
+        if self.file_info.size == 0:
+            return []
+        elif attribute not in self.file_info[0]:
             raise ValueError(f"Attribute '{attribute}' not found in file_info.")
         else:
             return [file[attribute] for file in self.file_info if attribute in file]
@@ -434,7 +438,9 @@ def get_subject_attribute(self, attribute: str) -> list[str]:
             list[str]: The values of the specified attribute(s) from the SubjectInfo object.
         """
         # check that attribute exists
-        if attribute not in self.subject_info[0]:
+        if self.subject_info.size == 0:
+            return []
+        elif attribute not in self.subject_info[0]:
             raise ValueError(f"Attribute '{attribute}' not found in subject_info.")
         else:
             return [