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

boris/advanced_event_filtering.py

@@ -358,8 +358,8 @@ def event_filtering(self):
         start_coding=start_coding,
         end_coding=end_coding,
         maxTime=max_media_duration_all_obs,
-        flagShowIncludeModifiers=False,
-        flagShowExcludeBehaviorsWoEvents=False,
+        show_include_modifiers=False,
+        show_exclude_non_coded_behaviors=False,
         by_category=False,
         n_observations=len(selected_observations),
     )

boris/behavior_binary_table.py

@@ -207,8 +207,8 @@ def behavior_binary_table(self):
         start_coding=start_coding,
         end_coding=end_coding,
         maxTime=max_media_duration_all_obs,
-        flagShowIncludeModifiers=True,
-        flagShowExcludeBehaviorsWoEvents=True,
+        show_include_modifiers=True,
+        show_exclude_non_coded_behaviors=True,
         by_category=False,
         n_observations=len(selected_observations),
     )

boris/config.py

@@ -365,6 +365,7 @@ SELECTED_BEHAVIORS = "selected behaviors"
 SELECTED_SUBJECTS = "selected subjects"
 INCLUDE_MODIFIERS = "include modifiers"
 EXCLUDE_BEHAVIORS = "exclude behaviors"
+EXCLUDE_NON_CODED_MODIFIERS = "exclude_non_coded_modifiers"
 EXCLUDED_BEHAVIORS = "excluded behaviors"
 TIME_INTERVAL = "time"
 START_TIME = "start time"

boris/cooccurence.py

@@ -101,8 +101,8 @@ def get_cooccurence(self):
             selected_observations,
             window_title="Select the behaviors",
             n_observations=len(selected_observations),
-            flagShowIncludeModifiers=False,
-            flagShowExcludeBehaviorsWoEvents=True,
+            show_include_modifiers=False,
+            show_exclude_non_coded_behaviors=True,
         )
 
         if parameters == {}:  # cancel button pressed

boris/core.py

@@ -774,7 +774,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         """
 
         if not self.pj[cfg.ETHOGRAM]:
-            True, []
+            return True, []
 
         behavior_type = [x.upper() for x in behavior_type]
 
@@ -2750,7 +2750,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
             start_coding=start_coding,
             end_coding=end_coding,
             maxTime=max_obs_length,
-            flagShowExcludeBehaviorsWoEvents=True,
+            show_exclude_non_coded_behaviors=True,
             by_category=False,
             n_observations=len(selected_observations),
         )
@@ -2849,8 +2849,8 @@ class MainWindow(QMainWindow, Ui_MainWindow):
             start_coding=start_coding,
             end_coding=end_coding,
             maxTime=max_obs_length if len(selected_observations) > 1 else selectedObsTotalMediaLength,
-            flagShowIncludeModifiers=False,
-            flagShowExcludeBehaviorsWoEvents=True,
+            show_include_modifiers=False,
+            show_exclude_non_coded_behaviors=True,
             n_observations=len(selected_observations),
         )
 
@@ -3730,8 +3730,8 @@ class MainWindow(QMainWindow, Ui_MainWindow):
             start_coding=start_coding,
             end_coding=end_coding,
             maxTime=max_media_duration_all_obs,
-            flagShowIncludeModifiers=False,
-            flagShowExcludeBehaviorsWoEvents=False,
+            show_include_modifiers=False,
+            show_exclude_non_coded_behaviors=False,
             n_observations=len(selected_observations),
         )
         if parameters == {}:

boris/db_functions.py

@@ -70,6 +70,7 @@ def load_events_in_db(
     """
 
     db = sqlite3.connect(":memory:", isolation_level=None)
+
     """
     import os
     os.system("rm /tmp/ramdisk/events.sqlite")
@@ -212,6 +213,7 @@ def load_aggregated_events_in_db(
     db = sqlite3.connect(":memory:")
 
     """
+    # only for debugging
     import os
     os.system("rm /tmp/ramdisk/aggreg.sqlite")
     db = sqlite3.connect("/tmp/ramdisk/aggreg.sqlite", isolation_level=None)

boris/event_operations.py

@@ -222,8 +222,8 @@ def filter_events(self):
         start_coding=dec("NaN"),
         end_coding=dec("NaN"),
         maxTime=None,
-        flagShowIncludeModifiers=False,
-        flagShowExcludeBehaviorsWoEvents=False,
+        show_include_modifiers=False,
+        show_exclude_non_coded_behaviors=False,
         by_category=False,
     )
     if parameters == {}:
@@ -983,9 +983,9 @@ def add_frame_indexes(self):
             continue
         if not self.seek_mediaplayer(event[0]):
             time.sleep(0.1)
-            self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS][idx][
-                cfg.PJ_OBS_FIELDS[cfg.MEDIA][cfg.FRAME_INDEX]
-            ] = self.get_frame_index()
+            self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS][idx][cfg.PJ_OBS_FIELDS[cfg.MEDIA][cfg.FRAME_INDEX]] = (
+                self.get_frame_index()
+            )
 
     self.seek_mediaplayer(mem_time)
 

boris/events_snapshots.py

@@ -21,7 +21,6 @@ Copyright 2012-2024 Olivier Friard
 
 """
 
-
 import logging
 import os
 import pathlib as pl
@@ -80,8 +79,8 @@ def events_snapshots(self):
         selected_observations,
         start_coding=dec("NaN"),
         end_coding=dec("NaN"),
-        flagShowIncludeModifiers=False,
-        flagShowExcludeBehaviorsWoEvents=False,
+        show_include_modifiers=False,
+        show_exclude_non_coded_behaviors=False,
         n_observations=len(selected_observations),
     )
 
@@ -346,8 +345,8 @@ def extract_events(self):
         selected_observations,
         start_coding=dec("NaN"),
         end_coding=dec("NaN"),
-        flagShowIncludeModifiers=False,
-        flagShowExcludeBehaviorsWoEvents=False,
+        show_include_modifiers=False,
+        show_exclude_non_coded_behaviors=False,
     )
     if parameters == {}:
         return

boris/export_events.py

@@ -82,8 +82,8 @@ def export_events_as_behavioral_sequences(self, separated_subjects=False, timed=
         start_coding=start_coding,
         end_coding=end_coding,
         maxTime=max_media_duration_all_obs,
-        flagShowIncludeModifiers=True,
-        flagShowExcludeBehaviorsWoEvents=False,
+        show_include_modifiers=True,
+        show_exclude_non_coded_behaviors=False,
         n_observations=len(selected_observations),
     )
 
@@ -171,8 +171,8 @@ def export_tabular_events(self, mode: str = "tabular") -> None:
         start_coding=start_coding,
         end_coding=end_coding,
         maxTime=max_media_duration_all_obs,
-        flagShowIncludeModifiers=False,
-        flagShowExcludeBehaviorsWoEvents=False,
+        show_include_modifiers=False,
+        show_exclude_non_coded_behaviors=False,
         n_observations=len(selected_observations),
     )
     if parameters == {}:
@@ -283,7 +283,7 @@ def export_aggregated_events(self):
     - select subjects and behaviors
     - export events in aggregated format
 
-    Formats can be SQL (sql), SDIS (sds) or Tabular format (tsv, csv, ods, xlsx, xls, html)
+    Formats can be SQL (sql), SDIS (sds), Tabular format (tsv, csv, ods, xlsx, xls, html) or Pandas dataframe
     """
 
     def fields_type(max_modif_number: int) -> dict:
@@ -366,14 +366,14 @@ def export_aggregated_events(self):
         start_coding=start_coding,
         end_coding=end_coding,
         maxTime=max_media_duration_all_obs,
-        flagShowIncludeModifiers=False,
-        flagShowExcludeBehaviorsWoEvents=False,
+        show_include_modifiers=False,
+        show_exclude_non_coded_behaviors=False,
         n_observations=len(selected_observations),
     )
     if parameters == {}:
         return
     if not parameters[cfg.SELECTED_SUBJECTS] or not parameters[cfg.SELECTED_BEHAVIORS]:
-        QMessageBox.warning(None, cfg.programName, "Select subject(s) and behavior(s) to analyze")
+        QMessageBox.warning(None, cfg.programName, "Select subject(s) and behavior(s) to export")
         return
 
     # check for grouping results
@@ -660,8 +660,8 @@ def export_events_as_textgrid(self) -> None:
         selected_observations,
         start_coding=start_coding,
         end_coding=end_coding,
-        flagShowIncludeModifiers=False,
-        flagShowExcludeBehaviorsWoEvents=False,
+        show_include_modifiers=False,
+        show_exclude_non_coded_behaviors=False,
         maxTime=max_obs_length,
         n_observations=len(selected_observations),
     )

boris/export_observation.py

@@ -583,7 +583,7 @@ def dataset_write(dataset: tablib.Dataset, file_name: str, output_format: str, d
     try:
         if output_format in (cfg.PANDAS_DF_EXT, cfg.RDS_EXT):
             # build pandas dataframe from the tsv export of tablib dataset
-            date_type = []
+            date_type: list = []
             for field_name in dtype:
                 if dtype[field_name] == dt.datetime:
                     date_type.append(field_name)

boris/geometric_measurement.py

@@ -547,16 +547,12 @@ def image_clicked(self, n_player: int, event) -> None:
     if self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] == cfg.MEDIA:
         fn = self.dw_player[n_player - 1].player.playlist[self.dw_player[n_player - 1].player.playlist_pos]["filename"]
 
-        print(f"{fn=}")
-
         # check if media file path contained in media list
         if [True for x in self.pj[cfg.OBSERVATIONS][self.observationId]["file"].values() if fn in x]:
             media_file_name = self.dw_player[n_player - 1].player.playlist[self.dw_player[n_player - 1].player.playlist_pos]["filename"]
         else:
             media_file_name = str(pl.Path(fn).relative_to(pl.Path(self.projectFileName).parent))
 
-            print(f"{media_file_name=}")
-
     if self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] == cfg.IMAGES:
         # check if pictures dir path is relative
         if str(pl.Path(self.images_list[current_frame]).parent) not in self.pj[cfg.OBSERVATIONS][self.observationId].get(

boris/irr.py

@@ -288,8 +288,8 @@ def irr_cohen_kappa(self):
         selected_observations,
         start_coding=dec("NaN"),
         end_coding=dec("NaN"),
-        flagShowIncludeModifiers=True,
-        flagShowExcludeBehaviorsWoEvents=False,
+        show_include_modifiers=True,
+        show_exclude_non_coded_behaviors=False,
         n_observations=len(selected_observations),
     )
     if parameters == {}:
@@ -581,8 +581,8 @@ def needleman_wunch(self):
         selected_observations,
         start_coding=dec("NaN"),
         end_coding=dec("NaN"),
-        flagShowIncludeModifiers=True,
-        flagShowExcludeBehaviorsWoEvents=False,
+        show_include_modifiers=True,
+        show_exclude_non_coded_behaviors=False,
         n_observations=len(selected_observations),
     )
 

boris/latency.py

@@ -83,7 +83,7 @@ def get_latency(self):
     parameters: dict = select_subj_behav.choose_obs_subj_behav_category(
         self,
         selected_observations,
-        flagShowExcludeBehaviorsWoEvents=False,
+        show_exclude_non_coded_behaviors=False,
         window_title="Select the marker behaviors (stimulus)",
         n_observations=len(selected_observations),
     )
@@ -102,7 +102,7 @@ def get_latency(self):
     print(f"{marker_behaviors=} {marker_subjects=} {include_marker_modifiers=}")
 
     parameters: dict = select_subj_behav.choose_obs_subj_behav_category(
-        self, selected_observations, flagShowExcludeBehaviorsWoEvents=False, window_title="Select the latency behaviors"
+        self, selected_observations, show_exclude_non_coded_behaviors=False, window_title="Select the latency behaviors"
     )
     if not parameters[cfg.SELECTED_SUBJECTS] or not parameters[cfg.SELECTED_BEHAVIORS]:
         return

boris/observation.py

@@ -1151,11 +1151,13 @@ class Observation(QDialog, Ui_Form):
 
         media_info = util.accurate_media_analysis(self.ffmpeg_bin, file_path)
 
+        print(f"{media_info=}")
+
         if "error" in media_info:
-            return (False, media_info["error"])
+            return (True, media_info["error"])
 
         if media_info["format_long_name"] == "Tele-typewriter":
-            return (False, "Text file")
+            return (True, "Text file")
 
         if media_info["duration"] > 0:
             if " rel " in mode:
@@ -1249,6 +1251,9 @@ class Observation(QDialog, Ui_Form):
 
                 for file_path in file_paths:
                     (error, msg) = self.check_media(file_path, mode)
+
+                    print(f"{(error, msg)=}")
+
                     if error:
                         QMessageBox.critical(self, cfg.programName, f"<b>{file_path}</b>. {msg}")
 

boris/param_panel.py

@@ -20,7 +20,6 @@ This file is part of BORIS.
 
 """
 
-
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QDialog
 
@@ -61,6 +60,16 @@ class Param_panel(QDialog, Ui_Dialog):
         self.rb_observed_events.clicked.connect(lambda: self.rb_time_interval_selection(cfg.TIME_EVENTS))
         self.rb_user_defined.clicked.connect(lambda: self.rb_time_interval_selection(cfg.TIME_ARBITRARY_INTERVAL))
 
+        self.cbIncludeModifiers.stateChanged.connect(self.cb_exclude_non_coded_modifiers_visibility)
+
+        self.cb_exclude_non_coded_modifiers.setVisible(False)
+
+    def cb_exclude_non_coded_modifiers_visibility(self):
+        """
+        set visibility of cb_exclude_non_coded_modifiers
+        """
+        self.cb_exclude_non_coded_modifiers.setEnabled(self.cbIncludeModifiers.isChecked())
+
     def rb_time_interval_selection(self, button):
         """
         select the time interval for operation

boris/param_panel_ui.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'boris/param_panel.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.4
+# Created by: PyQt5 UI code generator 5.15.6
 #
 # WARNING: Any manual changes made to this file will be lost when pyuic5 is
 # run again.  Do not edit this file unless you know what you are doing.
@@ -64,6 +64,10 @@ class Ui_Dialog(object):
         self.cbIncludeModifiers = QtWidgets.QCheckBox(Dialog)
         self.cbIncludeModifiers.setObjectName("cbIncludeModifiers")
         self.horizontalLayout_9.addWidget(self.cbIncludeModifiers)
+        self.cb_exclude_non_coded_modifiers = QtWidgets.QCheckBox(Dialog)
+        self.cb_exclude_non_coded_modifiers.setChecked(True)
+        self.cb_exclude_non_coded_modifiers.setObjectName("cb_exclude_non_coded_modifiers")
+        self.horizontalLayout_9.addWidget(self.cb_exclude_non_coded_modifiers)
         self.cbExcludeBehaviors = QtWidgets.QCheckBox(Dialog)
         self.cbExcludeBehaviors.setObjectName("cbExcludeBehaviors")
         self.horizontalLayout_9.addWidget(self.cbExcludeBehaviors)
@@ -177,6 +181,7 @@ class Ui_Dialog(object):
         self.pbUnselectAllBehaviors.setText(_translate("Dialog", "Unselect all"))
         self.pbReverseBehaviorsSelection.setText(_translate("Dialog", "Reverse selection"))
         self.cbIncludeModifiers.setText(_translate("Dialog", "Include modifiers"))
+        self.cb_exclude_non_coded_modifiers.setText(_translate("Dialog", "Exclude non coded modifiers"))
         self.cbExcludeBehaviors.setText(_translate("Dialog", "Exclude behaviors without events"))
         self.lb_time_bin_size.setText(_translate("Dialog", "Time bin size (s)"))
         self.lb_time_interval.setText(_translate("Dialog", "Time interval"))

boris/project_functions.py

@@ -244,6 +244,18 @@ def check_coded_behaviors_in_obs_list(pj: dict, observations_list: list) -> bool
     return False
 
 
+def get_modifiers_of_behavior(ethogram, behavior: str) -> list:
+    """
+    get all modifiers for a behavior (if any)
+    """
+
+    return [
+        [ethogram[x][cfg.MODIFIERS][y]["values"] for y in ethogram[x][cfg.MODIFIERS]]
+        for x in ethogram
+        if ethogram[x][cfg.BEHAVIOR_CODE] == behavior
+    ]
+
+
 def check_coded_behaviors(pj: dict) -> set:
     """
     check if behaviors coded in events are defined in ethogram for all observations
@@ -252,7 +264,7 @@ def check_coded_behaviors(pj: dict) -> set:
         pj (dict): project dictionary
 
     Returns:
-        set: behaviors present in observations that are not define in ethogram
+        set: behaviors present in observations that are not defined in ethogram
     """
 
     # set of behaviors defined in ethogram

boris/select_modifiers.py

@@ -80,7 +80,7 @@ class ModifiersList(QDialog):
                 V2layout.addWidget(lb1)
 
             if self.modifiers_dict[idx].get("description", ""):
-                lb2 = QLabel(f"<small>{self.modifiers_dict[idx].get('description', '')}</small>")
+                lb2 = QLabel(f"<small>{self.modifiers_dict[idx].get('description', '')[:50]}</small>")
                 V2layout.addWidget(lb2)
 
             if self.modifiers_dict[idx]["type"] in (

boris/select_observations.py

@@ -20,6 +20,7 @@ Copyright 2012-2024 Olivier Friard
   MA 02110-1301, USA.
 
 """
+
 from typing import Tuple
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QAbstractItemView
@@ -203,177 +204,3 @@ def select_observations2(self, mode: str, windows_title: str = "") -> Tuple[str,
         resultStr = cfg.VIEW
 
     return resultStr, selected_observations
-
-
-'''
-def select_observations(pj: dict, mode: str, windows_title: str = "") -> Tuple[str, list]:
-    """
-    allow user to select observations
-    mode: accepted values: OPEN, EDIT, SINGLE, MULTIPLE, SELECT1
-
-    Args:
-        pj (dict): BORIS project dictionary
-        mode (str): mode for selection: OPEN, EDIT, SINGLE, MULTIPLE, SELECT1
-        windows_title (str): title for windows
-
-    Returns:
-        str: selected mode: OPEN, EDIT, VIEW
-        list: list of selected observations
-    """
-
-    fields_list = ["id", "date", "description", "subjects", "observation duration", "exhaustivity %", "media"]
-    indep_var_header, column_type = [], [cfg.TEXT, cfg.TEXT, cfg.TEXT, cfg.TEXT, cfg.NUMERIC, cfg.NUMERIC, cfg.TEXT]
-
-    if cfg.INDEPENDENT_VARIABLES in pj:
-        for idx in util.sorted_keys(pj[cfg.INDEPENDENT_VARIABLES]):
-            indep_var_header.append(pj[cfg.INDEPENDENT_VARIABLES][idx]["label"])
-            column_type.append(pj[cfg.INDEPENDENT_VARIABLES][idx]["type"])
-
-    state_events_list = [
-        pj[cfg.ETHOGRAM][x][cfg.BEHAVIOR_CODE]
-        for x in pj[cfg.ETHOGRAM]
-        if cfg.STATE in pj[cfg.ETHOGRAM][x][cfg.TYPE].upper()
-    ]
-
-    data: list = []
-    not_paired: list = []
-
-    for obs in sorted(list(pj[cfg.OBSERVATIONS].keys())):
-        date = pj[cfg.OBSERVATIONS][obs]["date"].replace("T", " ")
-        descr = util.eol2space(pj[cfg.OBSERVATIONS][obs][cfg.DESCRIPTION])
-
-        # subjects
-        observed_subjects = [
-            cfg.NO_FOCAL_SUBJECT if x == "" else x for x in project_functions.extract_observed_subjects(pj, [obs])
-        ]
-
-        subjectsList = ", ".join(observed_subjects)
-
-        # observed time interval
-        interval = project_functions.observed_interval(pj[cfg.OBSERVATIONS][obs])
-        observed_interval_str = str(interval[1] - interval[0])
-
-        # media
-        media = ""
-        if pj[cfg.OBSERVATIONS][obs][cfg.TYPE] == cfg.MEDIA:
-            media_list = []
-            if pj[cfg.OBSERVATIONS][obs][cfg.FILE]:
-                for player in sorted(pj[cfg.OBSERVATIONS][obs][cfg.FILE].keys()):
-                    for media in pj[cfg.OBSERVATIONS][obs][cfg.FILE][player]:
-                        media_list.append(f"#{player}: {media}")
-
-            if len(media_list) > 8:
-                media = " ".join(media_list)
-            else:
-                media = "\n".join(media_list)
-
-        if pj[cfg.OBSERVATIONS][obs][cfg.TYPE] == cfg.LIVE:
-            media = cfg.LIVE
-
-        if pj[cfg.OBSERVATIONS][obs][cfg.TYPE] == cfg.IMAGES:
-            dir_list = []
-            for dir_path in pj[cfg.OBSERVATIONS][obs].get(cfg.DIRECTORIES_LIST, []):
-                dir_list.append(dir_path)
-            media = "; ".join(dir_list)
-
-        # independent variables
-        indepvar = []
-        if cfg.INDEPENDENT_VARIABLES in pj[cfg.OBSERVATIONS][obs]:
-            for var_label in indep_var_header:
-                if var_label in pj[cfg.OBSERVATIONS][obs][cfg.INDEPENDENT_VARIABLES]:
-                    indepvar.append(pj[cfg.OBSERVATIONS][obs][cfg.INDEPENDENT_VARIABLES][var_label])
-                else:
-                    indepvar.append("")
-
-        # check unpaired events
-        ok, _ = project_functions.check_state_events_obs(obs, pj[cfg.ETHOGRAM], pj[cfg.OBSERVATIONS][obs], cfg.HHMMSS)
-        if not ok:
-            not_paired.append(obs)
-
-        # exhaustivity
-        if pj[cfg.OBSERVATIONS][obs][cfg.TYPE] in (cfg.MEDIA, cfg.LIVE):
-            # check exhaustivity of observation
-            exhaustivity = project_functions.check_observation_exhaustivity(
-                pj[cfg.OBSERVATIONS][obs][cfg.EVENTS], state_events_list
-            )
-        elif pj[cfg.OBSERVATIONS][obs][cfg.TYPE] == cfg.IMAGES:
-            # TODO: add exhaustivity for images observation (number of coded images?)
-            exhaustivity = project_functions.check_observation_exhaustivity_pictures(pj[cfg.OBSERVATIONS][obs])
-
-        data.append([obs, date, descr, subjectsList, observed_interval_str, str(exhaustivity), media] + indepvar)
-
-    obsList = observations_list.observationsList_widget(
-        data, header=fields_list + indep_var_header, column_type=column_type, not_paired=not_paired
-    )
-    if windows_title:
-        obsList.setWindowTitle(windows_title)
-
-    obsList.pbOpen.setVisible(False)
-    obsList.pbView.setVisible(False)
-    obsList.pbEdit.setVisible(False)
-    obsList.pbOk.setVisible(False)
-    obsList.pbSelectAll.setVisible(False)
-    obsList.pbUnSelectAll.setVisible(False)
-    obsList.mode = mode
-
-    if mode == cfg.OPEN:
-        obsList.view.setSelectionMode(QAbstractItemView.SingleSelection)
-        obsList.pbOpen.setVisible(True)
-
-    if mode == cfg.VIEW:
-        obsList.view.setSelectionMode(QAbstractItemView.SingleSelection)
-        obsList.pbView.setVisible(True)
-
-    if mode == cfg.EDIT:
-        obsList.view.setSelectionMode(QAbstractItemView.SingleSelection)
-        obsList.pbEdit.setVisible(True)
-
-    if mode == cfg.SINGLE:
-        obsList.view.setSelectionMode(QAbstractItemView.SingleSelection)
-        obsList.pbOpen.setVisible(True)
-        obsList.pbView.setVisible(True)
-        obsList.pbEdit.setVisible(True)
-
-    if mode == cfg.MULTIPLE:
-        obsList.view.setSelectionMode(QAbstractItemView.MultiSelection)
-        obsList.pbOk.setVisible(True)
-        obsList.pbSelectAll.setVisible(True)
-        obsList.pbUnSelectAll.setVisible(True)
-
-    if mode == cfg.SELECT1:
-        obsList.view.setSelectionMode(QAbstractItemView.SingleSelection)
-        obsList.pbOk.setVisible(True)
-
-    # restore window geometry
-    gui_utilities.restore_geometry(obsList, "observations list", (900, 600))
-
-    obsList.view.sortItems(0, Qt.AscendingOrder)
-    for row in range(obsList.view.rowCount()):
-        obsList.view.resizeRowToContents(row)
-
-    selected_observations = []
-
-    result = obsList.exec_()
-
-    # saving window geometry in ini file
-    gui_utilities.save_geometry(obsList, "observations list")
-
-    if result:
-        if obsList.view.selectedIndexes():
-            for idx in obsList.view.selectedIndexes():
-                if idx.column() == 0:  # first column
-                    selected_observations.append(idx.data())
-
-    if result == 0:  # cancel
-        resultStr = ""
-    if result == 1:  # select
-        resultStr = "ok"
-    if result == 2:  # open
-        resultStr = cfg.OPEN
-    if result == 3:  # edit
-        resultStr = cfg.EDIT
-    if result == 4:  # view
-        resultStr = cfg.VIEW
-
-    return resultStr, selected_observations
-'''

boris/select_subj_behav.py

@@ -39,12 +39,13 @@ def choose_obs_subj_behav_category(
     start_coding: Optional[dec] = dec("NaN"),  #  Union[..., None]
     end_coding: Optional[dec] = dec("NaN"),
     maxTime: Optional[dec] = None,
-    flagShowIncludeModifiers: bool = True,
-    flagShowExcludeBehaviorsWoEvents: bool = True,
+    show_include_modifiers: bool = True,
+    show_exclude_non_coded_behaviors: bool = True,
     by_category: bool = False,
     n_observations: int = 1,
     show_time_bin_size: bool = False,
     window_title: str = "Select subjects and behaviors",
+    show_exclude_non_coded_modifiers: bool = False,
 ) -> dict:
     """
     show window for:
@@ -52,12 +53,13 @@ def choose_obs_subj_behav_category(
     - selection of behaviors (based on selected subjects)
     - selection of time interval
     - inclusion/exclusion of modifiers
-    - inclusion/exclusion of behaviors without events (flagShowExcludeBehaviorsWoEvents == True)
+    - inclusion/exclusion of behaviors without events (show_exclude_non_coded_behaviors == True)
     - selection of time bin size (show_time_bin_size == True)
 
     Args:
         selected_observations (list): List of selected observations
         ...
+        show_exclude_non_coded_modifiers (bool): display the Exclude non coded modifiers checkbox
 
     Returns:
         dict: {"selected subjects": selectedSubjects,
@@ -78,14 +80,19 @@ def choose_obs_subj_behav_category(
     paramPanelWindow.pj = self.pj
     paramPanelWindow.extract_observed_behaviors = self.extract_observed_behaviors
 
-    paramPanelWindow.cbIncludeModifiers.setVisible(flagShowIncludeModifiers)
-    paramPanelWindow.cbExcludeBehaviors.setVisible(flagShowExcludeBehaviorsWoEvents)
+    paramPanelWindow.cbIncludeModifiers.setVisible(show_include_modifiers)
+    paramPanelWindow.cb_exclude_non_coded_modifiers.setVisible(show_exclude_non_coded_modifiers)
+    paramPanelWindow.cbExcludeBehaviors.setVisible(show_exclude_non_coded_behaviors)
     # show_time_bin_size:
     paramPanelWindow.frm_time_bin_size.setVisible(show_time_bin_size)
 
     if by_category:
         paramPanelWindow.cbIncludeModifiers.setVisible(False)
         paramPanelWindow.cbExcludeBehaviors.setVisible(False)
+        paramPanelWindow.cb_exclude_non_coded_modifiers.setVisible(False)
+
+    # set state of cb_exclude_non_coded_modifiers
+    paramPanelWindow.cb_exclude_non_coded_modifiers.setEnabled(paramPanelWindow.cbIncludeModifiers.isChecked())
 
     paramPanelWindow.media_duration = maxTime
     paramPanelWindow.start_coding = start_coding
@@ -256,6 +263,7 @@ def choose_obs_subj_behav_category(
         cfg.SELECTED_BEHAVIORS: selectedBehaviors,
         cfg.INCLUDE_MODIFIERS: paramPanelWindow.cbIncludeModifiers.isChecked(),
         cfg.EXCLUDE_BEHAVIORS: paramPanelWindow.cbExcludeBehaviors.isChecked(),
+        cfg.EXCLUDE_NON_CODED_MODIFIERS: paramPanelWindow.cb_exclude_non_coded_modifiers.isChecked(),
         "time": time_param,
         cfg.START_TIME: startTime,
         cfg.END_TIME: endTime,