boris-behav-obs 9.7.4__tar.gz → 9.7.6__tar.gz

{boris_behav_obs-9.7.4 → boris_behav_obs-9.7.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boris-behav-obs
-Version: 9.7.4
+Version: 9.7.6
 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.7.4 → boris_behav_obs-9.7.6}/boris/config.py

@@ -132,7 +132,7 @@ POINT_EVENT_PLOT_COLOR = "black"
 
 CHAR_FORBIDDEN_IN_MODIFIERS = "(|),`~"
 
-FAST_FORWARD_DEFAULT_VALUE:float = 10.0
+FAST_FORWARD_DEFAULT_VALUE: float = 10.0
 
 ADAPT_FAST_JUMP = "adapt_fast_jump"
 ADAPT_FAST_JUMP_DEFAULT = False

{boris_behav_obs-9.7.4 → boris_behav_obs-9.7.6}/boris/core.py

@@ -63,6 +63,7 @@ from PySide6.QtCore import (
     QAbstractTableModel,
     QElapsedTimer,
     QSettings,
+    QTimer
 )
 from PySide6.QtGui import QIcon, QPixmap, QFont, QKeyEvent, QDesktopServices, QColor, QPainter, QPolygon, QAction
 from PySide6.QtMultimedia import QSoundEffect
@@ -318,6 +319,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
     data: list = []
     not_paired: list = []
 
+
     '''
     def add_button_menu(self, data, menu_obj):
         """
@@ -3951,13 +3953,13 @@ class MainWindow(QMainWindow, Ui_MainWindow):
             if self.dw_player[0].player.duration is None:
                 return
             print(f"{slider_position=}")
-            
+
             d = self.dw_player[0].player.duration
             print(f"{d=}")
             if d is None:
                 return
             video_position = slider_position * d
-            #video_position = slider_position * self.dw_player[0].player.duration
+            # video_position = slider_position * self.dw_player[0].player.duration
             # self.dw_player[0].player.command("seek", str(video_position), "absolute")
             self.dw_player[0].player.seek(video_position, "absolute")
 
@@ -5458,7 +5460,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         check if first player ended
         """
 
-        print("play_video")
+        logging.debug("play_video")
 
         if self.geometric_measurements_mode:
             return
@@ -5840,6 +5842,15 @@ def main():
             )
             sys.exit()
 
+        if sys.platform.startswith("darwin"):
+            QMessageBox.warning(
+                        None,
+                        cfg.programName,
+                        (f"This version of BORIS for macOS is still EXPERIMENTAL and should be used at your own risk."),
+                        QMessageBox.Ok | QMessageBox.Default,
+                        QMessageBox.NoButton,
+                    )
+
     window.show()
     window.raise_()  # for overlapping widget (?)
 

{boris_behav_obs-9.7.4 → boris_behav_obs-9.7.6}/boris/ipc_mpv.py

@@ -1,8 +1,29 @@
+"""
+BORIS
+Behavioral Observation Research Interactive Software
+Copyright 2012-2025 Olivier Friard
+
+This file is part of BORIS.
+
+  BORIS is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 3 of the License, or
+  any later version.
+
+  BORIS is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not see <http://www.gnu.org/licenses/>.
+
+"""
+
 import socket
 import json
 import subprocess
 
-# from PySide6.QtCore import QTimer
 import logging
 import config as cfg
 
@@ -117,6 +138,14 @@ class IPC_MPV:
     def playlist(self):
         return self.send_command({"command": ["get_property", "playlist"]})
 
+    def playlist_next(self):
+        self.send_command({"command": ["playlist-next"]})
+        return
+
+    def playlist_prev(self):
+        self.send_command({"command": ["playlist-prev"]})
+        return
+
     @property
     def playlist_pos(self):
         return self.send_command({"command": ["get_property", "playlist-pos"]})
@@ -265,6 +294,25 @@ class IPC_MPV:
     def core_idle(self):
         return self.send_command({"command": ["get_property", "core-idle"]})
 
+    @property
+    def video_pan_x(self):
+        return self.send_command({"command": ["get_property", "video-pan-x"]})
+
+    @video_pan_x.setter
+    def video_pan_x(self, value):
+        self.send_command({"command": ["set_property", "video-pan-x", value]})
+        return
+
+    @property
+    def video_pan_y(self):
+        return self.send_command({"command": ["get_property", "video-pan-y"]})
+
+    @video_pan_y.setter
+    def video_pan_y(self, value):
+        self.send_command({"command": ["set_property", "video-pan-y", value]})
+        return
+
+
     """
     @property
     def xxx(self):

{boris_behav_obs-9.7.4 → boris_behav_obs-9.7.6}/boris/observation.py

@@ -42,7 +42,7 @@ from PySide6.QtWidgets import (
     QApplication,
     QMenu,
     QListWidgetItem,
-    QHeaderView
+    QHeaderView,
 )
 
 from . import config as cfg
@@ -76,7 +76,10 @@ class AssignConverter(QDialog):
             self.cbb[-1].addItems(["None"] + sorted(converters.keys()))
 
             if column_idx in col_conv:
-                self.cbb[-1].setCurrentIndex((["None"] + sorted(converters.keys())).index(col_conv[column_idx]))
+                if col_conv[column_idx] in (["None"] + sorted(converters.keys())):
+                    self.cbb[-1].setCurrentIndex((["None"] + sorted(converters.keys())).index(col_conv[column_idx]))
+                else:
+                    self.cbb[-1].setCurrentIndex(0)
             else:
                 self.cbb[-1].setCurrentIndex(0)
             hbox.addWidget(self.cbb[-1])
@@ -229,7 +232,6 @@ class Observation(QDialog, Ui_Form):
 
         self.twVideo1.horizontalHeader().setSectionResizeMode(QHeaderView.ResizeToContents)
 
-
         self.mediaDurations, self.mediaFPS, self.mediaHasVideo, self.mediaHasAudio, self.media_creation_time = {}, {}, {}, {}, {}
 
         for w in (

{boris_behav_obs-9.7.4 → boris_behav_obs-9.7.6}/boris/observation_operations.py

@@ -113,6 +113,8 @@ def observations_list(self):
     result, selected_obs = select_observations.select_observations2(self, cfg.SINGLE)
 
     if not selected_obs:
+        # activate main window
+        self.activateWindow()
         return
 
     if self.observationId:
@@ -122,10 +124,14 @@ def observations_list(self):
         )
         if response == cfg.NO:
             self.show_data_files()
+            # activate main window
+            self.activateWindow()
+
             return ""
         else:
             close_observation(self)
 
+
         QtTest.QTest.qWait(1000)
 
     if result == cfg.OPEN:
@@ -145,6 +151,8 @@ def observations_list(self):
             )
 
     logging.debug("end observations list")
+    # activate main window
+    self.activateWindow()
 
 
 def open_observation(self, mode: str) -> str:
@@ -1151,6 +1159,9 @@ def close_observation(self):
         logging.info("Stop plot timer")
         self.plot_timer.stop()
 
+        if self.MPV_IPC_MODE:
+            self.main_window_activation_timer.stop()
+
         for i, player in enumerate(self.dw_player):
             if (
                 str(i + 1) in self.pj[cfg.OBSERVATIONS][self.observationId][cfg.FILE]
@@ -1340,8 +1351,6 @@ def initialize_new_media_observation(self) -> bool:
         self.playerType = cfg.VIEWER_MEDIA
         return True
 
-        # print(f"{self.process=}")
-
     self.playerType = cfg.MEDIA
     self.fps = 0
 
@@ -1365,7 +1374,7 @@ def initialize_new_media_observation(self) -> bool:
 
     # add all media files to media lists
     self.setDockOptions(QMainWindow.AnimatedDocks | QMainWindow.AllowNestedDocks)
-    self.dw_player: list = []
+    self.dw_player = []
 
     # check if media creation time used as offset
     # TODO check if cfg.MEDIA_CREATION_TIME dict is present
@@ -1831,8 +1840,8 @@ def initialize_new_media_observation(self) -> bool:
         self.dw_player[i].resize_signal.connect(self.resize_dw)
 
         # add durations list
-        self.dw_player[i].media_durations: list = []
-        self.dw_player[i].cumul_media_durations: List[int] = [0]  # [idx for idx,x in enumerate(l) if l[idx-1]<pos<=x]
+        self.dw_player[i].media_durations = []
+        self.dw_player[i].cumul_media_durations = [0]  # [idx for idx,x in enumerate(l) if l[idx-1]<pos<=x]
 
         # add fps list
         self.dw_player[i].fps = {}
@@ -1844,6 +1853,13 @@ def initialize_new_media_observation(self) -> bool:
                 if r:
                     break
 
+            # start timer for activating the main window
+            self.main_window_activation_timer = QTimer()
+            self.main_window_activation_timer.setInterval(500)
+            self.main_window_activation_timer.timeout.connect(self.activateWindow)
+            self.main_window_activation_timer.start()
+            
+
         for mediaFile in self.pj[cfg.OBSERVATIONS][self.observationId][cfg.FILE][n_player]:
             logging.debug(f"media file: {mediaFile}")
 

{boris_behav_obs-9.7.4 → boris_behav_obs-9.7.6}/boris/preferences.py

@@ -222,7 +222,7 @@ def preferences(self):
     # beep every
     preferencesWindow.sbBeepEvery.setValue(self.beep_every)
     # frame step size
-    #preferencesWindow.sb_frame_step_size.setValue(self.config_param.get(cfg.FRAME_STEP_SIZE, cfg.FRAME_STEP_SIZE_DEFAULT_VALUE))
+    # preferencesWindow.sb_frame_step_size.setValue(self.config_param.get(cfg.FRAME_STEP_SIZE, cfg.FRAME_STEP_SIZE_DEFAULT_VALUE))
 
     # alert no focal subject
     preferencesWindow.cbAlertNoFocalSubject.setChecked(self.alertNoFocalSubject)
@@ -422,7 +422,7 @@ def preferences(self):
             self.beep_every = preferencesWindow.sbBeepEvery.value()
 
             # frame step size
-            #self.config_param[cfg.FRAME_STEP_SIZE] = preferencesWindow.sb_frame_step_size.value()
+            # self.config_param[cfg.FRAME_STEP_SIZE] = preferencesWindow.sb_frame_step_size.value()
 
             self.alertNoFocalSubject = preferencesWindow.cbAlertNoFocalSubject.isChecked()
 
@@ -505,3 +505,6 @@ def preferences(self):
 
         else:
             break
+
+    # activate main window
+    self.activateWindow()

{boris_behav_obs-9.7.4 → boris_behav_obs-9.7.6}/boris/project.py

@@ -1977,7 +1977,7 @@ class projectDialog(QDialog, Ui_dlgProject):
         self.pj[cfg.INDEPENDENT_VARIABLES] = dict(self.indVar)
 
         # converters
-        converters = {}
+        converters: dict = {}
         for row in range(self.tw_converters.rowCount()):
             converters[self.tw_converters.item(row, 0).text()] = {
                 "name": self.tw_converters.item(row, 0).text(),

{boris_behav_obs-9.7.4 → boris_behav_obs-9.7.6}/boris/project_functions.py

@@ -1472,12 +1472,17 @@ def open_project_json(project_file_name: str) -> tuple:
             projectChanged = True
 
     # check if behavioral categories are stored as a list
-    if isinstance(pj[cfg.BEHAVIORAL_CATEGORIES_CONF], list):
-        # convert to dict
-        pj[cfg.BEHAVIORAL_CATEGORIES_CONF] = {str(idx): {"name": bc} for idx, bc in enumerate(pj[cfg.BEHAVIORAL_CATEGORIES_CONF])}
-        logging.info("Behavioral categories was converted from a list to a dictionary")
+    if cfg.BEHAVIORAL_CATEGORIES_CONF in pj:
+        if isinstance(pj[cfg.BEHAVIORAL_CATEGORIES_CONF], list):
+            # convert to dict
+            pj[cfg.BEHAVIORAL_CATEGORIES_CONF] = {str(idx): {"name": bc} for idx, bc in enumerate(pj[cfg.BEHAVIORAL_CATEGORIES_CONF])}
+            logging.info("Behavioral categories was converted from a list to a dictionary")
+            projectChanged = True
+    else:
+        pj[cfg.BEHAVIORAL_CATEGORIES_CONF] = dict()
         projectChanged = True
 
+
     # add category key if not found
     for idx in pj[cfg.ETHOGRAM]:
         if cfg.BEHAVIOR_CATEGORY not in pj[cfg.ETHOGRAM][idx]:

{boris_behav_obs-9.7.4 → boris_behav_obs-9.7.6}/boris/utilities.py

@@ -476,16 +476,16 @@ def txt2np_array(
                 function += f"    {line}\n"
             function += """    return OUTPUT"""
 
-
-            print('=============')
+            print("=============")
             print(function)
-            print('=============')
+            print("=============")
 
             import types
+
             mod = types.ModuleType("converter_module")
             exec(function, mod.__dict__)
 
-            '''
+            """
             try:
                 exec(function)
             except Exception:
@@ -495,13 +495,13 @@ def txt2np_array(
             print(f"{column_converter=}")
             print(locals())
             print(f"{conv_name=}")
-            '''
+            """
 
-            #np_converters[column_idx - 1] = locals()['conv_name']
+            # np_converters[column_idx - 1] = locals()['conv_name']
             np_converters[column_idx - 1] = getattr(mod, conv_name)
 
         else:
-            return False, f"converter {cfg.converters_param[column_idx]} not found", np.array([])
+            return False, f"converter {column_converter[column_idx]} not found", np.array([])
 
     # snif txt file
     try:

{boris_behav_obs-9.7.4 → boris_behav_obs-9.7.6}/boris/version.py

@@ -20,5 +20,5 @@ This file is part of BORIS.
 
 """
 
-__version__ = "9.7.4"
-__version_date__ = "2025-11-06"
+__version__ = "9.7.6"
+__version_date__ = "2025-11-13"

{boris_behav_obs-9.7.4 → boris_behav_obs-9.7.6}/boris_behav_obs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boris-behav-obs
-Version: 9.7.4
+Version: 9.7.6
 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.7.4 → boris_behav_obs-9.7.6}/pyproject.toml

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