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

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,