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

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 (
@@ -184,7 +184,7 @@ class Info_widget(QWidget):
 
 class get_time_widget(QWidget):
     """
-    widget for selecting a time in various formats: secondes, HH:MM:SS:ZZZ or YYYY-mm-DD HH:MM:SS:ZZZ
+    widget for selecting a time in various formats: seconds, HH:MM:SS:ZZZ or YYYY-mm-DD HH:MM:SS:ZZZ
     """
 
     def __init__(self, time_value=dec(0), parent=None):
@@ -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) 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:
         """
@@ -440,6 +440,11 @@ class get_time_widget(QWidget):
 
 
 class Ask_time(QDialog):
+    """
+    Qdialog class for asking time to user
+    User can select a time format between seconds, HHMMSS.zzz or YYY-mm-DD HH:MM:SS.zzz
+    """
+
     def __init__(self, time_value=0):
         super().__init__()
         self.setWindowTitle("")
@@ -453,10 +458,10 @@ class Ask_time(QDialog):
 
         hbox.addWidget(self.time_widget)
 
-        self.pbOK = QPushButton("OK", clicked=self.pb_ok_clicked)
+        self.pbOK = QPushButton(cfg.OK, clicked=self.pb_ok_clicked)
         self.pbOK.setDefault(True)
 
-        self.pbCancel = QPushButton("Cancel")
+        self.pbCancel = QPushButton(cfg.CANCEL)
         self.pbCancel.clicked.connect(self.reject)
 
         self.hbox2 = QHBoxLayout(self)
@@ -484,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()
@@ -975,6 +980,70 @@ class Results_dialog(QDialog):
             self.done(cfg.SAVE_DATASET)
 
 
+class Results_dialog_exit_code(QDialog):
+    """
+    widget for visualizing text output
+    """
+
+    def __init__(self):
+        super().__init__()
+
+        self.dataset = False
+
+        self.setWindowTitle("")
+
+        hbox = QVBoxLayout()
+
+        self.lb = QLabel("")
+        hbox.addWidget(self.lb)
+
+        self.ptText = QPlainTextEdit()
+        self.ptText.setReadOnly(True)
+        hbox.addWidget(self.ptText)
+
+        hbox2 = QHBoxLayout()
+        hbox2.addItem(QSpacerItem(241, 20, QSizePolicy.Expanding, QSizePolicy.Minimum))
+
+        self.pbSave = QPushButton("Save results", clicked=self.save_results)
+        hbox2.addWidget(self.pbSave)
+
+        self.pb1 = QPushButton("1", clicked=lambda: self.done_(1))
+        hbox2.addWidget(self.pb1)
+
+        self.pb2 = QPushButton("2", clicked=lambda: self.done_(2))
+        hbox2.addWidget(self.pb2)
+
+        self.pb3 = QPushButton("3", clicked=lambda: self.done_(3))
+        hbox2.addWidget(self.pb3)
+
+        hbox.addLayout(hbox2)
+        self.setLayout(hbox)
+
+        self.resize(800, 640)
+
+    def done_(self, status):
+        self.done(status)
+
+    def save_results(self):
+        """
+        save content of self.ptText
+        """
+
+        if not self.dataset:
+            file_name, _ = QFileDialog().getSaveFileName(self, "Save results", "", "Text files (*.txt *.tsv);;All files (*)")
+
+            if not file_name:
+                return
+            try:
+                with open(file_name, "w") as f:
+                    f.write(self.ptText.toPlainText())
+            except Exception:
+                QMessageBox.critical(self, cfg.programName, f"The file {file_name} can not be saved")
+
+        else:
+            self.done(cfg.SAVE_DATASET)
+
+
 class View_data(QDialog):
     """
     widget for visualizing rows of data file

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))