boris-behav-obs 8.16.6__py3-none-any.whl → 9.7.1__py3-none-any.whl

boris/param_panel.py

@@ -1,7 +1,7 @@
 """
 BORIS
 Behavioral Observation Research Interactive Software
-Copyright 2012-2023 Olivier Friard
+Copyright 2012-2025 Olivier Friard
 
 This file is part of BORIS.
 
@@ -20,48 +20,34 @@ This file is part of BORIS.
 
 """
 
-
-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QDialog
+from PySide6.QtCore import Qt
+from PySide6.QtWidgets import QDialog
 
 from . import config as cfg
-from . import duration_widget
 from .param_panel_ui import Ui_Dialog
+from . import dialog
 
 
 class Param_panel(QDialog, Ui_Dialog):
     def __init__(self, parent=None):
-
         super().__init__()
         self.setupUi(self)
 
         self.media_duration = None
 
         # insert duration widget for time offset
-        self.start_time = duration_widget.Duration_widget(0)
+        self.start_time = dialog.get_time_widget(0)
         self.horizontalLayout.insertWidget(1, self.start_time)
-        self.end_time = duration_widget.Duration_widget(0)
+        self.end_time = dialog.get_time_widget(0)
         self.horizontalLayout_6.insertWidget(1, self.end_time)
 
-        self.pbSelectAllSubjects.clicked.connect(
-            lambda: self.subjects_button_clicked("select all")
-        )
-        self.pbUnselectAllSubjects.clicked.connect(
-            lambda: self.subjects_button_clicked("unselect all")
-        )
-        self.pbReverseSubjectsSelection.clicked.connect(
-            lambda: self.subjects_button_clicked("reverse selection")
-        )
-
-        self.pbSelectAllBehaviors.clicked.connect(
-            lambda: self.behaviors_button_clicked("select all")
-        )
-        self.pbUnselectAllBehaviors.clicked.connect(
-            lambda: self.behaviors_button_clicked("unselect all")
-        )
-        self.pbReverseBehaviorsSelection.clicked.connect(
-            lambda: self.behaviors_button_clicked("reverse selection")
-        )
+        self.pbSelectAllSubjects.clicked.connect(lambda: self.subjects_button_clicked("select all"))
+        self.pbUnselectAllSubjects.clicked.connect(lambda: self.subjects_button_clicked("unselect all"))
+        self.pbReverseSubjectsSelection.clicked.connect(lambda: self.subjects_button_clicked("reverse selection"))
+
+        self.pbSelectAllBehaviors.clicked.connect(lambda: self.behaviors_button_clicked("select all"))
+        self.pbUnselectAllBehaviors.clicked.connect(lambda: self.behaviors_button_clicked("unselect all"))
+        self.pbReverseBehaviorsSelection.clicked.connect(lambda: self.behaviors_button_clicked("reverse selection"))
 
         self.pbOK.clicked.connect(self.ok)
         self.pbCancel.clicked.connect(self.reject)
@@ -70,15 +56,20 @@ class Param_panel(QDialog, Ui_Dialog):
 
         self.rb_observed_events.setChecked(True)
 
-        self.rb_media_duration.clicked.connect(
-            lambda: self.rb_time_interval_selection(cfg.TIME_FULL_OBS)
-        )
-        self.rb_observed_events.clicked.connect(
-            lambda: self.rb_time_interval_selection(cfg.TIME_EVENTS)
-        )
-        self.rb_user_defined.clicked.connect(
-            lambda: self.rb_time_interval_selection(cfg.TIME_ARBITRARY_INTERVAL)
-        )
+        self.rb_media_duration.clicked.connect(lambda: self.rb_time_interval_selection(cfg.TIME_FULL_OBS))
+        self.rb_observed_events.clicked.connect(lambda: self.rb_time_interval_selection(cfg.TIME_EVENTS))
+        self.rb_user_defined.clicked.connect(lambda: self.rb_time_interval_selection(cfg.TIME_ARBITRARY_INTERVAL))
+        self.rb_obs_interval.clicked.connect(lambda: self.rb_time_interval_selection(cfg.TIME_OBS_INTERVAL))
+
+        self.cbIncludeModifiers.stateChanged.connect(self.cb_exclude_non_coded_modifiers_visibility)
+
+        self.cb_exclude_non_coded_modifiers.setVisible(False)
+
+    def cb_exclude_non_coded_modifiers_visibility(self):
+        """
+        set visibility of cb_exclude_non_coded_modifiers
+        """
+        self.cb_exclude_non_coded_modifiers.setEnabled(self.cbIncludeModifiers.isChecked())
 
     def rb_time_interval_selection(self, button):
         """
@@ -94,16 +85,25 @@ class Param_panel(QDialog, Ui_Dialog):
             self.frm_time_interval.setEnabled(False)
             self.frm_time_interval.setVisible(True)
 
-        elif (
-            button == cfg.TIME_FULL_OBS
-            and len(self.selectedObservations) == 1
-            and self.media_duration is not None
-        ):
+        elif button == cfg.TIME_FULL_OBS and len(self.selectedObservations) == 1 and self.media_duration is not None:
             self.start_time.set_time(0)
             self.end_time.set_time(self.media_duration)
             self.frm_time_interval.setEnabled(False)
             self.frm_time_interval.setVisible(True)
 
+        elif button == cfg.TIME_OBS_INTERVAL:
+            if not ((self.start_interval is None) or self.start_interval.is_nan()):
+                # Set start_time and end_time widgets values even if it is not shown with
+                # more than 1 observation as some analyses might use it (eg: advanced event filtering)
+
+                end_interval = self.end_interval if self.end_interval != 0 else self.media_duration
+
+                self.start_time.set_time(self.start_interval)
+                self.end_time.set_time(end_interval)
+                self.frm_time_interval.setEnabled(False)
+                if len(self.selectedObservations) == 1:
+                    self.frm_time_interval.setVisible(True)
+
         else:
             self.frm_time_interval.setVisible(False)
 
@@ -119,7 +119,6 @@ class Param_panel(QDialog, Ui_Dialog):
 
     def behaviors_button_clicked(self, command):
         for idx in range(self.lwBehaviors.count()):
-
             if self.lwBehaviors.item(idx).data(33) != "category":
                 if command == "select all":
                     self.lwBehaviors.item(idx).setCheckState(Qt.Checked)
@@ -134,7 +133,6 @@ class Param_panel(QDialog, Ui_Dialog):
                         self.lwBehaviors.item(idx).setCheckState(Qt.Checked)
 
     def ok(self):
-
         selectedSubjects = []
         for idx in range(self.lwSubjects.count()):
             cb = self.lwSubjects.itemWidget(self.lwSubjects.item(idx))
@@ -158,11 +156,7 @@ class Param_panel(QDialog, Ui_Dialog):
         if item.data(33) == "category":
             category = item.data(34)
             for i in range(self.lwBehaviors.count()):
-                if (
-                    self.lwBehaviors.item(i).data(34) == category
-                    and self.lwBehaviors.item(i).data(33) != "category"
-                ):
-
+                if self.lwBehaviors.item(i).data(34) == category and self.lwBehaviors.item(i).data(33) != "category":
                     if item.data(35):
                         self.lwBehaviors.item(i).setCheckState(Qt.Unchecked)
                     else:
@@ -178,17 +172,12 @@ class Param_panel(QDialog, Ui_Dialog):
         observed_behaviors = []
 
         # extract events from selected observations
-        all_events = [
-            self.pj[cfg.OBSERVATIONS][x][cfg.EVENTS]
-            for x in self.pj[cfg.OBSERVATIONS]
-            if x in selected_observations
-        ]
+        all_events = [self.pj[cfg.OBSERVATIONS][x][cfg.EVENTS] for x in self.pj[cfg.OBSERVATIONS] if x in selected_observations]
 
         for events in all_events:
             for event in events:
                 if event[cfg.EVENT_SUBJECT_FIELD_IDX] in selected_subjects or (
-                    not event[cfg.EVENT_SUBJECT_FIELD_IDX]
-                    and cfg.NO_FOCAL_SUBJECT in selected_subjects
+                    not event[cfg.EVENT_SUBJECT_FIELD_IDX] and cfg.NO_FOCAL_SUBJECT in selected_subjects
                 ):
                     observed_behaviors.append(event[cfg.EVENT_BEHAVIOR_FIELD_IDX])
 
@@ -202,12 +191,9 @@ class Param_panel(QDialog, Ui_Dialog):
             if cb and cb.isChecked():
                 selected_subjects.append(cb.text())
 
-        observed_behaviors = self.extract_observed_behaviors(
-            self.selectedObservations, selected_subjects
-        )
+        observed_behaviors = self.extract_observed_behaviors(self.selectedObservations, selected_subjects)
 
         for idx in range(self.lwBehaviors.count()):
-
             if self.lwBehaviors.item(idx).data(33) != "category":
                 if self.lwBehaviors.item(idx).text() in observed_behaviors:
                     self.lwBehaviors.item(idx).setCheckState(Qt.Checked)

boris/param_panel_ui.py

@@ -1,189 +1,305 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'boris/param_panel.ui'
-#
-# Created by: PyQt5 UI code generator 5.15.4
-#
-# WARNING: Any manual changes made to this file will be lost when pyuic5 is
-# run again.  Do not edit this file unless you know what you are doing.
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
+################################################################################
+## Form generated from reading UI file 'param_panel.ui'
+##
+## Created by: Qt User Interface Compiler version 6.8.0
+##
+## WARNING! All changes made in this file will be lost when recompiling UI file!
+################################################################################
 
+from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
+    QMetaObject, QObject, QPoint, QRect,
+    QSize, QTime, QUrl, Qt)
+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, QDialog, QFrame,
+    QHBoxLayout, QLabel, QListWidget, QListWidgetItem,
+    QPushButton, QRadioButton, QSizePolicy, QSpacerItem,
+    QSpinBox, QVBoxLayout, QWidget)
 
 class Ui_Dialog(object):
     def setupUi(self, Dialog):
-        Dialog.setObjectName("Dialog")
+        if not Dialog.objectName():
+            Dialog.setObjectName(u"Dialog")
         Dialog.resize(1037, 890)
-        self.verticalLayout_4 = QtWidgets.QVBoxLayout(Dialog)
-        self.verticalLayout_4.setObjectName("verticalLayout_4")
-        self.verticalLayout_2 = QtWidgets.QVBoxLayout()
-        self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.lbSubjects = QtWidgets.QLabel(Dialog)
-        self.lbSubjects.setObjectName("lbSubjects")
+        self.verticalLayout_4 = QVBoxLayout(Dialog)
+        self.verticalLayout_4.setObjectName(u"verticalLayout_4")
+        self.verticalLayout_2 = QVBoxLayout()
+        self.verticalLayout_2.setObjectName(u"verticalLayout_2")
+        self.lbSubjects = QLabel(Dialog)
+        self.lbSubjects.setObjectName(u"lbSubjects")
+
         self.verticalLayout_2.addWidget(self.lbSubjects)
-        self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_3.setObjectName("horizontalLayout_3")
-        self.pbSelectAllSubjects = QtWidgets.QPushButton(Dialog)
-        self.pbSelectAllSubjects.setObjectName("pbSelectAllSubjects")
+
+        self.horizontalLayout_3 = QHBoxLayout()
+        self.horizontalLayout_3.setObjectName(u"horizontalLayout_3")
+        self.pbSelectAllSubjects = QPushButton(Dialog)
+        self.pbSelectAllSubjects.setObjectName(u"pbSelectAllSubjects")
+
         self.horizontalLayout_3.addWidget(self.pbSelectAllSubjects)
-        self.pbUnselectAllSubjects = QtWidgets.QPushButton(Dialog)
-        self.pbUnselectAllSubjects.setObjectName("pbUnselectAllSubjects")
+
+        self.pbUnselectAllSubjects = QPushButton(Dialog)
+        self.pbUnselectAllSubjects.setObjectName(u"pbUnselectAllSubjects")
+
         self.horizontalLayout_3.addWidget(self.pbUnselectAllSubjects)
-        self.pbReverseSubjectsSelection = QtWidgets.QPushButton(Dialog)
-        self.pbReverseSubjectsSelection.setObjectName("pbReverseSubjectsSelection")
+
+        self.pbReverseSubjectsSelection = QPushButton(Dialog)
+        self.pbReverseSubjectsSelection.setObjectName(u"pbReverseSubjectsSelection")
+
         self.horizontalLayout_3.addWidget(self.pbReverseSubjectsSelection)
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_3.addItem(spacerItem)
+
+        self.horizontalSpacer_4 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+
+        self.horizontalLayout_3.addItem(self.horizontalSpacer_4)
+
+
         self.verticalLayout_2.addLayout(self.horizontalLayout_3)
-        self.lwSubjects = QtWidgets.QListWidget(Dialog)
-        self.lwSubjects.setObjectName("lwSubjects")
+
+        self.lwSubjects = QListWidget(Dialog)
+        self.lwSubjects.setObjectName(u"lwSubjects")
+
         self.verticalLayout_2.addWidget(self.lwSubjects)
-        self.lbBehaviors = QtWidgets.QLabel(Dialog)
-        self.lbBehaviors.setObjectName("lbBehaviors")
+
+        self.lbBehaviors = QLabel(Dialog)
+        self.lbBehaviors.setObjectName(u"lbBehaviors")
+
         self.verticalLayout_2.addWidget(self.lbBehaviors)
-        self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_4.setObjectName("horizontalLayout_4")
-        self.pbSelectAllBehaviors = QtWidgets.QPushButton(Dialog)
-        self.pbSelectAllBehaviors.setObjectName("pbSelectAllBehaviors")
+
+        self.horizontalLayout_4 = QHBoxLayout()
+        self.horizontalLayout_4.setObjectName(u"horizontalLayout_4")
+        self.pbSelectAllBehaviors = QPushButton(Dialog)
+        self.pbSelectAllBehaviors.setObjectName(u"pbSelectAllBehaviors")
+
         self.horizontalLayout_4.addWidget(self.pbSelectAllBehaviors)
-        self.pbUnselectAllBehaviors = QtWidgets.QPushButton(Dialog)
-        self.pbUnselectAllBehaviors.setObjectName("pbUnselectAllBehaviors")
+
+        self.pbUnselectAllBehaviors = QPushButton(Dialog)
+        self.pbUnselectAllBehaviors.setObjectName(u"pbUnselectAllBehaviors")
+
         self.horizontalLayout_4.addWidget(self.pbUnselectAllBehaviors)
-        self.pbReverseBehaviorsSelection = QtWidgets.QPushButton(Dialog)
-        self.pbReverseBehaviorsSelection.setObjectName("pbReverseBehaviorsSelection")
+
+        self.pbReverseBehaviorsSelection = QPushButton(Dialog)
+        self.pbReverseBehaviorsSelection.setObjectName(u"pbReverseBehaviorsSelection")
+
         self.horizontalLayout_4.addWidget(self.pbReverseBehaviorsSelection)
-        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_4.addItem(spacerItem1)
+
+        self.horizontalSpacer_5 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+
+        self.horizontalLayout_4.addItem(self.horizontalSpacer_5)
+
+
         self.verticalLayout_2.addLayout(self.horizontalLayout_4)
-        self.lwBehaviors = QtWidgets.QListWidget(Dialog)
-        self.lwBehaviors.setObjectName("lwBehaviors")
+
+        self.lwBehaviors = QListWidget(Dialog)
+        self.lwBehaviors.setObjectName(u"lwBehaviors")
+
         self.verticalLayout_2.addWidget(self.lwBehaviors)
-        self.horizontalLayout_9 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_9.setObjectName("horizontalLayout_9")
-        self.cbIncludeModifiers = QtWidgets.QCheckBox(Dialog)
-        self.cbIncludeModifiers.setObjectName("cbIncludeModifiers")
+
+        self.horizontalLayout_9 = QHBoxLayout()
+        self.horizontalLayout_9.setObjectName(u"horizontalLayout_9")
+        self.cbIncludeModifiers = QCheckBox(Dialog)
+        self.cbIncludeModifiers.setObjectName(u"cbIncludeModifiers")
+
         self.horizontalLayout_9.addWidget(self.cbIncludeModifiers)
-        self.cbExcludeBehaviors = QtWidgets.QCheckBox(Dialog)
-        self.cbExcludeBehaviors.setObjectName("cbExcludeBehaviors")
+
+        self.cb_exclude_non_coded_modifiers = QCheckBox(Dialog)
+        self.cb_exclude_non_coded_modifiers.setObjectName(u"cb_exclude_non_coded_modifiers")
+        self.cb_exclude_non_coded_modifiers.setChecked(True)
+
+        self.horizontalLayout_9.addWidget(self.cb_exclude_non_coded_modifiers)
+
+        self.cbExcludeBehaviors = QCheckBox(Dialog)
+        self.cbExcludeBehaviors.setObjectName(u"cbExcludeBehaviors")
+
         self.horizontalLayout_9.addWidget(self.cbExcludeBehaviors)
-        spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_9.addItem(spacerItem2)
+
+        self.horizontalSpacer_7 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+
+        self.horizontalLayout_9.addItem(self.horizontalSpacer_7)
+
+
         self.verticalLayout_2.addLayout(self.horizontalLayout_9)
-        self.frm_time_bin_size = QtWidgets.QFrame(Dialog)
-        self.frm_time_bin_size.setFrameShape(QtWidgets.QFrame.StyledPanel)
-        self.frm_time_bin_size.setFrameShadow(QtWidgets.QFrame.Raised)
-        self.frm_time_bin_size.setObjectName("frm_time_bin_size")
-        self.horizontalLayout_8 = QtWidgets.QHBoxLayout(self.frm_time_bin_size)
-        self.horizontalLayout_8.setObjectName("horizontalLayout_8")
-        self.horizontalLayout_7 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_7.setObjectName("horizontalLayout_7")
-        self.lb_time_bin_size = QtWidgets.QLabel(self.frm_time_bin_size)
-        self.lb_time_bin_size.setObjectName("lb_time_bin_size")
+
+        self.frm_time_bin_size = QFrame(Dialog)
+        self.frm_time_bin_size.setObjectName(u"frm_time_bin_size")
+        self.frm_time_bin_size.setFrameShape(QFrame.StyledPanel)
+        self.frm_time_bin_size.setFrameShadow(QFrame.Raised)
+        self.horizontalLayout_8 = QHBoxLayout(self.frm_time_bin_size)
+        self.horizontalLayout_8.setObjectName(u"horizontalLayout_8")
+        self.horizontalLayout_7 = QHBoxLayout()
+        self.horizontalLayout_7.setObjectName(u"horizontalLayout_7")
+        self.lb_time_bin_size = QLabel(self.frm_time_bin_size)
+        self.lb_time_bin_size.setObjectName(u"lb_time_bin_size")
+
         self.horizontalLayout_7.addWidget(self.lb_time_bin_size)
-        self.sb_time_bin_size = QtWidgets.QSpinBox(self.frm_time_bin_size)
+
+        self.sb_time_bin_size = QSpinBox(self.frm_time_bin_size)
+        self.sb_time_bin_size.setObjectName(u"sb_time_bin_size")
         self.sb_time_bin_size.setMaximum(86400)
         self.sb_time_bin_size.setSingleStep(10)
-        self.sb_time_bin_size.setObjectName("sb_time_bin_size")
+
         self.horizontalLayout_7.addWidget(self.sb_time_bin_size)
-        spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_7.addItem(spacerItem3)
+
+        self.horizontalSpacer_8 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+
+        self.horizontalLayout_7.addItem(self.horizontalSpacer_8)
+
+
         self.horizontalLayout_8.addLayout(self.horizontalLayout_7)
+
+
         self.verticalLayout_2.addWidget(self.frm_time_bin_size)
-        self.frm_time = QtWidgets.QFrame(Dialog)
-        self.frm_time.setFrameShape(QtWidgets.QFrame.StyledPanel)
-        self.frm_time.setFrameShadow(QtWidgets.QFrame.Raised)
-        self.frm_time.setObjectName("frm_time")
-        self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.frm_time)
-        self.verticalLayout_3.setObjectName("verticalLayout_3")
-        self.lb_time_interval = QtWidgets.QLabel(self.frm_time)
-        self.lb_time_interval.setObjectName("lb_time_interval")
+
+        self.frm_time = QFrame(Dialog)
+        self.frm_time.setObjectName(u"frm_time")
+        self.frm_time.setFrameShape(QFrame.StyledPanel)
+        self.frm_time.setFrameShadow(QFrame.Raised)
+        self.verticalLayout_3 = QVBoxLayout(self.frm_time)
+        self.verticalLayout_3.setObjectName(u"verticalLayout_3")
+        self.lb_time_interval = QLabel(self.frm_time)
+        self.lb_time_interval.setObjectName(u"lb_time_interval")
+
         self.verticalLayout_3.addWidget(self.lb_time_interval)
-        self.horizontalLayout_5 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_5.setObjectName("horizontalLayout_5")
-        self.rb_observed_events = QtWidgets.QRadioButton(self.frm_time)
-        self.rb_observed_events.setObjectName("rb_observed_events")
+
+        self.horizontalLayout_5 = QHBoxLayout()
+        self.horizontalLayout_5.setObjectName(u"horizontalLayout_5")
+        self.rb_observed_events = QRadioButton(self.frm_time)
+        self.rb_observed_events.setObjectName(u"rb_observed_events")
+
         self.horizontalLayout_5.addWidget(self.rb_observed_events)
-        self.rb_user_defined = QtWidgets.QRadioButton(self.frm_time)
-        self.rb_user_defined.setObjectName("rb_user_defined")
+
+        self.rb_user_defined = QRadioButton(self.frm_time)
+        self.rb_user_defined.setObjectName(u"rb_user_defined")
+
         self.horizontalLayout_5.addWidget(self.rb_user_defined)
-        self.rb_media_duration = QtWidgets.QRadioButton(self.frm_time)
+
+        self.rb_obs_interval = QRadioButton(self.frm_time)
+        self.rb_obs_interval.setObjectName(u"rb_obs_interval")
+
+        self.horizontalLayout_5.addWidget(self.rb_obs_interval)
+
+        self.rb_media_duration = QRadioButton(self.frm_time)
+        self.rb_media_duration.setObjectName(u"rb_media_duration")
         self.rb_media_duration.setCheckable(True)
         self.rb_media_duration.setChecked(False)
-        self.rb_media_duration.setObjectName("rb_media_duration")
+
         self.horizontalLayout_5.addWidget(self.rb_media_duration)
-        spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_5.addItem(spacerItem4)
+
+        self.horizontalSpacer_3 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+
+        self.horizontalLayout_5.addItem(self.horizontalSpacer_3)
+
+
         self.verticalLayout_3.addLayout(self.horizontalLayout_5)
-        self.frm_time_interval = QtWidgets.QFrame(self.frm_time)
-        self.frm_time_interval.setFrameShape(QtWidgets.QFrame.StyledPanel)
-        self.frm_time_interval.setFrameShadow(QtWidgets.QFrame.Raised)
-        self.frm_time_interval.setObjectName("frm_time_interval")
-        self.verticalLayout = QtWidgets.QVBoxLayout(self.frm_time_interval)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.horizontalLayout = QtWidgets.QHBoxLayout()
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.lbStartTime = QtWidgets.QLabel(self.frm_time_interval)
-        self.lbStartTime.setObjectName("lbStartTime")
+
+        self.frm_time_interval = QFrame(self.frm_time)
+        self.frm_time_interval.setObjectName(u"frm_time_interval")
+        self.frm_time_interval.setFrameShape(QFrame.StyledPanel)
+        self.frm_time_interval.setFrameShadow(QFrame.Raised)
+        self.verticalLayout = QVBoxLayout(self.frm_time_interval)
+        self.verticalLayout.setObjectName(u"verticalLayout")
+        self.horizontalLayout = QHBoxLayout()
+        self.horizontalLayout.setObjectName(u"horizontalLayout")
+        self.lbStartTime = QLabel(self.frm_time_interval)
+        self.lbStartTime.setObjectName(u"lbStartTime")
+
         self.horizontalLayout.addWidget(self.lbStartTime)
-        self.label_2 = QtWidgets.QLabel(self.frm_time_interval)
-        self.label_2.setText("")
-        self.label_2.setObjectName("label_2")
+
+        self.label_2 = QLabel(self.frm_time_interval)
+        self.label_2.setObjectName(u"label_2")
+
         self.horizontalLayout.addWidget(self.label_2)
-        spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout.addItem(spacerItem5)
+
+        self.horizontalSpacer_2 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+
+        self.horizontalLayout.addItem(self.horizontalSpacer_2)
+
+
         self.verticalLayout.addLayout(self.horizontalLayout)
-        self.horizontalLayout_6 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_6.setObjectName("horizontalLayout_6")
-        self.lbEndTime = QtWidgets.QLabel(self.frm_time_interval)
-        self.lbEndTime.setObjectName("lbEndTime")
+
+        self.horizontalLayout_6 = QHBoxLayout()
+        self.horizontalLayout_6.setObjectName(u"horizontalLayout_6")
+        self.lbEndTime = QLabel(self.frm_time_interval)
+        self.lbEndTime.setObjectName(u"lbEndTime")
+
         self.horizontalLayout_6.addWidget(self.lbEndTime)
-        self.label_3 = QtWidgets.QLabel(self.frm_time_interval)
-        self.label_3.setText("")
-        self.label_3.setObjectName("label_3")
+
+        self.label_3 = QLabel(self.frm_time_interval)
+        self.label_3.setObjectName(u"label_3")
+
         self.horizontalLayout_6.addWidget(self.label_3)
-        spacerItem6 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_6.addItem(spacerItem6)
+
+        self.horizontalSpacer_6 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+
+        self.horizontalLayout_6.addItem(self.horizontalSpacer_6)
+
+
         self.verticalLayout.addLayout(self.horizontalLayout_6)
-        spacerItem7 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout.addItem(spacerItem7)
+
+        self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
+
+        self.verticalLayout.addItem(self.verticalSpacer)
+
+
         self.verticalLayout_3.addWidget(self.frm_time_interval)
+
+
         self.verticalLayout_2.addWidget(self.frm_time)
-        self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        spacerItem8 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_2.addItem(spacerItem8)
-        self.pbCancel = QtWidgets.QPushButton(Dialog)
-        self.pbCancel.setObjectName("pbCancel")
+
+        self.horizontalLayout_2 = QHBoxLayout()
+        self.horizontalLayout_2.setObjectName(u"horizontalLayout_2")
+        self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+
+        self.horizontalLayout_2.addItem(self.horizontalSpacer)
+
+        self.pbCancel = QPushButton(Dialog)
+        self.pbCancel.setObjectName(u"pbCancel")
+
         self.horizontalLayout_2.addWidget(self.pbCancel)
-        self.pbOK = QtWidgets.QPushButton(Dialog)
-        self.pbOK.setObjectName("pbOK")
+
+        self.pbOK = QPushButton(Dialog)
+        self.pbOK.setObjectName(u"pbOK")
+
         self.horizontalLayout_2.addWidget(self.pbOK)
+
+
         self.verticalLayout_2.addLayout(self.horizontalLayout_2)
+
+
         self.verticalLayout_4.addLayout(self.verticalLayout_2)
 
+
         self.retranslateUi(Dialog)
-        QtCore.QMetaObject.connectSlotsByName(Dialog)
+
+        QMetaObject.connectSlotsByName(Dialog)
+    # setupUi
 
     def retranslateUi(self, Dialog):
-        _translate = QtCore.QCoreApplication.translate
-        Dialog.setWindowTitle(_translate("Dialog", "Parameters"))
-        self.lbSubjects.setText(_translate("Dialog", "Subjects"))
-        self.pbSelectAllSubjects.setText(_translate("Dialog", "Select all"))
-        self.pbUnselectAllSubjects.setText(_translate("Dialog", "Unselect all"))
-        self.pbReverseSubjectsSelection.setText(_translate("Dialog", "Reverse selection"))
-        self.lbBehaviors.setText(_translate("Dialog", "Behaviors"))
-        self.pbSelectAllBehaviors.setText(_translate("Dialog", "Select all"))
-        self.pbUnselectAllBehaviors.setText(_translate("Dialog", "Unselect all"))
-        self.pbReverseBehaviorsSelection.setText(_translate("Dialog", "Reverse selection"))
-        self.cbIncludeModifiers.setText(_translate("Dialog", "Include modifiers"))
-        self.cbExcludeBehaviors.setText(_translate("Dialog", "Exclude behaviors without events"))
-        self.lb_time_bin_size.setText(_translate("Dialog", "Time bin size (s)"))
-        self.lb_time_interval.setText(_translate("Dialog", "Time interval"))
-        self.rb_observed_events.setText(_translate("Dialog", "Observed events"))
-        self.rb_user_defined.setText(_translate("Dialog", "User defined"))
-        self.rb_media_duration.setText(_translate("Dialog", "Media file(s) duration"))
-        self.lbStartTime.setText(_translate("Dialog", "Start time"))
-        self.lbEndTime.setText(_translate("Dialog", "End time"))
-        self.pbCancel.setText(_translate("Dialog", "Cancel"))
-        self.pbOK.setText(_translate("Dialog", "OK"))
+        Dialog.setWindowTitle(QCoreApplication.translate("Dialog", u"Parameters", None))
+        self.lbSubjects.setText(QCoreApplication.translate("Dialog", u"Subjects", None))
+        self.pbSelectAllSubjects.setText(QCoreApplication.translate("Dialog", u"Select all", None))
+        self.pbUnselectAllSubjects.setText(QCoreApplication.translate("Dialog", u"Unselect all", None))
+        self.pbReverseSubjectsSelection.setText(QCoreApplication.translate("Dialog", u"Reverse selection", None))
+        self.lbBehaviors.setText(QCoreApplication.translate("Dialog", u"Behaviors", None))
+        self.pbSelectAllBehaviors.setText(QCoreApplication.translate("Dialog", u"Select all", None))
+        self.pbUnselectAllBehaviors.setText(QCoreApplication.translate("Dialog", u"Unselect all", None))
+        self.pbReverseBehaviorsSelection.setText(QCoreApplication.translate("Dialog", u"Reverse selection", None))
+        self.cbIncludeModifiers.setText(QCoreApplication.translate("Dialog", u"Include modifiers", None))
+        self.cb_exclude_non_coded_modifiers.setText(QCoreApplication.translate("Dialog", u"Exclude non coded modifiers", None))
+        self.cbExcludeBehaviors.setText(QCoreApplication.translate("Dialog", u"Exclude behaviors without events", None))
+        self.lb_time_bin_size.setText(QCoreApplication.translate("Dialog", u"Time bin size (s)", None))
+        self.lb_time_interval.setText(QCoreApplication.translate("Dialog", u"Time interval", None))
+        self.rb_observed_events.setText(QCoreApplication.translate("Dialog", u"Observed events", None))
+        self.rb_user_defined.setText(QCoreApplication.translate("Dialog", u"User defined", None))
+        self.rb_obs_interval.setText(QCoreApplication.translate("Dialog", u"Interval of observation", None))
+        self.rb_media_duration.setText(QCoreApplication.translate("Dialog", u"Media file(s) duration", None))
+        self.lbStartTime.setText(QCoreApplication.translate("Dialog", u"Start time", None))
+        self.label_2.setText("")
+        self.lbEndTime.setText(QCoreApplication.translate("Dialog", u"End time", None))
+        self.label_3.setText("")
+        self.pbCancel.setText(QCoreApplication.translate("Dialog", u"Cancel", None))
+        self.pbOK.setText(QCoreApplication.translate("Dialog", u"OK", None))
+    # retranslateUi
+