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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boris-behav-obs
-Version: 9.7.2
+Version: 9.7.4
 Summary: BORIS - Behavioral Observation Research Interactive Software
 Author-email: Olivier Friard <olivier.friard@unito.it>
 License-Expression: GPL-3.0-only
@@ -44,15 +44,14 @@ BORIS (Behavioral Observation Research Interactive Software)
 
 BORIS is an easy-to-use event logging software for video/audio coding or live observations.
 
-BORIS is a free and open-source software available for GNU/Linux and Windows.
-You can not longer run BORIS natively on MacOS (since v.8). Some alternatives to run the last version of BORIS are available, see [BORIS on MacOS](https://www.boris.unito.it/download_mac).
+BORIS is a free and open-source software available for GNU/Linux, Windows and macOS.
 
 It provides also some analysis tools like time budget and some plotting functions.
 
 <!-- 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 2407 citations in peer-reviewed scientific publications.
+The BORIS paper has more than 2423 citations in peer-reviewed scientific publications.
 
 
 

{boris_behav_obs-9.7.2 → boris_behav_obs-9.7.4}/README.md

@@ -6,15 +6,14 @@ BORIS (Behavioral Observation Research Interactive Software)
 
 BORIS is an easy-to-use event logging software for video/audio coding or live observations.
 
-BORIS is a free and open-source software available for GNU/Linux and Windows.
-You can not longer run BORIS natively on MacOS (since v.8). Some alternatives to run the last version of BORIS are available, see [BORIS on MacOS](https://www.boris.unito.it/download_mac).
+BORIS is a free and open-source software available for GNU/Linux, Windows and macOS.
 
 It provides also some analysis tools like time budget and some plotting functions.
 
 <!-- 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 2407 citations in peer-reviewed scientific publications.
+The BORIS paper has more than 2423 citations in peer-reviewed scientific publications.
 
 
 

{boris_behav_obs-9.7.2 → boris_behav_obs-9.7.4}/boris/about.py

@@ -40,7 +40,7 @@ def actionAbout_activated(self):
     About dialog
     """
 
-    programs_versions: list = ["MPV media player"]
+    programs_versions: list[str] = ["MPV media player"]
 
     mpv_lib_version, mpv_lib_file_path, mpv_api_version = util.mpv_lib_version()
     programs_versions.append(
@@ -53,13 +53,13 @@ def actionAbout_activated(self):
 
     # ffmpeg
     if self.ffmpeg_bin == "ffmpeg" and sys.platform.startswith("linux"):
-        ffmpeg_true_path = subprocess.getoutput("which ffmpeg")
+        ffmpeg_true_path: str = subprocess.getoutput("which ffmpeg")
     else:
         ffmpeg_true_path = self.ffmpeg_bin
     programs_versions.extend(
         [
             "\nFFmpeg",
-            subprocess.getoutput(f'"{self.ffmpeg_bin}" -version').split("\n")[0],
+            subprocess.getoutput(cmd=f'"{self.ffmpeg_bin}" -version').split(sep="\n")[0],
             f"Path: {ffmpeg_true_path}",
             "https://www.ffmpeg.org",
         ]
@@ -75,11 +75,11 @@ def actionAbout_activated(self):
     programs_versions.extend(["\nPandas", f"version {pd.__version__}", "https://pandas.pydata.org"])
 
     # graphviz
-    gv_result = subprocess.getoutput("dot -V")
+    gv_result = subprocess.getoutput(cmd="dot -V")
 
     programs_versions.extend(["\nGraphViz", gv_result if "graphviz" in gv_result else "not installed", "https://www.graphviz.org/"])
 
-    about_dialog = QMessageBox()
+    about_dialog: QMessageBox = QMessageBox()
     about_dialog.setIconPixmap(QPixmap(":/boris_unito"))
 
     about_dialog.setWindowTitle(f"About {cfg.programName}")

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

@@ -3950,7 +3950,14 @@ class MainWindow(QMainWindow, Ui_MainWindow):
             slider_position = self.video_slider.value() / (cfg.SLIDER_MAXIMUM - 1)
             if self.dw_player[0].player.duration is None:
                 return
-            video_position = slider_position * self.dw_player[0].player.duration
+            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
             # self.dw_player[0].player.command("seek", str(video_position), "absolute")
             self.dw_player[0].player.seek(video_position, "absolute")
 
@@ -4311,8 +4318,6 @@ class MainWindow(QMainWindow, Ui_MainWindow):
 
             self.actionPlay.setIcon(QIcon(f":/play_{gui_utilities.theme_mode()}"))
 
-        print(f"{msg=}")
-
         if msg:
             self.lb_current_media_time.setText(msg)
 

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

@@ -36,6 +36,7 @@ class IPC_MPV:
         self.process = subprocess.Popen(
             [
                 "mpv",
+                "--ontop",
                 "--no-border",
                 "--osc=no",  # no on screen commands
                 "--input-ipc-server=" + self.socket_path,
@@ -48,30 +49,6 @@ class IPC_MPV:
             stderr=subprocess.PIPE,
         )
 
-    '''
-    def init_socket(self):
-        """
-        Initialize the JSON IPC socket.
-        """
-        print("init socket")
-        self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-        QTimer.singleShot(5000, self.connect_socket)  # Allow time for mpv to initialize
-    '''
-
-    '''
-    def connect_socket(self):
-        """
-        Connect to the mpv IPC socket.
-        """
-        print("connect socket")
-        try:
-            self.sock.connect(self.socket_path)
-            print("Connected to mpv IPC server.")
-        except socket.error as e:
-            print(f"Failed to connect to mpv IPC server: {e}")
-        print("end of connect_socket fucntion")
-    '''
-
     def send_command(self, command):
         """
         Send a JSON command to the mpv IPC server.
@@ -92,9 +69,7 @@ class IPC_MPV:
                 # Parse the response as JSON
                 response_data = json.loads(response.decode("utf-8"))
                 if response_data["error"] != "success":
-                    print(f"send command: {command}")
-                    print(f"{response_data=}")
-                    print()
+                    logging.warning(f"send command: {command} response data: {response_data}")
                 # Return the 'data' field which contains the playback position
                 return response_data.get("data")
         except FileNotFoundError:
@@ -128,7 +103,6 @@ class IPC_MPV:
 
     @pause.setter
     def pause(self, value):
-        print(f"set pause to {value}")
         return self.send_command({"command": ["set_property", "pause", value]})
 
     @property
@@ -168,7 +142,6 @@ class IPC_MPV:
     @property
     def playback_time(self):
         playback_time_ = self.send_command({"command": ["get_property", "playback-time"]})
-        print(f"playback_time: {playback_time_}")
         return playback_time_
 
     def frame_step(self):

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

@@ -42,6 +42,7 @@ from PySide6.QtWidgets import (
     QApplication,
     QMenu,
     QListWidgetItem,
+    QHeaderView
 )
 
 from . import config as cfg
@@ -224,6 +225,10 @@ class Observation(QDialog, Ui_Form):
         self.pbCancel.clicked.connect(self.pbCancel_clicked)
 
         self.tw_data_files.cellDoubleClicked[int, int].connect(self.tw_data_files_cellDoubleClicked)
+        self.tw_data_files.horizontalHeader().setSectionResizeMode(QHeaderView.ResizeToContents)
+
+        self.twVideo1.horizontalHeader().setSectionResizeMode(QHeaderView.ResizeToContents)
+
 
         self.mediaDurations, self.mediaFPS, self.mediaHasVideo, self.mediaHasAudio, self.media_creation_time = {}, {}, {}, {}, {}
 

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

@@ -1964,7 +1964,7 @@ def initialize_new_media_observation(self) -> bool:
 
     menu_options.update_menu(self)
 
-    if not self.MPV_IPC_MODE:
+    if self.MPV_IPC_MODE:
         # activate timer
         self.ipc_mpv_timer = QTimer()
         self.ipc_mpv_timer.setInterval(500)

{boris_behav_obs-9.7.2 → boris_behav_obs-9.7.4}/boris/plot_data_module.py

@@ -134,6 +134,8 @@ class Plot_data(QWidget):
             column_converter=column_converter,
         )
 
+        print(f"{error_msg=}")
+
         if not result:
             self.error_msg = error_msg
             return

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

@@ -471,17 +471,34 @@ def txt2np_array(
             conv_name = column_converter[column_idx]
 
             function = f"""def {conv_name}(INPUT):\n"""
-            function += """    INPUT = INPUT.decode("utf-8") if isinstance(INPUT, bytes) else INPUT"""
+            function += """    INPUT = INPUT.decode("utf-8") if isinstance(INPUT, bytes) else INPUT\n\n"""
             for line in converters[conv_name]["code"].split("\n"):
                 function += f"    {line}\n"
             function += """    return OUTPUT"""
 
+
+            print('=============')
+            print(function)
+            print('=============')
+
+            import types
+            mod = types.ModuleType("converter_module")
+            exec(function, mod.__dict__)
+
+            '''
             try:
                 exec(function)
             except Exception:
                 return False, f"error in converter: {sys.exc_info()[1]}", np.array([])
 
-            np_converters[column_idx - 1] = locals()[conv_name]
+            print(f"{converters=}")
+            print(f"{column_converter=}")
+            print(locals())
+            print(f"{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([])

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

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

{boris_behav_obs-9.7.2 → boris_behav_obs-9.7.4}/boris/video_operations.py

@@ -231,6 +231,10 @@ def display_zoom_level(self) -> None:
     """
     msg: str = "Zoom level: <b>"
     for player in self.dw_player:
+        vz = player.player.video_zoom
+        if vz is None:
+            self.lb_zoom_level.setText("-")
+            return
         msg += f"{2**player.player.video_zoom:.1f} "
     msg += "</b>"
     self.lb_zoom_level.setText(msg)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boris-behav-obs
-Version: 9.7.2
+Version: 9.7.4
 Summary: BORIS - Behavioral Observation Research Interactive Software
 Author-email: Olivier Friard <olivier.friard@unito.it>
 License-Expression: GPL-3.0-only
@@ -44,15 +44,14 @@ BORIS (Behavioral Observation Research Interactive Software)
 
 BORIS is an easy-to-use event logging software for video/audio coding or live observations.
 
-BORIS is a free and open-source software available for GNU/Linux and Windows.
-You can not longer run BORIS natively on MacOS (since v.8). Some alternatives to run the last version of BORIS are available, see [BORIS on MacOS](https://www.boris.unito.it/download_mac).
+BORIS is a free and open-source software available for GNU/Linux, Windows and macOS.
 
 It provides also some analysis tools like time budget and some plotting functions.
 
 <!-- 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 2407 citations in peer-reviewed scientific publications.
+The BORIS paper has more than 2423 citations in peer-reviewed scientific publications.
 
 
 

{boris_behav_obs-9.7.2 → boris_behav_obs-9.7.4}/pyproject.toml

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