boris-behav-obs 8.25.4__py2.py3-none-any.whl → 8.26.1__py2.py3-none-any.whl

boris/select_modifiers.py

@@ -43,6 +43,10 @@ from . import utilities as util
 
 
 class ModifiersList(QDialog):
+    """
+    class for selection the modifier(s)
+    """
+
     def __init__(self, code: str, modifiers_dict: dict, currentModifier: str):
         super().__init__()
         self.setWindowTitle(cfg.programName)
@@ -60,11 +64,11 @@ class ModifiersList(QDialog):
         self.modifiersSetNumber = 0
 
         for idx in util.sorted_keys(modifiers_dict):
-            if self.modifiers_dict[idx]["type"] not in [
+            if self.modifiers_dict[idx]["type"] not in (
                 cfg.SINGLE_SELECTION,
                 cfg.MULTI_SELECTION,
                 cfg.NUMERIC_MODIFIER,
-            ]:
+            ):
                 continue
 
             V2layout = QVBoxLayout()
@@ -75,10 +79,13 @@ class ModifiersList(QDialog):
             lb.setText(f"Modifier <b>{self.modifiers_dict[idx]['name']}</b>")
             V2layout.addWidget(lb)
 
-            if self.modifiers_dict[idx]["type"] in [
+            lb = QLabel(f"<small>{self.modifiers_dict[idx]['description']}</small>")
+            V2layout.addWidget(lb)
+
+            if self.modifiers_dict[idx]["type"] in (
                 cfg.SINGLE_SELECTION,
                 cfg.MULTI_SELECTION,
-            ]:
+            ):
                 lw = QListWidget()
                 self.modifiers_dict[idx]["widget"] = lw
                 lw.setObjectName(f"lw_modifiers_({self.modifiers_dict[idx]['type']})")
@@ -114,6 +121,7 @@ class ModifiersList(QDialog):
             if self.modifiers_dict[idx]["type"] in [cfg.NUMERIC_MODIFIER]:
                 le = QLineEdit()
                 self.modifiers_dict[idx]["widget"] = le
+                le.setObjectName(f"le_modifiers_({self.modifiers_dict[idx]['type']})")
 
                 if currentModifierList != [""] and currentModifierList[int(idx)] != "None":
                     le.setText(currentModifierList[int(idx)])
@@ -160,10 +168,14 @@ class ModifiersList(QDialog):
 
             # accept and close dialog if enter pressed
             if ek == Qt.Key_Enter or ek == Qt.Key_Return:  # enter or enter from numeric pad
-                self.accept()
+                if not self.pbOK_clicked():
+                    return False
                 return True
 
+            modifiersSetIndex = 0
             for widget in self.children():
+                if "_modifiers" in widget.objectName():
+                    modifiersSetIndex = modifiersSetIndex + 1
                 if "lw_modifiers" in widget.objectName():
                     if self.modifiersSetNumber == 1:
                         # check if modifiers have code
@@ -172,7 +184,7 @@ class ModifiersList(QDialog):
                                 break
                         else:
                             # modifiers have no associated code: the modifier starting with hit key will be selected
-                            if ek not in [Qt.Key_Down, Qt.Key_Up]:
+                            if ek not in (Qt.Key_Down, Qt.Key_Up):
                                 if ek == Qt.Key_Space and f"({cfg.MULTI_SELECTION})" in widget.objectName():  # checking using SPACE bar
                                     if widget.item(widget.currentRow()).checkState() == Qt.Checked:
                                         widget.item(widget.currentRow()).setCheckState(Qt.Unchecked)
@@ -198,6 +210,7 @@ class ModifiersList(QDialog):
                                     return
 
                     for index in range(widget.count()):
+                        # check function kesy (F1, F2...)
                         if ek in cfg.function_keys:
                             if f"({cfg.function_keys[ek]})" in widget.item(index).text().upper():
                                 if f"({cfg.SINGLE_SELECTION})" in widget.objectName():
@@ -206,6 +219,10 @@ class ModifiersList(QDialog):
                                     if self.modifiersSetNumber == 1:
                                         self.accept()
                                         return True
+                                    # else move to next set of mofifiers
+                                    elif modifiersSetIndex != self.modifiersSetNumber:
+                                        widget.parent().focusNextChild()
+                                        return True
 
                                 if f"({cfg.MULTI_SELECTION})" in widget.objectName():
                                     if widget.item(index).checkState() == Qt.Checked:
@@ -220,6 +237,10 @@ class ModifiersList(QDialog):
                                 if self.modifiersSetNumber == 1:
                                     self.accept()
                                     return True
+                                # else move to next set of mofifiers
+                                elif modifiersSetIndex != self.modifiersSetNumber:
+                                    widget.parent().focusNextChild()
+                                    return True
 
                             if f"({cfg.MULTI_SELECTION})" in widget.objectName():
                                 if widget.item(index).checkState() == Qt.Checked:
@@ -271,6 +292,9 @@ class ModifiersList(QDialog):
         return self.modifiers_dict
 
     def pbOK_clicked(self):
+        """
+        OK button is clicked
+        """
         for idx in util.sorted_keys(self.modifiers_dict):
             if self.modifiers_dict[idx]["type"] == cfg.NUMERIC_MODIFIER:
                 if self.modifiers_dict[idx]["widget"].text():
@@ -280,8 +304,8 @@ class ModifiersList(QDialog):
                         QMessageBox.warning(
                             self,
                             cfg.programName,
-                            "<b>{}</b> is not a numeric value".format(self.modifiers_dict[idx]["widget"].text()),
+                            f"<b>{self.modifiers_dict[idx]['widget'].text()}</b> is not a numeric value",
                         )
-                        return
+                        return False
 
         self.accept()

boris/time_budget_widget.py

@@ -112,7 +112,7 @@ class timeBudgetResults(QWidget):
         spacerItem = QSpacerItem(241, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
         hbox2.addItem(spacerItem)
 
-        self.pbClose = QPushButton("Close", clicked=self.close_clicked)
+        self.pbClose = QPushButton(cfg.CLOSE, clicked=self.close_clicked)
         hbox2.addWidget(self.pbClose)
 
         hbox.addLayout(hbox2)

boris/utilities.py

@@ -537,9 +537,9 @@ def get_current_states_modifiers_by_subject(
                 break
             if x[cfg.EVENT_BEHAVIOR_FIELD_IDX] in state_behaviors_codes:
                 if (x[cfg.EVENT_BEHAVIOR_FIELD_IDX], x[cfg.EVENT_MODIFIER_FIELD_IDX]) not in current_states[x[cfg.EVENT_SUBJECT_FIELD_IDX]]:
-                    current_states[x[cfg.EVENT_SUBJECT_FIELD_IDX]][
-                        (x[cfg.EVENT_BEHAVIOR_FIELD_IDX], x[cfg.EVENT_MODIFIER_FIELD_IDX])
-                    ] = False
+                    current_states[x[cfg.EVENT_SUBJECT_FIELD_IDX]][(x[cfg.EVENT_BEHAVIOR_FIELD_IDX], x[cfg.EVENT_MODIFIER_FIELD_IDX])] = (
+                        False
+                    )
 
                 current_states[x[cfg.EVENT_SUBJECT_FIELD_IDX]][
                     (x[cfg.EVENT_BEHAVIOR_FIELD_IDX], x[cfg.EVENT_MODIFIER_FIELD_IDX])
@@ -1493,6 +1493,17 @@ def all_subjects(subjects: dict) -> list:
     return [subjects[x][cfg.SUBJECT_NAME] for x in sorted_keys(subjects)]
 
 
+def has_coding_map(ethogram: dict, behavior_idx: str) -> bool:
+    """
+    check if behavior index has a coding map
+    """
+    if not ethogram.get(behavior_idx, False):
+        return False
+    if not ethogram[behavior_idx].get("coding map", False):
+        return False
+    return False
+
+
 def dir_images_number(dir_path_str: str) -> dict:
     """
     return number of images in dir_path (see cfg.IMAGE_EXTENSIONS)

boris/version.py

@@ -20,5 +20,5 @@ This file is part of BORIS.
 
 """
 
-__version__ = "8.25.4"
-__version_date__ = "2024-04-18"
+__version__ = "8.26.1"
+__version_date__ = "2024-06-06"

boris/write_event.py

@@ -181,75 +181,6 @@ def write_event(self, event: dict, mem_time: dec) -> int:
                 )
                 return 1
 
-    if "from map" not in event:  # modifiers only for behaviors without coding map
-        # check if event has modifiers
-        modifier_str = ""
-
-        if event[cfg.MODIFIERS]:
-            selected_modifiers, modifiers_external_data = {}, {}
-            # check if modifiers are from external data
-            for idx in event[cfg.MODIFIERS]:
-                if event[cfg.MODIFIERS][idx]["type"] == cfg.EXTERNAL_DATA_MODIFIER:
-                    if "row" not in event:  # no edit
-                        for idx2 in self.plot_data:
-                            if self.plot_data[idx2].y_label.upper() == event[cfg.MODIFIERS][idx]["name"].upper():
-                                modifiers_external_data[idx] = dict(event[cfg.MODIFIERS][idx])
-                                modifiers_external_data[idx]["selected"] = self.plot_data[idx2].lb_value.text()
-                    else:  # edit
-                        original_modifiers_list = event.get("original_modifiers", "").split("|")
-                        modifiers_external_data[idx] = dict(event[cfg.MODIFIERS][idx])
-                        modifiers_external_data[idx]["selected"] = original_modifiers_list[int(idx)]
-
-            # check if modifiers are in single, multiple or numeric
-            if [x for x in event[cfg.MODIFIERS] if event[cfg.MODIFIERS][x]["type"] != cfg.EXTERNAL_DATA_MODIFIER]:
-                # pause media
-                if self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] in [cfg.MEDIA]:
-                    if self.playerType == cfg.MEDIA:
-                        if self.dw_player[0].player.pause:
-                            memState = "paused"
-                        elif self.dw_player[0].player.time_pos is not None:
-                            memState = "playing"
-                        else:
-                            memState = "stopped"
-                        if memState == "playing":
-                            self.pause_video()
-
-                # check if editing (original_modifiers key)
-                currentModifiers = event.get("original_modifiers", "")
-
-                modifiers_selector = select_modifiers.ModifiersList(event["code"], eval(str(event[cfg.MODIFIERS])), currentModifiers)
-
-                r = modifiers_selector.exec_()
-                if r:
-                    selected_modifiers = modifiers_selector.get_modifiers()
-
-                # restart media
-                if self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] == cfg.MEDIA:
-                    if self.playerType == cfg.MEDIA:
-                        if memState == "playing":
-                            self.play_video()
-                if not r:  # cancel button pressed
-                    return
-
-            all_modifiers = {**selected_modifiers, **modifiers_external_data}
-
-            modifier_str = ""
-            for idx in util.sorted_keys(all_modifiers):
-                if modifier_str:
-                    modifier_str += "|"
-                if all_modifiers[idx]["type"] in [cfg.SINGLE_SELECTION, cfg.MULTI_SELECTION]:
-                    modifier_str += ",".join(all_modifiers[idx].get("selected", ""))
-                if all_modifiers[idx]["type"] in [cfg.NUMERIC_MODIFIER, cfg.EXTERNAL_DATA_MODIFIER]:
-                    modifier_str += all_modifiers[idx].get("selected", "NA")
-
-    else:
-        modifier_str = event["from map"]
-
-    modifier_str = re.sub(r" \(.*\)", "", modifier_str)
-
-    # update current state
-    # TODO: verify event["subject"] / self.currentSubject
-
     # extract State events
     state_behaviors_codes = util.state_behavior_codes(self.pj[cfg.ETHOGRAM])
 
@@ -261,7 +192,7 @@ def write_event(self, event: dict, mem_time: dec) -> int:
     if self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] == cfg.IMAGES:
         position = dec(image_idx)  # decimal to pass to util.get_current_states_modifiers_by_subject
 
-    current_states = util.get_current_states_modifiers_by_subject(
+    current_states: dict = util.get_current_states_modifiers_by_subject(
         state_behaviors_codes,
         self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS],
         dict(self.pj[cfg.SUBJECTS], **{"": {"name": ""}}),
@@ -269,6 +200,108 @@ def write_event(self, event: dict, mem_time: dec) -> int:
         include_modifiers=False,
     )
 
+    # check if ask modifiers at stop is enabled
+    flag_ask_at_stop = False
+    if event["type"] == cfg.STATE_EVENT:
+        for idx in event[cfg.MODIFIERS]:
+            if event[cfg.MODIFIERS][idx].get("ask at stop", False):
+                flag_ask_at_stop = True
+                break
+
+    flag_ask_modifier = False
+    if flag_ask_at_stop:
+        # TODO: check if new event is a STOP one
+
+        idx_subject: str = ""
+        for idx in current_states:
+            if idx in self.pj[cfg.SUBJECTS] and self.pj[cfg.SUBJECTS][idx][cfg.SUBJECT_NAME] == self.currentSubject:
+                idx_subject = idx
+                break
+
+        if event[cfg.BEHAVIOR_CODE] in current_states[idx_subject]:
+            flag_ask_modifier = True
+    else:
+        flag_ask_modifier = True
+
+    if flag_ask_modifier:
+        if "from map" in event:  # modifiers only for behaviors without coding map
+            modifier_str = event["from map"]
+        else:
+            # check if event has modifiers
+            modifier_str: str = ""
+
+            if event[cfg.MODIFIERS]:
+                selected_modifiers: dict = {}
+                modifiers_external_data: dict = {}
+                # check if modifiers are from external data
+                for idx in event[cfg.MODIFIERS]:
+                    if event[cfg.MODIFIERS][idx]["type"] == cfg.EXTERNAL_DATA_MODIFIER:
+                        if editing_event:
+                            original_modifiers_list = event.get("original_modifiers", "").split("|")
+                            modifiers_external_data[idx] = dict(event[cfg.MODIFIERS][idx])
+                            modifiers_external_data[idx]["selected"] = original_modifiers_list[int(idx)]
+
+                        else:  # no edit
+                            for idx2 in self.plot_data:
+                                if self.plot_data[idx2].y_label.upper() == event[cfg.MODIFIERS][idx]["name"].upper():
+                                    modifiers_external_data[idx] = dict(event[cfg.MODIFIERS][idx])
+                                    modifiers_external_data[idx]["selected"] = self.plot_data[idx2].lb_value.text()
+
+                # check if modifiers are in single, multiple or numeric
+                if [x for x in event[cfg.MODIFIERS] if event[cfg.MODIFIERS][x]["type"] != cfg.EXTERNAL_DATA_MODIFIER]:
+                    # pause media
+                    if self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] in (cfg.MEDIA):
+                        if self.playerType == cfg.MEDIA:
+                            if self.dw_player[0].player.pause:
+                                memState = cfg.PAUSED
+                            elif self.dw_player[0].player.time_pos is not None:
+                                memState = cfg.PLAYING
+                            else:
+                                memState = cfg.STOPPED
+                            if memState == cfg.PLAYING:
+                                self.pause_video()
+
+                    # check if editing (original_modifiers key)
+                    currentModifiers = event.get("original_modifiers", "")
+
+                    # print(f"{event=}")
+
+                    modifiers_selector = select_modifiers.ModifiersList(
+                        event[cfg.BEHAVIOR_CODE], eval(str(event[cfg.MODIFIERS])), currentModifiers
+                    )
+
+                    r = modifiers_selector.exec_()
+                    if r:
+                        selected_modifiers = modifiers_selector.get_modifiers()
+
+                    # restart media
+                    if self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] == cfg.MEDIA:
+                        if self.playerType == cfg.MEDIA:
+                            if memState == cfg.PLAYING:
+                                self.play_video()
+                    if not r:  # cancel button pressed
+                        return
+
+                all_modifiers = {**selected_modifiers, **modifiers_external_data}
+
+                modifier_str: str = ""
+                for idx in util.sorted_keys(all_modifiers):
+                    if modifier_str:
+                        modifier_str += "|"
+                    if all_modifiers[idx]["type"] in (cfg.SINGLE_SELECTION, cfg.MULTI_SELECTION):
+                        modifier_str += ",".join(all_modifiers[idx].get("selected", ""))
+                    if all_modifiers[idx]["type"] in (cfg.NUMERIC_MODIFIER, cfg.EXTERNAL_DATA_MODIFIER):
+                        modifier_str += all_modifiers[idx].get("selected", "NA")
+
+        modifier_str = re.sub(r" \(.*\)", "", modifier_str)
+    else:  # do not ask modifier
+        modifier_str = ""
+
+    # update current state
+    # TODO: verify event["subject"] / self.currentSubject
+
+    # print(f"{current_states=}")
+
     # logging.debug(f"self.currentSubject {self.currentSubject}")
     # logging.debug(f"current_states {current_states}")
 
@@ -279,7 +312,7 @@ def write_event(self, event: dict, mem_time: dec) -> int:
 
     if not editing_event:
         if self.currentSubject:
-            csj: list = []
+            csj: list = []  # list of current state for the current subject
             for idx in current_states:
                 if idx in self.pj[cfg.SUBJECTS] and self.pj[cfg.SUBJECTS][idx][cfg.SUBJECT_NAME] == self.currentSubject:
                     csj = current_states[idx]
@@ -293,6 +326,8 @@ def write_event(self, event: dict, mem_time: dec) -> int:
 
         logging.debug(f"csj {csj}")
 
+        # print(f"{csj=}")
+
         if self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] in (cfg.LIVE, cfg.MEDIA):
             check_index = cfg.PJ_OBS_FIELDS[self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE]][cfg.TIME]
         if self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] == cfg.IMAGES:
@@ -308,6 +343,23 @@ def write_event(self, event: dict, mem_time: dec) -> int:
                     if ev[cfg.EVENT_BEHAVIOR_FIELD_IDX] == cs:
                         cm[cs] = ev[cfg.EVENT_MODIFIER_FIELD_IDX]
 
+        # print(f"{cm=}")
+
+        if flag_ask_at_stop:
+            # set modifier to START behavior
+            if event[cfg.BEHAVIOR_CODE] in csj:
+                mem_idx = -1
+                for idx, e in enumerate(self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS]):
+                    # print(f"{e=}")
+                    if e[0] >= mem_time:
+                        break
+                    # same behavior, same subject and modifier(s) not set
+                    if e[2] == event[cfg.BEHAVIOR_CODE] and e[1] == self.currentSubject and e[3] == "":
+                        mem_idx = idx
+                if mem_idx != -1:
+                    self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS][mem_idx][3] = modifier_str
+                    csj.remove(event[cfg.BEHAVIOR_CODE])
+
         for cs in csj:
             # close state if same state without modifier
             if (
@@ -318,23 +370,74 @@ def write_event(self, event: dict, mem_time: dec) -> int:
                 modifier_str = cm[cs]
                 continue
 
-            if (event["excluded"] and cs in event["excluded"].split(",")) or (event[cfg.BEHAVIOR_CODE] == cs and cm[cs] != modifier_str):
+            if (event[cfg.EXCLUDED] and cs in event[cfg.EXCLUDED].split(",")) or (
+                event[cfg.BEHAVIOR_CODE] == cs and cm[cs] != modifier_str
+            ):
+                # check if behavior to stop is a 'ask modifier at stop'
+                behavior_to_stop = [
+                    self.pj[cfg.ETHOGRAM][x]
+                    for x in self.pj[cfg.ETHOGRAM]
+                    if self.pj[cfg.ETHOGRAM][x][cfg.BEHAVIOR_CODE] == cs and self.pj[cfg.ETHOGRAM][x]["type"] == cfg.STATE_EVENT
+                ]
+                if behavior_to_stop:
+                    behavior_to_stop = behavior_to_stop[0]
+
+                    flag_behavior_ask_at_stop = False
+                    for idx in behavior_to_stop[cfg.MODIFIERS]:
+                        if behavior_to_stop[cfg.MODIFIERS][idx].get("ask at stop", False):
+                            flag_behavior_ask_at_stop = True
+                            break
+                    if flag_behavior_ask_at_stop:
+                        modifiers_selector = select_modifiers.ModifiersList(
+                            behavior_to_stop[cfg.BEHAVIOR_CODE],
+                            eval(str(behavior_to_stop[cfg.MODIFIERS])),
+                            currentModifier="",
+                        )
+
+                        r = modifiers_selector.exec_()
+                        if r:
+                            selected_modifiers = modifiers_selector.get_modifiers()
+                            # print(f"{selected_modifiers=}")
+
+                            behavior_to_stop_modifier_str: str = ""
+                            for idx in util.sorted_keys(selected_modifiers):
+                                if behavior_to_stop_modifier_str:
+                                    behavior_to_stop_modifier_str += "|"
+                                if selected_modifiers[idx]["type"] in (cfg.SINGLE_SELECTION, cfg.MULTI_SELECTION):
+                                    behavior_to_stop_modifier_str += ",".join(selected_modifiers[idx].get("selected", ""))
+                                if selected_modifiers[idx]["type"] in (cfg.NUMERIC_MODIFIER, cfg.EXTERNAL_DATA_MODIFIER):
+                                    behavior_to_stop_modifier_str += selected_modifiers[idx].get("selected", "NA")
+
+                            # set the start modifier
+                            mem_idx = -1
+                            for idx, e in enumerate(self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS]):
+                                if e[0] >= mem_time - dec("0.001"):
+                                    break
+                                # same behavior, same subject and modifier(s) not set
+                                if e[2] == behavior_to_stop[cfg.BEHAVIOR_CODE] and e[1] == self.currentSubject and e[3] == "":
+                                    mem_idx = idx
+                            if mem_idx != -1:
+                                self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS][mem_idx][3] = behavior_to_stop_modifier_str
+
+                    else:
+                        behavior_to_stop_modifier_str = cm[cs]
+
                 # add excluded state event to observations (= STOP them)
                 if self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] in (cfg.LIVE):
                     bisect.insort(
                         self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS],
-                        [mem_time - dec("0.001"), self.currentSubject, cs, cm[cs], ""],
+                        [mem_time - dec("0.001"), self.currentSubject, cs, behavior_to_stop_modifier_str, ""],
                     )
 
                 if self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] in (cfg.MEDIA):
                     bisect.insort(
                         self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS],
-                        [mem_time - dec("0.001"), self.currentSubject, cs, cm[cs], "", cfg.NA],
+                        [mem_time - dec("0.001"), self.currentSubject, cs, behavior_to_stop_modifier_str, "", cfg.NA],
                     )
 
                 if self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] in (cfg.IMAGES):
                     self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS].append(
-                        [mem_time, self.currentSubject, cs, cm[cs], "", image_idx, image_path]
+                        [mem_time, self.currentSubject, cs, behavior_to_stop_modifier_str, "", image_idx, image_path]
                     )
 
                     # order by image index ASC

{boris_behav_obs-8.25.4.dist-info → boris_behav_obs-8.26.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: boris-behav-obs
-Version: 8.25.4
+Version: 8.26.1
 Summary: BORIS - Behavioral Observation Research Interactive Software
 Author-email: Olivier Friard <olivier.friard@unito.it>
 License: GNU GENERAL PUBLIC LICENSE
@@ -697,9 +697,9 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE.TXT
 Requires-Dist: exifread >=3.0.0
-Requires-Dist: numpy >=1.21
+Requires-Dist: numpy >=1.26.4
 Requires-Dist: matplotlib >=3.3.3
-Requires-Dist: pandas >=1.3.5
+Requires-Dist: pandas >=2.2.2
 Requires-Dist: tablib[cli,html,ods,pandas,xls,xlsx] >=3
 Requires-Dist: pyqt5 >=5.15
 Requires-Dist: pyreadr

{boris_behav_obs-8.25.4.dist-info → boris_behav_obs-8.26.1.dist-info}/RECORD

@@ -1,36 +1,29 @@
-boris/LICENSE.TXT,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
-boris/README.TXT,sha256=0506tPRqGbRsnH_JxX1HJXW3TkEuAFmUG1W1ArBTBmk,788
 boris/__init__.py,sha256=vEqzYsbV0DwIWYPXIv3OXrBBFW71dpYRSL63Dedv4xE,773
 boris/__main__.py,sha256=_cKab_aODdiWYjyf6mWu57D-84izlVDPAm13QxH-cCg,764
 boris/about.py,sha256=JnsPLW8o9iYyp8I8S4Chhh3GmWNijxyyxRe9e9VFMFU,5253
-boris/add_modifier.py,sha256=VrXmsSBkPSB7rN-Awwl7_ny0UJdFWl5cHMuLqQSh7Qc,24974
-boris/add_modifier.ui,sha256=HiaX_TO0qzbEE0CsezuKKqJKwZ2e1c8R_J4D2KaKg5w,9389
-boris/add_modifier_ui.py,sha256=QovmV97MPoyX9Mb1OnIKxR6x5tXn2Z9FVi6qfwRwouw,10248
-boris/advanced_event_filtering.py,sha256=4d3lF-zn32IZW5cLUQ5bAZ3eDZjyuNBGBsSOYzHInLs,15184
-boris/behav_coding_map_creator.py,sha256=rWU9Wm4KDxYDFJtSOC0lUWTviV1eYzlkuJdQl6x2dR0,37858
+boris/add_modifier.py,sha256=dtP1xZCwO0QlUJVir0JP2ShL5WrOvH26vQfwGwu683Q,26465
+boris/add_modifier_ui.py,sha256=ZKXDcpavvzF5X8gkTuza1WYsw3x9TB-qQjrhn1fka5c,10537
+boris/advanced_event_filtering.py,sha256=ScKwLy5zELU8R9WOS5wVZPk4OtWG1Cn4XeMxyHzG1Rc,15180
+boris/behav_coding_map_creator.py,sha256=FNU5fUjvXQhTn-fmFQpksgIUzE0ZkAxgpPCXRpSGsAM,37860
 boris/behavior_binary_table.py,sha256=_XIJuly5xF5oSqjl8YIBMgJ_o3gtyviTJ5DJafvO-Mo,11677
-boris/behaviors_coding_map.py,sha256=MJuwr84Nl1unKr4dr3UY5mT-UorMac5nJagzz3GYTKY,7307
+boris/behaviors_coding_map.py,sha256=Q_-k8DsYtXgUBzOYUdoGl41EgLdVAvGyuir98CUDY5Q,7309
 boris/boris_cli.py,sha256=CeUr_QKKySu9v-Gw5fkeQPjA3y_dGv7_Y4tCY41OeoA,13196
 boris/cmd_arguments.py,sha256=dNMEvMgTRMadC1Oz5IXw4JEBJw8Tq4yCo4yuRCnNfXc,1848
 boris/coding_pad.py,sha256=XVbg3Q7S4O6Rgxc5ZCzx4jv7eaDvbw_K2T_nQWtsvdU,10996
-boris/config.py,sha256=XXfLWPCRw04Uw6Scwz-bhq3NGuIk7GznPKW2h3KC7Mw,16859
-boris/config_file.py,sha256=Qy0qkOWip_VHA5uqVLWGDIxJPlxYsMQMdHrYnI_yGWs,13555
+boris/config.py,sha256=zx5SfQESXGZjJkxXIdZKn2nGpj8nwRc-ZifcBUMNzWM,16726
+boris/config_file.py,sha256=jTOhrX0tfxc3oHV7R85QX828xhezCsawXg6nvy5QIbE,13519
 boris/connections.py,sha256=RIQsaooiz6pzc2jJMHw9CQSyX39TgbM5JAwifCu5eWQ,19280
 boris/converters.py,sha256=FymqUxLEVLQwsUv6EVF7MRPowN1e87aVT2d3XjZJgAM,11771
-boris/converters.ui,sha256=hOcg0QkCMdnLf3a9DR3O2gZBl7EbX495VGndWnQVE4E,7400
 boris/converters_ui.py,sha256=firMWVgS3c492FF-YFv3FehOBLsbBHKaLEaVcoVctgc,8745
 boris/cooccurence.py,sha256=scazxKCmFQjBvv7oS9h7ylB8GJdkSmwy1LJZeUv5DOY,9824
-boris/core.py,sha256=7EPhbtCRM42Ijg6E5ubh2HxFLImWmY4s8b9U3sGD8ws,222059
-boris/core.qrc,sha256=9DibRJgfKpJ1i6xub-JQtMotLrSKhqRaF_oIkoJRqo8,2398
-boris/core.ui,sha256=z0unUmECYdGwULy8wX8cNscOlLYcRypWuVdhwM4FJsQ,46554
+boris/core.py,sha256=y_7xvlLojM-Jdu3FlAwzWLQoiiGtHIC2Eo6Qm2SaHhk,222161
 boris/core_qrc.py,sha256=5YMpr7ckI4TbXaeSyCMhNJBAlrGPeLes62RedU3EbWs,865287
 boris/core_ui.py,sha256=Z_6Ehp93fRVnPGyKRtgX2GcXRXb8QZojXipHSpJ_f3M,69854
 boris/db_functions.py,sha256=YyI2LMSFn772aMGdkOIpfXbPuoSWEvDckZZKevwvB-4,13326
 boris/dev.py,sha256=9pUElbjl9g17rFUJXX5aVSu55_iIKIuDxNdrB0DI_d0,3671
-boris/dialog.py,sha256=oHnC4j5IF0KUDyVkoher9PvAp5wH2DQizWIp_EefQ3Q,41213
+boris/dialog.py,sha256=9x9fSRUVhsxqcit_cNtnjnQMWuM6VB2c3EQ6-G3JDmo,41217
 boris/duration_widget.py,sha256=FHnDDg6RBtORCZDG9gkpjxP9ivZ3Rb4uYWCdEkBl-a4,6930
 boris/edit_event.py,sha256=cvZ4j2rcck8q5Rd6n5d6JGQ0wZMduVQls2UDylCuQqY,7578
-boris/edit_event.ui,sha256=oC2AZH9rZm8f4HWvsOGxXVgAr6SUx2Wub-B44R2LDqM,5969
 boris/edit_event_ui.py,sha256=X98eKSS0urd0eGce-q2_gkPx79GvO1XbJUEjxGCMUCI,6984
 boris/event_operations.py,sha256=JYIZC4ObShZ-SPxNQaQZwKs8xJn4Dj0lvIiNgzc28Jo,38929
 boris/events_cursor.py,sha256=Jfu7yV1MG7HikNmMQmOVJ7ntmEZzDZn5HHp3va8llwM,1983
@@ -39,27 +32,25 @@ boris/exclusion_matrix.py,sha256=xaEFLy2Zv5SWryMz1D0cEpywsAuZxZuBaaGYLaBGhng,527
 boris/export_events.py,sha256=35tu9K9kEXlossdWjTNs74YuIs-ZQBSzw7MRnRIUK3Q,37826
 boris/export_observation.py,sha256=TC_Mxyor5e0HZViG9xxAX_V18i61ihFnVmhioNOy_Dw,49821
 boris/external_processes.py,sha256=069iEVOfDI-7zUYPH7WlYBEnKqTR18mjj8dReBkUACE,11965
-boris/geometric_measurement.py,sha256=VZCUM9puq57HPP5q0U7Dt2ZiOlRb5j7Fduu3oeVuggA,34607
+boris/geometric_measurement.py,sha256=jd6HiWJNrjqRInG452a8Ke44Zj4QyNSYa9JKO8DZzOo,34609
 boris/gui_utilities.py,sha256=IhIz53CHSRvO-qjN5XrzpgAChf_LBcUWlE3iFMBeROw,3774
 boris/image_overlay.py,sha256=bxEHEr5p6nH_sgXRSGEWlJZJF7R07ItgHNM4_3kXTJA,2527
 boris/import_observations.py,sha256=FrXG_oOyPYWIX1XHHWvC9eg13FHsZPzhLGjCMSQFHT8,8838
 boris/irr.py,sha256=oFp8rJG9XxmKZ1q5fPnp79LEwFYHnu5i9Gk8CqRKiNM,22474
 boris/latency.py,sha256=EDgH2DhR3j3lExMLemwhh7SIWFCWX9kJ4YbVXhhYv-8,9737
 boris/map_creator.py,sha256=IJzvT2a9LoWk_Qx-Enc4jTsYh0ixpbrLNUFCLwB9idA,29437
-boris/measurement_widget.py,sha256=Og73L_ut0IuG89rydGNRta4PKjq1BPkk-D6hCrFrPpg,4484
+boris/measurement_widget.py,sha256=NI2d9qftFTtnUzy-aOtKhx3w63-mqDIJ4rz1l_8_Zos,4486
 boris/media_file.py,sha256=ofOoGyrqEcm6HZQxnyObdmcLlKS0TrcPQNPNf8EG1BM,4766
 boris/menu_options.py,sha256=izzYx-Rc7powf8PqhAXD3XMPYvBoVZqOYbS1jaW4sII,7094
 boris/modifiers_coding_map.py,sha256=XBTubBHw6Sayw5jUNaWR_jVIw6ttaJcbhbmUSF6_lx4,4566
 boris/mpv.py,sha256=EfzIHjPbgewG4w3smEtqEUPZoVwYmMQkL4Q8ZyW-a58,76410
 boris/mpv2.py,sha256=EXRtzQqFjOn4wMC6482Ilq3fNQ9N1GRP1VxwLzdeaBY,88077
-boris/observation.py,sha256=9CmVvZiXQsRVD2W_MQHm40ZMqRzjYaVx_NIpnqYufsg,52830
-boris/observation.ui,sha256=ZOng-yYtPJxLoUs_5Po35b5G9myTw1CTtD9Gqo_UhMI,27051
+boris/observation.py,sha256=pHP68WnjA1rZsefo6zNtmwaXcjwjpItZCQrefqwOCCQ,52832
 boris/observation_operations.py,sha256=tMKrL7sM-jcM4__Hpg7mPTfLkjxytXMBdKe2CKFGe5k,100217
 boris/observation_ui.py,sha256=dfk7pS2DlaiEgMjouH0-_t6kPgMwovQbloHtc3ZoCmY,30278
 boris/observations_list.py,sha256=rMuEVa3QccA89vjARcEVtSlLnr5s0sfihUlcwciV3OM,10600
-boris/otx_parser.py,sha256=-Sec_NzVUhwey0oscA1ObSE1rGh-CxwTZaj0jhGzPdM,16377
+boris/otx_parser.py,sha256=Ul5GokK46azx60P6-pk8wbSPUqUR9O4WLV42z3rE40s,16367
 boris/param_panel.py,sha256=XpFuoNtVuPx_3EieYt0JaQ2J3Bk4ZyMa4RgJha_10oE,7473
-boris/param_panel.ui,sha256=RHcf_MvWO4qPC3pB_L4ow4l_qTX21yRfrZvePhCSLsE,11013
 boris/param_panel_ui.py,sha256=R6Yfxd7m41_Mo5XCD9wlyAprrEKdCyBZm0jicwh_cGk,11704
 boris/player_dock_widget.py,sha256=Pl2GB-a2XmiKiPPsun9_Q8otXXrugV1tdCEW3YMP_VE,5642
 boris/plot_data_module.py,sha256=OazYAPHker30s1oYYKkSa0IXSj-DbB1-Qgcau0x-Il8,16582
@@ -67,33 +58,30 @@ 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=FiRiDpQXIRw2Ni1vjz3sPSZ2jv7971uv0JW5daQysYU,11622
-boris/preferences.ui,sha256=xaetyovsXq9G5YEg0ZwgFamcX8Px1XDu75xt_wEeFIA,19198
+boris/preferences.py,sha256=5KxUwP10mnsAk8CH3eSlzvd8mtsHsFJfWhzot3QOy3Y,11540
 boris/preferences_ui.py,sha256=LQ46jW9kltJBQD85EHd5cCmlHG4c9N6v6YQLQvUisGM,21935
-boris/project.py,sha256=8eiwud6N4slLlj1GAb71xvy5vs2-etOrfK0RM1qUQac,81465
-boris/project.ui,sha256=ZhUnCYABSAKc_kh5PLjzIFznfY7n4mGHxMXhQH8tmJM,36021
+boris/project.py,sha256=i9XT744HoJhlV93C0QuEMD8tNmzIHL0E-iZ4PIOSadc,82219
 boris/project_functions.py,sha256=R3DS_faDuMGKTpMnV0OhqgZp9yO1ojoA5wUIXdtHNIE,70972
 boris/project_import_export.py,sha256=lCL4fOZuG5MaEf_wfDSHiE7-M2ZQsIbUR7KpHZjb1Uw,38097
 boris/project_ui.py,sha256=TRJlsqq4XbIl8k2f20BKr2PtKa0QNjFNr6UnMieZYqU,35915
 boris/qrc_boris.py,sha256=4U2cD_fIBTtsTPhirOl9I3kTArOhXWYvfuO_A0M9N0I,675001
 boris/qrc_boris5.py,sha256=6bwT8OVtIr84nVIYp2ldUL7XL6WJi9zgJow6kgRxuIQ,161601
-boris/select_modifiers.py,sha256=jbzXKTuAuWnIVsykAuzlQmTqkAcmQsJl7c3cJiPbw_w,12051
+boris/select_modifiers.py,sha256=TAo7xi5bhiMp9WOAwEPq9xc8i4Nsa2QrcpoCrUgPwhE,13178
 boris/select_observations.py,sha256=snMC23nYD_qi88q95rXqV-NqbGO5BrLrC-CKlmVR3ok,14441
 boris/select_subj_behav.py,sha256=bX-YCeysK5QowYgoxQyy-9qeZmhzWM4SwArXxSAa5ho,10342
 boris/state_events.py,sha256=AcZmD0pIJ4AszTQe9conWlh8gJhwdBjZiGm1KOXt804,7768
 boris/subjects_pad.py,sha256=d-vI0qBcXfonN_BvYI19ZBWgY0Ywekc2DSWLFHIjz0o,3553
 boris/synthetic_time_budget.py,sha256=m3QJ0Ju4av7WzMUKFIvxJd5x4iNVTXc4-j9tWa3MIOE,9858
 boris/time_budget_functions.py,sha256=L-0PuPWYR33UMfqmxpcCVH-w4mLLrtZ8b8kBTmBwlsI,50299
-boris/time_budget_widget.py,sha256=nz7fmdfAQsI8Myyq7rvjnAiuvMKcYP59t7sNQPXjT4g,42850
+boris/time_budget_widget.py,sha256=9WV-iKYSl1f3HBrGcL-eHDjUswrFQh6-WUcffTtce1Y,42852
 boris/transitions.py,sha256=2zucdoa2jTpWtM6nWHr8lOvjXkrQmo9j71fz_fMLALU,11998
-boris/utilities.py,sha256=V27JgcKTWajCevmUBFc_tOfZPjklwXW2HiMHE0sup2Y,48431
-boris/version.py,sha256=M1QIV9i2Gd5MEabuH2QBD8Zdc1JDK2NrnHeDmqE4jWM,788
+boris/utilities.py,sha256=07qXAQ6aGyiSC2h6RMJ031OlXYy05-KTLJtnQtXn6FU,48724
+boris/version.py,sha256=p1Eo1rAKt4WoBUXddzmCG41ZVzlVjIetATyhD0XQVaI,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
 boris/vlc_local.py,sha256=M4yQ8pGW-sY9zMJXDlWg5fzfcwLep1pFQjqwyREHlKo,3053
-boris/write_event.py,sha256=ckNx1JqElvUli1s-W0Xk3NSziDRxhoV9_d2IDHe9J9M,18356
-boris/icons/logo_eye.ico,sha256=pGgNoNXijGOuv6c_iaFR9OsjJ1GBqvrtzxNtfCLv_sc,45470
+boris/write_event.py,sha256=Lsv7Jxoi4b4qVqjsxwiB2yago_TQ9BtwjjG7OejQEhI,23528
 boris/portion/__init__.py,sha256=ZBUG4I7YWhRkeWdP-JEpxhxldJlUYQkeaJseTjdhtJE,602
 boris/portion/const.py,sha256=hEp26BKcEg1Js4DfZsBHmDtJJts83Tl1HWQ0CNJNwEc,1588
 boris/portion/dict.py,sha256=SyHxc7PfDw2ufNLFQycwJtzmRfL48rDp4UrM2KN7IWc,11282
@@ -117,9 +105,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.25.4.dist-info/LICENSE.TXT,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
-boris_behav_obs-8.25.4.dist-info/METADATA,sha256=6kjRUo8YmiJnz60lU7w-mwKUuPpQgAvotCigGh3ljlY,45541
-boris_behav_obs-8.25.4.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-boris_behav_obs-8.25.4.dist-info/entry_points.txt,sha256=fuO7JxKFLOm6xp6m3JHRA1UO_QW1dYU-F0IooA1NqQs,37
-boris_behav_obs-8.25.4.dist-info/top_level.txt,sha256=fJSgm62S7WesiwTorGbOO4nNN0yzgZ3klgfGi3Px4qI,6
-boris_behav_obs-8.25.4.dist-info/RECORD,,
+boris_behav_obs-8.26.1.dist-info/LICENSE.TXT,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
+boris_behav_obs-8.26.1.dist-info/METADATA,sha256=38_OR718pDduPAAmZi8ixtl_iH1zyPE4T38USEQALBY,45543
+boris_behav_obs-8.26.1.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+boris_behav_obs-8.26.1.dist-info/entry_points.txt,sha256=fuO7JxKFLOm6xp6m3JHRA1UO_QW1dYU-F0IooA1NqQs,37
+boris_behav_obs-8.26.1.dist-info/top_level.txt,sha256=fJSgm62S7WesiwTorGbOO4nNN0yzgZ3klgfGi3Px4qI,6
+boris_behav_obs-8.26.1.dist-info/RECORD,,