boris-behav-obs 9.3.3__py2.py3-none-any.whl → 9.3.5__py2.py3-none-any.whl

boris/event_operations.py

@@ -70,7 +70,7 @@ def add_event(self):
 
     editWindow = DlgEditEvent(
         observation_type=self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE],
-        time_value=0,
+        time_value=dec("NaN"),
         image_idx=0,
         current_time=current_time,
         time_format=self.timeFormat,
@@ -80,8 +80,6 @@ def add_event(self):
 
     sortedSubjects = [cfg.NO_FOCAL_SUBJECT] + sorted([self.pj[cfg.SUBJECTS][x][cfg.SUBJECT_NAME] for x in self.pj[cfg.SUBJECTS]])
 
-    print(f"{sortedSubjects=}")
-
     editWindow.cobSubject.addItems(sortedSubjects)
     if self.currentSubject:
         editWindow.cobSubject.setCurrentIndex(editWindow.cobSubject.findText(self.currentSubject, Qt.MatchFixedString))
@@ -173,8 +171,13 @@ def add_event(self):
                     time_ = dec("NaN")
                     if self.pj[cfg.OBSERVATIONS][self.observationId].get(cfg.USE_EXIF_DATE, False):
                         if self.playerType != cfg.VIEWER_IMAGES:
-                            if self.extract_exif_DateTimeOriginal(self.images_list[new_index]) != -1:
-                                time_ = self.extract_exif_DateTimeOriginal(self.images_list[new_index]) - self.image_time_ref
+                            exif_date_time = util.extract_exif_DateTimeOriginal(self.images_list[new_index])
+                            if exif_date_time != -1:
+                                time_ = exif_date_time
+
+                                # check if first value must be substracted
+                                if self.pj[cfg.OBSERVATIONS][self.observationId].get(cfg.SUBSTRACT_FIRST_EXIF_DATE, True):
+                                    time_ -= self.image_time_ref
 
                     elif self.pj[cfg.OBSERVATIONS][self.observationId].get(cfg.TIME_LAPSE, 0):
                         time_ = new_index * self.pj[cfg.OBSERVATIONS][self.observationId].get(cfg.TIME_LAPSE, 0)
@@ -591,6 +594,12 @@ def edit_event(self):
     else:
         current_value = self.getLaps()
 
+    # get exif date time
+    if self.pj[cfg.OBSERVATIONS][self.observationId].get(cfg.USE_EXIF_DATE, False):
+        exif_date_time = util.extract_exif_DateTimeOriginal(self.images_list[self.image_idx])
+    else:
+        exif_date_time = None
+
     edit_window = DlgEditEvent(
         observation_type=self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE],
         time_value=time_value,
@@ -598,12 +607,15 @@ def edit_event(self):
         current_time=current_value,
         time_format=self.timeFormat,
         show_set_current_time=True,
+        exif_date_time=exif_date_time,
     )
     edit_window.setWindowTitle("Edit event")
 
     # time
     if time_value.is_nan():
         edit_window.cb_set_time_na.setChecked(True)
+
+    # remove visibility of 'set current time' widget if VIEWER mode
     if self.playerType in (cfg.VIEWER_MEDIA, cfg.VIEWER_LIVE, cfg.VIEWER_IMAGES):
         edit_window.pb_set_to_current_time.setVisible(False)
 
@@ -637,20 +649,16 @@ def edit_event(self):
             sortedCodes.index(self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS][pj_event_idx][cfg.EVENT_BEHAVIOR_FIELD_IDX])
         )
     else:
-        logging.warning(
-            (
-                f"The behaviour {self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS][pj_event_idx][cfg.EVENT_BEHAVIOR_FIELD_IDX]} "
-                "does not exist longer in the ethogram"
-            )
+        msg: str = (
+            f"The behaviour {self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS][pj_event_idx][cfg.EVENT_BEHAVIOR_FIELD_IDX]} "
+            "does not exist longer in the ethogram"
         )
+        logging.warning(msg)
+
         QMessageBox.warning(
             self,
             cfg.programName,
-            (
-                "The behaviour "
-                f"<b>{self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS][pj_event_idx][cfg.EVENT_BEHAVIOR_FIELD_IDX]}</b> "
-                "does not exist more in the ethogram"
-            ),
+            msg,
         )
         edit_window.cobCode.setCurrentIndex(0)
 
@@ -658,28 +666,32 @@ def edit_event(self):
         f"original modifiers: {self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS][pj_event_idx][cfg.EVENT_MODIFIER_FIELD_IDX]}"
     )
 
-    # frame index
-    frame_idx = read_event_field(
-        self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS][pj_event_idx],
-        self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE],
-        cfg.FRAME_INDEX,
-    )
-    edit_window.sb_frame_idx.setValue(0 if frame_idx in (cfg.NA, None) else frame_idx)
-    if frame_idx in (cfg.NA, None):
-        edit_window.cb_set_frame_idx_na.setChecked(True)
+    # # frame index
+    # frame_idx = read_event_field(
+    #     self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS][pj_event_idx],
+    #     self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE],
+    #     cfg.FRAME_INDEX,
+    # )
+    # edit_window.sb_frame_idx.setValue(0 if frame_idx in (cfg.NA, None) else frame_idx)
+    # if frame_idx in (cfg.NA, None):
+    #     edit_window.cb_set_frame_idx_na.setChecked(True)
 
     # comment
     edit_window.leComment.setPlainText(self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS][pj_event_idx][cfg.EVENT_COMMENT_FIELD_IDX])
 
     flag_ok = False  # for looping until event is OK or Cancel pressed
     while True:
-        if edit_window.exec_():  # button OK
+        if edit_window.exec():  # button OK
             self.project_changed()
 
+            new_time = edit_window.time_widget.get_time()
+
+            if edit_window.cb_set_time_na.isChecked():
+                new_time = dec("NaN")
+
             # MEDIA / LIVE
             if self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] in (cfg.MEDIA, cfg.LIVE):
-                new_time = edit_window.time_widget.get_time()
-                if new_time is None:
+                if new_time.is_nan():
                     QMessageBox.warning(
                         self,
                         cfg.programName,
@@ -707,19 +719,17 @@ def edit_event(self):
                                     event[cfg.FRAME_INDEX] = frame_idx
                                     self.seek_mediaplayer(mem_time)
 
-                            """
-                            if not edit_window.sb_frame_idx.value() or edit_window.cb_set_frame_idx_na.isChecked():
-                                event[cfg.FRAME_INDEX] = cfg.NA
-                            else:
-                                if self.playerType == cfg.MEDIA:
-                                    mem_time = self.getLaps()
-                                    if not self.seek_mediaplayer(new_time):
-                                        frame_idx = self.get_frame_index()
-                                        event[cfg.FRAME_INDEX] = frame_idx
-                                        self.seek_mediaplayer(mem_time)
-
-                                # event[cfg.FRAME_INDEX] = edit_window.sb_frame_idx.value()
-                            """
+                            # if not edit_window.sb_frame_idx.value() or edit_window.cb_set_frame_idx_na.isChecked():
+                            #     event[cfg.FRAME_INDEX] = cfg.NA
+                            # else:
+                            #     if self.playerType == cfg.MEDIA:
+                            #         mem_time = self.getLaps()
+                            #         if not self.seek_mediaplayer(new_time):
+                            #             frame_idx = self.get_frame_index()
+                            #             event[cfg.FRAME_INDEX] = frame_idx
+                            #             self.seek_mediaplayer(mem_time)
+                            #
+                            #     # event[cfg.FRAME_INDEX] = edit_window.sb_frame_idx.value()
 
                         event["row"] = pj_event_idx
                         event["original_modifiers"] = self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS][pj_event_idx][
@@ -747,10 +757,7 @@ def edit_event(self):
                 for key in self.pj[cfg.ETHOGRAM]:
                     if self.pj[cfg.ETHOGRAM][key][cfg.BEHAVIOR_CODE] == edit_window.cobCode.currentText():
                         event = self.full_event(key)
-                        if edit_window.time_value == cfg.NA or (edit_window.cb_set_time_na.isChecked()):
-                            event[cfg.TIME] = dec("NaN")
-                        else:
-                            event[cfg.TIME] = edit_window.time_widget.get_time()
+                        event[cfg.TIME] = new_time
 
                         event[cfg.SUBJECT] = (
                             "" if edit_window.cobSubject.currentText() == cfg.NO_FOCAL_SUBJECT else edit_window.cobSubject.currentText()
@@ -808,7 +815,7 @@ def edit_time_selected_events(self):
         return
 
     d = w.time_widget.get_time()
-    if d is None or not d:
+    if d.is_nan() or not d:
         return
 
     if ":" in util.smart_time_format(abs(d)):
@@ -882,8 +889,6 @@ def copy_selected_events(self):
             else:
                 copied_events.append("\t".join([str(x) for x in event]))
 
-    print(f"{copied_events=}")
-
     cb = QApplication.clipboard()
     cb.clear(mode=QClipboard.Mode.Clipboard)
     cb.setText("\n".join(copied_events), mode=QClipboard.Mode.Clipboard)

boris/observation.py

@@ -24,10 +24,9 @@ import logging
 import os
 import pandas as pd
 import pathlib as pl
-import datetime as dt
 
 from PySide6.QtCore import Qt
-from PySide6.QtGui import QColor, QTextCursor, QAction
+from PySide6.QtGui import QColor
 from PySide6.QtWidgets import (
     QDialog,
     QVBoxLayout,

boris/observation_operations.py

@@ -1024,7 +1024,21 @@ def new_observation(self, mode: str = cfg.NEW, obsId: str = "") -> None:
             self.pj[cfg.OBSERVATIONS][new_obs_id][cfg.DIRECTORIES_LIST] = [
                 observationWindow.lw_images_directory.item(i).text() for i in range(observationWindow.lw_images_directory.count())
             ]
+
+            # check if exif data must be used
             self.pj[cfg.OBSERVATIONS][new_obs_id][cfg.USE_EXIF_DATE] = observationWindow.rb_use_exif.isChecked()
+
+            # ask if the value of the exif date time of the first picture must be substracted
+            # TODO: improve this
+            if self.pj[cfg.OBSERVATIONS][new_obs_id][cfg.USE_EXIF_DATE]:
+                response = dialog.MessageDialog(
+                    cfg.programName,
+                    "You choose to use the EXIF metadata. Do you want to substract the date time value of the first picture?",
+                    (cfg.YES, cfg.NO),
+                )
+                self.pj[cfg.OBSERVATIONS][new_obs_id][cfg.SUBSTRACT_FIRST_EXIF_DATE] = response == cfg.YES
+
+            # check if time lapse
             if observationWindow.rb_time_lapse.isChecked():
                 self.pj[cfg.OBSERVATIONS][new_obs_id][cfg.TIME_LAPSE] = observationWindow.sb_time_lapse.value()
             else:
@@ -1086,7 +1100,6 @@ def new_observation(self, mode: str = cfg.NEW, obsId: str = "") -> None:
                     return "Observation not launched"
 
             if self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] == cfg.IMAGES:
-                # QMessageBox.critical(self, cfg.programName, "Observation from images directory is not yet implemented")
                 initialize_new_images_observation(self)
 
             self.load_tw_events(self.observationId)
@@ -1100,7 +1113,7 @@ def close_observation(self):
 
     logging.info(f"Close observation (player type: {self.playerType})")
 
-    # check observation events
+    # check observation state events
 
     flag_ok, msg = project_functions.check_state_events_obs(
         self.observationId,
@@ -1111,16 +1124,22 @@ def close_observation(self):
 
     if not flag_ok:
         out = f"The current observation has state event(s) that are not PAIRED:<br><br>{msg}"
-        results = dialog.Results_dialog()
+        results = dialog.Results_dialog_exit_code()
         results.setWindowTitle(f"{cfg.programName} - Check selected observations")
         results.ptText.setReadOnly(True)
         results.ptText.appendHtml(out)
-        results.pbSave.setVisible(False)
-        results.pbCancel.setText("Close observation")
-        results.pbCancel.setVisible(True)
-        results.pbOK.setText("Fix unpaired state events")
 
-        if results.exec_():  # fix events
+        results.pb1.setText("Close observation")
+        results.pb2.setText("Return to observation")
+        if self.playerType == cfg.IMAGES:
+            results.pb3.setVisible(False)
+        else:
+            results.pb3.setText("Fix unpaired state events")
+
+        r = results.exec()
+        if r == 2:  # Return to observation
+            return
+        if r == 3:  # Fix unpaired state events
             state_events.fix_unpaired_events(self, silent_mode=True)
 
     self.saved_state = self.saveState()
@@ -1280,7 +1299,7 @@ def check_creation_date(self) -> Tuple[int, dict]:
 def init_mpv(self):
     """Start mpv process and embed it in the PySide6 application."""
 
-    print("start MPV process")
+    logging.debug("function: init_mpv")
 
     """
     print(f"{self.winId()=}")
@@ -1307,7 +1326,7 @@ def init_mpv(self):
 def send_command(command):
     """Send a JSON command to the mpv IPC server."""
 
-    print(f"send commnand {command}")
+    logging.debug("function: send commnand {command}")
     # print(f"{self.mpv_process=}")
 
     try:
@@ -2407,8 +2426,11 @@ def event2media_file_name(observation: dict, timestamp: dec) -> Optional[str]:
 
     cumul_media_durations: list = [dec(0)]
     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(round(cumul_media_durations[-1] + media_duration, 3))
+        try:
+            media_duration = dec(str(observation[cfg.MEDIA_INFO][cfg.LENGTH][media_file]))
+            cumul_media_durations.append(round(cumul_media_durations[-1] + media_duration, 3))
+        except KeyError:
+            return None
 
     cumul_media_durations.remove(dec(0))
 

boris/project.py

@@ -150,12 +150,14 @@ class BehavioralCategories(QDialog):
             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 behavioral_categories_in_ethogram.difference(set(behavioral_categories)) and 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>"
+                        "There 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?"
@@ -210,7 +212,6 @@ class BehavioralCategories(QDialog):
             color = col_diag.currentColor()
             if color.name() == "#000000":  # black -> delete color
                 self.lw.item(row, 1).setText("")
-                # self.lw.item(row, 1).setBackground(QColor(230, 230, 230))
                 self.lw.item(row, 1).setBackground(self.not_editable_column_color())
             elif color.isValid():
                 self.lw.item(row, 1).setText(color.name())
@@ -820,18 +821,18 @@ class projectDialog(QDialog, Ui_dlgProject):
             column (int): column double-clicked
         """
 
-        # check if double click on excluded column
+        # excluded column
         if column == cfg.behavioursFields[cfg.EXCLUDED]:
             self.exclusion_matrix()
 
-        # check if double click on 'coding map' column
+        # coding map
         if column == cfg.behavioursFields[cfg.CODING_MAP_sp]:
             if "with coding map" in self.twBehaviors.item(row, cfg.behavioursFields[cfg.TYPE]).text():
                 self.behavior_type_changed(row)
             else:
                 QMessageBox.information(self, cfg.programName, "Change the behavior type on first column to select a coding map")
 
-        # check if double click on behavior type
+        # behavior type
         if column == cfg.behavioursFields["type"]:
             self.behavior_type_doubleclicked(row)
 
@@ -843,7 +844,7 @@ class projectDialog(QDialog, Ui_dlgProject):
         if column == cfg.behavioursFields[cfg.BEHAVIOR_CATEGORY]:
             self.category_doubleclicked(row)
 
-        # check if double click on modifiers
+        # modifiers
         if column == cfg.behavioursFields[cfg.MODIFIERS]:
             # check if behavior has coding map
             if (
@@ -897,16 +898,17 @@ class projectDialog(QDialog, Ui_dlgProject):
         if self.twBehaviors.item(row, cfg.behavioursFields[cfg.COLOR]).text():
             current_color = QColor(self.twBehaviors.item(row, cfg.behavioursFields[cfg.COLOR]).text())
             if current_color.isValid():
+                print(f"{current_color=}")
                 col_diag.setCurrentColor(current_color)
 
-        if col_diag.exec_():
+        if col_diag.exec():
             color = col_diag.currentColor()
             if color.name() == "#000000":  # black -> delete color
                 self.twBehaviors.item(row, cfg.behavioursFields[cfg.COLOR]).setText("")
                 self.twBehaviors.item(row, cfg.behavioursFields[cfg.COLOR]).setBackground(self.not_editable_column_color())
             elif color.isValid():
+                self.twBehaviors.item(row, cfg.behavioursFields[cfg.COLOR]).setBackground(QColor(color.name()))
                 self.twBehaviors.item(row, cfg.behavioursFields[cfg.COLOR]).setText(color.name())
-                self.twBehaviors.item(row, cfg.behavioursFields[cfg.COLOR]).setBackground(color)
 
     def category_doubleclicked(self, row):
         """

boris/project_functions.py

@@ -356,7 +356,7 @@ def check_state_events(pj: dict, observations_list: list) -> Tuple[bool, tuple]:
     use check_state_events_obs function
     """
 
-    logging.info("Check state events")
+    logging.info("Check state events function")
 
     out = ""
     not_paired_obs_list = []
@@ -404,7 +404,7 @@ def check_project_integrity(
     * check if media file are available (optional)
     * check if media length available
     * check independent variables
-    * check if coded subjects are defines
+    * check if coded subjects are defined
 
     Args:
         pj (dict): BORIS project
@@ -474,6 +474,7 @@ def check_project_integrity(
             if not timestamp.is_nan() and not (-2147483647 <= timestamp <= 2147483647):
                 out_events += f"Observation: <b>{obs_id}</b><br>The timestamp {timestamp} is not between -2147483647 and 2147483647.<br>"
 
+        """
         # check if media length available
         if pj[cfg.OBSERVATIONS][obs_id][cfg.TYPE] == cfg.MEDIA:
             for nplayer in cfg.ALL_PLAYERS:
@@ -484,6 +485,7 @@ def check_project_integrity(
                         except KeyError:
                             out += "<br><br>" if out else ""
                             out += f"Observation: <b>{obs_id}</b><br>Length not available for media file <b>{media_file}</b>"
+        """
 
     out += "<br><br>" if out else ""
     out += out_events
@@ -530,25 +532,46 @@ def check_project_integrity(
         ]
     )
 
-    out += "<br><br>" if out else ""
+    tmp_out: str = ""
     for obs_id in pj[cfg.OBSERVATIONS]:
         if cfg.INDEPENDENT_VARIABLES not in pj[cfg.OBSERVATIONS][obs_id]:
             continue
         for var_label in pj[cfg.OBSERVATIONS][obs_id][cfg.INDEPENDENT_VARIABLES]:
             if var_label in defined_set_var_label:
                 if pj[cfg.OBSERVATIONS][obs_id][cfg.INDEPENDENT_VARIABLES][var_label] not in defined_set_var_label[var_label].split(","):
-                    out += (
+                    tmp_out += (
                         f"{obs_id}: the <b>{pj[cfg.OBSERVATIONS][obs_id][cfg.INDEPENDENT_VARIABLES][var_label]}</b> value "
                         f" is not allowed for {var_label} (choose between {defined_set_var_label[var_label]})<br>"
                     )
+    if tmp_out:
+        out += "<br><br>" if out else ""
+        out += tmp_out
 
     # check if coded subjects are defined in the subjects list
+    tmp_out: str = ""
     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>"
+            tmp_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>"
+    if tmp_out:
+        out += "<br><br>" if out else ""
+        out += tmp_out
+
+    # check if media file have info in media_info section of project
+    tmp_out: str = ""
+    for obs_id in pj[cfg.OBSERVATIONS]:
+        for player in pj[cfg.OBSERVATIONS][obs_id][cfg.FILE]:
+            for media_file in pj[cfg.OBSERVATIONS][obs_id][cfg.FILE][player]:
+                for info in (cfg.LENGTH, cfg.FPS, cfg.HAS_AUDIO, cfg.HAS_VIDEO):
+                    if media_file not in pj[cfg.OBSERVATIONS][obs_id][cfg.MEDIA_INFO][info]:
+                        tmp_out += f"Observation <b>{obs_id}</b>:<br>"
+                        tmp_out += f"The media file {media_file} has no <b>{info}</b> info.<br>"
+    if tmp_out:
+        tmp_out += "<br>You should repick the media file to fix this issue."
+        out += "<br><br>" if out else ""
+        out += tmp_out
 
     return out
 
@@ -1168,13 +1191,8 @@ def observed_interval(observation: dict) -> Tuple[dec, dec]:
     """
     if not observation[cfg.EVENTS]:
         return (dec("0.0"), dec("0.0"))
-    if observation[cfg.TYPE] in (cfg.MEDIA, cfg.LIVE):
-        """
-        print("=" * 120)
-        print(observation[cfg.EVENTS])
-        print("=" * 120)
-        """
 
+    if observation[cfg.TYPE] in (cfg.MEDIA, cfg.LIVE):
         event_timestamp = [event[cfg.PJ_OBS_FIELDS[observation[cfg.TYPE]][cfg.TIME]] for event in observation[cfg.EVENTS]]
 
         return (
@@ -1183,8 +1201,12 @@ def observed_interval(observation: dict) -> Tuple[dec, dec]:
         )
     if observation[cfg.TYPE] == cfg.IMAGES:
         events = [x[cfg.PJ_OBS_FIELDS[observation[cfg.TYPE]][cfg.IMAGE_INDEX]] for x in observation[cfg.EVENTS]]
-
-        return (dec(min(events)), dec(max(events)))
+        # test if indexes contain NA
+        try:
+            dec(min(events))
+            return (dec(min(events)), dec(max(events)))
+        except Exception:
+            return (dec("NaN"), dec("NaN"))
 
 
 def events_start_stop(ethogram: dict, events: list, obs_type: str) -> List[tuple]:
@@ -1273,7 +1295,7 @@ def open_project_json(project_file_name: str) -> tuple:
         str: message
     """
 
-    logging.debug(f"open project: {project_file_name}")
+    logging.debug(f"open_project_json function: {project_file_name}")
 
     projectChanged: bool = False
     msg: str = ""
@@ -1612,6 +1634,8 @@ def fix_unpaired_state_events2(ethogram: dict, events: list, fix_at_time: dec) -
         list: list of events with state events fixed
     """
 
+    logging.debug("fix_unpaired_state_events2 function")
+
     closing_events_to_add: list = []
     subjects: list = [event[cfg.EVENT_SUBJECT_FIELD_IDX] for event in events]
     ethogram_behaviors: dict = {ethogram[idx][cfg.BEHAVIOR_CODE] for idx in ethogram}
@@ -1960,6 +1984,6 @@ def project2dataframe(pj: dict, observations_list: list = []) -> pd.DataFrame:
 
     pd.DataFrame(data).info()
 
-    print(pd.DataFrame(data))
+    # print(pd.DataFrame(data))
 
     return pd.DataFrame(data)

boris/select_observations.py

@@ -21,7 +21,9 @@ Copyright 2012-2025 Olivier Friard
 
 """
 
+import logging
 from typing import Tuple
+
 from PySide6.QtCore import Qt
 from PySide6.QtWidgets import QAbstractItemView
 
@@ -60,7 +62,10 @@ def select_observations2(self, mode: str, windows_title: str = "") -> Tuple[str,
     data: list = []
     not_paired: list = []
 
+    # check if observations changed
     if hash(str(self.pj[cfg.OBSERVATIONS])) != self.mem_hash_obs:
+        logging.debug("observations changed")
+
         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])
@@ -124,11 +129,12 @@ def select_observations2(self, mode: str, windows_title: str = "") -> Tuple[str,
             data, header=fields_list + indep_var_header, column_type=column_type, not_paired=not_paired
         )
         self.data = data
+        self.not_paired = not_paired
         self.mem_hash_obs = hash(str(self.pj[cfg.OBSERVATIONS]))
 
     else:
         obsList = observations_list.observationsList_widget(
-            self.data, header=fields_list + indep_var_header, column_type=column_type, not_paired=not_paired
+            self.data, header=fields_list + indep_var_header, column_type=column_type, not_paired=self.not_paired
         )
 
     if windows_title:

boris/state_events.py

@@ -109,7 +109,7 @@ def fix_unpaired_events(self, silent_mode: bool = False):
             return
 
         fix_at_time = w.time_widget.get_time()
-        if fix_at_time is None:
+        if fix_at_time.is_nan():
             QMessageBox.warning(
                 self,
                 cfg.programName,

boris/utilities.py

@@ -129,7 +129,7 @@ def extract_video_creation_date(file_path: str) -> int | None:
         return None
 
 
-def extract_date_time_from_file_name(file_path: str) -> int:
+def extract_date_time_from_file_name(file_path: str) -> int | None:
     """
     extract YYYY-MM-DD_HHMMSS or YYYY-MM-DD_HH:MM:SS from file name
     """

boris/version.py

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

{boris_behav_obs-9.3.3.dist-info → boris_behav_obs-9.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boris-behav-obs
-Version: 9.3.3
+Version: 9.3.5
 Summary: BORIS - Behavioral Observation Research Interactive Software
 Author-email: Olivier Friard <olivier.friard@unito.it>
 License-Expression: GPL-3.0-only
@@ -24,7 +24,7 @@ Requires-Dist: matplotlib>=3.3.3
 Requires-Dist: pandas>=2.2.2
 Requires-Dist: tablib[cli,html,ods,pandas,xls,xlsx]>=3
 Requires-Dist: pyreadr
-Requires-Dist: pyside6==6.8.0.2
+Requires-Dist: pyside6==6.9
 Requires-Dist: hachoir>=3.3.0
 Provides-Extra: dev
 Requires-Dist: ruff; extra == "dev"