boris-behav-obs 9.3.1__py2.py3-none-any.whl → 9.3.2__py2.py3-none-any.whl

boris/analysis_plugins/_latency.py

@@ -0,0 +1,59 @@
+"""
+BORIS plugin
+
+number of occurences of behaviors
+"""
+
+import pandas as pd
+
+__version__ = "0.0.1"
+__version_date__ = "2025-04-10"
+__plugin_name__ = "Behavior latency"
+__author__ = "Olivier Friard - University of Torino - Italy"
+
+
+import itertools
+
+
+def run(df: pd.DataFrame):
+    """
+    Latency of a behavior after another.
+    """
+
+    df["start_time"] = pd.to_datetime(df["Start (s)"])
+    df["end_time"] = pd.to_datetime(df["Stop (s)"])
+
+    latency_by_subject: dict = {}
+
+    for subject, group in df.groupby("subject"):
+        behaviors = group["behavior"].tolist()
+        # combinations = []
+        # Utiliser itertools pour créer des combinaisons 2 à 2 des comportements
+        for comb in itertools.combinations(behaviors, 2):
+            # combinations.append(comb)
+
+            last_A_end_time = None
+
+            # Liste pour stocker les latences de chaque sujet
+            subject_latency = []
+
+            for index, row in group.iterrows():
+                if row["behavior"] == comb[0]:
+                    # Si on rencontre un comportement A, on réinitialise le temps de fin du comportement A
+                    last_A_end_time = row["end_time"]
+                    subject_latency.append(None)  # Pas de latence pour A
+                elif row["behavior"] == comb[1] and last_A_end_time is not None:
+                    # Si on rencontre un comportement B et qu'on a déjà vu un A avant
+                    latency_time = row["start_time"] - last_A_end_time
+                    subject_latency.append(latency_time)
+                else:
+                    # Si on rencontre un B mais sans A avant
+                    subject_latency.append(None)
+
+            # Ajout des latences calculées au DataFrame
+            df.loc[group.index, f"latency {comb[1]} after {comb[0]}"] = subject_latency
+
+            # Calcul de la latence totale ou moyenne par sujet
+            latency_by_subject[(subject, comb)] = df.groupby("subject")["latency"].agg(["sum", "mean"])
+
+    return str(latency_by_subject)

boris/behav_coding_map_creator.py

@@ -24,6 +24,7 @@ import binascii
 import io
 import json
 from pathlib import Path
+import gui_utilities
 
 from PySide6.QtCore import QBuffer, QByteArray, QIODevice, QLineF, QPoint, Qt, Signal
 from PySide6.QtGui import QBrush, QColor, QIcon, QMouseEvent, QPen, QPixmap, QPolygonF, QAction
@@ -790,7 +791,6 @@ class BehaviorsMapCreatorWindow(QMainWindow):
 
         if not self.fileName:
             return
-        """if os.path.splitext(self.fileName)[1] != ".behav_coding_map":"""
         if Path(self.fileName).suffix != ".behav_coding_map":
             self.fileName += ".behav_coding_map"
         self.saveMap()
@@ -1106,10 +1106,6 @@ if __name__ == "__main__":
     app = QApplication(sys.argv)
     window = BehaviorsMapCreatorWindow(["North zone", "East zone", "South zone", "West zone"])
     window.bcm_list = []
-    window.resize(cfg.CODING_MAP_RESIZE_W, cfg.CODING_MAP_RESIZE_H)
-    screen_geometry = app.primaryScreen().geometry()
-    center_x = (screen_geometry.width() - window.width()) // 2
-    center_y = (screen_geometry.height() - window.height()) // 2
-    window.move(center_x, center_y)
+    gui_utilities.resize_center(app, window, cfg.CODING_MAP_RESIZE_W, cfg.CODING_MAP_RESIZE_H)
     window.show()
     sys.exit(app.exec())

boris/core.py

@@ -135,8 +135,9 @@ __version__ = version.__version__
 __version_date__ = version.__version_date__
 
 # check minimal version of python
-if util.versiontuple(platform.python_version()) < util.versiontuple("3.8"):
-    msg = f"BORIS requires Python 3.8+! You are using Python v. {platform.python_version()}\n"
+MIN_PYTHON_VERSION = "3.12"
+if util.versiontuple(platform.python_version()) < util.versiontuple(MIN_PYTHON_VERSION):
+    msg = f"BORIS requires Python {MIN_PYTHON_VERSION}+! You are using Python v. {platform.python_version()}\n"
     logging.critical(msg)
     sys.exit()
 
@@ -237,19 +238,6 @@ class TableModel(QAbstractTableModel):
                         return self._data[row][event_idx]
 
 
-"""
-class ButtonEventFilter(QObject):
-    def eventFilter(self, obj, event):
-        print("event filter")
-        if isinstance(obj, QPushButton) and event.type() == QEvent.KeyPress:
-            print("keypress")
-            if event.key() in (Qt.Key_Enter, Qt.Key_Return, Qt.Key_Space):
-                print("enter sapce")
-                return False  # Block the event
-        return super().eventFilter(obj, event)
-"""
-
-
 class MainWindow(QMainWindow, Ui_MainWindow):
     """
     Main BORIS window
@@ -301,7 +289,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
     ext_data_timer_list: list = []
     projectFileName: str = ""
     mediaTotalLength = None
-    beep_every = 0
+    beep_every: float = 0.0
 
     plot_colors = cfg.BEHAVIORS_PLOT_COLORS
     behav_category_colors = cfg.CATEGORY_COLORS_LIST
@@ -315,19 +303,20 @@ class MainWindow(QMainWindow, Ui_MainWindow):
     fast = 10
 
     currentStates: dict = {}
-    subject_name_index = {}
+    subject_name_index: dict = {}
     flag_slow = False
     play_rate: float = 1
     play_rate_step: float = 0.1
     currentSubject: str = ""  # contains the current subject of observation
-    coding_map_window_geometry = 0
 
     # FFmpeg
-    memx, memy, mem_player = -1, -1, -1
+    memx = -1
+    memy = -1
+    mem_player = -1
 
     # path for ffmpeg/ffmpeg.exe program
-    ffmpeg_bin = ""
-    ffmpeg_cache_dir = ""
+    ffmpeg_bin: str = ""
+    ffmpeg_cache_dir: str = ""
 
     # dictionary for FPS storing
     fps = 0
@@ -390,9 +379,6 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         super(MainWindow, self).__init__(parent)
         self.setupUi(self)
 
-        # disable trigger with RETURN or SPACE keys
-        """filter_obj = ButtonEventFilter()
-        self.pb_live_obs.installEventFilter(filter_obj)"""
         self.pb_live_obs.setFocusPolicy(Qt.NoFocus)
 
         self.ffmpeg_bin = ffmpeg_bin
@@ -418,25 +404,18 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         self.tb_export.setMenu(self.menu)
         """
 
-        gui_utilities.set_icons(self, theme_mode=self.theme_mode())
+        gui_utilities.set_icons(self, theme_mode=gui_utilities.theme_mode())
 
         self.setWindowTitle(f"{cfg.programName} ({__version__})")
 
-        self.w_obs_info.setVisible(False)
-
         self.lbLogoBoris.setPixmap(QPixmap(":/logo"))
-
         self.lbLogoBoris.setScaledContents(False)
         self.lbLogoBoris.setAlignment(Qt.AlignCenter)
 
-        # self.lbLogoUnito.setPixmap(QPixmap(":/dbios_unito"))
-        # self.lbLogoUnito.setScaledContents(False)
-        # self.lbLogoUnito.setAlignment(Qt.AlignCenter)
-
         self.toolBar.setEnabled(True)
 
         # start with dock widget invisible
-        for w in [self.dwEvents, self.dwEthogram, self.dwSubjects]:
+        for w in (self.w_obs_info, self.dwEvents, self.dwEthogram, self.dwSubjects):
             w.setVisible(False)
             w.keyPressEvent = self.keyPressEvent
 
@@ -475,15 +454,6 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         self.lbTimeOffset.setMinimumWidth(160)
         self.statusbar.addPermanentWidget(self.lbTimeOffset)
 
-        # play rate are now displayed in the main info widget
-        """
-        # SPEED
-        self.lbSpeed = QLabel()
-        self.lbSpeed.setFrameStyle(QFrame.StyledPanel)
-        self.lbSpeed.setMinimumWidth(40)
-        self.statusbar.addPermanentWidget(self.lbSpeed)
-        """
-
         # set painter for tv_events to highlight current row
         delegate = self.CustomItemDelegate()
         self.tv_events.setItemDelegate(delegate)
@@ -499,14 +469,6 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         plugins.load_plugins(self)
         plugins.add_plugins_to_menu(self)
 
-    def theme_mode(self):
-        """
-        return the theme mode (dark or light) of the OS
-        """
-        palette = QApplication.instance().palette()
-        color = palette.window().color()
-        return "dark" if color.value() < 128 else "light"  # Dark mode if the color value is less than 128
-
     class CustomItemDelegate(QStyledItemDelegate):
         def paint(self, painter, option, index):
             # Custom drawing logic here (overriding paint)
@@ -1506,7 +1468,9 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         # one media
         if self.dw_player[player].player.playlist_count == 1:
             if new_time < self.dw_player[player].player.duration:
-                self.dw_player[player].player.seek(new_time, "absolute+exact")
+                new_time_float = round(float(new_time), 3)
+
+                self.dw_player[player].player.seek(new_time_float, "absolute+exact")
 
                 if player == 0 and not self.user_move_slider:
                     self.video_slider.setValue(
@@ -3835,7 +3799,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         if self.geometric_measurements_mode:
             geometric_measurement.redraw_measurements(self)
 
-            self.actionPlay.setIcon(QIcon(f":/play_{self.theme_mode()}"))
+            self.actionPlay.setIcon(QIcon(f":/play_{gui_utilities.theme_mode()}"))
 
     def previous_frame(self) -> None:
         """
@@ -3859,7 +3823,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         if self.geometric_measurements_mode:
             geometric_measurement.redraw_measurements(self)
 
-            self.actionPlay.setIcon(QIcon(f":/play_{self.theme_mode()}"))
+            self.actionPlay.setIcon(QIcon(f":/play_{gui_utilities.theme_mode()}"))
 
     def run_event_outside(self):
         """
@@ -4353,8 +4317,12 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         if not sys.platform.startswith(cfg.MACOS_CODE):
             if self.dw_player[0].player.time_pos is not None:
                 for n_player in range(1, len(self.dw_player)):
+                    print(f"{n_player=}")
+
                     ct = self.getLaps(n_player=n_player)
 
+                    print(f"{ct=}")
+
                     # sync players 2..8 if time diff >= 1 s
                     if (
                         abs(ct0 - (ct + dec(self.pj[cfg.OBSERVATIONS][self.observationId][cfg.MEDIA_INFO][cfg.OFFSET][str(n_player + 1)])))
@@ -4463,7 +4431,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
             for data_timer in self.ext_data_timer_list:
                 data_timer.stop()
 
-            self.actionPlay.setIcon(QIcon(f":/play_{self.theme_mode()}"))
+            self.actionPlay.setIcon(QIcon(f":/play_{gui_utilities.theme_mode()}"))
 
         if msg:
             self.lb_current_media_time.setText(msg)
@@ -5634,7 +5602,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         for data_timer in self.ext_data_timer_list:
             data_timer.start()
 
-        self.actionPlay.setIcon(QIcon(f":/pause_{self.theme_mode()}"))
+        self.actionPlay.setIcon(QIcon(f":/pause_{gui_utilities.theme_mode()}"))
         self.actionPlay.setText("Pause")
 
         return True
@@ -5668,7 +5636,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         for idx in self.plot_data:
             self.timer_plot_data_out(self.plot_data[idx])
 
-        self.actionPlay.setIcon(QIcon(f":/play_{self.theme_mode()}"))
+        self.actionPlay.setIcon(QIcon(f":/play_{gui_utilities.theme_mode()}"))
         self.actionPlay.setText("Play")
 
     def play_activated(self):
@@ -5823,8 +5791,6 @@ class MainWindow(QMainWindow, Ui_MainWindow):
 
 
 def main():
-    # QApplication.setAttribute(Qt.AA_EnableHighDpiScaling)
-
     app = QApplication(sys.argv)
     app.setStyle("Fusion")
 
@@ -5917,7 +5883,7 @@ def main():
                 results.show()
 
     window.show()
-    window.raise_()
+    window.raise_()  # for overlapping widget (?)
 
     if observation_to_open and "error" not in pj:
         r = observation_operations.load_observation(window, obs_id=observation_to_open, mode=cfg.OBS_START)

boris/dialog.py

@@ -71,7 +71,12 @@ from . import utilities as util
 
 def MessageDialog(title: str, text: str, buttons: tuple) -> str:
     """
-    generic message dialog
+    show a generic message dialog and returns the text of the clicked button
+
+    Args:
+        title (str): Title of the dialog box
+        text (str): text of the dialog box
+        buttons (tuple): text for buttons
 
     Return
         str: text of the clicked button
@@ -83,8 +88,8 @@ def MessageDialog(title: str, text: str, buttons: tuple) -> str:
     for button in buttons:
         message.addButton(button, QMessageBox.YesRole)
 
-    # message.setWindowFlags(Qt.WindowStaysOnTopHint)
-    message.exec_()
+    message.setWindowFlags(Qt.WindowStaysOnTopHint)
+    message.exec()
     return message.clickedButton().text()
 
 

boris/gui_utilities.py

@@ -22,10 +22,19 @@ Copyright 2012-2025 Olivier Friard
 import pathlib as pl
 import logging
 from PySide6.QtCore import QSettings
-from PySide6.QtWidgets import QWidget
+from PySide6.QtWidgets import QWidget, QApplication
 from PySide6.QtGui import QIcon
 
 
+def theme_mode() -> str:
+    """
+    return the theme mode (dark or light) of the OS
+    """
+    palette = QApplication.instance().palette()
+    color = palette.window().color()
+    return "dark" if color.value() < 128 else "light"  # Dark mode if the color value is less than 128
+
+
 def save_geometry(widget: QWidget, widget_name: str):
     """
     save window geometry in ini file
@@ -44,6 +53,7 @@ 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:
@@ -51,15 +61,14 @@ def restore_geometry(widget: QWidget, widget_name: str, default_width_height):
             except Exception:
                 logging.warning("Error during restoring default")
 
-
-    logging.debug(f'restore geometry function for {widget_name}')
+    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")}')
+            logging.debug(f"geometry restored for {widget_name}  {settings.value(f'{widget_name} geometry')}")
         else:
             default_resize(widget, default_width_height)
     except Exception:
@@ -108,3 +117,20 @@ def set_icons(self, theme_mode: str) -> None:
     self.action_geometric_measurements.setIcon(QIcon(f":/measurement_{theme_mode}"))
     self.actionFind_in_current_obs.setIcon(QIcon(f":/find_{theme_mode}"))
     self.actionExplore_project.setIcon(QIcon(f":/explore_{theme_mode}"))
+
+
+def resize_center(app, window, width: int, height: int) -> None:
+    """
+    resize and center window
+    """
+    window.resize(width, height)
+    screen_geometry = app.primaryScreen().geometry()
+    if window.height() > screen_geometry.height():
+        window.resize(window.width(), int(screen_geometry.height() * 0.8))
+    if window.width() > screen_geometry.width():
+        window.resize(screen_geometry.width(), window.height())
+    # center
+    center_x = (screen_geometry.width() - window.width()) // 2
+    center_y = (screen_geometry.height() - window.height()) // 2
+
+    window.move(center_x, center_y)

boris/modifier_coding_map_creator.py

@@ -26,8 +26,9 @@ This file is part of BORIS.
 import binascii
 import io
 import json
-import os
+from pathlib import Path
 import re
+import gui_utilities
 
 from PySide6.QtCore import (
     Qt,
@@ -727,7 +728,8 @@ class ModifiersMapCreatorWindow(QMainWindow):
             self.fileName = fn
 
         if self.fileName:
-            if os.path.splitext(self.fileName)[1] != ".boris_map":
+            # if os.path.splitext(self.fileName)[1] != ".boris_map":
+            if Path(self.fileName).suffix != ".boris_map":
                 self.fileName += ".boris_map"
             self.saveMap()
 
@@ -744,7 +746,7 @@ class ModifiersMapCreatorWindow(QMainWindow):
             else:
                 self.fileName = fn
 
-            if self.fileName and os.path.splitext(self.fileName)[1] != ".boris_map":
+            if self.fileName and Path(self.fileName).suffix() != ".boris_map":
                 self.fileName += ".boris_map"
 
         if self.fileName:
@@ -1006,25 +1008,8 @@ if __name__ == "__main__":
 
     app = QApplication(sys.argv)
     window = ModifiersMapCreatorWindow()
-    window.resize(800, 700)
 
-    print(f"{window.width()=}")
-    print(f"{window.height()=}")
-
-    # Get the screen geometry (screen size and position)
-    screen_geometry = app.primaryScreen().geometry()
-
-    print(f"{screen_geometry=}")
-
-    # Calculate the center of the screen
-    center_x = (screen_geometry.width() - window.width()) // 2
-    center_y = (screen_geometry.height() - window.height()) // 2
-
-    print(f"{center_x=}")
-    print(f"{center_y=}")
-
-    # Move the widget to the center of the screen
-    window.move(center_x, center_y)
+    gui_utilities.resize_center(app, window, cfg.CODING_MAP_RESIZE_W, cfg.CODING_MAP_RESIZE_H)
 
     window.show()
     sys.exit(app.exec())

boris/observation.py

@@ -1008,27 +1008,30 @@ class Observation(QDialog, Ui_Form):
 
         # check if observation id not empty
         if not self.leObservationId.text():
-            self.qm = QMessageBox()
-            self.qm.setIcon(QMessageBox.Critical)
-            self.qm.setText("The <b>observation id</b> is mandatory and must be unique.")
-            self.qm.exec_()
+            QMessageBox.critical(
+                self,
+                cfg.programName,
+                "The <b>observation id</b> is mandatory and must be unique.",
+            )
             return False
 
         # check if observation_type
         if not any((self.rb_media_files.isChecked(), self.rb_live.isChecked(), self.rb_images.isChecked())):
-            self.qm = QMessageBox()
-            self.qm.setIcon(QMessageBox.Critical)
-            self.qm.setText("Choose an observation type.")
-            self.qm.exec_()
+            QMessageBox.critical(
+                self,
+                cfg.programName,
+                "Choose an observation type.",
+            )
             return False
 
         # check if offset is correct
         if self.cb_time_offset.isChecked():
             if self.obs_time_offset.get_time() is None:
-                self.qm = QMessageBox()
-                self.qm.setIcon(QMessageBox.Critical)
-                self.qm.setText("Check the time offset value.")
-                self.qm.exec_()
+                QMessageBox.critical(
+                    self,
+                    cfg.programName,
+                    "Check the time offset value.",
+                )
                 return False
 
         if self.rb_media_files.isChecked():  # observation based on media file(s)
@@ -1051,18 +1054,20 @@ class Observation(QDialog, Ui_Form):
 
             # check if player #1 is used
             if not players_list or min(players_list) > 1:
-                self.qm = QMessageBox()
-                self.qm.setIcon(QMessageBox.Critical)
-                self.qm.setText("A media file must be loaded in player #1")
-                self.qm.exec_()
+                QMessageBox.critical(
+                    self,
+                    cfg.programName,
+                    "A media file must be loaded in player #1",
+                )
                 return False
 
             # check if players are used in crescent order
             if set(list(range(min(players_list), max(players_list) + 1))) != set(players_list):
-                self.qm = QMessageBox()
-                self.qm.setIcon(QMessageBox.Critical)
-                self.qm.setText("Some player are not used. Please reorganize your media files")
-                self.qm.exec_()
+                QMessageBox.critical(
+                    self,
+                    cfg.programName,
+                    "Some player are not used. Please reorganize your media files",
+                )
                 return False
 
             # check if more media in player #1 and media in other players

boris/observation_operations.py

@@ -888,7 +888,7 @@ def new_observation(self, mode: str = cfg.NEW, obsId: str = "") -> None:
                 self.pj[cfg.OBSERVATIONS][obsId][cfg.CLOSE_BEHAVIORS_BETWEEN_VIDEOS]
             )
 
-    rv = observationWindow.exec_()
+    rv = observationWindow.exec()
 
     # save geometry
     gui_utilities.save_geometry(observationWindow, "new observation")
@@ -2012,7 +2012,7 @@ def initialize_new_media_observation(self) -> bool:
     self.mpv_eof_reached_signal.connect(self.mpv_eof_reached)
     self.video_click_signal.connect(self.player_clicked)
 
-    self.actionPlay.setIcon(QIcon(f":/play_{self.theme_mode()}"))
+    self.actionPlay.setIcon(QIcon(f":/play_{gui_utilities.theme_mode()}"))
 
     self.display_statusbar_info(self.observationId)
 

boris/player_dock_widget.py

@@ -23,8 +23,12 @@ This file is part of BORIS.
 import sys
 import logging
 import functools
+from . import mpv2 as mpv
+import config as cfg
+import gui_utilities
+
+
 from PySide6.QtWidgets import (
-    QApplication,
     QLabel,
     QDockWidget,
     QWidget,
@@ -38,8 +42,6 @@ from PySide6.QtWidgets import (
 from PySide6.QtCore import Signal, QEvent, Qt
 from PySide6.QtGui import QIcon, QAction
 
-from . import mpv2 as mpv
-import config as cfg
 
 """
 try:
@@ -153,7 +155,7 @@ class DW_player(QDockWidget):
         self.mute_button.setAutoRaise(True)
         self.mute_action = QAction()
 
-        theme_mode = "dark" if QApplication.instance().palette().window().color().value() < 128 else "light"
+        theme_mode = gui_utilities.theme_mode()
 
         self.mute_action.setIcon(QIcon(f":/volume_xmark_{theme_mode}"))
         self.mute_action.triggered.connect(self.mute_action_triggered)
@@ -194,7 +196,7 @@ class DW_player(QDockWidget):
         """
         emit signal when mute action is triggered
         """
-        theme_mode = "dark" if QApplication.instance().palette().window().color().value() < 128 else "light"
+        theme_mode = gui_utilities.theme_mode()
         if self.player.mute:
             self.mute_action.setIcon(QIcon(f":/volume_xmark_{theme_mode}"))
         else:

boris/plugins.py

@@ -82,6 +82,8 @@ def load_plugins(self):
     for file_ in sorted((Path(__file__).parent / "analysis_plugins").glob("*.py")):
         if file_.name == "__init__.py":
             continue
+        if file_.name.startswith("_"):
+            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
@@ -96,6 +98,8 @@ def load_plugins(self):
         for file_ in sorted(Path(self.config_param.get(cfg.PERSONAL_PLUGINS_DIR, "")).glob("*.py")):
             if file_.name == "__init__.py":
                 continue
+            if file_.name.startswith("_"):
+                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

boris/utilities.py

@@ -28,7 +28,6 @@ import math
 import os
 import pathlib as pl
 import re
-import socket
 import subprocess
 import sys
 import urllib.parse
@@ -292,27 +291,6 @@ def return_file_header_footer(file_name: str, file_row_number: int = 0, row_numb
     return header, footer
 
 
-def bytes_to_str(b: bytes) -> str:
-    """
-    Translate bytes to string.
-
-    Args:
-        b (bytes): byte to convert
-
-    Returns:
-        str: converted byte
-    """
-
-    if isinstance(b, bytes):
-        fileSystemEncoding = sys.getfilesystemencoding()
-        # hack for PyInstaller
-        if fileSystemEncoding is None:
-            fileSystemEncoding = "UTF-8"
-        return b.decode(fileSystemEncoding)
-    else:
-        return b
-
-
 def convertTime(time_format: str, sec: Union[float, dec]) -> Union[str, None]:
     """
     convert time in base at the current format (S or HHMMSS)
@@ -381,20 +359,6 @@ def count_media_file(media_files: dict) -> int:
     return sum([len(media_files[idx]) for idx in media_files])
 
 
-def file_content_md5(file_name: str) -> str:
-    """
-    returns the MD5 sum of file content
-    """
-    hash_md5 = hashlib.md5()
-    try:
-        with open(file_name, "rb") as f:
-            for chunk in iter(lambda: f.read(4096), b""):
-                hash_md5.update(chunk)
-        return hash_md5.hexdigest()
-    except FileNotFoundError:
-        return ""
-
-
 def txt2np_array(
     file_name: str, columns_str: str, substract_first_value: str, converters=None, column_converter=None
 ) -> Tuple[bool, str, np.array]:
@@ -760,19 +724,6 @@ def get_current_points_by_subject(
     return current_points
 
 
-def get_ip_address():
-    """Get current IP address
-
-    Args:
-
-    Returns:
-        str: IP address
-    """
-    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    s.connect(("8.8.8.8", 80))
-    return s.getsockname()[0]
-
-
 def check_txt_file(file_name: str) -> dict:
     """
     Extract parameters of txt file (test for tsv csv)
@@ -950,7 +901,7 @@ def intfloatstr(s: str) -> int:
             return s
 
 
-def distance(p1, p2):
+def distance(p1: tuple, p2: tuple) -> float:
     """
     euclidean distance between 2 points
     """
@@ -987,12 +938,12 @@ def oriented_angle(P1: tuple, P2: tuple, P3: tuple) -> float:
     Calculate the oriented angle between two segments.
 
     Args:
-        P1: Coordinates of the vertex
-        P2: Coordinates of the first point
-        P3: Coordinates of the second point
+        P1 (tuple): Coordinates of the vertex
+        P2 (tuple): Coordinates of the first point
+        P3 (tuple): Coordinates of the second point
 
     Returns:
-        The oriented angle between the two segments in degrees.
+        float: The oriented angle between the two segments in degrees.
     """
 
     x1, y1 = P1
@@ -1008,6 +959,36 @@ def oriented_angle(P1: tuple, P2: tuple, P3: tuple) -> float:
     return oriented_angle
 
 
+def oriented_angle_trigo(B: Tuple[float, float], A: Tuple[float, float], C: Tuple[float, float]) -> float:
+    """
+    Calculates the oriented angle between vectors BA and BC, in degrees.
+    The angle is positive in the counter-clockwise (trigonometric) direction.
+
+    Parameters:
+        B: The pivot point (the origin of the vectors BA and BC).
+        A, C: Points that define the vectors.
+
+    Returns:
+        Angle in degrees, between 0 and 360.
+    """
+    # Vectors BA and BC
+    v1 = (A[0] - B[0], A[1] - B[1])
+    v2 = (C[0] - B[0], C[1] - B[1])
+
+    # Dot product and 2D cross product (determinant)
+    dot = v1[0] * v2[0] + v1[1] * v2[1]
+    det = v1[0] * v2[1] - v1[1] * v2[0]
+
+    # Signed angle in radians, then converted to degrees
+    angle_rad = math.atan2(det, dot)
+    angle_deg = math.degrees(angle_rad)
+
+    if angle_deg < 0:
+        angle_deg += 360
+
+    return angle_deg
+
+
 def mem_info():
     """
     get info about total mem, used mem and available mem using:

boris/version.py

@@ -20,5 +20,5 @@ This file is part of BORIS.
 
 """
 
-__version__ = "9.3.1"
-__version_date__ = "2025-04-08"
+__version__ = "9.3.2"
+__version_date__ = "2025-04-14"

{boris_behav_obs-9.3.1.dist-info → boris_behav_obs-9.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boris-behav-obs
-Version: 9.3.1
+Version: 9.3.2
 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.3.1.dist-info → boris_behav_obs-9.3.2.dist-info}/RECORD

@@ -1,11 +1,10 @@
-boris/1.py,sha256=rb6Nstw1vIHlBwMnzExVOlgU2F75Tuf1VYRXBTrZUFg,1082
 boris/__init__.py,sha256=iAtmVMy22TJpMmxVTMSK_6-wXnCbx1ogvWgfYEcbHzU,773
 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=VlvU12mL6xYacZOvJAi5uLpHMcmAw5Pvuvmka-PN29c,15469
-boris/behav_coding_map_creator.py,sha256=gzBmfMmG-BsvREdkmiCtu73OuvnHkWb_aVLsMKxTZzU,39071
+boris/behav_coding_map_creator.py,sha256=_WmfWTYkKh_a7pZa49h2GtORCi6h8joZTWihud6YDBE,38826
 boris/behavior_binary_table.py,sha256=bpmRDpEjq0rw3YOCoN_He3kfUe8A_R6E48kQR7KnkH8,12453
 boris/behaviors_coding_map.py,sha256=xIGJxp2eghrpiGDmYH73eJPERuyc4A_54uT-Got3zTs,7302
 boris/boris_cli.py,sha256=n0OiVvZM1gM6E7yKaff9wlgmpAGK4TK052VRi8AabJo,13196
@@ -17,12 +16,12 @@ boris/connections.py,sha256=rVI18AuXh8cEnnoCKJk0RMWAaiNOpiaS554Okgk3SBY,19383
 boris/converters.py,sha256=c1Jps-URoglY5ILQHz-pCCf6-4DFUHZLtqr_ofsrFg0,11722
 boris/converters_ui.py,sha256=uu7LOBV_fKv2DBdOqsqPwjGsjgONr5ODBoscAA-EP48,9900
 boris/cooccurence.py,sha256=tVERC-V8MWjWHlGEfDuu08iS94qjt4do-38jwI62QaY,10367
-boris/core.py,sha256=f3sEuCVf9zYzyuPuLviYI9IddrZgNWhz5EqueQmNJtc,234758
+boris/core.py,sha256=qO8ZQoPxr_jjdy7-oihjcPcNvWgHvs-IWd7JWmxy_M0,233608
 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
 boris/dev.py,sha256=9pUElbjl9g17rFUJXX5aVSu55_iIKIuDxNdrB0DI_d0,3671
-boris/dialog.py,sha256=IAX5_CtTfEUGm5lhzxajjx0oVTs8HNEAw2twTW8AmkE,32859
+boris/dialog.py,sha256=0mWbOQu9QvkCr6AIa1Tue5EYaTxbHo7rm-tnGAqQ3nk,33047
 boris/duration_widget.py,sha256=GjZgCAMGOcsNjoPiRImEVe6yMkH2vuNoh44ulpd5nlg,6924
 boris/edit_event.py,sha256=2hpxn9DYuJW1CK02hF4iU0--J_0C_KTiN9gGZ1frJBc,7678
 boris/edit_event_ui.py,sha256=vhglQrhkF9tt0HVlkXnkG7symW0eOFA7nhbk6l_qn3k,7772
@@ -34,7 +33,7 @@ boris/export_events.py,sha256=3B336WEA0g_8oW3VDo_kfq5D0ISu-e7z2f-_ROUvU9c,39756
 boris/export_observation.py,sha256=SvKhuGa-Ag_kK3igL9DFdJ0TKoQLDneu54R_uiSHUyo,50813
 boris/external_processes.py,sha256=vpmhA4Lj2GblBIrDD0YjesB8HPOgx4K9gSWVhTop4Cg,11927
 boris/geometric_measurement.py,sha256=4pI-AYpBSFlJBqS-f8dnkgLtj_Z2E5kwwAdh6WwZ4kk,35049
-boris/gui_utilities.py,sha256=5vjIWbUOHFbqKSti-kT0GoteBBEQ5fUYdNGdMxcg_0A,4607
+boris/gui_utilities.py,sha256=2HdWFxo2y0oxC29VJAA3R-TOMxVbOy3FuVwspjrTD6A,5519
 boris/image_overlay.py,sha256=zZAL8MTt2i2s58CuX81Nym3rJ5pKiTeP4AO8WbIUonM,2527
 boris/import_observations.py,sha256=hwEPIag741AXTFIuxDdZLDvLrsmvaqTkjyTjQu5M_RA,8798
 boris/irr.py,sha256=o5QN3B2b-02AUkrklMJCitFGsfiUDtmI0MxUbPv2cBg,22472
@@ -42,25 +41,25 @@ boris/latency.py,sha256=48z9L_A582-wKCfD0M3h0uyYkeL2ezjlQAS_GzeoOe0,9739
 boris/measurement_widget.py,sha256=lZV62KtK6TjdoNbKxj3uyNAuL5dfnQnn7mYwzMo-dOM,4480
 boris/media_file.py,sha256=QzUC0mT905SzlONvcXUJB2OCxhj8kJ0h0W6PN1ssSIY,4722
 boris/menu_options.py,sha256=UEB3GxRh6YKNCg67qbhOVhJW1ZOznuPe15bADc_CNTI,7062
-boris/modifier_coding_map_creator.py,sha256=AHGi1s-T0EB1p9qazQerQH1IlsrF8ND9v0OvLC-fWW4,33643
+boris/modifier_coding_map_creator.py,sha256=NQHy_txgxKZnGByXiro_Oy_cq4DrFaFiAYwVp1CWrTs,33281
 boris/modifiers_coding_map.py,sha256=oT56ZY_PXhEJsMoblEsyNMAPbDpv7ZMOCnvmt7Ibx_Y,4554
 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=j7TSGzWSRmAdmD7vdrfvEBFtCfM0HXbo9VeIHNew2PY,105748
+boris/observation.py,sha256=d-7q-RkMHuLDV87nF4yahvDFPYhlXp6GmE80vckn5zU,57073
+boris/observation_operations.py,sha256=hYtwMk3dx9O1UURbxPUewlyL111jDThO5_b3CnNmI1o,105756
 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=aDC6a7JEEY64TWMDU_jBBaavN-Z-fd9JQo9BnnNI4_M,6303
+boris/player_dock_widget.py,sha256=cJ2UB6qfdxrk22nLWgOzs5EomCfR7OcznJq67UjF8dg,6186
 boris/plot_data_module.py,sha256=6QbLKfyGp4TYRyHnB9G45y5XrpeXLytcorltEAWfYak,16562
 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=FSeZdbGFPGfi5TDM3RQG6mEVwsp1cGKhJIZs-H0BMy4,9901
+boris/plugins.py,sha256=CCS1I44OMkGZqcfLGKNPGfEQXPgngocy5YhWveXQPKM,10029
 boris/preferences.py,sha256=qPfd9Tyg7u30kXwVqMOgkdy2RXri9bItRa5U2-ZVQmg,16847
 boris/preferences_ui.py,sha256=D2bFLb3E0m6IwSeqKoItRDiqvPmJGoeXLHF2K02n1Zo,26293
 boris/project.py,sha256=hAeAb5pD0u_l0bezU9ePvbTOYQKfxrFGvYB2NAqSDHg,84377
@@ -78,8 +77,8 @@ boris/synthetic_time_budget.py,sha256=3Eb9onMLmgqCLd50CuxV9L8RV2ESzfaMWvPK_bXUMM
 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=H69vrYGkQuQJVE_ywcYC6DNYcS8VTC-GoClmVEUXacA,52748
-boris/version.py,sha256=8YtWciv9CU7BQCzJyVkJgpiFVxZsHgPZWue0GIrwFJU,787
+boris/utilities.py,sha256=SoVTDiFkidh-POwYcu_TVfJsFeXHYZV--s1tdxKH1VU,52654
+boris/version.py,sha256=1P9L6ZnUsH7kDLTVpQPQLqCJMN5PAWXFyIRRUTkgDkA,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
@@ -87,6 +86,7 @@ boris/view_df.py,sha256=AKScLASX2Uatw7rqPbsnio83eVT4GZYCFhL091eMvlY,3370
 boris/view_df_ui.py,sha256=CaMeRH_vQ00CTDDFQn73ZZaS-r8BSTWpL-dMCFqzJ_Q,2775
 boris/write_event.py,sha256=Fsy_apFl7RLnRsBAwXqACr_URnE_QoAFiPMh0o95ANg,23852
 boris/analysis_plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+boris/analysis_plugins/_latency.py,sha256=vLWCPh0cPpAEpdMboCkVIuYO1e3pJlP5tEICe27Sqms,2027
 boris/analysis_plugins/number_of_occurences.py,sha256=IDyDrdezqvSKT3BlD8QWpSYk8X9nnBBLI80OUnFJ3bY,509
 boris/analysis_plugins/number_of_occurences_by_independent_variable.py,sha256=t39bmmmZIDCSbcDvVeiKAhKNNP2SdpHp417JczHEnP4,793
 boris/analysis_plugins/time_budget.py,sha256=C1wNYwd5Jugr8h5z2aXRUBY8dF8pD4n953dPwNHY5VY,2244
@@ -96,9 +96,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.3.1.dist-info/licenses/LICENSE.TXT,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
-boris_behav_obs-9.3.1.dist-info/METADATA,sha256=6OEa47oUYBrON6hG2Rg7PkIqMb5Z6Ty9upy1O7vwmuA,4518
-boris_behav_obs-9.3.1.dist-info/WHEEL,sha256=MAQBAzGbXNI3bUmkDsiV_duv8i-gcdnLzw7cfUFwqhU,109
-boris_behav_obs-9.3.1.dist-info/entry_points.txt,sha256=k__8XvFi4vaA4QFvQehCZjYkKmZH34HSAJI2iYCWrMs,52
-boris_behav_obs-9.3.1.dist-info/top_level.txt,sha256=fJSgm62S7WesiwTorGbOO4nNN0yzgZ3klgfGi3Px4qI,6
-boris_behav_obs-9.3.1.dist-info/RECORD,,
+boris_behav_obs-9.3.2.dist-info/licenses/LICENSE.TXT,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
+boris_behav_obs-9.3.2.dist-info/METADATA,sha256=ZUt0hNpFSkVJweQn-PndnIpkRpCN--vQaJOqYwfEZMg,4518
+boris_behav_obs-9.3.2.dist-info/WHEEL,sha256=MAQBAzGbXNI3bUmkDsiV_duv8i-gcdnLzw7cfUFwqhU,109
+boris_behav_obs-9.3.2.dist-info/entry_points.txt,sha256=k__8XvFi4vaA4QFvQehCZjYkKmZH34HSAJI2iYCWrMs,52
+boris_behav_obs-9.3.2.dist-info/top_level.txt,sha256=fJSgm62S7WesiwTorGbOO4nNN0yzgZ3klgfGi3Px4qI,6
+boris_behav_obs-9.3.2.dist-info/RECORD,,

boris/1.py

@@ -1,45 +0,0 @@
-import time
-from PIL import Image, ImageDraw, ImageFont
-import mpv
-
-player = mpv.MPV()
-
-player.loop = True
-player.play('/home/olivier/gdrive_sync/src/python/generate_video_test/video1.mp4')
-player.wait_until_playing()
-
-font = ImageFont.truetype('DejaVuSans.ttf', 40)
-
-overlay = player.create_image_overlay()
-
-img = Image.new('RGBA', (400, 150),  (255, 255, 255, 0))
-d = ImageDraw.Draw(img)
-d.text((10, 10), 'Hello World', font=font, fill=(0, 255, 255, 128))
-#d.text((10, 60), f't={ts:.3f}', font=font, fill=(255, 0, 255, 255))
-
-pos = 100
-
-overlay.update(img, pos=(2*pos, pos))
-
-
-while not player.core_idle:
-    pass
-
-
-    '''
-    for pos in range(0, 500, 5):
-        ts = player.time_pos
-        if ts is None:
-            break
-
-        img = Image.new('RGBA', (400, 150),  (255, 255, 255, 0))
-        d = ImageDraw.Draw(img)
-        d.text((10, 10), 'Hello World', font=font, fill=(0, 255, 255, 128))
-        d.text((10, 60), f't={ts:.3f}', font=font, fill=(255, 0, 255, 255))
-
-        overlay.update(img, pos=(2*pos, pos))
-        time.sleep(0.05)
-
-
-    overlay.remove()
-    '''