minor improvements 1

Author: marinraf

village/custom_classes/online_plot_base.py

@@ -4,7 +4,8 @@
 
 
 class OnlinePlotBase:
-    """Class to handle creation and management of Matplotlib figures to monitor behavioral data in real-time.
+    """Class to handle creation and management of Matplotlib figures to monitor
+    behavioral data in real-time.
 
     Use this with the variables you are registering in your task,
     that are part of Task.session_df.
@@ -19,15 +20,10 @@ def __init__(self) -> None:
         self.fig: Figure | None = None
         self.active = False
 
-    def ensure_figure(self, width: int = 10, height: int = 8) -> None:
-        """Ensures that the matplotlib figure exists, creating it if necessary.
-
-        Args:
-            width (int, optional): Width of the figure in inches. Defaults to 10.
-            height (int, optional): Height of the figure in inches. Defaults to 8.
-        """
+    def ensure_figure(self) -> None:
+        """Ensures that the matplotlib figure exists, creating it if necessary."""
         if self.fig is None or getattr(self.fig, "canvas", None) is None:
-            self.create_figure_and_axes(width, height)
+            self.create_figure_and_axes()
 
     def close(self) -> None:
         """Closes the matplotlib figure and resets the state."""
@@ -52,13 +48,10 @@ def update_canvas(self, df: pd.DataFrame) -> None:
         except Exception:
             pass
 
-    def create_figure_and_axes(self, width: int = 10, height: int = 8) -> None:
-        """Creates the figure and axes. Should be overridden by subclasses.
-
-        Args:
-            width (int, optional): Width of the figure. Defaults to 10.
-            height (int, optional): Height of the figure. Defaults to 8.
-        """
+    def create_figure_and_axes(self) -> None:
+        """Creates the figure and axes. Should be overridden by subclasses."""
+        width = 10
+        height = 8
         self.fig, self.ax = plt.subplots(figsize=(width, height))
 
         # self.fig = plt.figure(figsize=(width, height))

village/gui/data_layout.py

@@ -63,7 +63,8 @@ def __init__(self, model: "Table | None" = None) -> None:
         """Initializes the TableView.
 
         Args:
-            model (Table | None, optional): The data model for the table. Defaults to None.
+            model (Table | None, optional): The data model for the table.
+            Defaults to None.
         """
         super().__init__()
         if model is not None:
@@ -226,7 +227,8 @@ def __init__(self, parent=None, current_value=None) -> None:
 
         Args:
             parent (QWidget, optional): Parent widget. Defaults to None.
-            current_value (str, optional): Current value ("ON", "OFF", or "Mon-Tue..."). Defaults to None.
+            current_value (str, optional): Current value ("ON", "OFF", or "Mon-Tue...").
+            Defaults to None.
         """
         super().__init__(parent)
         self.setWindowTitle("Select Days or On/Off")
@@ -344,7 +346,8 @@ def getSelection(self) -> str | None:
         """Constructs the result string based on selected days.
 
         Returns:
-            str: A string representing the selected days (e.g., "Mon-Wed-Fri") or "ON"/"OFF".
+            str: A string representing the selected days
+            (e.g., "Mon-Wed-Fri") or "ON"/"OFF".
         """
         if self.on_checkbox.isChecked():
             return "ON"
@@ -413,11 +416,13 @@ def columnCount(self, parent: QModelIndex = QModelIndex()) -> int:
         return self.df.shape[1]
 
     def data(self, index: QModelIndex, role: int = Qt.DisplayRole) -> Any:
-        """Returns the data stored under the given role for the item referred to by the index.
+        """Returns the data stored under the given role for the item
+        referred to by the index.
 
         Args:
             index (QModelIndex): The index of the item.
-            role (int, optional): The role for which data is requested. Defaults to Qt.DisplayRole.
+            role (int, optional): The role for which data is requested.
+            Defaults to Qt.DisplayRole.
 
         Returns:
             Any: The data for the given role.
@@ -454,12 +459,15 @@ def data(self, index: QModelIndex, role: int = Qt.DisplayRole) -> Any:
     def headerData(
         self, section: int, orientation: Qt.Orientation, role: int = Qt.DisplayRole
     ) -> Any:
-        """Returns the data for the given role and section in the header with the specified orientation.
+        """Returns the data for the given role and section in the header
+        with the specified orientation.
 
         Args:
             section (int): The section number (row or column index).
-            orientation (Qt.Orientation): The orientation of the header (Horizontal or Vertical).
-            role (int, optional): The role for which data is requested. Defaults to Qt.DisplayRole.
+            orientation (Qt.Orientation): The orientation of the header
+            (Horizontal or Vertical).
+            role (int, optional): The role for which data is requested.
+            Defaults to Qt.DisplayRole.
 
         Returns:
             Any: The header data.
@@ -738,7 +746,8 @@ def change_to_df(self) -> None:
         self.central_layout.setCurrentWidget(self.page1)
 
     def update_data(self) -> None:
-        """Updates the data displayed in the current layout based on the selected table."""
+        """Updates the data displayed in the current layout based on
+        the selected table."""
         if self.central_layout.currentIndex() == 0:
             self.page1Layout.update_data()
             self.page1Layout.create_table()
@@ -1168,7 +1177,8 @@ def connect_button_to_add(self, button: QPushButton) -> None:
         button.show()
 
     def update_buttons(self) -> None:
-        """Updates the state and visibility of action buttons based on selection and table type."""
+        """Updates the state and visibility of action buttons based on selection
+        and table type."""
         sel_model = self.table_view.selectionModel()
         selected_indexes = sel_model.selectedRows() if sel_model else []
         match manager.table:
@@ -1315,7 +1325,8 @@ def get_selected_row_series(self) -> pd.Series | None:
         return self.model.df.iloc[index.row()]
 
     def get_seconds_from_session_row(self) -> int:
-        """Calculates the time elapsed in seconds from the session start for the selected row.
+        """Calculates the time elapsed in seconds from the session start
+        for the selected row.
 
         Returns:
             int: The elapsed time in seconds.
@@ -1405,7 +1416,8 @@ def get_paths_from_sessions_summary_row(self, row: pd.Series) -> list[str]:
             row (pd.Series): The session summary row.
 
         Returns:
-            list[str]: A list containing session paths (csv, raw, json, video, video_data).
+            list[str]: A list containing session paths
+            (csv, raw, json, video, video_data).
         """
         date_str = row["date"]
         task = row["task"]
@@ -1820,8 +1832,7 @@ def __init__(self, window: GuiWindow, rows: int, columns: int) -> None:
             columns (int): Number of columns.
         """
         super().__init__(window, rows=rows, columns=columns)
-        self.deltas: list[float] = []
-        self.now = time_utils.get_time_monotonic()
+        self.video_path = ""
         self.draw()
 
     def draw(self) -> None:
@@ -1913,6 +1924,36 @@ def draw(self) -> None:
             self.backward_five_minutes,
             "Skip backward 5 minutes",
         )
+        self.create_and_add_button(
+            "Previous video",
+            26,
+            155,
+            15,
+            2,
+            self.previous_video,
+            "Play the previous video",
+        )
+        self.create_and_add_button(
+            "Next video",
+            26,
+            170,
+            15,
+            2,
+            self.next_video,
+            "Play the next video",
+        )
+
+    def next_video(self) -> None:
+        path = time_utils.next_video_path(self.video_path)
+        if path is not None:
+            self.stop_button_clicked()
+            self.start_video(path, 0)
+
+    def previous_video(self) -> None:
+        path = time_utils.previous_video_path(self.video_path)
+        if path is not None:
+            self.stop_button_clicked()
+            self.start_video(path, 0)
 
     def start_video(self, path: str, seconds: int) -> None:
         """Starts video playback from a specific time.
@@ -1921,6 +1962,7 @@ def start_video(self, path: str, seconds: int) -> None:
             path (str): The path to the video file.
             seconds (int): The number of seconds to skip.
         """
+        self.video_path = path
         try:
             self.cap = cv2.VideoCapture(path)
             self.fps = int(self.cap.get(cv2.CAP_PROP_FPS))
@@ -2059,16 +2101,9 @@ def close(self) -> None:
         """Closes the video layout and saves playback data."""
         self.stop_button_clicked()
         self.data_from_video_change_requested.emit("")
-        with open("deltas.txt", "w") as f:
-            for delta in self.deltas:
-                f.write(f"{delta}\n")
 
     def next_frame_slot(self) -> None:
         """Handles the next frame timer event to update the video display."""
-        last = self.now
-        self.now = time_utils.get_time_monotonic()
-        delta = int((self.now - last) * 1000)
-        self.deltas.append(delta)
 
         ret, frame = self.cap.read()
         if ret:

village/gui/layout.py

@@ -212,7 +212,8 @@ def __init__(
 
         Args:
             window (GuiWindow): The parent window.
-            stacked (bool, optional): Whether this layout is part of a stacked widget. Defaults to False.
+            stacked (bool, optional): Whether this layout is part of a stacked widget.
+            Defaults to False.
             rows (int, optional): Number of rows in the grid. Defaults to 51.
             columns (int, optional): Number of columns in the grid. Defaults to 200.
         """
@@ -793,7 +794,8 @@ def create_and_add_toggle_button(
             index (int): Initial index in possible_values.
             action (Callable): The function to call on toggle.
             description (str): Tooltip text.
-            complete_name (bool, optional): Whether to show key + value. Defaults to False.
+            complete_name (bool, optional): Whether to show key + value.
+            Defaults to False.
             color (str, optional): Background color. Defaults to "lightgray".
 
         Returns:

village/gui/sound_calibration_layout.py

@@ -348,11 +348,12 @@ def draw(self) -> None:
         self.addLayout(self.plot_layout, 5, 121, 38, 79)
 
     def change_layout(self, auto: bool = False) -> bool:
-        if manager.state in [State.RUN_MANUAL, State.SAVE_MANUAL]:
-            if not auto:
-                QMessageBox.information(
-                    self.window, "WARNING", "Wait until the task finishes."
-                )
+        if auto:
+            return False
+        elif manager.state in [State.RUN_MANUAL, State.SAVE_MANUAL]:
+            QMessageBox.information(
+                self.window, "WARNING", "Wait until the task finishes."
+            )
             return False
         elif self.save_button.isEnabled():
             reply = QMessageBox.question(

village/scripts/time_utils.py

@@ -347,6 +347,40 @@ def format_duration(self, milliseconds: int) -> str:
         millis = milliseconds % 1_000
         return f"{hours:02}:{minutes:02}:{seconds:02}.{millis:03}"
 
+    def get_sorted_videos(self, directory: str) -> list[str]:
+        files = [f for f in os.listdir(directory) if f.endswith(".mp4")]
+        files_with_dates = []
+        for f in files:
+            try:
+                date = self.date_from_path(f)
+                files_with_dates.append((f, date))
+            except (ValueError, IndexError):
+                pass
+        files_with_dates.sort(key=lambda x: x[1])
+        return [f for f, _ in files_with_dates]
+
+    def next_video_path(self, video_path: str) -> str | None:
+        directory = os.path.dirname(video_path)
+        filename = os.path.basename(video_path)
+        sorted_videos = self.get_sorted_videos(directory)
+        if filename not in sorted_videos:
+            return None
+        idx = sorted_videos.index(filename)
+        if idx + 1 < len(sorted_videos):
+            return os.path.join(directory, sorted_videos[idx + 1])
+        return None
+
+    def previous_video_path(self, video_path: str) -> str | None:
+        directory = os.path.dirname(video_path)
+        filename = os.path.basename(video_path)
+        sorted_videos = self.get_sorted_videos(directory)
+        if filename not in sorted_videos:
+            return None
+        idx = sorted_videos.index(filename)
+        if idx - 1 >= 0:
+            return os.path.join(directory, sorted_videos[idx - 1])
+        return None
+
     class Chrono:
         """Simple specific chronometer for measuring elapsed time."""