boris-behav-obs 9.3.2__tar.gz → 9.3.3__tar.gz

{boris_behav_obs-9.3.2/boris_behav_obs.egg-info → boris_behav_obs-9.3.3}/PKG-INFO

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

@@ -155,6 +155,7 @@ CHECK_PROJECT_INTEGRITY = "check_project_integrity"
 YES = "Yes"
 NO = "No"
 CANCEL = "Cancel"
+IGNORE = "Ignore"
 APPEND = "Append"
 CLOSE = "Close"
 REPLACE = "Replace"
@@ -454,7 +455,8 @@ POINT = "POINT"
 START = "START"
 STOP = "STOP"
 
-PLAYER1, PLAYER2 = "1", "2"
+PLAYER1 = "1"
+PLAYER2 = "2"
 ALL_PLAYERS = [str(x + 1) for x in range(N_PLAYER)]
 
 VISUALIZE_SPECTROGRAM = "visualize_spectrogram"
@@ -701,6 +703,7 @@ EMPTY_PROJECT = {
     ETHOGRAM: {},
     OBSERVATIONS: {},
     BEHAVIORAL_CATEGORIES: [],
+    BEHAVIORAL_CATEGORIES_CONF: {},
     INDEPENDENT_VARIABLES: {},
     CODING_MAP: {},
     BEHAVIORS_CODING_MAP: [],

{boris_behav_obs-9.3.2 → boris_behav_obs-9.3.3}/boris/core.py

@@ -114,7 +114,6 @@ from . import cmd_arguments
 
 from . import core_qrc
 from .core_ui import Ui_MainWindow
-import exifread
 from . import config as cfg
 from . import video_operations
 
@@ -4317,12 +4316,8 @@ 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)])))

{boris_behav_obs-9.3.2 → boris_behav_obs-9.3.3}/boris/dialog.py

@@ -88,7 +88,7 @@ def MessageDialog(title: str, text: str, buttons: tuple) -> str:
     for button in buttons:
         message.addButton(button, QMessageBox.YesRole)
 
-    message.setWindowFlags(Qt.WindowStaysOnTopHint)
+    message.setWindowFlags(message.windowFlags() | Qt.WindowStaysOnTopHint)
     message.exec()
     return message.clickedButton().text()
 

{boris_behav_obs-9.3.2 → boris_behav_obs-9.3.3}/boris/media_file.py

@@ -20,11 +20,13 @@ This file is part of BORIS.
 
 """
 
+from PySide6.QtWidgets import QFileDialog
+
 from . import config as cfg
 from . import utilities as util
 from . import dialog
 from . import project_functions
-from PySide6.QtWidgets import QFileDialog
+from . import utilities as util
 
 
 def get_info(self) -> None:
@@ -38,17 +40,17 @@ def get_info(self) -> None:
         if "error" in r:
             ffmpeg_output = f"File path: {media_full_path}<br><br>{r['error']}<br><br>"
         else:
-            ffmpeg_output = f"<br><b>{r['analysis_program'] } analysis</b><br>"
+            ffmpeg_output = f"<br><b>{r['analysis_program']} analysis</b><br>"
 
             ffmpeg_output += (
                 f"File path: <b>{media_full_path}</b><br><br>"
                 f"Duration: {r['duration']} seconds ({util.convertTime(self.timeFormat, r['duration'])})<br>"
+                f"FPS: {r['fps']}<br>"
+                f"Resolution: {r['resolution']} pixels<br>"
                 f"Format long name: {r.get('format_long_name', cfg.NA)}<br>"
                 f"Creation time: {r.get('creation_time', cfg.NA)}<br>"
-                f"Resolution: {r['resolution']}<br>"
                 f"Number of frames: {r['frames_number']}<br>"
                 f"Bitrate: {util.smart_size_format(r['bitrate'])}   <br>"
-                f"FPS: {r['fps']}<br>"
                 f"Has video: {r['has_video']}<br>"
                 f"Has audio: {r['has_audio']}<br>"
                 f"File size: {util.smart_size_format(r.get('file size', cfg.NA))}<br>"
@@ -70,6 +72,12 @@ def get_info(self) -> None:
 
             mpv_output = (
                 "<b>MPV information</b><br>"
+                f"Duration: {dw.player.duration} seconds ({util.seconds2time(dw.player.duration)})<br>"
+                # "Position: {} %<br>"
+                f"FPS: {dw.player.container_fps}<br>"
+                # "Rate: {}<br>"
+                f"Resolution: {dw.player.width}x{dw.player.height} pixels<br>"
+                # "Scale: {}<br>"
                 f"Video format: {dw.player.video_format}<br>"
                 # "State: {}<br>"
                 # "Media Resource Location: {}<br>"
@@ -77,12 +85,6 @@ def get_info(self) -> None:
                 # "Track: {}/{}<br>"
                 f"Number of media in media list: {dw.player.playlist_count}<br>"
                 f"Current time position: {dw.player.time_pos}<br>"
-                f"Duration: {dw.player.duration}<br>"
-                # "Position: {} %<br>"
-                f"FPS: {dw.player.container_fps}<br>"
-                # "Rate: {}<br>"
-                f"Video size: {dw.player.width}x{dw.player.height}<br>"
-                # "Scale: {}<br>"
                 f"Aspect ratio: {round(dw.player.width / dw.player.height, 3)}<br>"
                 # "is seekable? {}<br>"
                 # "has_vout? {}<br>"

{boris_behav_obs-9.3.2 → boris_behav_obs-9.3.3}/boris/observation_operations.py

@@ -2406,15 +2406,15 @@ def event2media_file_name(observation: dict, timestamp: dec) -> Optional[str]:
     """
 
     cumul_media_durations: list = [dec(0)]
-    for media_file in observation[cfg.FILE]["1"]:
+    for media_file in observation[cfg.FILE][cfg.PLAYER1]:
         media_duration = dec(str(observation[cfg.MEDIA_INFO][cfg.LENGTH][media_file]))
-        cumul_media_durations.append(cumul_media_durations[-1] + media_duration)
+        cumul_media_durations.append(round(cumul_media_durations[-1] + media_duration, 3))
 
     cumul_media_durations.remove(dec(0))
 
     # test if timestamp is at end of last media
     if timestamp == cumul_media_durations[-1]:
-        player_idx = len(observation[cfg.FILE]["1"]) - 1
+        player_idx = len(observation[cfg.FILE][cfg.PLAYER1]) - 1
     else:
         player_idx = -1
         for idx, value in enumerate(cumul_media_durations):
@@ -2424,7 +2424,7 @@ def event2media_file_name(observation: dict, timestamp: dec) -> Optional[str]:
                 break
 
     if player_idx != -1:
-        video_file_name = observation[cfg.FILE]["1"][player_idx]
+        video_file_name = observation[cfg.FILE][cfg.PLAYER1][player_idx]
     else:
         video_file_name = None
 

{boris_behav_obs-9.3.2 → boris_behav_obs-9.3.3}/boris/project.py

@@ -82,12 +82,12 @@ class BehavioralCategories(QDialog):
         # add categories
         self.lw.setColumnCount(2)
         self.lw.setHorizontalHeaderLabels(["Category name", "Color"])
-        # self.lw.verticalHeader().hide()
         self.lw.setEditTriggers(QAbstractItemView.NoEditTriggers)
 
-        # self.lw.setSelectionBehavior(QAbstractItemView.SelectRows)
         self.lw.setSelectionMode(QAbstractItemView.SingleSelection)
 
+        behavioral_categories: list = []
+
         if cfg.BEHAVIORAL_CATEGORIES_CONF in pj:
             self.lw.setRowCount(len(pj.get(cfg.BEHAVIORAL_CATEGORIES_CONF, {})))
             behav_cat = pj.get(cfg.BEHAVIORAL_CATEGORIES_CONF, {})
@@ -95,7 +95,7 @@ class BehavioralCategories(QDialog):
                 # name
                 item = QTableWidgetItem()
                 item.setText(behav_cat[key]["name"])
-                # item.setFlags(Qt.ItemIsEnabled)
+                behavioral_categories.append(behav_cat[key]["name"])
                 self.lw.setItem(idx, 0, item)
                 # color
                 item = QTableWidgetItem()
@@ -103,24 +103,21 @@ class BehavioralCategories(QDialog):
                 if behav_cat[key].get(cfg.COLOR, ""):
                     item.setBackground(QColor(behav_cat[key].get(cfg.COLOR, "")))
                 else:
-                    # item.setBackground(QColor(230, 230, 230))
                     item.setBackground(self.not_editable_column_color())
-                # item.setFlags(Qt.ItemIsEnabled)
                 self.lw.setItem(idx, 1, item)
         else:
             self.lw.setRowCount(len(pj.get(cfg.BEHAVIORAL_CATEGORIES, [])))
             for idx, category in enumerate(sorted(pj.get(cfg.BEHAVIORAL_CATEGORIES, []))):
+                # name
                 item = QTableWidgetItem()
                 item.setText(category)
-                # item.setFlags(Qt.ItemIsEnabled)
+                behavioral_categories.append(category)
                 self.lw.setItem(idx, 0, item)
-
+                # color
                 item = QTableWidgetItem()
                 item.setText("")
-                # item.setFlags(Qt.ItemIsEnabled)
-                self.lw.setItem(idx, 1, item)
 
-            # self.lw.addItem(QListWidgetItem(category))
+                self.lw.setItem(idx, 1, item)
 
         self.vbox.addWidget(self.lw)
 
@@ -148,6 +145,41 @@ class BehavioralCategories(QDialog):
 
         self.setLayout(self.vbox)
 
+        # check if behavioral categories are present in events
+        behavioral_categories_in_ethogram = set(
+            sorted([pj[cfg.ETHOGRAM][idx].get(cfg.BEHAVIOR_CATEGORY, "") for idx in pj.get(cfg.ETHOGRAM, {})])
+        )
+
+        if behavioral_categories_in_ethogram.difference(set(behavioral_categories)):
+            if (
+                dialog.MessageDialog(
+                    cfg.programName,
+                    (
+                        "They are behavioral categories that are present in ethogram but not defined.<br>"
+                        f"{behavioral_categories_in_ethogram.difference(set(behavioral_categories))}<br>"
+                        "<br>"
+                        "Do you want to add them in the behavioral categories list?"
+                    ),
+                    [cfg.YES, cfg.NO],
+                )
+                == cfg.YES
+            ):
+                # add behavioral categories present in ethogram in behavioal categories list
+                rc = self.lw.rowCount()
+                self.lw.setRowCount(rc + len(behavioral_categories_in_ethogram.difference(set(behavioral_categories))))
+                for idx, category in enumerate(sorted(list(behavioral_categories_in_ethogram.difference(set(behavioral_categories))))):
+                    print(category)
+                    # name
+                    item = QTableWidgetItem()
+                    item.setText(category)
+                    # behavioral_categories.append(category)
+                    self.lw.setItem(rc + idx, 0, item)
+                    # color
+                    item = QTableWidgetItem()
+                    item.setText("")
+
+                    self.lw.setItem(rc + idx, 1, item)
+
     def not_editable_column_color(self):
         """
         return a color for the not editable column
@@ -663,7 +695,7 @@ class projectDialog(QDialog, Ui_dlgProject):
             QMessageBox.warning(
                 self,
                 cfg.programName,
-                ("The following behavior{} are not defined in the ethogram:<br>" "{}").format(
+                ("The following behavior{} are not defined in the ethogram:<br>{}").format(
                     "s" if len(bcm_code_not_found) > 1 else "", ",".join(bcm_code_not_found)
                 ),
             )
@@ -733,7 +765,7 @@ class projectDialog(QDialog, Ui_dlgProject):
         behavioral categories manager
         """
 
-        bc = BehavioralCategories(self.pj)  # self.config_param.get(cfg.DARK_MODE, cfg.DEFAULT_FRAME_MODE)
+        bc = BehavioralCategories(self.pj)
 
         if bc.exec_():
             self.pj[cfg.BEHAVIORAL_CATEGORIES] = []
@@ -1377,7 +1409,7 @@ class projectDialog(QDialog, Ui_dlgProject):
             # let user select a coding maop
             file_name, _ = QFileDialog().getOpenFileName(
                 self,
-                "Select a modifier coding map for " f"{self.twBehaviors.item(row, cfg.behavioursFields['code']).text()} behavior",
+                f"Select a modifier coding map for {self.twBehaviors.item(row, cfg.behavioursFields['code']).text()} behavior",
                 "",
                 "BORIS map files (*.boris_map);;All files (*)",
             )
@@ -1759,24 +1791,40 @@ class projectDialog(QDialog, Ui_dlgProject):
             return {cfg.CANCEL: True}
 
         # check if behavior belong to category that is not in categories list
-        behavior_category: list = []
+        missing_behavior_category: list = []
         for idx in checked_ethogram:
             if cfg.BEHAVIOR_CATEGORY in checked_ethogram[idx]:
                 if checked_ethogram[idx][cfg.BEHAVIOR_CATEGORY]:
                     if checked_ethogram[idx][cfg.BEHAVIOR_CATEGORY] not in self.pj[cfg.BEHAVIORAL_CATEGORIES]:
-                        behavior_category.append((checked_ethogram[idx][cfg.BEHAVIOR_CODE], checked_ethogram[idx][cfg.BEHAVIOR_CATEGORY]))
-        if behavior_category:
+                        missing_behavior_category.append(
+                            (checked_ethogram[idx][cfg.BEHAVIOR_CODE], checked_ethogram[idx][cfg.BEHAVIOR_CATEGORY])
+                        )
+        if missing_behavior_category:
             response = dialog.MessageDialog(
                 f"{cfg.programName} - Behavioral categories",
                 (
-                    "The behavioral categorie(s) "
-                    f"{', '.join(set(['<b>' + x[1] + '</b>' + ' (used with <b>' + x[0] + '</b>)' for x in behavior_category]))} "
-                    "are no more defined in behavioral categories list"
+                    "The behavioral category/ies<br> "
+                    f"{', '.join(set(['<b>' + x[1] + '</b>' + ' (used with <b>' + x[0] + '</b>)<br>' for x in missing_behavior_category]))} "
+                    "are not defined in behavioral categories list.<br>"
                 ),
-                ["Add behavioral category/ies", "Ignore", cfg.CANCEL],
+                ["Add behavioral category/ies", cfg.IGNORE, cfg.CANCEL],
             )
             if response == "Add behavioral category/ies":
-                [self.pj[cfg.BEHAVIORAL_CATEGORIES].append(x1) for x1 in set(x[1] for x in behavior_category)]
+                if cfg.BEHAVIORAL_CATEGORIES_CONF not in self.pj:
+                    self.pj[cfg.BEHAVIORAL_CATEGORIES_CONF] = {}
+                for x1 in set(x[1] for x in missing_behavior_category):
+                    self.pj[cfg.BEHAVIORAL_CATEGORIES].append(x1)
+
+                    if self.pj[cfg.BEHAVIORAL_CATEGORIES_CONF]:
+                        index = str(max([int(k) for k in self.pj[cfg.BEHAVIORAL_CATEGORIES_CONF]]) + 1)
+                    else:
+                        index = "0"
+
+                    self.pj[cfg.BEHAVIORAL_CATEGORIES_CONF][index] = {
+                        "name": x1,
+                        cfg.COLOR: "",
+                    }
+
             if response == cfg.CANCEL:
                 return {cfg.CANCEL: True}
 

{boris_behav_obs-9.3.2 → boris_behav_obs-9.3.3}/boris/project_import_export.py

@@ -89,9 +89,10 @@ def export_ethogram(self) -> None:
             return
         pj = dict(cfg.EMPTY_PROJECT)
         pj[cfg.ETHOGRAM] = dict(r)
-        # behavioral categories
 
+        # behavioral categories
         pj[cfg.BEHAVIORAL_CATEGORIES] = list(self.pj[cfg.BEHAVIORAL_CATEGORIES])
+        pj[cfg.BEHAVIORAL_CATEGORIES_CONF] = dict(self.pj.get(cfg.BEHAVIORAL_CATEGORIES_CONF, {}))
 
         # project file indentation
         file_indentation = self.config_param.get(cfg.PROJECT_FILE_INDENTATION, cfg.PROJECT_FILE_INDENTATION_DEFAULT_VALUE)
@@ -309,6 +310,7 @@ def import_ethogram_from_dict(self, project: dict):
     """
     # import behavioral_categories
     self.pj[cfg.BEHAVIORAL_CATEGORIES] = list(project.get(cfg.BEHAVIORAL_CATEGORIES, []))
+    self.pj[cfg.BEHAVIORAL_CATEGORIES_CONF] = list(project.get(cfg.BEHAVIORAL_CATEGORIES_CONF, {}))
 
     # configuration of behaviours
     if not (cfg.ETHOGRAM in project and project[cfg.ETHOGRAM]):

{boris_behav_obs-9.3.2 → boris_behav_obs-9.3.3}/boris/utilities.py

@@ -21,7 +21,6 @@ Copyright 2012-2025 Olivier Friard
 
 import csv
 import datetime as dt
-import hashlib
 import json
 import logging
 import math

{boris_behav_obs-9.3.2 → boris_behav_obs-9.3.3}/boris/version.py

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

{boris_behav_obs-9.3.2 → boris_behav_obs-9.3.3/boris_behav_obs.egg-info}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [project]
 name = "boris-behav-obs"
-version = "9.3.2"
+version = "9.3.3"
 description = "BORIS - Behavioral Observation Research Interactive Software"
 authors = [{ name="Olivier Friard", email="olivier.friard@unito.it" }]
 readme = "README.md"
@@ -54,7 +54,7 @@ line-length = 140
 exclude = ["*_ui.py", "mpv*"]
 
 [tool.bumpver]
-current_version = "9.3.2"
+current_version = "9.3.3"
 version_pattern = "MAJOR.MINOR.PATCH"
 
 

{boris_behav_obs-9.3.2 → boris_behav_obs-9.3.3}/tests/test_utilities.py

@@ -564,7 +564,7 @@ class Test_txt2np_array(object):
             file_name="files/xxx", columns_str="4,6", substract_first_value="False", converters={}, column_converter={}
         )
         # print(r)
-        assert r[0] == False
+        assert r[0] is False
         assert r[1] == "[Errno 2] No such file or directory: 'files/xxx'"
         assert list(r[2].shape) == [0]
 
@@ -576,7 +576,10 @@ class Test_txt2np_array(object):
             converters={},
             column_converter={},
         )
-        assert r[0] == False
+
+        print(r)
+
+        assert r[0] is False
         assert r[1] == "could not convert string to float: '14:38:58'"
         assert list(r[2].shape) == [0]
 
@@ -594,7 +597,7 @@ class Test_txt2np_array(object):
             },
             column_converter={4: "HHMMSS_2_seconds"},
         )
-        assert r[0] == True
+        assert r[0] is True
         assert r[1] == ""
         assert r[2][0, 0] == 52738.0
         assert r[2][1, 0] == 52740.0