boris-behav-obs 9.5.2__tar.gz → 9.6.1__tar.gz

{boris_behav_obs-9.5.2/boris_behav_obs.egg-info → boris_behav_obs-9.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boris-behav-obs
-Version: 9.5.2
+Version: 9.6.1
 Summary: BORIS - Behavioral Observation Research Interactive Software
 Author-email: Olivier Friard <olivier.friard@unito.it>
 License-Expression: GPL-3.0-only

boris_behav_obs-9.6.1/boris/analysis_plugins/number_of_occurences_by_independent_variable.py

@@ -0,0 +1,54 @@
+"""
+BORIS plugin
+
+number of occurences of behaviors by independent_variable
+"""
+
+import pandas as pd
+
+__version__ = "0.4.0"
+__version_date__ = "2025-07-17"
+__plugin_name__ = "Number of occurences of behaviors by subject by independent_variable"
+__author__ = "Olivier Friard - University of Torino - Italy"
+
+
+def run(df: pd.DataFrame):
+    """
+    Calculate the number of occurrences of behaviors by subject and by independent_variable.
+
+    This plugin returns a Pandas dataframe
+    """
+
+    df_results_list: list = []
+
+    flag_variable_found = False
+
+    for column in df.columns:
+        if isinstance(column, tuple) or (isinstance(column, str) and not column.startswith("independent variable '")):
+            continue
+
+        flag_variable_found = True
+        grouped_df: df.DataFrame = (
+            df.groupby(
+                [
+                    column,
+                    "Subject",
+                    "Behavior",
+                ]
+            )["Behavior"]
+            .count()
+            .reset_index(name="number of occurences")
+        )
+
+        grouped_df.rename(columns={column: "Value"}, inplace=True)
+
+        grouped_df.insert(0, "independent variable name", column)
+
+        df_results_list.append(grouped_df)
+
+    df_results = pd.concat(df_results_list, ignore_index=True) if df_results_list else pd.DataFrame([])
+
+    if not flag_variable_found:
+        return "No independent variable found"
+    else:
+        return df_results

{boris_behav_obs-9.5.2 → boris_behav_obs-9.6.1}/boris/connections.py

@@ -166,8 +166,10 @@ def connections(self):
     # menu playback
     self.actionJumpTo.triggered.connect(self.jump_to)
     self.action_deinterlace.triggered.connect(lambda: video_operations.deinterlace(self))
+    self.action_change_time_offset_of_players.triggered.connect(lambda: video_operations.change_player_offset(self))
     self.actionZoom_level.triggered.connect(lambda: video_operations.zoom_level(self))
     self.actionRotate_current_video.triggered.connect(lambda: video_operations.rotate_displayed_video(self))
+
     self.actionDisplay_subtitles.triggered.connect(lambda: video_operations.display_subtitles(self))
     self.actionVideo_equalizer.triggered.connect(lambda: video_equalizer.video_equalizer_show(self))
 

{boris_behav_obs-9.5.2 → boris_behav_obs-9.6.1}/boris/core_ui.py

@@ -380,6 +380,8 @@ class Ui_MainWindow(object):
         self.action_load_plugins.setObjectName(u"action_load_plugins")
         self.actionCreate_video_spectrogram = QAction(MainWindow)
         self.actionCreate_video_spectrogram.setObjectName(u"actionCreate_video_spectrogram")
+        self.action_change_time_offset_of_players = QAction(MainWindow)
+        self.action_change_time_offset_of_players.setObjectName(u"action_change_time_offset_of_players")
         self.centralwidget = QWidget(MainWindow)
         self.centralwidget.setObjectName(u"centralwidget")
         self.horizontalLayout_2 = QHBoxLayout(self.centralwidget)
@@ -486,7 +488,7 @@ class Ui_MainWindow(object):
         MainWindow.setCentralWidget(self.centralwidget)
         self.menubar = QMenuBar(MainWindow)
         self.menubar.setObjectName(u"menubar")
-        self.menubar.setGeometry(QRect(0, 0, 1509, 20))
+        self.menubar.setGeometry(QRect(0, 0, 1509, 25))
         self.menuHelp = QMenu(self.menubar)
         self.menuHelp.setObjectName(u"menuHelp")
         self.menuFile = QMenu(self.menubar)
@@ -743,6 +745,7 @@ class Ui_MainWindow(object):
         self.menuPlayback.addAction(self.actionJumpForward)
         self.menuPlayback.addAction(self.actionJumpBackward)
         self.menuPlayback.addAction(self.actionJumpTo)
+        self.menuPlayback.addAction(self.action_change_time_offset_of_players)
         self.menuPlayback.addAction(self.action_deinterlace)
         self.menuPlayback.addSeparator()
         self.menuPlayback.addAction(self.actionZoom_level)
@@ -1033,6 +1036,7 @@ class Ui_MainWindow(object):
         self.actionAdd_frame_indexes.setText(QCoreApplication.translate("MainWindow", u"Add frame indexes", None))
         self.action_load_plugins.setText(QCoreApplication.translate("MainWindow", u"Load plugins", None))
         self.actionCreate_video_spectrogram.setText(QCoreApplication.translate("MainWindow", u"Create video spectrogram", None))
+        self.action_change_time_offset_of_players.setText(QCoreApplication.translate("MainWindow", u"Change time offset of players", None))
         self.lbLogoBoris.setText("")
         self.lbLogoUnito.setText("")
         self.lb_player_status.setText(QCoreApplication.translate("MainWindow", u"lb_player_status", None))

{boris_behav_obs-9.5.2 → boris_behav_obs-9.6.1}/boris/version.py

@@ -20,5 +20,5 @@ This file is part of BORIS.
 
 """
 
-__version__ = "9.5.2"
-__version_date__ = "2025-07-15"
+__version__ = "9.6.1"
+__version_date__ = "2025-07-17"

{boris_behav_obs-9.5.2 → boris_behav_obs-9.6.1}/boris/video_operations.py

@@ -87,13 +87,6 @@ def zoom_level(self):
     for idx, dw in enumerate(self.dw_player):
         players_list.append(("dsb", f"Player #{idx + 1}", 0.1, 12, 0.1, 2**dw.player.video_zoom, 1))
 
-        """
-        zoom_levels: list = []
-        for choice in (2, 1, 0.5, 0.25):
-            zoom_levels.append((str(choice), "selected" if log2(choice) == dw.player.video_zoom else ""))
-        players_list.append(("il", f"Player #{idx + 1}", zoom_levels))
-        """
-
     zl = dialog.Input_dialog(label_caption="Select the zoom level", elements_list=players_list, title="Video zoom level")
     if not zl.exec_():
         return
@@ -117,6 +110,52 @@ def zoom_level(self):
             self.project_changed()
 
 
+def change_player_offset(self):
+    """
+    display dialog box for setting the player time offset
+    """
+    logging.info("change the player time offset")
+
+    if cfg.OFFSET not in self.pj[cfg.OBSERVATIONS][self.observationId][cfg.MEDIA_INFO]:
+        self.pj[cfg.OBSERVATIONS][self.observationId][cfg.MEDIA_INFO][cfg.OFFSET] = {}
+
+    players_list: list = []
+
+    for idx, dw in enumerate(self.dw_player):
+        players_list.append(
+            (
+                "dsb",
+                f"Player #{idx + 1}",
+                -100000,
+                100000,
+                0.001,
+                self.pj[cfg.OBSERVATIONS][self.observationId][cfg.MEDIA_INFO][cfg.OFFSET][str(idx + 1)],
+                3,
+            )
+        )
+
+    zl = dialog.Input_dialog(label_caption="Select the time offset", elements_list=players_list, title="Time offset")
+    if not zl.exec_():
+        return
+
+    for idx, dw in enumerate(self.dw_player):
+        if (
+            self.pj[cfg.OBSERVATIONS][self.observationId][cfg.MEDIA_INFO][cfg.OFFSET].get(str(idx + 1), 0)
+            != zl.elements[f"Player #{idx + 1}"].value()
+        ):
+            logging.debug(f"time offset of player changed in {zl.elements[f'Player #{idx + 1}'].value()} for player {idx + 1}")
+
+            self.pj[cfg.OBSERVATIONS][self.observationId][cfg.MEDIA_INFO][cfg.OFFSET][str(idx + 1)] = float(
+                zl.elements[f"Player #{idx + 1}"].value()
+            )
+
+            if self.dw_player[0].player.time_pos is not None:
+                cumulative_time_pos = self.getLaps()  # for player 1
+                self.sync_time(idx, cumulative_time_pos)
+
+            self.project_changed()
+
+
 def rotate_displayed_video(self):
     """
     rotate the displayed video

{boris_behav_obs-9.5.2 → boris_behav_obs-9.6.1/boris_behav_obs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boris-behav-obs
-Version: 9.5.2
+Version: 9.6.1
 Summary: BORIS - Behavioral Observation Research Interactive Software
 Author-email: Olivier Friard <olivier.friard@unito.it>
 License-Expression: GPL-3.0-only

{boris_behav_obs-9.5.2 → boris_behav_obs-9.6.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "boris-behav-obs"
-version = "9.5.2"
+version = "9.6.1"
 description = "BORIS - Behavioral Observation Research Interactive Software"
 authors = [{ name="Olivier Friard", email="olivier.friard@unito.it" }]
 readme = "README.md"

boris_behav_obs-9.5.2/boris/analysis_plugins/number_of_occurences_by_independent_variable.py

@@ -1,34 +0,0 @@
-"""
-BORIS plugin
-
-number of occurences of behaviors by independent_variable
-"""
-
-import pandas as pd
-
-__version__ = "0.3.0"
-__version_date__ = "2025-03-17"
-__plugin_name__ = "Number of occurences of behaviors by subject by independent_variable"
-__author__ = "Olivier Friard - University of Torino - Italy"
-
-
-def run(df: pd.DataFrame):
-    """
-    Calculate the number of occurrences of behaviors by subject and by independent_variable.
-
-    This plugin returns a Pandas dataframe
-    """
-
-    df_results: df.DataFrame = (
-        df.groupby(
-            [
-                "independent variable 'Weather'",
-                "Subject",
-                "Behavior",
-            ]
-        )["Behavior"]
-        .count()
-        .reset_index(name="number of occurences")
-    )
-
-    return df_results