boris-behav-obs 8.27.6__tar.gz → 8.27.8__tar.gz

{boris_behav_obs-8.27.6/boris_behav_obs.egg-info → boris_behav_obs-8.27.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: boris-behav-obs
-Version: 8.27.6
+Version: 8.27.8
 Summary: BORIS - Behavioral Observation Research Interactive Software
 Author-email: Olivier Friard <olivier.friard@unito.it>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -720,11 +720,11 @@ 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 <http://www.boris.unito.it/pages/download_mac>`_.
+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/>`_.
 
 It provides also some analysis tools like time budget and some plotting functions.
 
-The BORIS paper has more than `1700 citations in peer-reviewed scientific publications <http://www.boris.unito.it/pages/citations.html>`_.
+The BORIS paper has more than `1700 citations in peer-reviewed scientific publications <https://www.boris.unito.it/citations/>`_.
 
 See http://www.boris.unito.it
 

{boris_behav_obs-8.27.6 → boris_behav_obs-8.27.8}/README.rst

@@ -9,11 +9,11 @@ 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 <http://www.boris.unito.it/pages/download_mac>`_.
+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/>`_.
 
 It provides also some analysis tools like time budget and some plotting functions.
 
-The BORIS paper has more than `1700 citations in peer-reviewed scientific publications <http://www.boris.unito.it/pages/citations.html>`_.
+The BORIS paper has more than `1700 citations in peer-reviewed scientific publications <https://www.boris.unito.it/citations/>`_.
 
 See http://www.boris.unito.it
 

{boris_behav_obs-8.27.6 → boris_behav_obs-8.27.8}/boris/core.py

@@ -472,7 +472,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         """
         allow to block Qdockwidgets on main window because they can have a strange behavior specially on Mac
         """
-        for w in [self.dwEvents, self.dwEthogram, self.dwSubjects]:
+        for w in (self.dwEvents, self.dwEthogram, self.dwSubjects):
             if self.action_block_dockwidgets.isChecked():
                 w.setFloating(False)
                 w.setFeatures(QDockWidget.NoDockWidgetFeatures)

{boris_behav_obs-8.27.6 → boris_behav_obs-8.27.8}/boris/mpv2.py

@@ -868,6 +868,8 @@ class MPV(object):
         Extra arguments and extra keyword arguments will be passed to mpv as options.
         """
 
+        print(f"{extra_mpv_flags=}")
+
         self.handle = _mpv_create()
         self._event_thread = None
         self._core_shutdown = False

{boris_behav_obs-8.27.6 → boris_behav_obs-8.27.8}/boris/player_dock_widget.py

@@ -117,7 +117,7 @@ class DW_player(QDockWidget):
 
         self.player = mpv.MPV(
             wid=str(int(self.videoframe.winId())),
-            # vo='x11', # You may not need this
+            vo="x11" if sys.platform.startswith("linux") else "",
             log_handler=functools.partial(mpv_logger, self.id_),
             loglevel="debug",
         )

{boris_behav_obs-8.27.6 → boris_behav_obs-8.27.8}/boris/preferences.py

@@ -146,7 +146,7 @@ def preferences(self):
             cfg.MPV_HWDEC_OPTIONS.index(self.config_param.get(cfg.MPV_HWDEC, cfg.MPV_HWDEC_DEFAULT_VALUE))
         )
     except Exception:
-        preferencesWindow.cb_hwdec.setCurrentIndex(cfg.MPV_HWDEC_DEFAULT_VALUE)
+        preferencesWindow.cb_hwdec.setCurrentIndex(cfg.MPV_HWDEC_OPTIONS.index(cfg.MPV_HWDEC_DEFAULT_VALUE))
 
     # PROJET FILE INDENTATION
     preferencesWindow.combo_project_file_indentation.clear()
@@ -286,7 +286,7 @@ def preferences(self):
         # interface
         self.config_param[cfg.TOOLBAR_ICON_SIZE] = preferencesWindow.sb_toolbar_icon_size.value()
         self.config_param[cfg.DARK_MODE] = preferencesWindow.cb_darkmode.isChecked()
-        if self.config_param[cfg.DARK_MODE]:
+        if self.config_param.get(cfg.DARK_MODE, cfg.DEFAULT_FRAME_MODE):
             self.setStyleSheet(qdarkstyle.load_stylesheet(qt_api="pyqt5"))
         else:
             self.setStyleSheet("")

{boris_behav_obs-8.27.6 → boris_behav_obs-8.27.8}/boris/project.py

@@ -430,7 +430,7 @@ class projectDialog(QDialog, Ui_dlgProject):
         """
         return a color for the not editable column
         """
-        if self.config_param[cfg.DARK_MODE]:
+        if self.config_param.get(cfg.DARK_MODE, cfg.DEFAULT_FRAME_MODE):
             return QColor(55, 65, 79)
         else:
             return QColor(230, 230, 230)
@@ -730,7 +730,7 @@ class projectDialog(QDialog, Ui_dlgProject):
         behavioral categories manager
         """
 
-        bc = BehavioralCategories(self.pj, self.config_param[cfg.DARK_MODE])
+        bc = BehavioralCategories(self.pj, self.config_param.get(cfg.DARK_MODE, cfg.DEFAULT_FRAME_MODE))
 
         if bc.exec_():
             self.pj[cfg.BEHAVIORAL_CATEGORIES] = []
@@ -1836,10 +1836,9 @@ class projectDialog(QDialog, Ui_dlgProject):
         # check subjects
         for row in range(self.twSubjects.rowCount()):
             # check key
+            key: str = ""
             if self.twSubjects.item(row, 0):
                 key = self.twSubjects.item(row, 0).text()
-            else:
-                key = ""
 
             # check subject name
             if self.twSubjects.item(row, 1):
@@ -1865,7 +1864,7 @@ class projectDialog(QDialog, Ui_dlgProject):
                 return
 
             # description
-            subjectDescription = ""
+            subjectDescription: str = ""
             if self.twSubjects.item(row, 2):
                 subjectDescription = self.twSubjects.item(row, 2).text().strip()
 
@@ -1875,6 +1874,25 @@ class projectDialog(QDialog, Ui_dlgProject):
                 "description": subjectDescription,
             }
 
+        # check if coded subjects are defined in the subjects list
+        subjects_list: list = [self.subjects_conf[x]["name"] for x in self.subjects_conf]
+        coded_subjects = set(
+            util.flatten_list([[y[1] for y in self.pj[cfg.OBSERVATIONS][x].get(cfg.EVENTS, [])] for x in self.pj[cfg.OBSERVATIONS]])
+        )
+
+        not_defined_subjects: list = []
+        for subject in coded_subjects:
+            if subject and subject not in subjects_list:
+                not_defined_subjects.append(subject)
+
+        if not_defined_subjects:
+            QMessageBox.warning(
+                self,
+                cfg.programName,
+                f"The coded subject(s) <b>{', '.join(not_defined_subjects)}</b> is/are not defined in the subjects list.<br>You can use the <b>Explore project</b> to fix it.",
+            )
+            return
+
         self.pj[cfg.SUBJECTS] = dict(self.subjects_conf)
 
         # check ethogram

{boris_behav_obs-8.27.6 → boris_behav_obs-8.27.8}/boris/project_functions.py

@@ -379,15 +379,16 @@ def check_project_integrity(
     media_file_available: bool = True,
 ) -> str:
     """
-    check project integrity
-    check if behaviors in observations are in ethogram
-    check unpaired state events
-    check if timestamp between -2147483647 and 2147483647 (2**31 - 1)
-    check if behavior belong to behavioral category that do not more exist
-    check for leading and trailing spaces and special chars in modifiers
-    check if media file are available
-    check if media length available
-    check independent variables
+    check project integrity:
+    * check if coded behaviors are defined in ethogram
+    * check unpaired state events
+    * check if timestamp between -2147483647 and 2147483647 (2**31 - 1)
+    * check if behavior belong to behavioral category that do not more exist
+    * check for leading and trailing spaces and special chars in modifiers
+    * check if media file are available (optional)
+    * check if media length available
+    * check independent variables
+    * check if coded subjects are defines
 
     Args:
         pj (dict): BORIS project
@@ -398,7 +399,7 @@ def check_project_integrity(
     Returns:
         str: message
     """
-    out = ""
+    out: str = ""
 
     # check if coded behaviors are defined in ethogram
     r = check_coded_behaviors(pj)
@@ -521,6 +522,14 @@ def check_project_integrity(
                         f" is not allowed for {var_label} (choose between {defined_set_var_label[var_label]})<br>"
                     )
 
+    # check if coded subjects are defined in the subjects list
+    subjects_list: list = [pj[cfg.SUBJECTS][x]["name"] for x in pj[cfg.SUBJECTS]]
+    coded_subjects = set(util.flatten_list([[y[1] for y in pj[cfg.OBSERVATIONS][x].get(cfg.EVENTS, [])] for x in pj[cfg.OBSERVATIONS]]))
+
+    for subject in coded_subjects:
+        if subject and subject not in subjects_list:
+            out += f"The coded subject <b>{subject}</b> is not defined in the subjects list.<br>You can use the <b>Explore project</b> to fix it.<br><br>"
+
     return out
 
 

{boris_behav_obs-8.27.6 → boris_behav_obs-8.27.8}/boris/utilities.py

@@ -505,6 +505,19 @@ def group_events(pj: dict, obs_id: str, include_modifiers: bool = False) -> dict
         return {"error": ""}
 
 
+def flatten_list(nested_list) -> list:
+    """
+    Flatten a list of lists.
+    """
+    flattened: list = []
+    for item in nested_list:
+        if isinstance(item, list):
+            flattened.extend(flatten_list(item))
+        else:
+            flattened.append(item)
+    return flattened
+
+
 def get_current_states_modifiers_by_subject(
     state_behaviors_codes: list, events: list, subjects: dict, time_: dec, include_modifiers: bool = False
 ) -> dict:

{boris_behav_obs-8.27.6 → boris_behav_obs-8.27.8}/boris/version.py

@@ -20,5 +20,5 @@ This file is part of BORIS.
 
 """
 
-__version__ = "8.27.6"
-__version_date__ = "2024-08-21"
+__version__ = "8.27.8"
+__version_date__ = "2024-08-26"

{boris_behav_obs-8.27.6 → boris_behav_obs-8.27.8/boris_behav_obs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: boris-behav-obs
-Version: 8.27.6
+Version: 8.27.8
 Summary: BORIS - Behavioral Observation Research Interactive Software
 Author-email: Olivier Friard <olivier.friard@unito.it>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -720,11 +720,11 @@ 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 <http://www.boris.unito.it/pages/download_mac>`_.
+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/>`_.
 
 It provides also some analysis tools like time budget and some plotting functions.
 
-The BORIS paper has more than `1700 citations in peer-reviewed scientific publications <http://www.boris.unito.it/pages/citations.html>`_.
+The BORIS paper has more than `1700 citations in peer-reviewed scientific publications <https://www.boris.unito.it/citations/>`_.
 
 See http://www.boris.unito.it
 

{boris_behav_obs-8.27.6 → boris_behav_obs-8.27.8}/pyproject.toml

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