boris-behav-obs 8.27.10__py2.py3-none-any.whl → 9.0.2__py2.py3-none-any.whl

boris/about.py

@@ -31,9 +31,9 @@ from . import config as cfg
 from . import utilities as util
 
 
-from PyQt5.QtCore import QT_VERSION_STR, PYQT_VERSION_STR
-from PyQt5.QtGui import QPixmap
-from PyQt5.QtWidgets import QMessageBox
+from PySide6.QtCore import qVersion
+from PySide6.QtGui import QPixmap
+from PySide6.QtWidgets import QMessageBox
 
 
 def actionAbout_activated(self):
@@ -41,6 +41,8 @@ def actionAbout_activated(self):
     About dialog
     """
 
+    import PySide6
+
     programs_versions: list = ["MPV media player"]
 
     mpv_lib_version, mpv_lib_file_path, mpv_api_version = util.mpv_lib_version()
@@ -112,7 +114,7 @@ def actionAbout_activated(self):
         f"Operating system: {current_system.system} {current_system.release} {current_system.version} \n"
         f"CPU: {current_system.machine} {current_system.processor}\n\n"
         f"Python {platform.python_version()} ({'64-bit' if sys.maxsize > 2**32 else '32-bit'})"
-        f" - Qt {QT_VERSION_STR} - PyQt {PYQT_VERSION_STR}\n\n"
+        f"Qt {qVersion()} - PySide {PySide6.__version__}\n"
     )
 
     r, memory = util.mem_info()
@@ -137,4 +139,4 @@ def actionAbout_activated(self):
 
     about_dialog.setDetailedText(details)
 
-    _ = about_dialog.exec_()
+    _ = about_dialog.exec()

boris/add_modifier.py

@@ -16,15 +16,15 @@ This file is part of BORIS.
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program; if not see <http://www.gnu.org/licenses/>.
+  along with this program; if not see <http://www.gnu.org/licPbehav_enses/>.
 
 """
 
 import logging
 import json
 
-from PyQt5.QtGui import QIcon
-from PyQt5.QtWidgets import QDialog, QWidget, QFileDialog, QMessageBox
+from PySide6.QtGui import QIcon
+from PySide6.QtWidgets import QDialog, QWidget, QFileDialog, QMessageBox
 
 from . import dialog
 from .add_modifier_ui import Ui_Dialog
@@ -158,38 +158,38 @@ class addModifierDialog(QDialog, Ui_Dialog):
         add modifiers from file
         """
 
-        fn = QFileDialog().getOpenFileName(self, "Load modifiers from file", "", "All files (*)")
-        file_name = fn[0] if type(fn) is tuple else fn
-        if file_name:
-            try:
-                with open(file_name) as f_in:
-                    for line in f_in:
-                        if line.strip():
-                            for c in cfg.CHAR_FORBIDDEN_IN_MODIFIERS:
-                                if c in line.strip():
-                                    QMessageBox.critical(
-                                        self,
-                                        cfg.programName,
-                                        (
-                                            f"The character <b>{c}</b> is not allowed.<br>"
-                                            "The following characters are not allowed in modifiers:<br>"
-                                            f"<b>{cfg.CHAR_FORBIDDEN_IN_MODIFIERS}</b>"
-                                        ),
-                                    )
-                                    break
-                            else:
-                                if line.strip() not in [self.lwModifiers.item(x).text() for x in range(self.lwModifiers.count())]:
-                                    if self.itemPositionMem != -1:
-                                        self.lwModifiers.insertItem(self.itemPositionMem, line.strip())
-                                    else:
-                                        self.lwModifiers.addItem(line.strip())
-
-                self.modifiers_sets_dict[str(self.tabWidgetModifiersSets.currentIndex())]["values"] = [
-                    self.lwModifiers.item(x).text() for x in range(self.lwModifiers.count())
-                ]
-            except Exception:
-                QMessageBox.warning(self, cfg.programName, f"Error reading modifiers from file:<br>{file_name}")
-                logging.warning(f"Error reading modifiers from file<br>{file_name}")
+        file_name, _ = QFileDialog.getOpenFileName(self, "Load modifiers from file", "", "All files (*)")
+        if not file_name:
+            return
+        try:
+            with open(file_name) as f_in:
+                for line in f_in:
+                    if line.strip():
+                        for c in cfg.CHAR_FORBIDDEN_IN_MODIFIERS:
+                            if c in line.strip():
+                                QMessageBox.critical(
+                                    self,
+                                    cfg.programName,
+                                    (
+                                        f"The character <b>{c}</b> is not allowed.<br>"
+                                        "The following characters are not allowed in modifiers:<br>"
+                                        f"<b>{cfg.CHAR_FORBIDDEN_IN_MODIFIERS}</b>"
+                                    ),
+                                )
+                                break
+                        else:
+                            if line.strip() not in [self.lwModifiers.item(x).text() for x in range(self.lwModifiers.count())]:
+                                if self.itemPositionMem != -1:
+                                    self.lwModifiers.insertItem(self.itemPositionMem, line.strip())
+                                else:
+                                    self.lwModifiers.addItem(line.strip())
+
+            self.modifiers_sets_dict[str(self.tabWidgetModifiersSets.currentIndex())]["values"] = [
+                self.lwModifiers.item(x).text() for x in range(self.lwModifiers.count())
+            ]
+        except Exception:
+            QMessageBox.warning(self, cfg.programName, f"Error reading modifiers from file:<br>{file_name}")
+            logging.warning(f"Error reading modifiers from file<br>{file_name}")
 
     def sort_modifiers(self):
         """

boris/add_modifier_ui.py

@@ -1,185 +1,285 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'boris/add_modifier.ui'
-#
-# Created by: PyQt5 UI code generator 5.15.6
-#
-# 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 'add_modifier.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, QComboBox, QDialog,
+    QHBoxLayout, QLabel, QLineEdit, QListWidget,
+    QListWidgetItem, QPushButton, QSizePolicy, QSpacerItem,
+    QTabWidget, QVBoxLayout, QWidget)
 
 class Ui_Dialog(object):
     def setupUi(self, Dialog):
-        Dialog.setObjectName("Dialog")
+        if not Dialog.objectName():
+            Dialog.setObjectName(u"Dialog")
         Dialog.resize(1088, 654)
-        self.verticalLayout_5 = QtWidgets.QVBoxLayout(Dialog)
-        self.verticalLayout_5.setObjectName("verticalLayout_5")
-        self.cb_ask_at_stop = QtWidgets.QCheckBox(Dialog)
-        self.cb_ask_at_stop.setObjectName("cb_ask_at_stop")
+        self.verticalLayout_5 = QVBoxLayout(Dialog)
+        self.verticalLayout_5.setObjectName(u"verticalLayout_5")
+        self.cb_ask_at_stop = QCheckBox(Dialog)
+        self.cb_ask_at_stop.setObjectName(u"cb_ask_at_stop")
+
         self.verticalLayout_5.addWidget(self.cb_ask_at_stop)
-        self.verticalLayout_4 = QtWidgets.QVBoxLayout()
-        self.verticalLayout_4.setObjectName("verticalLayout_4")
-        self.horizontalLayout_5 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_5.setObjectName("horizontalLayout_5")
-        self.verticalLayout_2 = QtWidgets.QVBoxLayout()
-        self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.lbModifier = QtWidgets.QLabel(Dialog)
-        self.lbModifier.setObjectName("lbModifier")
+
+        self.verticalLayout_4 = QVBoxLayout()
+        self.verticalLayout_4.setObjectName(u"verticalLayout_4")
+        self.horizontalLayout_5 = QHBoxLayout()
+        self.horizontalLayout_5.setObjectName(u"horizontalLayout_5")
+        self.verticalLayout_2 = QVBoxLayout()
+        self.verticalLayout_2.setObjectName(u"verticalLayout_2")
+        self.lbModifier = QLabel(Dialog)
+        self.lbModifier.setObjectName(u"lbModifier")
+
         self.verticalLayout_2.addWidget(self.lbModifier)
-        self.leModifier = QtWidgets.QLineEdit(Dialog)
-        self.leModifier.setObjectName("leModifier")
+
+        self.leModifier = QLineEdit(Dialog)
+        self.leModifier.setObjectName(u"leModifier")
+
         self.verticalLayout_2.addWidget(self.leModifier)
-        self.lbCode = QtWidgets.QLabel(Dialog)
-        self.lbCode.setObjectName("lbCode")
+
+        self.lbCode = QLabel(Dialog)
+        self.lbCode.setObjectName(u"lbCode")
+
         self.verticalLayout_2.addWidget(self.lbCode)
-        self.leCode = QtWidgets.QLineEdit(Dialog)
-        self.leCode.setObjectName("leCode")
+
+        self.leCode = QLineEdit(Dialog)
+        self.leCode.setObjectName(u"leCode")
+
         self.verticalLayout_2.addWidget(self.leCode)
-        self.lbCodeHelp = QtWidgets.QLabel(Dialog)
+
+        self.lbCodeHelp = QLabel(Dialog)
+        self.lbCodeHelp.setObjectName(u"lbCodeHelp")
         self.lbCodeHelp.setWordWrap(True)
-        self.lbCodeHelp.setObjectName("lbCodeHelp")
+
         self.verticalLayout_2.addWidget(self.lbCodeHelp)
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_2.addItem(spacerItem)
+
+        self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
+
+        self.verticalLayout_2.addItem(self.verticalSpacer)
+
+
         self.horizontalLayout_5.addLayout(self.verticalLayout_2)
-        self.verticalLayout_3 = QtWidgets.QVBoxLayout()
-        self.verticalLayout_3.setObjectName("verticalLayout_3")
-        self.pbAddModifier = QtWidgets.QPushButton(Dialog)
-        self.pbAddModifier.setText("")
-        self.pbAddModifier.setObjectName("pbAddModifier")
+
+        self.verticalLayout_3 = QVBoxLayout()
+        self.verticalLayout_3.setObjectName(u"verticalLayout_3")
+        self.pbAddModifier = QPushButton(Dialog)
+        self.pbAddModifier.setObjectName(u"pbAddModifier")
+
         self.verticalLayout_3.addWidget(self.pbAddModifier)
-        self.pbModifyModifier = QtWidgets.QPushButton(Dialog)
-        self.pbModifyModifier.setText("")
-        self.pbModifyModifier.setObjectName("pbModifyModifier")
+
+        self.pbModifyModifier = QPushButton(Dialog)
+        self.pbModifyModifier.setObjectName(u"pbModifyModifier")
+
         self.verticalLayout_3.addWidget(self.pbModifyModifier)
-        spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_3.addItem(spacerItem1)
+
+        self.verticalSpacer_2 = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
+
+        self.verticalLayout_3.addItem(self.verticalSpacer_2)
+
+
         self.horizontalLayout_5.addLayout(self.verticalLayout_3)
-        self.verticalLayout = QtWidgets.QVBoxLayout()
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.tabWidgetModifiersSets = QtWidgets.QTabWidget(Dialog)
-        self.tabWidgetModifiersSets.setMaximumSize(QtCore.QSize(16777215, 30))
-        self.tabWidgetModifiersSets.setTabPosition(QtWidgets.QTabWidget.North)
-        self.tabWidgetModifiersSets.setTabShape(QtWidgets.QTabWidget.Rounded)
-        self.tabWidgetModifiersSets.setElideMode(QtCore.Qt.ElideNone)
+
+        self.verticalLayout = QVBoxLayout()
+        self.verticalLayout.setObjectName(u"verticalLayout")
+        self.tabWidgetModifiersSets = QTabWidget(Dialog)
+        self.tabWidgetModifiersSets.setObjectName(u"tabWidgetModifiersSets")
+        self.tabWidgetModifiersSets.setMaximumSize(QSize(16777215, 30))
+        self.tabWidgetModifiersSets.setTabPosition(QTabWidget.North)
+        self.tabWidgetModifiersSets.setTabShape(QTabWidget.Rounded)
+        self.tabWidgetModifiersSets.setElideMode(Qt.ElideNone)
         self.tabWidgetModifiersSets.setDocumentMode(True)
-        self.tabWidgetModifiersSets.setObjectName("tabWidgetModifiersSets")
+
         self.verticalLayout.addWidget(self.tabWidgetModifiersSets)
-        self.lb_name = QtWidgets.QLabel(Dialog)
-        self.lb_name.setObjectName("lb_name")
+
+        self.lb_name = QLabel(Dialog)
+        self.lb_name.setObjectName(u"lb_name")
+
         self.verticalLayout.addWidget(self.lb_name)
-        self.le_name = QtWidgets.QLineEdit(Dialog)
-        self.le_name.setObjectName("le_name")
+
+        self.le_name = QLineEdit(Dialog)
+        self.le_name.setObjectName(u"le_name")
+
         self.verticalLayout.addWidget(self.le_name)
-        self.lb_description = QtWidgets.QLabel(Dialog)
-        self.lb_description.setObjectName("lb_description")
+
+        self.lb_description = QLabel(Dialog)
+        self.lb_description.setObjectName(u"lb_description")
+
         self.verticalLayout.addWidget(self.lb_description)
-        self.le_description = QtWidgets.QLineEdit(Dialog)
-        self.le_description.setObjectName("le_description")
+
+        self.le_description = QLineEdit(Dialog)
+        self.le_description.setObjectName(u"le_description")
+
         self.verticalLayout.addWidget(self.le_description)
-        self.lbType = QtWidgets.QLabel(Dialog)
-        self.lbType.setObjectName("lbType")
+
+        self.lbType = QLabel(Dialog)
+        self.lbType.setObjectName(u"lbType")
+
         self.verticalLayout.addWidget(self.lbType)
-        self.cbType = QtWidgets.QComboBox(Dialog)
-        self.cbType.setObjectName("cbType")
+
+        self.cbType = QComboBox(Dialog)
         self.cbType.addItem("")
         self.cbType.addItem("")
         self.cbType.addItem("")
         self.cbType.addItem("")
+        self.cbType.setObjectName(u"cbType")
+
         self.verticalLayout.addWidget(self.cbType)
-        self.lbValues = QtWidgets.QLabel(Dialog)
-        self.lbValues.setObjectName("lbValues")
+
+        self.lbValues = QLabel(Dialog)
+        self.lbValues.setObjectName(u"lbValues")
+
         self.verticalLayout.addWidget(self.lbValues)
-        self.lwModifiers = QtWidgets.QListWidget(Dialog)
-        self.lwModifiers.setObjectName("lwModifiers")
+
+        self.lwModifiers = QListWidget(Dialog)
+        self.lwModifiers.setObjectName(u"lwModifiers")
+
         self.verticalLayout.addWidget(self.lwModifiers)
-        self.horizontalLayout = QtWidgets.QHBoxLayout()
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.pbMoveUp = QtWidgets.QPushButton(Dialog)
-        self.pbMoveUp.setObjectName("pbMoveUp")
+
+        self.horizontalLayout = QHBoxLayout()
+        self.horizontalLayout.setObjectName(u"horizontalLayout")
+        self.pbMoveUp = QPushButton(Dialog)
+        self.pbMoveUp.setObjectName(u"pbMoveUp")
+
         self.horizontalLayout.addWidget(self.pbMoveUp)
-        self.pbMoveDown = QtWidgets.QPushButton(Dialog)
-        self.pbMoveDown.setObjectName("pbMoveDown")
+
+        self.pbMoveDown = QPushButton(Dialog)
+        self.pbMoveDown.setObjectName(u"pbMoveDown")
+
         self.horizontalLayout.addWidget(self.pbMoveDown)
-        self.pbRemoveModifier = QtWidgets.QPushButton(Dialog)
-        self.pbRemoveModifier.setObjectName("pbRemoveModifier")
+
+        self.pbRemoveModifier = QPushButton(Dialog)
+        self.pbRemoveModifier.setObjectName(u"pbRemoveModifier")
+
         self.horizontalLayout.addWidget(self.pbRemoveModifier)
+
+
         self.verticalLayout.addLayout(self.horizontalLayout)
-        self.pb_sort_modifiers = QtWidgets.QPushButton(Dialog)
-        self.pb_sort_modifiers.setObjectName("pb_sort_modifiers")
+
+        self.pb_sort_modifiers = QPushButton(Dialog)
+        self.pb_sort_modifiers.setObjectName(u"pb_sort_modifiers")
+
         self.verticalLayout.addWidget(self.pb_sort_modifiers)
-        self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_3.setObjectName("horizontalLayout_3")
-        self.pbAddSet = QtWidgets.QPushButton(Dialog)
-        self.pbAddSet.setObjectName("pbAddSet")
+
+        self.horizontalLayout_3 = QHBoxLayout()
+        self.horizontalLayout_3.setObjectName(u"horizontalLayout_3")
+        self.pbAddSet = QPushButton(Dialog)
+        self.pbAddSet.setObjectName(u"pbAddSet")
+
         self.horizontalLayout_3.addWidget(self.pbAddSet)
-        self.pbRemoveSet = QtWidgets.QPushButton(Dialog)
-        self.pbRemoveSet.setObjectName("pbRemoveSet")
+
+        self.pbRemoveSet = QPushButton(Dialog)
+        self.pbRemoveSet.setObjectName(u"pbRemoveSet")
+
         self.horizontalLayout_3.addWidget(self.pbRemoveSet)
+
+
         self.verticalLayout.addLayout(self.horizontalLayout_3)
-        self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_4.setObjectName("horizontalLayout_4")
-        self.pbMoveSetLeft = QtWidgets.QPushButton(Dialog)
-        self.pbMoveSetLeft.setObjectName("pbMoveSetLeft")
+
+        self.horizontalLayout_4 = QHBoxLayout()
+        self.horizontalLayout_4.setObjectName(u"horizontalLayout_4")
+        self.pbMoveSetLeft = QPushButton(Dialog)
+        self.pbMoveSetLeft.setObjectName(u"pbMoveSetLeft")
+
         self.horizontalLayout_4.addWidget(self.pbMoveSetLeft)
-        self.pbMoveSetRight = QtWidgets.QPushButton(Dialog)
-        self.pbMoveSetRight.setObjectName("pbMoveSetRight")
+
+        self.pbMoveSetRight = QPushButton(Dialog)
+        self.pbMoveSetRight.setObjectName(u"pbMoveSetRight")
+
         self.horizontalLayout_4.addWidget(self.pbMoveSetRight)
+
+
         self.verticalLayout.addLayout(self.horizontalLayout_4)
-        self.pb_add_subjects = QtWidgets.QPushButton(Dialog)
-        self.pb_add_subjects.setObjectName("pb_add_subjects")
+
+        self.pb_add_subjects = QPushButton(Dialog)
+        self.pb_add_subjects.setObjectName(u"pb_add_subjects")
+
         self.verticalLayout.addWidget(self.pb_add_subjects)
-        self.pb_load_file = QtWidgets.QPushButton(Dialog)
-        self.pb_load_file.setObjectName("pb_load_file")
+
+        self.pb_load_file = QPushButton(Dialog)
+        self.pb_load_file.setObjectName(u"pb_load_file")
+
         self.verticalLayout.addWidget(self.pb_load_file)
-        spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout.addItem(spacerItem2)
+
+        self.verticalSpacer_3 = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
+
+        self.verticalLayout.addItem(self.verticalSpacer_3)
+
+
         self.horizontalLayout_5.addLayout(self.verticalLayout)
+
+
         self.verticalLayout_4.addLayout(self.horizontalLayout_5)
-        self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_2.addItem(spacerItem3)
-        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_4.addLayout(self.horizontalLayout_2)
+
+
         self.verticalLayout_5.addLayout(self.verticalLayout_4)
 
+
         self.retranslateUi(Dialog)
+
         self.tabWidgetModifiersSets.setCurrentIndex(-1)
-        QtCore.QMetaObject.connectSlotsByName(Dialog)
+
+
+        QMetaObject.connectSlotsByName(Dialog)
+    # setupUi
 
     def retranslateUi(self, Dialog):
-        _translate = QtCore.QCoreApplication.translate
-        Dialog.setWindowTitle(_translate("Dialog", "Set modifiers"))
-        self.cb_ask_at_stop.setText(_translate("Dialog", "Ask for modifier(s) when behavior stops"))
-        self.lbModifier.setText(_translate("Dialog", "Modifier"))
-        self.lbCode.setText(_translate("Dialog", "Key code"))
-        self.lbCodeHelp.setText(_translate("Dialog", "Key code is case sensitive. Type one character or a function key (F1, F2... F12)"))
-        self.lb_name.setText(_translate("Dialog", "Set name"))
-        self.lb_description.setText(_translate("Dialog", "Description"))
-        self.lbType.setText(_translate("Dialog", "Modifier type"))
-        self.cbType.setItemText(0, _translate("Dialog", "Single selection"))
-        self.cbType.setItemText(1, _translate("Dialog", "Multiple selection"))
-        self.cbType.setItemText(2, _translate("Dialog", "Numeric"))
-        self.cbType.setItemText(3, _translate("Dialog", "Value from external data file"))
-        self.lbValues.setText(_translate("Dialog", "Values"))
-        self.pbMoveUp.setText(_translate("Dialog", "Move modifier up"))
-        self.pbMoveDown.setText(_translate("Dialog", "Move modifier down"))
-        self.pbRemoveModifier.setText(_translate("Dialog", "Remove modifier"))
-        self.pb_sort_modifiers.setText(_translate("Dialog", "Sort modifiers"))
-        self.pbAddSet.setText(_translate("Dialog", "Add set of modifiers"))
-        self.pbRemoveSet.setText(_translate("Dialog", "Remove set of modifiers"))
-        self.pbMoveSetLeft.setText(_translate("Dialog", "Move set left"))
-        self.pbMoveSetRight.setText(_translate("Dialog", "Move set right"))
-        self.pb_add_subjects.setText(_translate("Dialog", "Add subjects as modifiers"))
-        self.pb_load_file.setText(_translate("Dialog", "Load modifiers from file"))
-        self.pbCancel.setText(_translate("Dialog", "Cancel"))
-        self.pbOK.setText(_translate("Dialog", "OK"))
+        Dialog.setWindowTitle(QCoreApplication.translate("Dialog", u"Set modifiers", None))
+        self.cb_ask_at_stop.setText(QCoreApplication.translate("Dialog", u"Ask for modifier(s) when behavior stops", None))
+        self.lbModifier.setText(QCoreApplication.translate("Dialog", u"Modifier", None))
+        self.lbCode.setText(QCoreApplication.translate("Dialog", u"Key code", None))
+        self.lbCodeHelp.setText(QCoreApplication.translate("Dialog", u"Key code is case sensitive. Type one character or a function key (F1, F2... F12)", None))
+        self.pbAddModifier.setText("")
+        self.pbModifyModifier.setText("")
+        self.lb_name.setText(QCoreApplication.translate("Dialog", u"Set name", None))
+        self.lb_description.setText(QCoreApplication.translate("Dialog", u"Description", None))
+        self.lbType.setText(QCoreApplication.translate("Dialog", u"Modifier type", None))
+        self.cbType.setItemText(0, QCoreApplication.translate("Dialog", u"Single selection", None))
+        self.cbType.setItemText(1, QCoreApplication.translate("Dialog", u"Multiple selection", None))
+        self.cbType.setItemText(2, QCoreApplication.translate("Dialog", u"Numeric", None))
+        self.cbType.setItemText(3, QCoreApplication.translate("Dialog", u"Value from external data file", None))
+
+        self.lbValues.setText(QCoreApplication.translate("Dialog", u"Values", None))
+        self.pbMoveUp.setText(QCoreApplication.translate("Dialog", u"Move modifier up", None))
+        self.pbMoveDown.setText(QCoreApplication.translate("Dialog", u"Move modifier down", None))
+        self.pbRemoveModifier.setText(QCoreApplication.translate("Dialog", u"Remove modifier", None))
+        self.pb_sort_modifiers.setText(QCoreApplication.translate("Dialog", u"Sort modifiers", None))
+        self.pbAddSet.setText(QCoreApplication.translate("Dialog", u"Add set of modifiers", None))
+        self.pbRemoveSet.setText(QCoreApplication.translate("Dialog", u"Remove set of modifiers", None))
+        self.pbMoveSetLeft.setText(QCoreApplication.translate("Dialog", u"Move set left", None))
+        self.pbMoveSetRight.setText(QCoreApplication.translate("Dialog", u"Move set right", None))
+        self.pb_add_subjects.setText(QCoreApplication.translate("Dialog", u"Add subjects as modifiers", None))
+        self.pb_load_file.setText(QCoreApplication.translate("Dialog", u"Load modifiers from file", None))
+        self.pbCancel.setText(QCoreApplication.translate("Dialog", u"Cancel", None))
+        self.pbOK.setText(QCoreApplication.translate("Dialog", u"OK", None))
+    # retranslateUi
+

boris/advanced_event_filtering.py

@@ -25,9 +25,9 @@ import statistics
 import sys
 
 import tablib
-from PyQt5.QtCore import Qt
-from PyQt5.QtGui import QIcon
-from PyQt5.QtWidgets import (
+from PySide6.QtCore import Qt
+from PySide6.QtGui import QIcon
+from PySide6.QtWidgets import (
     QDialog,
     QFileDialog,
     QHBoxLayout,

boris/analysis_plugins/number_of_occurences.py

@@ -0,0 +1,60 @@
+"""
+BORIS plugin
+
+number of occurences of behaviors
+"""
+
+import pandas as pd
+
+__version__ = "0.1.0"
+__version_date__ = "2024-11-14"
+__plugin_name__ = "Number of occurences of behaviors"
+__author__ = "Olivier Friard - University of Torino - Italy"
+
+
+def run(df: pd.DataFrame):
+    """
+    Calculate the number of occurrences of behaviors by subject.
+    """
+
+    return df.groupby(["Subject", "Behavior"])["Behavior"].count().reset_index(name="number of occurences")
+
+
+def main(df: pd.DataFrame, observations_list: list = [], parameters: dict = {}) -> pd.DataFrame:
+    """
+    filter by selected observations.
+    filter by selected subjects.
+    filter by selected behaviors.
+    filter by time interval.
+    """
+
+    # filter selected observations
+    if observations_list:
+        df = df[df["Observation id"].isin(observations_list)]
+
+    if parameters:
+        # filter selected subjects
+        df = df[df["Subject"].isin(parameters["selected subjects"])]
+
+        # filter selected behaviors
+        df = df[df["Behavior"].isin(parameters["selected behaviors"])]
+
+        # filter selected time interval
+        if parameters["start time"] is not None and parameters["end time"] is not None:
+            MIN_TIME = parameters["start time"]
+            MAX_TIME = parameters["end time"]
+            df_interval = df[
+                (
+                    ((df["Start (s)"] >= MIN_TIME) & (df["Start (s)"] <= MAX_TIME))
+                    | ((df["Stop (s)"] >= MIN_TIME) & (df["Stop (s)"] <= MAX_TIME))
+                )
+                | ((df["Start (s)"] < MIN_TIME) & (df["Stop (s)"] > MAX_TIME))
+            ]
+            df_interval.loc[df["Start (s)"] < MIN_TIME, "Start (s)"] = MIN_TIME
+            df_interval.loc[df["Stop (s)"] > MAX_TIME, "Stop (s)"] = MAX_TIME
+
+            df_interval.loc[:, "Duration (s)"] = df_interval["Stop (s)"] - df_interval["Start (s)"]
+
+            df = df_interval
+
+    return run(df)