boris-behav-obs 9.3.4__tar.gz → 9.3.5__tar.gz

{boris_behav_obs-9.3.4/boris_behav_obs.egg-info → boris_behav_obs-9.3.5}/PKG-INFO

@@ -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 → boris_behav_obs-9.3.5}/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_behav_obs-9.3.4 → boris_behav_obs-9.3.5}/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_behav_obs-9.3.4 → boris_behav_obs-9.3.5}/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_behav_obs-9.3.4 → boris_behav_obs-9.3.5}/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_behav_obs-9.3.4 → boris_behav_obs-9.3.5}/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))