boris-behav-obs 9.6.5__tar.gz → 9.6.6__tar.gz

{boris_behav_obs-9.6.5 → boris_behav_obs-9.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boris-behav-obs
-Version: 9.6.5
+Version: 9.6.6
 Summary: BORIS - Behavioral Observation Research Interactive Software
 Author-email: Olivier Friard <olivier.friard@unito.it>
 License-Expression: GPL-3.0-only
@@ -24,7 +24,7 @@ Requires-Dist: matplotlib==3.10.5
 Requires-Dist: pandas==2.3.2
 Requires-Dist: tablib[cli,html,ods,pandas,xls,xlsx]==3.8.0
 Requires-Dist: pyreadr==0.5.3
-Requires-Dist: pyside6==6.9
+Requires-Dist: pyside6==6.10
 Requires-Dist: hachoir==3.3.0
 Requires-Dist: scipy==1.16.1
 Requires-Dist: scikit-learn==1.7.1
@@ -52,7 +52,7 @@ It provides also some analysis tools like time budget and some plotting function
 <!-- The BO-RIS paper has more than [![BORIS citations counter](https://penelope.unito.it/friard/boris_scopus_citations.png) citations](https://www.boris.unito.it/citations) in peer-reviewed scientific publications. -->
 
 
-The BORIS paper has more than 2336 citations in peer-reviewed scientific publications.
+The BORIS paper has more than 2337 citations in peer-reviewed scientific publications.
 
 
 

{boris_behav_obs-9.6.5 → boris_behav_obs-9.6.6}/README.md

@@ -14,7 +14,7 @@ It provides also some analysis tools like time budget and some plotting function
 <!-- The BO-RIS paper has more than [![BORIS citations counter](https://penelope.unito.it/friard/boris_scopus_citations.png) citations](https://www.boris.unito.it/citations) in peer-reviewed scientific publications. -->
 
 
-The BORIS paper has more than 2336 citations in peer-reviewed scientific publications.
+The BORIS paper has more than 2337 citations in peer-reviewed scientific publications.
 
 
 

boris_behav_obs-9.6.6/boris/1.py

@@ -0,0 +1,45 @@
+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()
+    '''

{boris_behav_obs-9.6.5 → boris_behav_obs-9.6.6}/boris/cmd_arguments.py

@@ -30,6 +30,7 @@ def parse_arguments():
     parser = OptionParser(usage=usage)
 
     parser.add_option("-d", "--debug", action="store_true", default=False, dest="debug", help="Use debugging mode")
+    parser.add_option("-q", "--quit", action="store_true", default=False, dest="quit", help="Quit after launch")
     parser.add_option("-v", "--version", action="store_true", default=False, dest="version", help="Print version")
     parser.add_option("-n", "--nosplashscreen", action="store_true", default=False, help="No splash screen")
     parser.add_option("-p", "--project", action="store", default="", dest="project", help="Project file")

{boris_behav_obs-9.6.5 → boris_behav_obs-9.6.6}/boris/core.py

@@ -236,8 +236,8 @@ class MainWindow(QMainWindow, Ui_MainWindow):
     processes: list = []  # list of QProcess processes
     overlays: dict = {}  # dict for storing video overlays
 
-    undo_queue = deque()
-    undo_description = deque()
+    undo_queue = deque() # queue for undoing event operations
+    undo_description = deque() # queue for description of event operations
 
     current_player: int = 0  # id of the selected (left click) video player
 
@@ -5666,16 +5666,25 @@ def main():
     ret, msg = util.check_ffmpeg_path()
     if not ret:
         if sys.platform.startswith("win"):
-            QMessageBox.warning(
-                None,
-                cfg.programName,
-                "FFmpeg is not available.<br>It will be downloaded",
-                QMessageBox.Ok | QMessageBox.Default,
-                QMessageBox.NoButton,
-            )
+
+            import ctypes
+            MessageBoxTimeoutW = ctypes.windll.user32.MessageBoxTimeoutW
+            MessageBoxTimeoutW.argtypes = [ctypes.c_void_p, ctypes.c_wchar_p, ctypes.c_wchar_p,
+                                ctypes.c_uint, ctypes.c_uint, ctypes.c_uint]
+            ctypes.windll.user32.MessageBoxTimeoutW(None, "The FFmpeg framework is not available.\nIt will be downloaded from the BORIS GitHub repository.", "FFmpeg", 0, 0, 10000) # time out
+
+            # if (not options.nosplashscreen):
+            #     QMessageBox.warning(
+            #         None,
+            #         cfg.programName,
+            #         "FFmpeg is not available.<br>It will be downloaded from the BORIS GitHub repository",
+            #         QMessageBox.Ok | QMessageBox.Default,
+            #         QMessageBox.NoButton,
+            #     )
+            logging.info("FFmpeg is not available. It will be downloaded from the BORIS GitHub repository")
 
             # download ffmpeg and ffprobe from https://github.com/boris-behav-obs/boris-behav-obs.github.io/releases/download/files/
-            url = "https://github.com/boris-behav-obs/boris-behav-obs.github.io/releases/download/files/"
+            url:str = "https://github.com/boris-behav-obs/boris-behav-obs.github.io/releases/download/files/"
 
             # search where to download ffmpeg
             ffmpeg_dir = Path(__file__).parent / "misc"
@@ -5807,6 +5816,10 @@ def main():
     if not options.nosplashscreen and (sys.platform != "darwin"):
         splash.finish(window)
 
+    # quit just after launch (used in the deployment procedure)
+    if options.quit:
+        sys.exit()
+
     return_code = app.exec()
 
     del window

{boris_behav_obs-9.6.5 → boris_behav_obs-9.6.6}/boris/observation_operations.py

@@ -19,21 +19,25 @@ Copyright 2012-2025 Olivier Friard
   MA 02110-1301, USA.
 """
 
-from math import log2, floor
-import os
+
 import logging
-import time
-import tempfile
+from collections import deque
+import datetime as dt
+from decimal import Decimal as dec
 import json
-import subprocess
+from math import log2, floor
+import os
+import pathlib as pl
 import socket
+import subprocess
 import sys
-from decimal import Decimal as dec
-import pathlib as pl
-import datetime as dt
+import tempfile
+import time
 from typing import List, Tuple, Optional
 
 
+
+
 from PySide6.QtWidgets import (
     QMessageBox,
     QFileDialog,
@@ -1183,6 +1187,11 @@ def close_observation(self):
 
     self.observationId = ""
 
+    # delete undo queue
+    self.undo_queue = deque()
+    self.undo_description = deque()
+
+
     if self.playerType in (cfg.MEDIA, cfg.IMAGES):
         """
         for idx, _ in enumerate(self.dw_player):

{boris_behav_obs-9.6.5 → boris_behav_obs-9.6.6}/boris/plugins.py

@@ -310,7 +310,11 @@ def run_plugin(self, plugin_name):
 
     logging.info("preparing dataframe for plugin")
 
-    df = project_functions.project2dataframe(self.pj, selected_observations)
+    message, df = project_functions.project2dataframe(self.pj, selected_observations)
+    if message:
+        logging.critical(message)
+        QMessageBox.critical(self, cfg.programName, message)
+        return
 
     logging.info("done")
 

{boris_behav_obs-9.6.5 → boris_behav_obs-9.6.6}/boris/project_functions.py

@@ -466,7 +466,7 @@ def check_project_integrity(
                 out += "<br><br>" if out else ""
                 out += f"Observation: <b>{obs_id}</b><br>{msg}"
 
-    out_events = ""
+    out_events: str = ""
     for obs_id in pj[cfg.OBSERVATIONS]:
         # check if timestamp between -2147483647 and 2147483647
         for event in pj[cfg.OBSERVATIONS][obs_id][cfg.EVENTS]:
@@ -573,6 +573,41 @@ def check_project_integrity(
         out += "<br><br>" if out else ""
         out += tmp_out
 
+    # check if the number of coded modifiers correspond to the number of sets of modifier
+    obs_results: dict = {}
+    for obs_id in pj[cfg.OBSERVATIONS]:
+        for event_idx, event in enumerate(pj[cfg.OBSERVATIONS][obs_id][cfg.EVENTS]):
+            # event[2]
+            for idx in pj[cfg.ETHOGRAM]:
+                if pj[cfg.ETHOGRAM][idx]["code"] == event[2]:
+                    break
+            else:
+                raise
+            if (not event[3]) and not pj[cfg.ETHOGRAM][idx][cfg.MODIFIERS]:
+                continue
+
+            if len(event[3].split("|")) != len(pj[cfg.ETHOGRAM][idx][cfg.MODIFIERS]):
+                print("behavior", event[2])
+                print(f"modifier(s) #{event[3]}#", len(event[3].split("|")))
+                print(pj[cfg.ETHOGRAM][idx]["code"], pj[cfg.ETHOGRAM][idx][cfg.MODIFIERS])
+                print()
+                if obs_id not in obs_results:
+                    obs_results[obs_id] = []
+
+                obs_results[obs_id].append(
+                    (
+                        f"Event #{event_idx}: the coded modifiers for {event[2]} are {len(event[3].split('|'))} "
+                        f"but {len(pj[cfg.ETHOGRAM][idx][cfg.MODIFIERS])} sets were defined in ethogram."
+                    )
+                )
+
+    if obs_results:
+        out += "<br><br>" if out else ""
+        for o in obs_results:
+            out += f"<br>Observation <b>{o}</b>:<br>"
+            out += "<br>".join(obs_results[o])
+            out += "<br><br>"
+
     return out
 
 
@@ -1779,7 +1814,7 @@ def explore_project(self) -> None:
         QMessageBox.information(self, cfg.programName, "No events found")
 
 
-def project2dataframe(pj: dict, observations_list: list = []) -> pd.DataFrame:
+def project2dataframe(pj: dict, observations_list: list = []) -> Tuple[str, pd.DataFrame]:
     """
     returns a pandas dataframe containing observations data
     """
@@ -1950,7 +1985,10 @@ def project2dataframe(pj: dict, observations_list: list = []) -> pd.DataFrame:
             count_set = 0
             for modifier_set in all_modifier_sets:
                 if event[2] == modifier_set[0]:
-                    data[modifier_set].append(event[3].split("|")[count_set])
+                    try:
+                        data[modifier_set].append(event[3].split("|")[count_set])
+                    except Exception:
+                        return f"Modifier error for {event[2]} in observation {obs_id}", pd.DataFrame()
                     count_set += 1
                 else:
                     data[modifier_set].append(np.nan)
@@ -1971,7 +2009,7 @@ def project2dataframe(pj: dict, observations_list: list = []) -> pd.DataFrame:
                         data["Comment stop"].append(event2[4])
                         break
                 else:
-                    raise ("not paired")
+                    return f"Some events are not paired in {obs_id}", pd.DataFrame()
 
             else:  # point
                 data["Stop (s)"].append(float(event[0]))
@@ -1985,4 +2023,4 @@ def project2dataframe(pj: dict, observations_list: list = []) -> pd.DataFrame:
 
     pd.DataFrame(data).info()
 
-    return pd.DataFrame(data)
+    return "", pd.DataFrame(data)

{boris_behav_obs-9.6.5 → boris_behav_obs-9.6.6}/boris/utilities.py

@@ -62,11 +62,18 @@ except Exception:
     if sys.platform.startswith("win"):
         import ctypes
 
-        ctypes.windll.user32.MessageBoxW(0, "The MPV library was not found!\nIt will be downloaded.", "BORIS", 0)
+        logger.info("The MPV library was not found!\nIt will be downloaded from the BORIS GitHub repository")
+        #ctypes.windll.user32.MessageBoxW(0, "The MPV library was not found!\nIt will be downloaded.", "BORIS", 0)
 
-        # download libmpv2.dll and ffprobe from https://github.com/boris-behav-obs/boris-behav-obs.github.io/releases/download/files/
+        # test if following function works on windows
+        MessageBoxTimeoutW = ctypes.windll.user32.MessageBoxTimeoutW
+        MessageBoxTimeoutW.argtypes = [ctypes.c_void_p, ctypes.c_wchar_p, ctypes.c_wchar_p,
+                               ctypes.c_uint, ctypes.c_uint, ctypes.c_uint]
+        ctypes.windll.user32.MessageBoxTimeoutW(None, "The MPV library was not found.\nIt will be downloaded from the BORIS GitHub repository.", "MPV library", 0, 0, 10000) # time out
 
-        url = "https://github.com/boris-behav-obs/boris-behav-obs.github.io/releases/download/files/"
+        # download libmpv2.dll from https://github.com/boris-behav-obs/boris-behav-obs.github.io/releases/download/files/
+
+        url:str = "https://github.com/boris-behav-obs/boris-behav-obs.github.io/releases/download/files/"
 
         external_files_dir = ""
         # search where to download libmpv-2.dll
@@ -91,7 +98,7 @@ except Exception:
         try:
             from . import mpv2 as mpv
         except Exception:
-            logger.warning("MPV library not found after dowloading")
+            logger.critical("MPV library not found after dowloading")
             sys.exit(5)
 
     elif sys.platform.startswith("linux"):

{boris_behav_obs-9.6.5 → boris_behav_obs-9.6.6}/boris/version.py

@@ -20,5 +20,5 @@ This file is part of BORIS.
 
 """
 
-__version__ = "9.6.5"
-__version_date__ = "2025-09-02"
+__version__ = "9.6.6"
+__version_date__ = "2025-10-18"

{boris_behav_obs-9.6.5 → boris_behav_obs-9.6.6}/boris_behav_obs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boris-behav-obs
-Version: 9.6.5
+Version: 9.6.6
 Summary: BORIS - Behavioral Observation Research Interactive Software
 Author-email: Olivier Friard <olivier.friard@unito.it>
 License-Expression: GPL-3.0-only
@@ -24,7 +24,7 @@ Requires-Dist: matplotlib==3.10.5
 Requires-Dist: pandas==2.3.2
 Requires-Dist: tablib[cli,html,ods,pandas,xls,xlsx]==3.8.0
 Requires-Dist: pyreadr==0.5.3
-Requires-Dist: pyside6==6.9
+Requires-Dist: pyside6==6.10
 Requires-Dist: hachoir==3.3.0
 Requires-Dist: scipy==1.16.1
 Requires-Dist: scikit-learn==1.7.1
@@ -52,7 +52,7 @@ It provides also some analysis tools like time budget and some plotting function
 <!-- The BO-RIS paper has more than [![BORIS citations counter](https://penelope.unito.it/friard/boris_scopus_citations.png) citations](https://www.boris.unito.it/citations) in peer-reviewed scientific publications. -->
 
 
-The BORIS paper has more than 2336 citations in peer-reviewed scientific publications.
+The BORIS paper has more than 2337 citations in peer-reviewed scientific publications.
 
 
 

{boris_behav_obs-9.6.5 → boris_behav_obs-9.6.6}/boris_behav_obs.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ MANIFEST.in
 README.TXT
 README.md
 pyproject.toml
+boris/1.py
 boris/__init__.py
 boris/__main__.py
 boris/about.py

{boris_behav_obs-9.6.5 → boris_behav_obs-9.6.6}/boris_behav_obs.egg-info/requires.txt

@@ -4,7 +4,7 @@ matplotlib==3.10.5
 pandas==2.3.2
 tablib[cli,html,ods,pandas,xls,xlsx]==3.8.0
 pyreadr==0.5.3
-pyside6==6.9
+pyside6==6.10
 hachoir==3.3.0
 scipy==1.16.1
 scikit-learn==1.7.1

{boris_behav_obs-9.6.5 → boris_behav_obs-9.6.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "boris-behav-obs"
-version = "9.6.5"
+version = "9.6.6"
 description = "BORIS - Behavioral Observation Research Interactive Software"
 authors = [{ name="Olivier Friard", email="olivier.friard@unito.it" }]
 readme = "README.md"
@@ -21,7 +21,7 @@ dependencies = [
     "pandas==2.3.2",
     "tablib[cli,html,ods,pandas,xls,xlsx]==3.8.0",
     "pyreadr==0.5.3",
-    "pyside6==6.9",
+    "pyside6==6.10",
     "hachoir==3.3.0",
     "scipy==1.16.1",
     "scikit-learn==1.7.1",