boris-behav-obs 8.27.6__py2.py3-none-any.whl → 8.27.8__py2.py3-none-any.whl

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/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/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/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/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/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/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/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.dist-info → boris_behav_obs-8.27.8.dist-info}/METADATA

@@ -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.dist-info → boris_behav_obs-8.27.8.dist-info}/RECORD

@@ -16,7 +16,7 @@ boris/connections.py,sha256=RIQsaooiz6pzc2jJMHw9CQSyX39TgbM5JAwifCu5eWQ,19280
 boris/converters.py,sha256=FymqUxLEVLQwsUv6EVF7MRPowN1e87aVT2d3XjZJgAM,11771
 boris/converters_ui.py,sha256=firMWVgS3c492FF-YFv3FehOBLsbBHKaLEaVcoVctgc,8745
 boris/cooccurence.py,sha256=scazxKCmFQjBvv7oS9h7ylB8GJdkSmwy1LJZeUv5DOY,9824
-boris/core.py,sha256=xkgkxUjAg-mqXORTQUKKPH8FMRMUkAH7UY8QC1NHeJQ,224211
+boris/core.py,sha256=wXJh-oLoiJthPFPjI1ZltODlWrQLxI6Bvh47D5P4RhA,224211
 boris/core_qrc.py,sha256=5YMpr7ckI4TbXaeSyCMhNJBAlrGPeLes62RedU3EbWs,865287
 boris/core_ui.py,sha256=Z_6Ehp93fRVnPGyKRtgX2GcXRXb8QZojXipHSpJ_f3M,69854
 boris/db_functions.py,sha256=YyI2LMSFn772aMGdkOIpfXbPuoSWEvDckZZKevwvB-4,13326
@@ -45,7 +45,7 @@ boris/menu_options.py,sha256=izzYx-Rc7powf8PqhAXD3XMPYvBoVZqOYbS1jaW4sII,7094
 boris/modifiers_coding_map.py,sha256=XBTubBHw6Sayw5jUNaWR_jVIw6ttaJcbhbmUSF6_lx4,4566
 boris/mpv-1.0.3.py,sha256=EXRtzQqFjOn4wMC6482Ilq3fNQ9N1GRP1VxwLzdeaBY,88077
 boris/mpv.py,sha256=EfzIHjPbgewG4w3smEtqEUPZoVwYmMQkL4Q8ZyW-a58,76410
-boris/mpv2.py,sha256=IUI4t4r9GYX7G5OXTjd3RhMMOkDdfal_15buBgksLsk,92152
+boris/mpv2.py,sha256=WZaPHXNSMdPZKuQ2ZZiWu_1KViNsnsxg7imSx-yKaXU,92190
 boris/observation.py,sha256=pHP68WnjA1rZsefo6zNtmwaXcjwjpItZCQrefqwOCCQ,52832
 boris/observation_operations.py,sha256=eW5DPoU_21EQEWUUmOvqe6flgHxgTcFkGaJjfS6yWJo,100276
 boris/observation_ui.py,sha256=dfk7pS2DlaiEgMjouH0-_t6kPgMwovQbloHtc3ZoCmY,30278
@@ -53,16 +53,16 @@ boris/observations_list.py,sha256=rMuEVa3QccA89vjARcEVtSlLnr5s0sfihUlcwciV3OM,10
 boris/otx_parser.py,sha256=Ul5GokK46azx60P6-pk8wbSPUqUR9O4WLV42z3rE40s,16367
 boris/param_panel.py,sha256=XpFuoNtVuPx_3EieYt0JaQ2J3Bk4ZyMa4RgJha_10oE,7473
 boris/param_panel_ui.py,sha256=R6Yfxd7m41_Mo5XCD9wlyAprrEKdCyBZm0jicwh_cGk,11704
-boris/player_dock_widget.py,sha256=fSGrGTKX4uHuUODyOh5n8ojxdW0wW7PQI1d2md9GBQI,5717
+boris/player_dock_widget.py,sha256=PJHBvpoyrXjrp39EwVS3C8Rw9cNaXsAoPqlQ_wduJI0,5735
 boris/plot_data_module.py,sha256=OazYAPHker30s1oYYKkSa0IXSj-DbB1-Qgcau0x-Il8,16582
 boris/plot_events.py,sha256=HAKrdS3qf0A_PG1pGo0FRyk62femDxfxGss3w8CrlUw,23541
 boris/plot_events_rt.py,sha256=UfO1NKSqBR7j-vnfG8CKuOcdg5o8QQI_0eYdcz29Ufc,8358
 boris/plot_spectrogram_rt.py,sha256=yc8ifg9HCl-v_upMHkH_rmIZLhWBYkWBOhtKftvRvh0,8394
 boris/plot_waveform_rt.py,sha256=kNk6NVjM3wT3MpAw5zE9ktH94Pkd2AJ4ppv6uM6BVBc,7502
-boris/preferences.py,sha256=W_BHck8lxODvZ9NzIgfvhvXAwUI5A66aJVmdTRTxZMo,11494
+boris/preferences.py,sha256=ySGmCSjqj4rpKksdWNNP2EQEJKVYHCwp3qXyRZG9i8A,11551
 boris/preferences_ui.py,sha256=fz0jHW7Nqw2P68FLBqheaGrQsZATNz8d8J00TVMX_Ig,21981
-boris/project.py,sha256=wMOcWsz7tA-efmHOrKe0_s5I4Vy-u1u_fUTWzxTVdp8,83465
-boris/project_functions.py,sha256=R3DS_faDuMGKTpMnV0OhqgZp9yO1ojoA5wUIXdtHNIE,70972
+boris/project.py,sha256=crarDFfAB3lv7BJaVz3yXsS0k9fNiuKUBLTfjaHRzwQ,84361
+boris/project_functions.py,sha256=IM68W1d4U9MpGymKSpMmxmu5-41w2xNdAfZBz8vYbE8,71572
 boris/project_import_export.py,sha256=E2Jv4CQQpFxGspLZdAIxBcB-aCM7SlfobR5ZlC2QqHk,38463
 boris/project_ui.py,sha256=TRJlsqq4XbIl8k2f20BKr2PtKa0QNjFNr6UnMieZYqU,35915
 boris/qrc_boris.py,sha256=4U2cD_fIBTtsTPhirOl9I3kTArOhXWYvfuO_A0M9N0I,675001
@@ -76,8 +76,8 @@ boris/synthetic_time_budget.py,sha256=m3QJ0Ju4av7WzMUKFIvxJd5x4iNVTXc4-j9tWa3MIO
 boris/time_budget_functions.py,sha256=L-0PuPWYR33UMfqmxpcCVH-w4mLLrtZ8b8kBTmBwlsI,50299
 boris/time_budget_widget.py,sha256=9WV-iKYSl1f3HBrGcL-eHDjUswrFQh6-WUcffTtce1Y,42852
 boris/transitions.py,sha256=2zucdoa2jTpWtM6nWHr8lOvjXkrQmo9j71fz_fMLALU,11998
-boris/utilities.py,sha256=pNWZAy7Fsu3PrbijjQMDUZRbwkaEoJ6M0FXW6KPuB3E,48781
-boris/version.py,sha256=c_t6QM5YfrEuol9HnMRdzd0Xxd-rR3nlsks8vwkCdwM,788
+boris/utilities.py,sha256=VdncrA1hCbMg7zGBKdwcGaBO-EQ3i0-KBHj1ZfHuM4o,49075
+boris/version.py,sha256=GVQrRRG_nuhxMPmOEqfkYDpTsQWODkmLvTItV6N8pjM,788
 boris/video_equalizer.py,sha256=QpVgmdqX_E4HnMa2f_Qo_fKJTl9nBoTQd_ykv9RWlIQ,5862
 boris/video_equalizer_ui.py,sha256=A2_Sz9AAVnJygTRUeK_YXxf-WWQpxSSlFw0MjkxiwSg,9762
 boris/video_operations.py,sha256=96jR-3snNn9VeEURRD6rCwvOL2sSHXoqlP_gYFwgO8A,9379
@@ -106,9 +106,9 @@ boris/qdarkstyle/utils/__init__.py,sha256=Nlma8-zbHoJc5n2NVT7OvwxPG5765JnsmMeGzr
 boris/qdarkstyle/utils/__main__.py,sha256=J1biUyDzfutKU1n9NdH9WnD0gFHaF-OJA4Q-n6Q2ehs,3309
 boris/qdarkstyle/utils/images.py,sha256=af-BJllzWgVoVz6QMvhFcKqvF3mo44AThaBjuAuHtNE,14444
 boris/qdarkstyle/utils/scss.py,sha256=n7WNo6pPRft8-dU7_gfjB_jA-JZAy50-S792RwR7Ri0,9366
-boris_behav_obs-8.27.6.dist-info/LICENSE.TXT,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
-boris_behav_obs-8.27.6.dist-info/METADATA,sha256=9DbnABxSKjvYzzfWNRn4TKzcWLT6_HX1zgq5ZJmgTpk,45526
-boris_behav_obs-8.27.6.dist-info/WHEEL,sha256=GUeE9LxUgRABPG7YM0jCNs9cBsAIx0YAkzCB88PMLgc,109
-boris_behav_obs-8.27.6.dist-info/entry_points.txt,sha256=fuO7JxKFLOm6xp6m3JHRA1UO_QW1dYU-F0IooA1NqQs,37
-boris_behav_obs-8.27.6.dist-info/top_level.txt,sha256=fJSgm62S7WesiwTorGbOO4nNN0yzgZ3klgfGi3Px4qI,6
-boris_behav_obs-8.27.6.dist-info/RECORD,,
+boris_behav_obs-8.27.8.dist-info/LICENSE.TXT,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
+boris_behav_obs-8.27.8.dist-info/METADATA,sha256=xI4ShJlGxJ4v5NKJl5JnPC2EzL3PHet1x-67J48tRTY,45513
+boris_behav_obs-8.27.8.dist-info/WHEEL,sha256=GUeE9LxUgRABPG7YM0jCNs9cBsAIx0YAkzCB88PMLgc,109
+boris_behav_obs-8.27.8.dist-info/entry_points.txt,sha256=fuO7JxKFLOm6xp6m3JHRA1UO_QW1dYU-F0IooA1NqQs,37
+boris_behav_obs-8.27.8.dist-info/top_level.txt,sha256=fJSgm62S7WesiwTorGbOO4nNN0yzgZ3klgfGi3Px4qI,6
+boris_behav_obs-8.27.8.dist-info/RECORD,,