boris-behav-obs 9.2__py2.py3-none-any.whl → 9.2.2__py2.py3-none-any.whl

boris/advanced_event_filtering.py

@@ -359,8 +359,10 @@ def event_filtering(self):
         selected_observations,
         start_coding=start_coding,
         end_coding=end_coding,
-        start_interval=start_interval,
-        end_interval=end_interval,
+        # start_interval=start_interval,
+        # end_interval=end_interval,
+        start_interval=None,
+        end_interval=None,
         maxTime=max_media_duration_all_obs,
         show_include_modifiers=False,
         show_exclude_non_coded_behaviors=False,
@@ -368,7 +370,7 @@ def event_filtering(self):
         n_observations=len(selected_observations),
     )
 
-    if parameters == {}:
+    if not parameters:
         return
 
     if not parameters[cfg.SELECTED_SUBJECTS] or not parameters[cfg.SELECTED_BEHAVIORS]:

boris/behavior_binary_table.py

@@ -80,12 +80,12 @@ def create_behavior_binary_table(pj: dict, selected_observations: list, paramete
                 end_time = dec(max_obs_length)
 
         if parameters_obs["time"] == cfg.TIME_OBS_INTERVAL:
-            obs_interval = pj[cfg.OBSERVATIONS][obs_id][cfg.OBSERVATION_TIME_INTERVAL]
+            obs_interval = pj[cfg.OBSERVATIONS][obs_id].get(cfg.OBSERVATION_TIME_INTERVAL, [0, 0])
             offset = pj[cfg.OBSERVATIONS][obs_id][cfg.TIME_OFFSET]
             start_time = dec(obs_interval[0]) + offset
             # Use max observation length for end time if no interval is defined (=0)
             max_obs_length, _ = observation_operations.observation_length(pj, [obs_id])
-            end_time = dec(obs_interval[1]) + offset if obs_interval[1] != 0 else dec(max_obs_length)
+            end_time = dec(obs_interval[1]) + offset if obs_interval[1] not in (0, None) else dec(max_obs_length)
 
         if obs_id not in results_df:
             results_df[obs_id] = {}
@@ -166,8 +166,8 @@ def behavior_binary_table(self):
         None,
         cfg.programName,
         (
-            "Depending of the length of your observations "
-            "the execution of this function may be very long.<br>"
+            "Depending on the length of yours observations "
+            "the execution of this function may take a long time.<br>"
             "The program interface may freeze, be patient. <br>"
         ),
     )
@@ -224,7 +224,7 @@ def behavior_binary_table(self):
         by_category=False,
         n_observations=len(selected_observations),
     )
-    if parameters == {}:
+    if not parameters:
         return
     if not parameters[cfg.SELECTED_SUBJECTS] or not parameters[cfg.SELECTED_BEHAVIORS]:
         QMessageBox.warning(None, cfg.programName, "Select subject(s) and behavior(s) to analyze")

boris/cooccurence.py

@@ -106,8 +106,10 @@ def get_cooccurence(self):
             selected_observations,
             start_coding=start_coding,
             end_coding=end_coding,
-            start_interval=start_interval,
-            end_interval=end_interval,
+            # start_interval=start_interval,
+            # end_interval=end_interval,
+            start_interval=None,
+            end_interval=None,
             maxTime=max_media_duration_all_obs,
             n_observations=len(selected_observations),
             show_include_modifiers=False,

boris/core.py

@@ -3631,6 +3631,17 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         else:
             current_time = self.getLaps()
 
+        # check if observation time interval
+        if self.pj[cfg.OBSERVATIONS][self.observationId].get(cfg.OBSERVATION_TIME_INTERVAL, [0, 0])[1]:
+            # check if current time outside of interval
+            if current_time >= self.pj[cfg.OBSERVATIONS][self.observationId].get(cfg.OBSERVATION_TIME_INTERVAL, [None, None])[1]:
+                self.beep("beep")
+                self.liveTimer.stop()
+                self.liveObservationStarted = False
+                # set current time to end of observation interval
+                current_time = dec(self.pj[cfg.OBSERVATIONS][self.observationId].get(cfg.OBSERVATION_TIME_INTERVAL, [None, None])[1])
+                self.pb_live_obs.setText("Live observation finished")
+
         self.lb_current_media_time.setText(util.convertTime(self.timeFormat, current_time))
 
         # extract State events
@@ -3660,14 +3671,6 @@ class MainWindow(QMainWindow, Ui_MainWindow):
                 self.liveTimer.stop()
                 self.pb_live_obs.setText("Live observation stopped (scan sampling)")
 
-        # observation time interval
-        if self.pj[cfg.OBSERVATIONS][self.observationId].get(cfg.OBSERVATION_TIME_INTERVAL, [0, 0])[1]:
-            if current_time >= self.pj[cfg.OBSERVATIONS][self.observationId].get(cfg.OBSERVATION_TIME_INTERVAL, [0, 0])[1]:
-                self.beep("beep")
-                self.liveTimer.stop()
-                self.liveObservationStarted = False
-                self.pb_live_obs.setText("Live observation finished")
-
     def start_live_observation(self):
         """
         activate the live observation mode
@@ -3769,8 +3772,10 @@ class MainWindow(QMainWindow, Ui_MainWindow):
             selected_observations,
             start_coding=start_coding,
             end_coding=end_coding,
-            start_interval=start_interval,
-            end_interval=end_interval,
+            # start_interval=start_interval,
+            # end_interval=end_interval,
+            start_interval=None,
+            end_interval=None,
             maxTime=max_media_duration_all_obs,
             show_include_modifiers=False,
             show_exclude_non_coded_behaviors=False,
@@ -5747,10 +5752,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         if self.playerType == cfg.MEDIA:
             self.pause_video()
 
-            if cfg.OBSERVATION_TIME_INTERVAL in self.pj[cfg.OBSERVATIONS][self.observationId]:
-                self.seek_mediaplayer(int(self.pj[cfg.OBSERVATIONS][self.observationId][cfg.OBSERVATION_TIME_INTERVAL][0]))
-            else:
-                self.seek_mediaplayer(0)
+            self.seek_mediaplayer(int(self.pj[cfg.OBSERVATIONS][self.observationId].get(cfg.OBSERVATION_TIME_INTERVAL, [0, 0])[0]))
 
             self.update_visualizations()
 

boris/export_events.py

@@ -76,7 +76,7 @@ def export_events_as_behavioral_sequences(self, separated_subjects=False, timed=
     else:
         max_media_duration_all_obs = None
         start_coding, end_coding = dec("NaN"), dec("NaN")
-        start_interval, end_interval = dec("NaN"), dec("NaN")
+        start_interval, end_interval = None, None
 
     parameters = select_subj_behav.choose_obs_subj_behav_category(
         self,
@@ -169,7 +169,7 @@ def export_tabular_events(self, mode: str = "tabular") -> None:
     else:
         max_media_duration_all_obs = None
         start_coding, end_coding = dec("NaN"), dec("NaN")
-        start_interval, end_interval = dec("NaN"), dec("NaN")
+        start_interval, end_interval = None, None
 
     parameters = select_subj_behav.choose_obs_subj_behav_category(
         self,
@@ -373,7 +373,7 @@ def export_aggregated_events(self):
     else:
         max_media_duration_all_obs = None
         start_coding, end_coding = dec("NaN"), dec("NaN")
-        start_interval, end_interval = dec("NaN"), dec("NaN")
+        start_interval, end_interval = None, None
 
     parameters = select_subj_behav.choose_obs_subj_behav_category(
         self,
@@ -681,8 +681,10 @@ def export_events_as_textgrid(self) -> None:
         selected_observations,
         start_coding=start_coding,
         end_coding=end_coding,
-        start_interval=start_interval,
-        end_interval=end_interval,
+        # start_interval=start_interval,
+        # end_interval=end_interval,
+        start_interval=None,
+        end_interval=None,
         show_include_modifiers=False,
         show_exclude_non_coded_behaviors=False,
         maxTime=max_obs_length,
@@ -786,7 +788,7 @@ def export_events_as_textgrid(self) -> None:
 
         if parameters["time"] == cfg.TIME_OBS_INTERVAL:
             max_media_duration, _ = observation_operations.media_duration(self.pj[cfg.OBSERVATIONS], [obs_id])
-            obs_interval = self.pj[cfg.OBSERVATIONS][obs_id][cfg.OBSERVATION_TIME_INTERVAL]
+            obs_interval = self.pj[cfg.OBSERVATIONS][obs_id].get(cfg.OBSERVATION_TIME_INTERVAL, [0, 0])
             offset = float(self.pj[cfg.OBSERVATIONS][obs_id][cfg.TIME_OFFSET])
             min_time = float(obs_interval[0]) + offset
             # Use max media duration for max time if no interval is defined (=0)

boris/gui_utilities.py

@@ -31,32 +31,40 @@ def save_geometry(widget: QWidget, widget_name: str):
     save window geometry in ini file
     """
 
-    try:
-        ini_file_path = pl.Path.home() / pl.Path(".boris")
-        if ini_file_path.is_file():
+    ini_file_path = pl.Path.home() / pl.Path(".boris")
+    if ini_file_path.is_file():
+        try:
             settings = QSettings(str(ini_file_path), QSettings.IniFormat)
             settings.setValue(f"{widget_name} geometry", widget.saveGeometry())
-    except Exception:
-        logging.warning(f"error during saving {widget_name} geometry")
+        except Exception:
+            logging.warning(f"error during saving {widget_name} geometry")
 
 
-def restore_geometry(widget: QWidget, widget_name: str, default_geometry):
+def restore_geometry(widget: QWidget, widget_name: str, default_width_height):
     """
     restore window geometry in ini file
     """
+    def default_resize(widget, default_width_height):
+        if default_width_height != (0, 0):
+            try:
+                widget.resize(default_width_height[0], default_width_height[1])
+            except Exception:
+                logging.warning("Error during restoring default")
+
 
+    logging.debug(f'restore geometry function for {widget_name}')
     try:
         ini_file_path = pl.Path.home() / pl.Path(".boris")
         if ini_file_path.is_file():
             settings = QSettings(str(ini_file_path), QSettings.IniFormat)
+            print(settings.value(f"{widget_name} geometry"))
             widget.restoreGeometry(settings.value(f"{widget_name} geometry"))
+            logging.debug(f'geometry restored for {widget_name}  {settings.value(f"{widget_name} geometry")}')
+        else:
+            default_resize(widget, default_width_height)
     except Exception:
         logging.warning(f"error during restoring {widget_name} geometry")
-        if default_geometry != (0, 0):
-            try:
-                widget.resize(default_geometry[0], default_geometry[1])
-            except Exception:
-                logging.warning("Error during restoring default")
+        default_resize(widget, default_width_height)
 
 
 def set_icons(self, theme_mode: str) -> None:

boris/observation_operations.py

@@ -359,14 +359,20 @@ def time_intervals_range(observations: dict, observations_list: list) -> Tuple[O
         decimal.Decimal: time of latest end interval
 
     """
-    start_interval_list = []
-    end_interval_list = []
+    start_interval_list: list = []
+    end_interval_list: list = []
     for obs_id in observations_list:
         observation = observations[obs_id]
         offset = observation[cfg.TIME_OFFSET]
-        if dec(observation[cfg.OBSERVATION_TIME_INTERVAL][0]) + offset and dec(observation[cfg.OBSERVATION_TIME_INTERVAL][1]) + offset:
-            start_interval_list.append(dec(observation[cfg.OBSERVATION_TIME_INTERVAL][0]) + offset)
-            end_interval_list.append(dec(observation[cfg.OBSERVATION_TIME_INTERVAL][1]) + offset)
+        # check if observation interval is defined
+        if (
+            not observation.get(cfg.OBSERVATION_TIME_INTERVAL, [None, None])[0]
+            and not observation.get(cfg.OBSERVATION_TIME_INTERVAL, [None, None])[1]
+        ):
+            return None, None
+
+        start_interval_list.append(dec(observation[cfg.OBSERVATION_TIME_INTERVAL][0]) + offset)
+        end_interval_list.append(dec(observation[cfg.OBSERVATION_TIME_INTERVAL][1]) + offset)
 
     if not start_interval_list:
         earliest_start_interval = None
@@ -872,8 +878,8 @@ def new_observation(self, mode: str = cfg.NEW, obsId: str = "") -> None:
             observationWindow.cb_observation_time_interval.setText(
                 (
                     "Limit observation to a time interval: "
-                    f"{self.pj[cfg.OBSERVATIONS][obsId][cfg.OBSERVATION_TIME_INTERVAL][0]} - "
-                    f"{self.pj[cfg.OBSERVATIONS][obsId][cfg.OBSERVATION_TIME_INTERVAL][1]}"
+                    f"{self.pj[cfg.OBSERVATIONS][obsId].get(cfg.OBSERVATION_TIME_INTERVAL, [0, 0])[0]} - "
+                    f"{self.pj[cfg.OBSERVATIONS][obsId].get(cfg.OBSERVATION_TIME_INTERVAL, [0, 0])[1]}"
                 )
             )
 
@@ -1950,8 +1956,9 @@ def initialize_new_media_observation(self) -> bool:
             )
 
             # position media
-            if cfg.OBSERVATION_TIME_INTERVAL in self.pj[cfg.OBSERVATIONS][self.observationId]:
-                self.seek_mediaplayer(int(self.pj[cfg.OBSERVATIONS][self.observationId][cfg.OBSERVATION_TIME_INTERVAL][0]), player=i)
+            self.seek_mediaplayer(
+                int(self.pj[cfg.OBSERVATIONS][self.observationId].get(cfg.OBSERVATION_TIME_INTERVAL, [0, 0])[0]), player=i
+            )
 
             # restore video zoom level
             if cfg.ZOOM_LEVEL in self.pj[cfg.OBSERVATIONS][self.observationId][cfg.MEDIA_INFO]:

boris/player_dock_widget.py

@@ -23,7 +23,18 @@ This file is part of BORIS.
 import sys
 import logging
 import functools
-from PySide6.QtWidgets import QLabel, QDockWidget, QWidget, QHBoxLayout, QVBoxLayout, QSlider, QSizePolicy, QStackedWidget, QToolButton
+from PySide6.QtWidgets import (
+    QApplication,
+    QLabel,
+    QDockWidget,
+    QWidget,
+    QHBoxLayout,
+    QVBoxLayout,
+    QSlider,
+    QSizePolicy,
+    QStackedWidget,
+    QToolButton,
+)
 from PySide6.QtCore import Signal, QEvent, Qt
 from PySide6.QtGui import QIcon, QAction
 
@@ -141,7 +152,10 @@ class DW_player(QDockWidget):
         self.mute_button.setFocusPolicy(Qt.NoFocus)
         self.mute_button.setAutoRaise(True)
         self.mute_action = QAction()
-        self.mute_action.setIcon(QIcon(":/volume_xmark"))
+
+        theme_mode = "dark" if QApplication.instance().palette().window().color().value() < 128 else "light"
+
+        self.mute_action.setIcon(QIcon(f":/volume_xmark_{theme_mode}"))
         self.mute_action.triggered.connect(self.mute_action_triggered)
         self.mute_button.setDefaultAction(self.mute_action)
 
@@ -180,10 +194,11 @@ class DW_player(QDockWidget):
         """
         emit signal when mute action is triggered
         """
+        theme_mode = "dark" if QApplication.instance().palette().window().color().value() < 128 else "light"
         if self.player.mute:
-            self.mute_action.setIcon(QIcon(":/volume_xmark"))
+            self.mute_action.setIcon(QIcon(f":/volume_xmark_{theme_mode}"))
         else:
-            self.mute_action.setIcon(QIcon(":/volume_off"))
+            self.mute_action.setIcon(QIcon(f":/volume_off_{theme_mode}"))
         self.mute_action_triggered_signal.emit(self.id_)
 
     def keyPressEvent(self, event):

boris/plot_events.py

@@ -441,7 +441,7 @@ def create_events_plot(
             max_time = float(obs_length)
 
         if interval == cfg.TIME_OBS_INTERVAL:
-            obs_interval = self.pj[cfg.OBSERVATIONS][obs_id][cfg.OBSERVATION_TIME_INTERVAL]
+            obs_interval = self.pj[cfg.OBSERVATIONS][obs_id].get(cfg.OBSERVATION_TIME_INTERVAL, [0, 0])
             offset = float(self.pj[cfg.OBSERVATIONS][obs_id][cfg.TIME_OFFSET])
             min_time = float(obs_interval[0]) + offset
             # Use max media duration for max time if no interval is defined (=0)

boris/plugins.py

@@ -65,24 +65,44 @@ def load_plugins(self):
     """
     load selected plugins in analysis menu
     """
+
+    def msg():
+        QMessageBox.warning(
+            self,
+            cfg.programName,
+            f"A plugin with the same name is already loaded ({self.config_param[cfg.ANALYSIS_PLUGINS][plugin_name]}).\n\nThe plugin from {file_} is not loaded.",
+            QMessageBox.Ok | QMessageBox.Default,
+            QMessageBox.NoButton,
+        )
+
     self.menu_plugins.clear()
     self.config_param[cfg.ANALYSIS_PLUGINS] = {}
 
     # load BORIS plugins
-    for file_ in (Path(__file__).parent / "analysis_plugins").glob("*.py"):
+    for file_ in sorted((Path(__file__).parent / "analysis_plugins").glob("*.py")):
         if file_.name == "__init__.py":
             continue
         plugin_name = get_plugin_name(file_)
         if plugin_name is not None and plugin_name not in self.config_param.get(cfg.EXCLUDED_PLUGINS, set()):
+            # check if plugin with same name already loaded
+            if plugin_name in self.config_param[cfg.ANALYSIS_PLUGINS]:
+                msg()
+                continue
+
             self.config_param[cfg.ANALYSIS_PLUGINS][plugin_name] = str(file_)
 
     # load personal plugins
     if self.config_param.get(cfg.PERSONAL_PLUGINS_DIR, ""):
-        for file_ in Path(self.config_param.get(cfg.PERSONAL_PLUGINS_DIR, "")).glob("*.py"):
+        for file_ in sorted(Path(self.config_param.get(cfg.PERSONAL_PLUGINS_DIR, "")).glob("*.py")):
             if file_.name == "__init__.py":
                 continue
             plugin_name = get_plugin_name(file_)
             if plugin_name is not None and plugin_name not in self.config_param.get(cfg.EXCLUDED_PLUGINS, set()):
+                # check if plugin with same name already loaded
+                if plugin_name in self.config_param[cfg.ANALYSIS_PLUGINS]:
+                    msg()
+                    continue
+
                 self.config_param[cfg.ANALYSIS_PLUGINS][plugin_name] = str(file_)
 
     logging.debug(f"{self.config_param.get(cfg.ANALYSIS_PLUGINS, {})=}")
@@ -108,7 +128,7 @@ def plugin_df_filter(df: pd.DataFrame, observations_list: list = [], parameters:
         # filter selected behaviors
         df = df[df["Behavior"].isin(parameters["selected behaviors"])]
 
-        if parameters["time"] == "interval of observation":
+        if parameters["time"] == cfg.TIME_OBS_INTERVAL:
             # filter each observation with observation interval start/stop
 
             # keep events between observation interval start time and observation interval stop/end
@@ -142,6 +162,7 @@ def plugin_df_filter(df: pd.DataFrame, observations_list: list = [], parameters:
                     | ((df["Start (s)"] < MIN_TIME) & (df["Stop (s)"] > MAX_TIME))
                 ]
 
+                # cut state events to interval
                 df_interval.loc[df["Start (s)"] < MIN_TIME, "Start (s)"] = MIN_TIME
                 df_interval.loc[df["Stop (s)"] > MAX_TIME, "Stop (s)"] = MAX_TIME
 
@@ -152,7 +173,7 @@ def plugin_df_filter(df: pd.DataFrame, observations_list: list = [], parameters:
     print("filtered")
     print("=" * 50)
 
-    print(f"{df=}")
+    # print(f"{df=}")
 
     return df
 
@@ -205,8 +226,12 @@ def run_plugin(self, plugin_name):
     if not selected_observations:
         return
 
+    logging.info("preparing dtaaframe for plugin")
+
     df = project_functions.project2dataframe(self.pj, selected_observations)
 
+    logging.info("done")
+
     """
     logging.debug("dataframe info")
     logging.debug(f"{df.info()}")
@@ -214,7 +239,9 @@ def run_plugin(self, plugin_name):
     """
 
     # filter the dataframe with parameters
+    logging.info("filtering dataframe for plugin")
     filtered_df = plugin_df_filter(df, observations_list=selected_observations, parameters=parameters)
+    logging.info("done")
 
     plugin_results = plugin_module.run(filtered_df)
     # test if plugin_tests is a tuple: if not transform to tuple

boris/project_functions.py

@@ -1899,20 +1899,12 @@ def project2dataframe(pj: dict, observations_list: list = []) -> pd.DataFrame:
             if idx_event in stop_event_idx:
                 continue
             data["Observation id"].append(obs_id)
-            data["Observation date"].append(pj["observations"][obs_id]["date"])
-            data["Description"].append(" ".join(pj["observations"][obs_id]["description"].splitlines()))
-            data["Observation type"].append(pj["observations"][obs_id]["type"])
-
-            data["Observation interval start"].append(
-                pj["observations"][obs_id]["observation time interval"][0]
-                if pj["observations"][obs_id]["observation time interval"][0]
-                else None
-            )
-            data["Observation interval stop"].append(
-                pj["observations"][obs_id]["observation time interval"][1]
-                if pj["observations"][obs_id]["observation time interval"][1]
-                else None
-            )
+            data["Observation date"].append(pj[cfg.OBSERVATIONS][obs_id]["date"])
+            data["Description"].append(" ".join(pj[cfg.OBSERVATIONS][obs_id]["description"].splitlines()))
+            data["Observation type"].append(pj[cfg.OBSERVATIONS][obs_id]["type"])
+
+            data["Observation interval start"].append(pj[cfg.OBSERVATIONS][obs_id].get(cfg.OBSERVATION_TIME_INTERVAL, [None, None])[0])
+            data["Observation interval stop"].append(pj[cfg.OBSERVATIONS][obs_id].get(cfg.OBSERVATION_TIME_INTERVAL, [None, None])[1])
 
             # data["Source"].append("")
             # data["Time offset (s)"].append(pj["observations"][obs_id]["time offset"])

boris/synthetic_time_budget.py

@@ -71,8 +71,10 @@ def synthetic_time_budget(self) -> None:
         selected_observations,
         start_coding=start_coding,
         end_coding=end_coding,
-        start_interval=start_interval,
-        end_interval=end_interval,
+        # start_interval=start_interval,
+        # end_interval=end_interval,
+        start_interval=None,
+        end_interval=None,
         maxTime=max_media_duration_all_obs,
         show_exclude_non_coded_behaviors=False,
         by_category=False,
@@ -201,8 +203,10 @@ def synthetic_binned_time_budget(self) -> None:
         selected_observations,
         start_coding=start_coding,
         end_coding=end_coding,
-        start_interval=start_interval,
-        end_interval=end_interval,
+        # start_interval=start_interval,
+        # end_interval=end_interval,
+        start_interval=None,
+        end_interval=None,
         maxTime=max_media_duration_all_obs,
         show_exclude_non_coded_behaviors=False,
         by_category=False,
@@ -221,7 +225,7 @@ def synthetic_binned_time_budget(self) -> None:
     # ask for excluding behaviors durations from total time
     cancel_pressed, synth_tb_param[cfg.EXCLUDED_BEHAVIORS] = self.filter_behaviors(
         title="Select behaviors to exclude",
-        text=("The duration of the selected behaviors will " "be subtracted from the total time"),
+        text=("The duration of the selected behaviors will be subtracted from the total time"),
         table="",
         behavior_type=[cfg.STATE_EVENT],
     )

boris/time_budget_functions.py

@@ -260,7 +260,7 @@ def synthetic_time_budget_bin(pj: dict, selected_observations: list, parameters_
             max_time = dec(end_time)
 
         if time_interval == cfg.TIME_OBS_INTERVAL:
-            obs_interval = pj[cfg.OBSERVATIONS][obs_id][cfg.OBSERVATION_TIME_INTERVAL]
+            obs_interval = pj[cfg.OBSERVATIONS][obs_id].get(cfg.OBSERVATION_TIME_INTERVAL, [0, 0])
             offset = pj[cfg.OBSERVATIONS][obs_id][cfg.TIME_OFFSET]
             min_time = dec(obs_interval[0]) + offset
             # Use max media duration for max time if no interval is defined (=0)

boris/time_budget_widget.py

@@ -436,8 +436,10 @@ def time_budget(self, mode: str, mode2: str = "list"):
         selected_observations,
         start_coding=start_coding,
         end_coding=end_coding,
-        start_interval=start_interval,
-        end_interval=end_interval,
+        # start_interval=start_interval,
+        # end_interval=end_interval,
+        start_interval=None,
+        end_interval=None,
         maxTime=max_media_duration_all_obs,
         by_category=(mode == "by_category"),
         n_observations=len(selected_observations),
@@ -502,7 +504,7 @@ def time_budget(self, mode: str, mode2: str = "list"):
                     max_time = float(obs_length)
 
             if parameters[cfg.TIME_INTERVAL] == cfg.TIME_OBS_INTERVAL:
-                obs_interval = self.pj[cfg.OBSERVATIONS][obsId][cfg.OBSERVATION_TIME_INTERVAL]
+                obs_interval = self.pj[cfg.OBSERVATIONS][obsId].get(cfg.OBSERVATION_TIME_INTERVAL, [0, 0])
                 offset = float(self.pj[cfg.OBSERVATIONS][obsId][cfg.TIME_OFFSET])
                 min_time = float(obs_interval[0]) + offset
                 # Use max media duration for max time if no interval is defined (=0)
@@ -744,7 +746,7 @@ def time_budget(self, mode: str, mode2: str = "list"):
 
         self.tb.twTB.resizeColumnsToContents()
 
-        gui_utilities.restore_geometry(self.tb, "time budget", (0, 0))
+        gui_utilities.restore_geometry(self.tb, "time budget", (800, 600))
 
         self.tb.show()
 

boris/utilities.py

@@ -1456,8 +1456,6 @@ def accurate_media_analysis(ffmpeg_bin: str, file_name: str) -> dict:
 
     ffprobe_results = ffprobe_media_analysis(ffmpeg_bin, file_name)
 
-    print(f"{ffprobe_results=}")
-
     logging.debug(f"file_name: {file_name}")
     logging.debug(f"ffprobe_results: {ffprobe_results}")
 

boris/version.py

@@ -20,5 +20,5 @@ This file is part of BORIS.
 
 """
 
-__version__ = "9.2"
-__version_date__ = "2025-03-17"
+__version__ = "9.2.2"
+__version_date__ = "2025-03-28"

{boris_behav_obs-9.2.dist-info → boris_behav_obs-9.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: boris-behav-obs
-Version: 9.2
+Version: 9.2.2
 Summary: BORIS - Behavioral Observation Research Interactive Software
 Author-email: Olivier Friard <olivier.friard@unito.it>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -686,13 +686,10 @@ Project-URL: Issues, https://github.com/olivierfriard/BORIS/issues
 Classifier: Topic :: Scientific/Engineering
 Classifier: Intended Audience :: Science/Research
 Classifier: Intended Audience :: Education
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
+Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.12
 Description-Content-Type: text/x-rst
 License-File: LICENSE.TXT
@@ -705,7 +702,7 @@ Requires-Dist: pyreadr
 Requires-Dist: pyside6==6.8.0.2
 Requires-Dist: hachoir>=3.3.0
 Provides-Extra: dev
-Requires-Dist: black; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
+Dynamic: license-file

{boris_behav_obs-9.2.dist-info → boris_behav_obs-9.2.2.dist-info}/RECORD

@@ -3,9 +3,9 @@ boris/__main__.py,sha256=ANjTbXgXDoz2nB1tCtOIllfIVotCa602iebACX7rXaE,764
 boris/about.py,sha256=KEUz6nryrg8FceVyFsf8sMz-xWd2cGwIUfuVydHxqC4,5366
 boris/add_modifier.py,sha256=DWqxkKDBm21QH_kPvhpnltwLtFvPxne0VmZ1SY26hj8,26340
 boris/add_modifier_ui.py,sha256=Y7TLO5uS6zW7zpjXmjA4V_VIp_bFDNtjOTbJ9Q6m-mQ,11601
-boris/advanced_event_filtering.py,sha256=DyPHEj2QsTpkkYjBD0iMXqFYCkrMjMcmp1MOuSITtGk,15411
+boris/advanced_event_filtering.py,sha256=VlvU12mL6xYacZOvJAi5uLpHMcmAw5Pvuvmka-PN29c,15469
 boris/behav_coding_map_creator.py,sha256=PSEYMLvOwt0HR7H4kQZl6dli3q89wezWMv-Ri3EZWWc,37443
-boris/behavior_binary_table.py,sha256=SsaPrXyGXwWYPJ_4R0BlfqeV-q1n0vGNDo0HB3ZmQi8,12426
+boris/behavior_binary_table.py,sha256=bpmRDpEjq0rw3YOCoN_He3kfUe8A_R6E48kQR7KnkH8,12453
 boris/behaviors_coding_map.py,sha256=Pat6U2JHxH8epWH42ZlwzZJ0Rmgl-BKQ5KARjp3GbNg,7291
 boris/boris_cli.py,sha256=n0OiVvZM1gM6E7yKaff9wlgmpAGK4TK052VRi8AabJo,13196
 boris/cmd_arguments.py,sha256=oWb-FvhKLbKJhATlTHy9muWu8XnnUfOZ-3Fmz2M8Yzc,1848
@@ -15,8 +15,8 @@ boris/config_file.py,sha256=1-2ZmTvKET57rwrLR1dXblt0AxMpGB1LAiHxu-Sy8es,13543
 boris/connections.py,sha256=y_KkIj3WQQEepJASATHBpZaqwT-ERyFNovy2Q8e7FAA,19321
 boris/converters.py,sha256=c1Jps-URoglY5ILQHz-pCCf6-4DFUHZLtqr_ofsrFg0,11722
 boris/converters_ui.py,sha256=uu7LOBV_fKv2DBdOqsqPwjGsjgONr5ODBoscAA-EP48,9900
-boris/cooccurence.py,sha256=V3HZejWsH-BkCDMCFSRkQ5a75Ne-4elvI3RTxY5YCBk,10299
-boris/core.py,sha256=1T60p9giYcBX5DO1cygsyj-7hIpdUqqIMTZb1jsddl4,234461
+boris/cooccurence.py,sha256=tVERC-V8MWjWHlGEfDuu08iS94qjt4do-38jwI62QaY,10367
+boris/core.py,sha256=DGCZJvw9hgEt9RHgrkaaLzh1R-JkLFmgGfohwTs4XM0,234654
 boris/core_qrc.py,sha256=T3ki5e2Pj0I0QBGz63MPUgZzl8F_VHZwSq074mRNBDU,650669
 boris/core_ui.py,sha256=SeC26uveDCjrCBLsRPuQ6FaapKfON_HIRcQStEDLhl4,76384
 boris/db_functions.py,sha256=Uw9wWH_Pe-qNzpV1k21YG_jKsoOmfY_iiK_7ARZHGDc,13352
@@ -29,11 +29,11 @@ boris/event_operations.py,sha256=ys1DxZ6iooMvvq_hzpPVZSW0dF9Trbx921XV3jeKOxw,382
 boris/events_cursor.py,sha256=VPY_ygD0fxE5lp25mcd2l00XQXurCR6hprffF4tKRbU,2078
 boris/events_snapshots.py,sha256=PjWzQvUGQtIcEc_7FDsRphf7fAhhTccQgYc2eQSA65g,27621
 boris/exclusion_matrix.py,sha256=ff88xD6aqc8bpIuj9ZCz9ju_HeqqgibQwoaJrIOJ6RI,5272
-boris/export_events.py,sha256=YoqE0vHXeDMAk28e6rewI3TODdfMr8YbJsNnJqiXv0Y,39720
+boris/export_events.py,sha256=3B336WEA0g_8oW3VDo_kfq5D0ISu-e7z2f-_ROUvU9c,39756
 boris/export_observation.py,sha256=uPJH_5MXqGm4JSeaSlTikh1i6OKSyLIaZFzS9wp-9qk,50729
 boris/external_processes.py,sha256=vpmhA4Lj2GblBIrDD0YjesB8HPOgx4K9gSWVhTop4Cg,11927
 boris/geometric_measurement.py,sha256=4pI-AYpBSFlJBqS-f8dnkgLtj_Z2E5kwwAdh6WwZ4kk,35049
-boris/gui_utilities.py,sha256=402qypJ44JkcZ1PDeV79j8Z9faQ473TzEkjjO-scBz0,4170
+boris/gui_utilities.py,sha256=5vjIWbUOHFbqKSti-kT0GoteBBEQ5fUYdNGdMxcg_0A,4607
 boris/image_overlay.py,sha256=zZAL8MTt2i2s58CuX81Nym3rJ5pKiTeP4AO8WbIUonM,2527
 boris/import_observations.py,sha256=hwEPIag741AXTFIuxDdZLDvLrsmvaqTkjyTjQu5M_RA,8798
 boris/irr.py,sha256=o5QN3B2b-02AUkrklMJCitFGsfiUDtmI0MxUbPv2cBg,22472
@@ -47,23 +47,23 @@ boris/mpv-1.0.3.py,sha256=EXRtzQqFjOn4wMC6482Ilq3fNQ9N1GRP1VxwLzdeaBY,88077
 boris/mpv.py,sha256=EfzIHjPbgewG4w3smEtqEUPZoVwYmMQkL4Q8ZyW-a58,76410
 boris/mpv2.py,sha256=IUI4t4r9GYX7G5OXTjd3RhMMOkDdfal_15buBgksLsk,92152
 boris/observation.py,sha256=oop08nflDLZAgDbIB8GOiVdTgLhppJ_ODH0Z24cyqvE,57176
-boris/observation_operations.py,sha256=8rVC_iWb0Y8zkd64_XvDxD2e7_jsKdGfDSdyi4eDRAs,105643
+boris/observation_operations.py,sha256=j7TSGzWSRmAdmD7vdrfvEBFtCfM0HXbo9VeIHNew2PY,105748
 boris/observation_ui.py,sha256=DAnU94QBNvkLuHT6AxTwqSk_D_n6VUhSl8PexZv_dUk,33309
 boris/observations_list.py,sha256=NqwECGHtHYmKhSe-qCfqPmJ24SSfzlXvIXS2i3op_zE,10591
 boris/otx_parser.py,sha256=70QvilzFHXbjAHR88YH0aEXJ3xxheLS5fZGgHFHGpNE,16367
 boris/param_panel.py,sha256=G0XzNmJIX89-n2OQTDccuY_wWMhr3p7GB4ZorbU6EWc,8786
 boris/param_panel_ui.py,sha256=4emQDFmuL4_R7bKxosLjdUb-VSPWkDm7suy38F5EKcA,13260
-boris/player_dock_widget.py,sha256=VBuuGoAb2D027oFnMBlIQPiSQcEdedhoQltNFSJq8mw,5982
+boris/player_dock_widget.py,sha256=aDC6a7JEEY64TWMDU_jBBaavN-Z-fd9JQo9BnnNI4_M,6303
 boris/plot_data_module.py,sha256=6QbLKfyGp4TYRyHnB9G45y5XrpeXLytcorltEAWfYak,16562
-boris/plot_events.py,sha256=hA_Yt-ZaxbAOKjN7gYHiaEx5TPR-7HIWGJXXg4cq6lw,24048
+boris/plot_events.py,sha256=CF6gnsTeaPG-P1USwh4An2s31NoMJ1roHDImcQrQj3c,24060
 boris/plot_events_rt.py,sha256=xig__Uea3mQqO5raMBVB3pm3vuQkjAbJpwSS7AwIob8,8327
 boris/plot_spectrogram_rt.py,sha256=JV8N7T8133wGVhlPxmgOb426u1g1p21-LbTqgaeddkk,8361
 boris/plot_waveform_rt.py,sha256=05JN_6HCq674ROore_6PNw93GQNZJQDlDxp2ODAFkkA,7474
-boris/plugins.py,sha256=RtC_Ew6VxAwWQqRuKQj9FgpsSBGoZmZuCZ5gPj0EiwI,8963
+boris/plugins.py,sha256=FSeZdbGFPGfi5TDM3RQG6mEVwsp1cGKhJIZs-H0BMy4,9901
 boris/preferences.py,sha256=qPfd9Tyg7u30kXwVqMOgkdy2RXri9bItRa5U2-ZVQmg,16847
 boris/preferences_ui.py,sha256=D2bFLb3E0m6IwSeqKoItRDiqvPmJGoeXLHF2K02n1Zo,26293
 boris/project.py,sha256=hAeAb5pD0u_l0bezU9ePvbTOYQKfxrFGvYB2NAqSDHg,84377
-boris/project_functions.py,sha256=p_CC2UoFEbb0PpKt9c5MtJulSszz-fV1o1sgFRFVQEk,79920
+boris/project_functions.py,sha256=mPaKTjcegsC6n-J8ZsOhWh_4TepJ3Y-vwXiIgl9nij0,79702
 boris/project_import_export.py,sha256=1FdsYFzZ_jrhPRaH7xEkcPnh-hQXN4HFz1PhsIsSoL8,38361
 boris/project_ui.py,sha256=yB-ewhHt8S8DTTRIk-dNK2tPMNU24lNji9fDW_Xazu8,38805
 boris/qrc_boris.py,sha256=aH-qUirYY1CGxmTK1SFCPvuZfazIHX4DdUKF1gxZeYM,675008
@@ -73,12 +73,12 @@ boris/select_observations.py,sha256=HM0suMes1YxVwQ-Xakw7ROaxbN0EyeSiZFZNrTQIHAA,
 boris/select_subj_behav.py,sha256=ulXbsRY-AIyQRSwXhVlvkNRS_eqWaCvkDKTTyOLqvoE,11742
 boris/state_events.py,sha256=R5CcT_cldnxqhQkvX_V1AMNxH0Nc6jLzMZYiWkeJwAE,7770
 boris/subjects_pad.py,sha256=lSRRGfLfD10_YpGua8RGVdKhoXlsXawGhNibPkRhuzM,3541
-boris/synthetic_time_budget.py,sha256=NwJt6TO6XZwxF2s7ETvqiDEqrz9ad30g1sQ0bVBsN9o,10364
-boris/time_budget_functions.py,sha256=1-7_G84SDs7rp1EWr5zHInzRVDUkUdIfm_AX0516ceQ,52539
-boris/time_budget_widget.py,sha256=_yYzLa6aJRWHRataek_ciXMEKGW75HA9y0auhAJwzbA,43137
+boris/synthetic_time_budget.py,sha256=sj-5jq7MH-bxPUwKwpi7Xud-jkKTs6PUFlN_01vgimE,10481
+boris/time_budget_functions.py,sha256=y5He8crz0xsTxVfz0jATwFFQVnPAIrNHja_0sF6NtRE,52551
+boris/time_budget_widget.py,sha256=z-tyITBtIz-KH1H2OdMB5a8x9QQLK7Wu96-zkC6NVDA,43213
 boris/transitions.py,sha256=_aZJfJWv3EBrtmQ7qsdTCayQo6uWU7BXqtQQgflEhr4,12250
-boris/utilities.py,sha256=zwWpH-lozAUj_8K6Gf2Hl-BSW0aRdWo37HGXTWQ86qk,52782
-boris/version.py,sha256=4Axxl-LKvQ2Gomtc1ISs8xC-XrfU08mMhJ7JJObW_qk,785
+boris/utilities.py,sha256=H69vrYGkQuQJVE_ywcYC6DNYcS8VTC-GoClmVEUXacA,52748
+boris/version.py,sha256=5kROL79sz_Rg_OudjnnIDgT2wFXSEDVVT7mwzEg38mI,787
 boris/video_equalizer.py,sha256=FartoGghFK-T53zklP70rPKYqTuzL8qdvfGlsOF2wwc,5854
 boris/video_equalizer_ui.py,sha256=1CG3s79eM4JAbaCx3i1ILZXLceb41_gGXlOLNfpBgnw,10142
 boris/video_operations.py,sha256=mh3iR__Sm2KnV44L_sW2pOo3AgLwlM7wiTnnqQiAVs4,9381
@@ -95,9 +95,9 @@ boris/portion/dict.py,sha256=SyHxc7PfDw2ufNLFQycwJtzmRfL48rDp4UrM2KN7IWc,11282
 boris/portion/func.py,sha256=3TkQtFKLfsqntwd27HSGHceFhnXHmT-EbNMqktElC5Q,2174
 boris/portion/interval.py,sha256=bAdUiJjGeUAPgsBAImwNeviiwfQq5odfhFZccAWzOTA,20299
 boris/portion/io.py,sha256=ppNeRpiLNrocF1yzGeuEUIhYMf2LfsR-cji3d0nmvUs,6371
-boris_behav_obs-9.2.dist-info/LICENSE.TXT,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
-boris_behav_obs-9.2.dist-info/METADATA,sha256=j6x4yuzcQMKV9DydHYBd9CQmpi7PLiuQperTRnLQrZQ,42100
-boris_behav_obs-9.2.dist-info/WHEEL,sha256=SrDKpSbFN1G94qcmBqS9nyHcDMp9cUS9OC06hC0G3G0,109
-boris_behav_obs-9.2.dist-info/entry_points.txt,sha256=-Vl37ZFjZYK5wTSDf5LAzd2cVLON1Pfy1xkx490Wxak,47
-boris_behav_obs-9.2.dist-info/top_level.txt,sha256=fJSgm62S7WesiwTorGbOO4nNN0yzgZ3klgfGi3Px4qI,6
-boris_behav_obs-9.2.dist-info/RECORD,,
+boris_behav_obs-9.2.2.dist-info/licenses/LICENSE.TXT,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
+boris_behav_obs-9.2.2.dist-info/METADATA,sha256=R8CaTPupqJXh6ElyecpT_9hx6aFjG91uSAzB1ho7gVA,41929
+boris_behav_obs-9.2.2.dist-info/WHEEL,sha256=MAQBAzGbXNI3bUmkDsiV_duv8i-gcdnLzw7cfUFwqhU,109
+boris_behav_obs-9.2.2.dist-info/entry_points.txt,sha256=-Vl37ZFjZYK5wTSDf5LAzd2cVLON1Pfy1xkx490Wxak,47
+boris_behav_obs-9.2.2.dist-info/top_level.txt,sha256=fJSgm62S7WesiwTorGbOO4nNN0yzgZ3klgfGi3Px4qI,6
+boris_behav_obs-9.2.2.dist-info/RECORD,,

{boris_behav_obs-9.2.dist-info → boris_behav_obs-9.2.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.0.0)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any