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

boris/config.py

@@ -37,6 +37,7 @@ SECONDS_PER_DAY: int = 86_400
 HOUR_CUTOFF: int = 7 * 24
 DATE_CUTOFF: int = HOUR_CUTOFF * 60 * 60  # 1 week
 
+# cutoff for displaying time in HH:MM:SS.zzz format
 SMART_TIME_CUTOFF_DEFAULT: int = 300
 
 # minimal project version for handling observations from images
@@ -218,6 +219,7 @@ OVERLAY = "video overlay"
 
 
 USE_EXIF_DATE = "use_exif_date"
+SUBSTRACT_FIRST_EXIF_DATE = "substract_first_exif_date"
 TIME_LAPSE = "time_lapse_delay"
 
 

boris/core.py

@@ -308,9 +308,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
     play_rate_step: float = 0.1
     currentSubject: str = ""  # contains the current subject of observation
 
-    # FFmpeg
-    memx = -1
-    memy = -1
+    # geometric measurements
     mem_player = -1
 
     # path for ffmpeg/ffmpeg.exe program
@@ -339,6 +337,10 @@ class MainWindow(QMainWindow, Ui_MainWindow):
 
     mem_hash_obs: int = 0
 
+    # variables for list of observations
+    data: list = []
+    not_paired: list = []
+
     '''
     def add_button_menu(self, data, menu_obj):
         """
@@ -1342,21 +1344,6 @@ class MainWindow(QMainWindow, Ui_MainWindow):
             self.pj[cfg.BEHAVIORS_CODING_MAP][idx] = dict(behav_coding_map)
             return
 
-            """
-            QMessageBox.critical(
-                None,
-                cfg.programName,
-                (
-                    "The current project already contains a behaviors coding map "
-                    f"with the same name (<b>{behav_coding_map['name']}</b>)"
-                ),
-                QMessageBox.Ok | QMessageBox.Default,
-                QMessageBox.NoButton,
-            )
-
-            return
-            """
-
         self.pj[cfg.BEHAVIORS_CODING_MAP].append(behav_coding_map)
         QMessageBox.information(
             self,
@@ -1526,7 +1513,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         jt.setWindowTitle("Jump to specific time")
         jt.label.setText("Set the time")
 
-        if jt.exec_():
+        if jt.exec():
             new_time = jt.time_widget.get_time()
             if new_time < 0:
                 return
@@ -1704,7 +1691,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
                 QMessageBox.critical(
                     None,
                     cfg.programName,
-                    ("The picture directory was changed since the creation of observation."),
+                    ("The picture directory has changed since the creation of observation."),
                     QMessageBox.Ok | QMessageBox.Default,
                     QMessageBox.NoButton,
                 )
@@ -1718,15 +1705,13 @@ class MainWindow(QMainWindow, Ui_MainWindow):
             # extract EXIF tag
             if self.pj[cfg.OBSERVATIONS][self.observationId].get(cfg.USE_EXIF_DATE, False):
                 date_time_original = util.extract_exif_DateTimeOriginal(self.images_list[self.image_idx])
+
                 if date_time_original != -1:
                     msg += f"<br>EXIF Date/Time Original: <b>{datetime.datetime.fromtimestamp(date_time_original):%Y-%m-%d %H:%M:%S}</b>"
-                else:
-                    msg += "<br>EXIF Date/Time Original: <b>NA</b>"
 
-                if self.image_idx == 0 and date_time_original != -1:
-                    self.image_time_ref = date_time_original
+                    if self.image_idx == 0:
+                        self.image_time_ref = date_time_original
 
-                if date_time_original != -1:
                     if self.image_time_ref is not None:
                         seconds_from_1st = date_time_original - self.image_time_ref
 
@@ -1736,6 +1721,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
                         seconds_from_1st_formated = seconds_from_1st
 
                 else:
+                    msg += "<br>EXIF Date/Time Original: <b>NA</b>"
                     seconds_from_1st_formated = cfg.NA
 
                 msg += f"<br>Time from 1st image: <b>{seconds_from_1st_formated}</b>"
@@ -2311,11 +2297,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         self.tv_events.setModel(model)
 
         # column width
-        # https://doc.qt.io/qtforpython-5/PySide2/QtWidgets/QHeaderView.html#more
-        self.tv_events.horizontalHeader().setSectionResizeMode(QHeaderView.ResizeToContents)
-
-        # self.table.setSortingEnabled(True)
-        # self.table.sortByColumn(0, Qt.AscendingOrder)
+        self.tv_events.horizontalHeader().setSectionResizeMode(QHeaderView.Interactive)
 
     def load_tw_events(self, obs_id) -> None:
         """
@@ -2343,76 +2325,6 @@ class MainWindow(QMainWindow, Ui_MainWindow):
 
         return
 
-        """
-        DISABLED tableview component is used
-        
-        logging.debug(f"begin load events from obs in tablewidget: {obs_id}")
-
-        t1 = time.time()
-
-        self.twEvents.clear()
-
-        self.twEvents.setColumnCount(len(cfg.TW_EVENTS_FIELDS[self.playerType]))
-        self.twEvents.setHorizontalHeaderLabels([s.capitalize() for s in cfg.TW_EVENTS_FIELDS[self.playerType]])
-
-        for idx, field in enumerate(cfg.TW_EVENTS_FIELDS[self.playerType]):
-            if field not in self.config_param.get(f"{self.playerType} tw fields", cfg.TW_EVENTS_FIELDS[self.playerType]):
-                self.twEvents.horizontalHeader().hideSection(idx)
-            else:
-                self.twEvents.horizontalHeader().showSection(idx)
-
-        self.twEvents.setRowCount(len(self.pj[cfg.OBSERVATIONS][obs_id][cfg.EVENTS]))
-        if self.filtered_behaviors or self.filtered_subjects:
-            self.twEvents.setRowCount(0)
-        row = 0
-
-        for event_idx, event in enumerate(self.pj[cfg.OBSERVATIONS][obs_id][cfg.EVENTS]):
-            if self.filtered_behaviors and event[cfg.PJ_OBS_FIELDS[self.playerType][cfg.BEHAVIOR_CODE]] not in self.filtered_behaviors:
-                continue
-
-            if self.filtered_subjects and event[cfg.PJ_OBS_FIELDS[self.playerType][cfg.SUBJECT]] not in self.filtered_subjects:
-                continue
-
-            if self.filtered_behaviors or self.filtered_subjects:
-                self.twEvents.insertRow(self.twEvents.rowCount())
-
-            for field_type in cfg.TW_EVENTS_FIELDS[self.playerType]:
-                if field_type in cfg.PJ_EVENTS_FIELDS[self.playerType]:
-                    field = event_operations.read_event_field(event, self.playerType, field_type)
-
-                    if field_type == cfg.TIME:
-                        item = QTableWidgetItem(str(util.convertTime(self.timeFormat, field)))
-
-                        # add index of project events
-                        item.setData(Qt.UserRole, event_idx)
-                        self.twEvents.setItem(row, cfg.TW_OBS_FIELD[self.playerType][field_type], item)
-                        continue
-
-                    if field_type in (cfg.IMAGE_INDEX, cfg.FRAME_INDEX):
-                        field = str(field)
-
-                    self.twEvents.setItem(
-                        row,
-                        cfg.TW_OBS_FIELD[self.playerType][field_type],
-                        QTableWidgetItem(field),
-                    )
-
-                else:
-                    self.twEvents.setItem(
-                        row,
-                        cfg.TW_OBS_FIELD[self.playerType][field_type],
-                        QTableWidgetItem(""),
-                    )
-
-            row += 1
-
-        self.update_events_start_stop()
-
-        print("load twevent:", time.time() - t1)
-
-        logging.debug("end load events from obs")
-        """
-
     def close_tool_windows(self):
         """
         close tool windows:
@@ -3493,7 +3405,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
             return
 
         logging.debug(
-            f"{self.config_param[cfg.CHECK_PROJECT_INTEGRITY] if cfg.CHECK_PROJECT_INTEGRITY in self.config_param else "Check project integrity config NOT FOUND"=}"
+            f"{self.config_param[cfg.CHECK_PROJECT_INTEGRITY] if cfg.CHECK_PROJECT_INTEGRITY in self.config_param else 'Check project integrity config NOT FOUND'=}"
         )
 
         if self.config_param.get(cfg.CHECK_PROJECT_INTEGRITY, True):
@@ -4707,7 +4619,10 @@ class MainWindow(QMainWindow, Ui_MainWindow):
                     self.pj[cfg.OBSERVATIONS][self.observationId].get(cfg.USE_EXIF_DATE, False)
                     and util.extract_exif_DateTimeOriginal(self.images_list[self.image_idx]) != -1
                 ):
-                    time_ = util.extract_exif_DateTimeOriginal(self.images_list[self.image_idx]) - self.image_time_ref
+                    time_ = util.extract_exif_DateTimeOriginal(self.images_list[self.image_idx])
+                    # 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_ = (self.image_idx + 1) * self.pj[cfg.OBSERVATIONS][self.observationId].get(cfg.TIME_LAPSE, 0)
@@ -4765,7 +4680,10 @@ class MainWindow(QMainWindow, Ui_MainWindow):
                     self.pj[cfg.OBSERVATIONS][self.observationId].get(cfg.USE_EXIF_DATE, False)
                     and util.extract_exif_DateTimeOriginal(self.images_list[self.image_idx]) != -1
                 ):
-                    time_ = util.extract_exif_DateTimeOriginal(self.images_list[self.image_idx]) - self.image_time_ref
+                    time_ = util.extract_exif_DateTimeOriginal(self.images_list[self.image_idx])
+                    # check if first value must be substracte
+                    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_ = (self.image_idx + 1) * self.pj[cfg.OBSERVATIONS][self.observationId].get(cfg.TIME_LAPSE, 0)

boris/dialog.py

@@ -20,9 +20,8 @@ This file is part of BORIS.
 
 """
 
-from decimal import Decimal as dec
-from typing import Union
 import datetime as dt
+from decimal import Decimal as dec
 import logging
 import math
 import pathlib as pl
@@ -30,6 +29,7 @@ import platform
 import subprocess
 import sys
 import traceback
+from typing import Union
 
 from PySide6.QtCore import Qt, Signal, qVersion, QRect, QTime, QDateTime, QSize
 from PySide6.QtWidgets import (
@@ -383,7 +383,7 @@ class get_time_widget(QWidget):
             dec: time in seconds (None if no format selected)
         """
 
-        time_sec = None
+        time_sec = dec("NaN")
 
         if self.rb_seconds.isChecked():
             try:
@@ -396,7 +396,7 @@ class get_time_widget(QWidget):
                     QMessageBox.Ok | QMessageBox.Default,
                     QMessageBox.NoButton,
                 )
-                return None
+                return dec("NaN")
 
         if self.rb_time.isChecked():
             time_sec = self.sb_hour.value() * 3600
@@ -408,7 +408,7 @@ class get_time_widget(QWidget):
         if self.pb_sign.text() == "-":
             time_sec = -time_sec
 
-        return dec(time_sec).quantize(dec("0.001")) if time_sec is not None else None
+        return dec(time_sec).quantize(dec("0.001"))  # if time_sec is not None else None
 
     def set_time(self, new_time: dec) -> None:
         """
@@ -489,7 +489,7 @@ class Ask_time(QDialog):
             )
             return
         # test time value
-        if self.time_widget.get_time() is None:
+        if self.time_widget.get_time().is_nan():
             return
 
         self.accept()

boris/edit_event.py

@@ -21,7 +21,7 @@ This file is part of BORIS.
 """
 
 from decimal import Decimal as dec
-import math
+import logging
 
 from PySide6.QtWidgets import (
     QDialog,
@@ -44,11 +44,12 @@ class DlgEditEvent(QDialog, Ui_Form):
     def __init__(
         self,
         observation_type: str,
-        time_value: dec = dec(0),
+        time_value: dec = dec("NaN"),
         image_idx=None,
         current_time=0,
         time_format: str = cfg.S,
         show_set_current_time: bool = False,
+        exif_date_time: dec | None = None,
         parent=None,
     ):
         super().__init__(parent)
@@ -59,42 +60,49 @@ class DlgEditEvent(QDialog, Ui_Form):
 
         self.pb_set_to_current_time.setVisible(show_set_current_time)
         self.current_time = current_time
+        self.exif_date_time = exif_date_time
+
+        # hide frame index for all observations
+        # frame index is determined in base of time
+        for w in (
+            self.lb_frame_idx,
+            self.sb_frame_idx,
+            self.cb_set_frame_idx_na,
+        ):
+            w.setVisible(False)
 
         # hide image index
         if observation_type in (cfg.LIVE, cfg.MEDIA):
-            for w in (self.lb_image_idx, self.sb_image_idx, self.cb_set_time_na, self.pb_set_to_current_image_index):
-                w.setVisible(False)
-            # hide frame index because frame index is automatically extracted
-            for w in (self.lb_frame_idx, self.sb_frame_idx, self.cb_set_frame_idx_na):
+            # hide image index
+            for w in (
+                self.cb_set_time_na,
+                self.gb_image_index,
+            ):
                 w.setVisible(False)
 
-        if (observation_type in (cfg.LIVE, cfg.MEDIA)) or (observation_type == cfg.IMAGES and not math.isnan(self.time_value)):
-            self.time_widget = dialog.get_time_widget(self.time_value)
+        # widget for time
+        self.time_widget = dialog.get_time_widget(self.time_value)
 
-            if time_format == cfg.S:
-                self.time_widget.rb_seconds.setChecked(True)
-            if time_format == cfg.HHMMSS:
-                self.time_widget.rb_time.setChecked(True)
-            if self.time_value > cfg.DATE_CUTOFF:
-                self.time_widget.rb_datetime.setChecked(True)
+        if time_format == cfg.S:
+            self.time_widget.rb_seconds.setChecked(True)
+        if time_format == cfg.HHMMSS:
+            self.time_widget.rb_time.setChecked(True)
+        if not self.time_value.is_nan() and int(self.time_value) > cfg.DATE_CUTOFF:
+            self.time_widget.rb_datetime.setChecked(True)
 
-            self.horizontalLayout_2.insertWidget(0, self.time_widget)
+        self.horizontalLayout_3.insertWidget(0, self.time_widget)
 
         if observation_type == cfg.IMAGES:
-            self.time_widget = dialog.get_time_widget(self.time_value)
             # hide frame index widgets
-            for w in (self.lb_frame_idx, self.sb_frame_idx, self.cb_set_frame_idx_na, self.pb_set_to_current_time):
-                w.setVisible(False)
+            self.pb_set_to_current_time.setVisible(self.exif_date_time is not None)
             self.sb_image_idx.setValue(self.image_idx)
 
-            # self.pb_set_to_current_time.setText("Set to current image index")
-
         self.pb_set_to_current_time.clicked.connect(self.set_to_current_time)
         self.pb_set_to_current_image_index.clicked.connect(self.set_to_current_image_index)
 
         self.cb_set_time_na.stateChanged.connect(self.time_na)
 
-        self.cb_set_frame_idx_na.stateChanged.connect(self.frame_idx_na)
+        # self.cb_set_frame_idx_na.stateChanged.connect(self.frame_idx_na)
         self.pbOK.clicked.connect(self.close_widget)
         self.pbCancel.clicked.connect(self.reject)
 
@@ -119,22 +127,34 @@ class DlgEditEvent(QDialog, Ui_Form):
         """
         set time to current media time
         """
+
+        print(f"{self.current_time=}")
+
         if self.observation_type in (cfg.LIVE, cfg.MEDIA):
             self.time_widget.set_time(dec(float(self.current_time)))
 
-    def frame_idx_na(self):
-        """
-        set/unset frame index NA
-        """
-        self.lb_frame_idx.setEnabled(not self.cb_set_frame_idx_na.isChecked())
-        self.sb_frame_idx.setEnabled(not self.cb_set_frame_idx_na.isChecked())
+        if self.observation_type == cfg.IMAGES:
+            if self.exif_date_time is not None:
+                self.time_widget.set_time(dec(self.exif_date_time))
+
+    # def frame_idx_na(self):
+    #     """
+    #     set/unset frame index NA
+    #     """
+    #     self.lb_frame_idx.setEnabled(not self.cb_set_frame_idx_na.isChecked())
+    #     self.sb_frame_idx.setEnabled(not self.cb_set_frame_idx_na.isChecked())
 
     def time_na(self):
         """
         set/unset time to NA
         """
 
+        logging.debug("time_na function")
+
+        self.time_widget.setVisible(not self.cb_set_time_na.isChecked())
         self.time_widget.setEnabled(not self.cb_set_time_na.isChecked())
+
+        self.pb_set_to_current_time.setVisible(not self.cb_set_time_na.isChecked() and self.exif_date_time is not None)
         self.pb_set_to_current_time.setEnabled(not self.cb_set_time_na.isChecked())
 
 

boris/edit_event_ui.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'edit_event.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.8.0
+## Created by: Qt User Interface Compiler version 6.9.0
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -15,60 +15,89 @@ from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
     QFont, QFontDatabase, QGradient, QIcon,
     QImage, QKeySequence, QLinearGradient, QPainter,
     QPalette, QPixmap, QRadialGradient, QTransform)
-from PySide6.QtWidgets import (QApplication, QCheckBox, QComboBox, QHBoxLayout,
-    QLabel, QPlainTextEdit, QPushButton, QSizePolicy,
-    QSpacerItem, QSpinBox, QVBoxLayout, QWidget)
+from PySide6.QtWidgets import (QApplication, QCheckBox, QComboBox, QGroupBox,
+    QHBoxLayout, QLabel, QPlainTextEdit, QPushButton,
+    QSizePolicy, QSpacerItem, QSpinBox, QVBoxLayout,
+    QWidget)
 
 class Ui_Form(object):
     def setupUi(self, Form):
         if not Form.objectName():
             Form.setObjectName(u"Form")
-        Form.resize(413, 488)
-        self.verticalLayout = QVBoxLayout(Form)
+        Form.resize(600, 638)
+        self.verticalLayout_3 = QVBoxLayout(Form)
+        self.verticalLayout_3.setObjectName(u"verticalLayout_3")
+        self.gb_time = QGroupBox(Form)
+        self.gb_time.setObjectName(u"gb_time")
+        self.verticalLayout = QVBoxLayout(self.gb_time)
         self.verticalLayout.setObjectName(u"verticalLayout")
+        self.horizontalLayout_8 = QHBoxLayout()
+        self.horizontalLayout_8.setObjectName(u"horizontalLayout_8")
+        self.cb_set_time_na = QCheckBox(self.gb_time)
+        self.cb_set_time_na.setObjectName(u"cb_set_time_na")
+
+        self.horizontalLayout_8.addWidget(self.cb_set_time_na)
+
+        self.horizontalSpacer_7 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+
+        self.horizontalLayout_8.addItem(self.horizontalSpacer_7)
+
+
+        self.verticalLayout.addLayout(self.horizontalLayout_8)
+
         self.horizontalLayout_3 = QHBoxLayout()
         self.horizontalLayout_3.setObjectName(u"horizontalLayout_3")
-        self.label = QLabel(Form)
-        self.label.setObjectName(u"label")
+        self.lb_time = QLabel(self.gb_time)
+        self.lb_time.setObjectName(u"lb_time")
 
-        self.horizontalLayout_3.addWidget(self.label)
+        self.horizontalLayout_3.addWidget(self.lb_time)
 
         self.horizontalLayout_2 = QHBoxLayout()
         self.horizontalLayout_2.setObjectName(u"horizontalLayout_2")
-        self.pb_set_to_current_time = QPushButton(Form)
+        self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+
+        self.horizontalLayout_2.addItem(self.horizontalSpacer)
+
+
+        self.horizontalLayout_3.addLayout(self.horizontalLayout_2)
+
+
+        self.verticalLayout.addLayout(self.horizontalLayout_3)
+
+        self.horizontalLayout_9 = QHBoxLayout()
+        self.horizontalLayout_9.setObjectName(u"horizontalLayout_9")
+        self.pb_set_to_current_time = QPushButton(self.gb_time)
         self.pb_set_to_current_time.setObjectName(u"pb_set_to_current_time")
 
-        self.horizontalLayout_2.addWidget(self.pb_set_to_current_time)
+        self.horizontalLayout_9.addWidget(self.pb_set_to_current_time)
 
-        self.cb_set_time_na = QCheckBox(Form)
-        self.cb_set_time_na.setObjectName(u"cb_set_time_na")
+        self.horizontalSpacer_8 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
-        self.horizontalLayout_2.addWidget(self.cb_set_time_na)
+        self.horizontalLayout_9.addItem(self.horizontalSpacer_8)
 
-        self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
-        self.horizontalLayout_2.addItem(self.horizontalSpacer)
+        self.verticalLayout.addLayout(self.horizontalLayout_9)
 
+        self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
 
-        self.horizontalLayout_3.addLayout(self.horizontalLayout_2)
+        self.verticalLayout.addItem(self.verticalSpacer)
 
 
-        self.verticalLayout.addLayout(self.horizontalLayout_3)
+        self.verticalLayout_3.addWidget(self.gb_time)
 
+        self.gb_image_index = QGroupBox(Form)
+        self.gb_image_index.setObjectName(u"gb_image_index")
+        self.verticalLayout_2 = QVBoxLayout(self.gb_image_index)
+        self.verticalLayout_2.setObjectName(u"verticalLayout_2")
         self.horizontalLayout_7 = QHBoxLayout()
         self.horizontalLayout_7.setObjectName(u"horizontalLayout_7")
-        self.lb_image_idx = QLabel(Form)
-        self.lb_image_idx.setObjectName(u"lb_image_idx")
-
-        self.horizontalLayout_7.addWidget(self.lb_image_idx)
-
-        self.sb_image_idx = QSpinBox(Form)
+        self.sb_image_idx = QSpinBox(self.gb_image_index)
         self.sb_image_idx.setObjectName(u"sb_image_idx")
         self.sb_image_idx.setMaximum(10000000)
 
         self.horizontalLayout_7.addWidget(self.sb_image_idx)
 
-        self.pb_set_to_current_image_index = QPushButton(Form)
+        self.pb_set_to_current_image_index = QPushButton(self.gb_image_index)
         self.pb_set_to_current_image_index.setObjectName(u"pb_set_to_current_image_index")
 
         self.horizontalLayout_7.addWidget(self.pb_set_to_current_image_index)
@@ -78,7 +107,10 @@ class Ui_Form(object):
         self.horizontalLayout_7.addItem(self.horizontalSpacer_6)
 
 
-        self.verticalLayout.addLayout(self.horizontalLayout_7)
+        self.verticalLayout_2.addLayout(self.horizontalLayout_7)
+
+
+        self.verticalLayout_3.addWidget(self.gb_image_index)
 
         self.horizontalLayout_4 = QHBoxLayout()
         self.horizontalLayout_4.setObjectName(u"horizontalLayout_4")
@@ -97,7 +129,7 @@ class Ui_Form(object):
         self.horizontalLayout_4.addItem(self.horizontalSpacer_2)
 
 
-        self.verticalLayout.addLayout(self.horizontalLayout_4)
+        self.verticalLayout_3.addLayout(self.horizontalLayout_4)
 
         self.horizontalLayout_5 = QHBoxLayout()
         self.horizontalLayout_5.setObjectName(u"horizontalLayout_5")
@@ -116,7 +148,7 @@ class Ui_Form(object):
         self.horizontalLayout_5.addItem(self.horizontalSpacer_3)
 
 
-        self.verticalLayout.addLayout(self.horizontalLayout_5)
+        self.verticalLayout_3.addLayout(self.horizontalLayout_5)
 
         self.horizontalLayout_6 = QHBoxLayout()
         self.horizontalLayout_6.setObjectName(u"horizontalLayout_6")
@@ -142,17 +174,17 @@ class Ui_Form(object):
         self.horizontalLayout_6.addItem(self.horizontalSpacer_5)
 
 
-        self.verticalLayout.addLayout(self.horizontalLayout_6)
+        self.verticalLayout_3.addLayout(self.horizontalLayout_6)
 
         self.label_4 = QLabel(Form)
         self.label_4.setObjectName(u"label_4")
 
-        self.verticalLayout.addWidget(self.label_4)
+        self.verticalLayout_3.addWidget(self.label_4)
 
         self.leComment = QPlainTextEdit(Form)
         self.leComment.setObjectName(u"leComment")
 
-        self.verticalLayout.addWidget(self.leComment)
+        self.verticalLayout_3.addWidget(self.leComment)
 
         self.horizontalLayout = QHBoxLayout()
         self.horizontalLayout.setObjectName(u"horizontalLayout")
@@ -171,7 +203,7 @@ class Ui_Form(object):
         self.horizontalLayout.addWidget(self.pbOK)
 
 
-        self.verticalLayout.addLayout(self.horizontalLayout)
+        self.verticalLayout_3.addLayout(self.horizontalLayout)
 
 
         self.retranslateUi(Form)
@@ -184,13 +216,14 @@ class Ui_Form(object):
 
     def retranslateUi(self, Form):
         Form.setWindowTitle(QCoreApplication.translate("Form", u"Edit event", None))
-        self.label.setText(QCoreApplication.translate("Form", u"Time", None))
+        self.gb_time.setTitle(QCoreApplication.translate("Form", u"Time", None))
+        self.cb_set_time_na.setText(QCoreApplication.translate("Form", u"Set time to NA", None))
+        self.lb_time.setText("")
         self.pb_set_to_current_time.setText(QCoreApplication.translate("Form", u"Set to current time", None))
-        self.cb_set_time_na.setText(QCoreApplication.translate("Form", u"Set NA", None))
-        self.lb_image_idx.setText(QCoreApplication.translate("Form", u"Image index", None))
+        self.gb_image_index.setTitle(QCoreApplication.translate("Form", u"Image index", None))
         self.pb_set_to_current_image_index.setText(QCoreApplication.translate("Form", u"Set to current image index", None))
         self.lbSubject.setText(QCoreApplication.translate("Form", u"Subject", None))
-        self.label_2.setText(QCoreApplication.translate("Form", u"Code", None))
+        self.label_2.setText(QCoreApplication.translate("Form", u"Behavior", None))
         self.lb_frame_idx.setText(QCoreApplication.translate("Form", u"Frame index", None))
         self.cb_set_frame_idx_na.setText(QCoreApplication.translate("Form", u"Set NA", None))
         self.label_4.setText(QCoreApplication.translate("Form", u"Comment", None))

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)
@@ -576,8 +579,6 @@ def edit_event(self):
 
     pj_event_idx = self.tv_idx2events_idx[tvevents_row]
 
-    print(f"{self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS]=}")
-
     time_value = self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS][pj_event_idx][
         cfg.PJ_OBS_FIELDS[self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE]][cfg.TIME]
     ]
@@ -593,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,
@@ -600,15 +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")
 
-    print(f"{time_value=}")
-
     # 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)
 
@@ -642,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)
 
@@ -663,15 +666,15 @@ 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])
@@ -681,13 +684,14 @@ def edit_event(self):
         if edit_window.exec():  # button OK
             self.project_changed()
 
-            # MEDIA / LIVE
-            if self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] in (cfg.MEDIA, cfg.LIVE):
-                new_time = edit_window.time_widget.get_time()
+            new_time = edit_window.time_widget.get_time()
 
-                print(f"{new_time=}")
+            if edit_window.cb_set_time_na.isChecked():
+                new_time = dec("NaN")
 
-                if new_time is None:
+            # MEDIA / LIVE
+            if self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] in (cfg.MEDIA, cfg.LIVE):
+                if new_time.is_nan():
                     QMessageBox.warning(
                         self,
                         cfg.programName,
@@ -715,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][
@@ -755,14 +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 (isinstance(edit_window.time_value, dec) and edit_window.time_value.is_nan())
-                            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()
@@ -820,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)):
@@ -894,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)
@@ -1286,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()=}")
@@ -1313,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:

boris/project_functions.py

@@ -1984,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/version.py

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

{boris_behav_obs-9.3.4.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.4
+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

{boris_behav_obs-9.3.4.dist-info → boris_behav_obs-9.3.5.dist-info}/RECORD

@@ -10,22 +10,22 @@ boris/behaviors_coding_map.py,sha256=xIGJxp2eghrpiGDmYH73eJPERuyc4A_54uT-Got3zTs
 boris/boris_cli.py,sha256=n0OiVvZM1gM6E7yKaff9wlgmpAGK4TK052VRi8AabJo,13196
 boris/cmd_arguments.py,sha256=oWb-FvhKLbKJhATlTHy9muWu8XnnUfOZ-3Fmz2M8Yzc,1848
 boris/coding_pad.py,sha256=fBKdp7DDyupySJosIYtqNd8s2E-GruzCgVhDFsoVWKE,10986
-boris/config.py,sha256=rPfhmdE5XilliNjioC1KuDL_LNze4MZBDy_p0zK4tt8,17349
+boris/config.py,sha256=PQXm3gJgdCtPOFKLH65sDGw8sk_cdMP53p6eMrlRJl0,17457
 boris/config_file.py,sha256=1-2ZmTvKET57rwrLR1dXblt0AxMpGB1LAiHxu-Sy8es,13543
 boris/connections.py,sha256=rVI18AuXh8cEnnoCKJk0RMWAaiNOpiaS554Okgk3SBY,19383
 boris/converters.py,sha256=c1Jps-URoglY5ILQHz-pCCf6-4DFUHZLtqr_ofsrFg0,11722
 boris/converters_ui.py,sha256=uu7LOBV_fKv2DBdOqsqPwjGsjgONr5ODBoscAA-EP48,9900
 boris/cooccurence.py,sha256=tVERC-V8MWjWHlGEfDuu08iS94qjt4do-38jwI62QaY,10367
-boris/core.py,sha256=EK19Xn0Z_sxu9TaqeRimMzzpn9ThZdTqUtlJJXz6pVY,233512
+boris/core.py,sha256=kmWCzeMv-26bL3a2f_NDnfyes2jLehVwh-Hmlg7c1dI,230405
 boris/core_qrc.py,sha256=J0kom27nrmi4-TCDLJZCZbtUAitiXQ4WEDfErawuxt8,639879
 boris/core_ui.py,sha256=SeC26uveDCjrCBLsRPuQ6FaapKfON_HIRcQStEDLhl4,76384
 boris/db_functions.py,sha256=Uw9wWH_Pe-qNzpV1k21YG_jKsoOmfY_iiK_7ARZHGDc,13352
 boris/dev.py,sha256=9pUElbjl9g17rFUJXX5aVSu55_iIKIuDxNdrB0DI_d0,3671
-boris/dialog.py,sha256=AxqXiTNiNOM5Ec9hGQ54aSeG-0jN_rycQdxJvhM7XWg,34956
+boris/dialog.py,sha256=ppgaWBLCPfXHLK3_9xpu8h0Nj_m0Ls_4dsZ6lym5wjE,34972
 boris/duration_widget.py,sha256=GjZgCAMGOcsNjoPiRImEVe6yMkH2vuNoh44ulpd5nlg,6924
-boris/edit_event.py,sha256=2hpxn9DYuJW1CK02hF4iU0--J_0C_KTiN9gGZ1frJBc,7678
-boris/edit_event_ui.py,sha256=vhglQrhkF9tt0HVlkXnkG7symW0eOFA7nhbk6l_qn3k,7772
-boris/event_operations.py,sha256=JNSK9zTbVaPSP2H4hGUtbygyBlFX4hmJXjOqKYRxKoc,38670
+boris/edit_event.py,sha256=IMZnopPALNJHgGenl_kMZjqO_Q9GKtyEcyVq5w5VGyU,8001
+boris/edit_event_ui.py,sha256=qFgt00cejGB6UGC1mFkyZcsIAdvMeYMK0WYjZtJl1T0,9207
+boris/event_operations.py,sha256=bqUZjgJaJ1Z8oTiidG9wfCp2LLUH1Zf4kBDeg_yjC-o,38514
 boris/events_cursor.py,sha256=VPY_ygD0fxE5lp25mcd2l00XQXurCR6hprffF4tKRbU,2078
 boris/events_snapshots.py,sha256=PjWzQvUGQtIcEc_7FDsRphf7fAhhTccQgYc2eQSA65g,27621
 boris/exclusion_matrix.py,sha256=ff88xD6aqc8bpIuj9ZCz9ju_HeqqgibQwoaJrIOJ6RI,5272
@@ -46,8 +46,8 @@ boris/modifiers_coding_map.py,sha256=oT56ZY_PXhEJsMoblEsyNMAPbDpv7ZMOCnvmt7Ibx_Y
 boris/mpv-1.0.3.py,sha256=EXRtzQqFjOn4wMC6482Ilq3fNQ9N1GRP1VxwLzdeaBY,88077
 boris/mpv.py,sha256=EfzIHjPbgewG4w3smEtqEUPZoVwYmMQkL4Q8ZyW-a58,76410
 boris/mpv2.py,sha256=IUI4t4r9GYX7G5OXTjd3RhMMOkDdfal_15buBgksLsk,92152
-boris/observation.py,sha256=d-7q-RkMHuLDV87nF4yahvDFPYhlXp6GmE80vckn5zU,57073
-boris/observation_operations.py,sha256=5OLdnnzdlazhevJzalDMtXSxo9dRZOLN_5jVE54ZnKE,106039
+boris/observation.py,sha256=PcyRjeWnDDniug-cJTr9tqfL0lfMQ02hMk4xY7ZxIvk,57029
+boris/observation_operations.py,sha256=6krVy8PrxZ_EUHzUN9FA6Qy17v8QhayVt0uMOMlSDac,106603
 boris/observation_ui.py,sha256=DAnU94QBNvkLuHT6AxTwqSk_D_n6VUhSl8PexZv_dUk,33309
 boris/observations_list.py,sha256=NqwECGHtHYmKhSe-qCfqPmJ24SSfzlXvIXS2i3op_zE,10591
 boris/otx_parser.py,sha256=70QvilzFHXbjAHR88YH0aEXJ3xxheLS5fZGgHFHGpNE,16367
@@ -63,22 +63,22 @@ boris/plugins.py,sha256=CCS1I44OMkGZqcfLGKNPGfEQXPgngocy5YhWveXQPKM,10029
 boris/preferences.py,sha256=qPfd9Tyg7u30kXwVqMOgkdy2RXri9bItRa5U2-ZVQmg,16847
 boris/preferences_ui.py,sha256=D2bFLb3E0m6IwSeqKoItRDiqvPmJGoeXLHF2K02n1Zo,26293
 boris/project.py,sha256=nyXfCDY_rLP3jC1QGv-280jUKgbABqESjOm7I19rJ1U,86432
-boris/project_functions.py,sha256=eP-YEjoFvZXEPuzNPBeXsRDYurt0wHP6B09a8k8SlDc,80792
+boris/project_functions.py,sha256=7Pf-u7rPKQGWxO2AwLuR4WljxOpuoH6bxsAEkttPCzw,80794
 boris/project_import_export.py,sha256=oBG1CSXfKISsb3TLNT-8BH8kZPAzxIYSNemlLVH1Lh8,38560
 boris/project_ui.py,sha256=yB-ewhHt8S8DTTRIk-dNK2tPMNU24lNji9fDW_Xazu8,38805
 boris/qrc_boris.py,sha256=aH-qUirYY1CGxmTK1SFCPvuZfazIHX4DdUKF1gxZeYM,675008
 boris/qrc_boris5.py,sha256=prnOw7VGXWXRuVCYp_yIrmWhrlG1F9rx-3BQvkPenjY,161608
 boris/select_modifiers.py,sha256=42uG9F75pfPoPJ-blp-vFgmpBpVJtL42FlIxpNpq9z4,13319
-boris/select_observations.py,sha256=HM0suMes1YxVwQ-Xakw7ROaxbN0EyeSiZFZNrTQIHAA,7886
+boris/select_observations.py,sha256=k7c3FNVQW74YGH9oFmtHXRVCRnpKGhjCVk3cQtyLML8,8027
 boris/select_subj_behav.py,sha256=ulXbsRY-AIyQRSwXhVlvkNRS_eqWaCvkDKTTyOLqvoE,11742
-boris/state_events.py,sha256=R5CcT_cldnxqhQkvX_V1AMNxH0Nc6jLzMZYiWkeJwAE,7770
+boris/state_events.py,sha256=Vrxn3CxC3yf8aeFE76l24n03qgaQ1QXpMtprYT0pq64,7771
 boris/subjects_pad.py,sha256=lSRRGfLfD10_YpGua8RGVdKhoXlsXawGhNibPkRhuzM,3541
 boris/synthetic_time_budget.py,sha256=3Eb9onMLmgqCLd50CuxV9L8RV2ESzfaMWvPK_bXUMMk,10489
 boris/time_budget_functions.py,sha256=y5He8crz0xsTxVfz0jATwFFQVnPAIrNHja_0sF6NtRE,52551
 boris/time_budget_widget.py,sha256=z-tyITBtIz-KH1H2OdMB5a8x9QQLK7Wu96-zkC6NVDA,43213
 boris/transitions.py,sha256=_aZJfJWv3EBrtmQ7qsdTCayQo6uWU7BXqtQQgflEhr4,12250
 boris/utilities.py,sha256=4b3BjO96eR54sPXIYkHwxkUnROGgY5f5vhWKIy8THUo,52646
-boris/version.py,sha256=st-9YZePMhFx60fiF0uKR_IhGjVv4ik2D_Td5O2XQr0,787
+boris/version.py,sha256=GfkFu2oCmCqcl0AuaKWJ5PwDcop2IbfKoZ_56iiDrIA,787
 boris/video_equalizer.py,sha256=FartoGghFK-T53zklP70rPKYqTuzL8qdvfGlsOF2wwc,5854
 boris/video_equalizer_ui.py,sha256=1CG3s79eM4JAbaCx3i1ILZXLceb41_gGXlOLNfpBgnw,10142
 boris/video_operations.py,sha256=mh3iR__Sm2KnV44L_sW2pOo3AgLwlM7wiTnnqQiAVs4,9381
@@ -96,9 +96,9 @@ boris/portion/dict.py,sha256=SyHxc7PfDw2ufNLFQycwJtzmRfL48rDp4UrM2KN7IWc,11282
 boris/portion/func.py,sha256=3TkQtFKLfsqntwd27HSGHceFhnXHmT-EbNMqktElC5Q,2174
 boris/portion/interval.py,sha256=bAdUiJjGeUAPgsBAImwNeviiwfQq5odfhFZccAWzOTA,20299
 boris/portion/io.py,sha256=ppNeRpiLNrocF1yzGeuEUIhYMf2LfsR-cji3d0nmvUs,6371
-boris_behav_obs-9.3.4.dist-info/licenses/LICENSE.TXT,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
-boris_behav_obs-9.3.4.dist-info/METADATA,sha256=G03KB1bA9U-pdA0egf0dsvhkvRG2O3jQZudOyEdjfyA,4514
-boris_behav_obs-9.3.4.dist-info/WHEEL,sha256=oSJJyWjO7Z2XSScFQUpXG1HL-N0sFMqqeKVVbZTPkWc,109
-boris_behav_obs-9.3.4.dist-info/entry_points.txt,sha256=k__8XvFi4vaA4QFvQehCZjYkKmZH34HSAJI2iYCWrMs,52
-boris_behav_obs-9.3.4.dist-info/top_level.txt,sha256=fJSgm62S7WesiwTorGbOO4nNN0yzgZ3klgfGi3Px4qI,6
-boris_behav_obs-9.3.4.dist-info/RECORD,,
+boris_behav_obs-9.3.5.dist-info/licenses/LICENSE.TXT,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
+boris_behav_obs-9.3.5.dist-info/METADATA,sha256=X_4eXVCfsqHmHTFqUlJXwAAwNbqVSwEwJTl78vDXC3o,4514
+boris_behav_obs-9.3.5.dist-info/WHEEL,sha256=joeZ_q2kZqPjVkNy_YbjGrynLS6bxmBj74YkvIORXVI,109
+boris_behav_obs-9.3.5.dist-info/entry_points.txt,sha256=k__8XvFi4vaA4QFvQehCZjYkKmZH34HSAJI2iYCWrMs,52
+boris_behav_obs-9.3.5.dist-info/top_level.txt,sha256=fJSgm62S7WesiwTorGbOO4nNN0yzgZ3klgfGi3Px4qI,6
+boris_behav_obs-9.3.5.dist-info/RECORD,,

{boris_behav_obs-9.3.4.dist-info → boris_behav_obs-9.3.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any