boris-behav-obs 8.27.9__py2.py3-none-any.whl → 9.0.1__py2.py3-none-any.whl

boris/measurement_widget.py

@@ -22,10 +22,10 @@ This file is part of BORIS.
 
 import logging
 
-from PyQt5.QtCore import pyqtSignal
+from PySide6.QtCore import Signal
 
-# from PyQt5.QtGui import *
-from PyQt5.QtWidgets import (
+# from PySide6.QtGui import *
+from PySide6.QtWidgets import (
     QApplication,
     QWidget,
     QRadioButton,
@@ -46,7 +46,7 @@ from . import config as cfg
 class wgMeasurement(QWidget):
     """ """
 
-    closeSignal, clearSignal = pyqtSignal(), pyqtSignal()
+    closeSignal, clearSignal = Signal(), Signal()
     flagSaved = True
     draw_mem = []
 

boris/media_file.py

@@ -20,12 +20,11 @@ This file is part of BORIS.
 
 """
 
-
 from . import config as cfg
 from . import utilities as util
 from . import dialog
 from . import project_functions
-from PyQt5.QtWidgets import QFileDialog
+from PySide6.QtWidgets import QFileDialog
 
 
 def get_info(self) -> None:
@@ -100,8 +99,7 @@ def get_info(self) -> None:
             tot_output += mpv_output + ffmpeg_output + "<br><hr>"
 
     else:  # no open observation
-        fn = QFileDialog().getOpenFileNames(self, "Select a media file", "", "Media files (*)")
-        file_paths = fn[0] if type(fn) is tuple else fn
+        file_paths, _ = QFileDialog().getOpenFileNames(self, "Select a media file", "", "Media files (*)")
         if not file_paths:
             return
 

boris/menu_options.py

@@ -19,10 +19,9 @@ Copyright 2012-2024 Olivier Friard
   MA 02110-1301, USA.
 """
 
-
 import logging
 from . import config as cfg
-from PyQt5.QtCore import QSize
+from PySide6.QtCore import QSize
 
 
 def update_windows_title(self):
@@ -73,7 +72,6 @@ def update_menu(self):
         self.actionExport_project,
         self.actionCheck_project,
         self.actionClose_project,
-        self.actionSend_project,
         self.actionNew_observation,
         self.actionRemove_path_from_media_files,
         self.action_create_observations,

boris/modifiers_coding_map.py

@@ -22,9 +22,9 @@ This file is part of BORIS.
 
 import binascii
 
-from PyQt5.QtCore import pyqtSignal, QPoint, Qt
-from PyQt5.QtGui import QPen, QPixmap, QBrush, QMouseEvent, QPolygonF, QColor
-from PyQt5.QtWidgets import (
+from PySide6.QtCore import Signal, QPoint, Qt
+from PySide6.QtGui import QPen, QPixmap, QBrush, QMouseEvent, QPolygonF, QColor
+from PySide6.QtWidgets import (
     QDialog,
     QGraphicsView,
     QGraphicsScene,
@@ -41,7 +41,7 @@ from PyQt5.QtWidgets import (
 
 class ModifiersCodingMapWindowClass(QDialog):
     class View(QGraphicsView):
-        mousePress = pyqtSignal(QMouseEvent)
+        mousePress = Signal(QMouseEvent)
 
         def mousePressEvent(self, event):
             self.mousePress.emit(event)

boris/mpv2.py

@@ -868,8 +868,6 @@ class MPV(object):
         Extra arguments and extra keyword arguments will be passed to mpv as options.
         """
 
-        print(f"{extra_mpv_flags=}")
-
         self.handle = _mpv_create()
         self._event_thread = None
         self._core_shutdown = False

boris/observation.py

@@ -26,9 +26,9 @@ import pandas as pd
 import pathlib as pl
 import datetime as dt
 
-from PyQt5.QtCore import Qt
-from PyQt5.QtGui import QColor, QTextCursor
-from PyQt5.QtWidgets import (
+from PySide6.QtCore import Qt
+from PySide6.QtGui import QColor, QTextCursor, QAction
+from PySide6.QtWidgets import (
     QDialog,
     QVBoxLayout,
     QHBoxLayout,
@@ -134,7 +134,8 @@ class Observation(QDialog, Ui_Form):
         self.rb_images.toggled.connect(self.obs_type_changed)
 
         # button menu for media
-        menu_items = [
+
+        add_media_menu_items = [
             "media abs path|with absolute path",
             "media rel path|with relative path",
             {
@@ -144,10 +145,30 @@ class Observation(QDialog, Ui_Form):
                 ]
             },
         ]
-        menu = QMenu()
-        menu.triggered.connect(lambda x: self.add_media(mode=x.statusTip()))
-        self.add_button_menu(menu_items, menu)
-        self.pbAddVideo.setMenu(menu)
+
+        self.media_menu = QMenu()
+        # Add actions to the menu
+        """
+        self.action1 = QAction("with absolute path")
+        self.action2 = QAction("with relative path")
+        self.action3 = QAction("directory with absolute path")
+        self.action4 = QAction("directory with relative path")
+
+        self.menu.addAction(self.action1)
+        self.menu.addAction(self.action2)
+        self.menu.addAction(self.action3)
+        self.menu.addAction(self.action4)
+
+        # Connect actions to functions
+        self.action1.triggered.connect(lambda: self.add_media(mode="media abs path|with absolute path"))
+        self.action2.triggered.connect(lambda: self.add_media(mode="media rel path|with relative path"))
+        self.action3.triggered.connect(lambda: self.add_media(mode="dir abs path|with absolute path"))
+        self.action4.triggered.connect(lambda: self.add_media(mode="dir rel path|wih relative path"))
+        """
+
+        self.media_menu.triggered.connect(lambda x: self.add_media(mode=x.statusTip()))
+        self.add_button_menu(add_media_menu_items, self.media_menu)
+        self.pbAddVideo.setMenu(self.media_menu)
 
         self.pbRemoveVideo.clicked.connect(self.remove_media)
 
@@ -157,10 +178,23 @@ class Observation(QDialog, Ui_Form):
             "data rel path|with relative path",
         ]
 
-        menu_data = QMenu()
-        menu_data.triggered.connect(lambda x: self.add_data_file(mode=x.statusTip()))
-        self.add_button_menu(data_menu_items, menu_data)
-        self.pb_add_data_file.setMenu(menu_data)
+        self.menu_data = QMenu()
+
+        # Add actions to the menu
+        """
+        self.data_action1 = QAction("with absolute path")
+        self.data_action2 = QAction("with relative path")
+        self.menu_data.addAction(self.data_action1)
+        self.menu_data.addAction(self.data_action2)
+
+        # Connect actions to functions
+        self.data_action1.triggered.connect(lambda: self.add_data_file(mode="data abs path|with absolute path"))
+        self.data_action2.triggered.connect(lambda: self.add_data_file(mode="data rel path|with relative path"))
+        """
+
+        self.menu_data.triggered.connect(lambda x: self.add_data_file(mode=x.statusTip()))
+        self.add_button_menu(data_menu_items, self.menu_data)
+        self.pb_add_data_file.setMenu(self.menu_data)
 
         # button menu for images
         images_menu_items = [
@@ -168,10 +202,11 @@ class Observation(QDialog, Ui_Form):
             "images rel path|with relative path",
         ]
 
-        menu_images = QMenu()
-        menu_images.triggered.connect(lambda x: self.add_images_directory(mode=x.statusTip()))
-        self.add_button_menu(images_menu_items, menu_images)
-        self.pb_add_directory.setMenu(menu_images)
+        self.menu_images = QMenu()
+
+        self.menu_images.triggered.connect(lambda x: self.add_images_directory(mode=x.statusTip()))
+        self.add_button_menu(images_menu_items, self.menu_images)
+        self.pb_add_directory.setMenu(self.menu_images)
 
         self.pb_remove_data_file.clicked.connect(self.remove_data_file)
         self.pb_view_data_head.clicked.connect(self.view_data_file_head_tail)
@@ -183,8 +218,6 @@ class Observation(QDialog, Ui_Form):
         self.cbVisualizeSpectrogram.clicked.connect(self.extract_wav)
         self.cb_visualize_waveform.clicked.connect(self.extract_wav)
 
-        # self.cb_media_creation_date_as_offset.clicked.connect(self.check_creation_date)
-
         self.cb_observation_time_interval.clicked.connect(self.limit_time_interval)
 
         self.pbSave.clicked.connect(self.pbSave_clicked)
@@ -223,6 +256,48 @@ class Observation(QDialog, Ui_Form):
     #    """
     #    self.de_date_offset.setEnabled(self.cb_date_offset.isChecked())
 
+    def check_media_creation_date(self):
+        """
+        check if all media files contain creation date time
+        search in metadata then in filename
+        """
+
+        creation_date_not_found: list = []
+        flag_filename_used = False
+
+        self.media_creation_time = {}
+
+        if self.cb_media_creation_date_as_offset.isChecked():
+            for row in range(self.twVideo1.rowCount()):
+                if self.twVideo1.item(row, 2).text():  # media file path
+                    date_time_original = util.extract_video_creation_date(
+                        project_functions.full_path(self.twVideo1.item(row, 2).text(), self.project_path)
+                    )
+                    if date_time_original is None:
+                        date_time_file_name = util.extract_date_time_from_file_name(self.twVideo1.item(row, 2).text())
+                        if date_time_file_name is None:
+                            creation_date_not_found.append(self.twVideo1.item(row, 2).text())
+                        else:
+                            self.media_creation_time[self.twVideo1.item(row, 2).text()] = date_time_file_name
+                            flag_filename_used = True
+                    else:
+                        self.media_creation_time[self.twVideo1.item(row, 2).text()] = date_time_original
+
+        if creation_date_not_found:
+            QMessageBox.warning(
+                self, cfg.programName, "The creation date time was not found for all media file(s).\nThe option was disabled."
+            )
+            self.cb_media_creation_date_as_offset.setChecked(False)
+            self.media_creation_time = {}
+            return 1
+
+        elif flag_filename_used:
+            QMessageBox.information(
+                self, cfg.programName, "The creation date time was not found in metadata. The media file name(s) was/were used"
+            )
+
+        return 0
+
     def cb_time_offset_changed(self):
         """
         activate/desactivate date value
@@ -237,7 +312,7 @@ class Observation(QDialog, Ui_Form):
             QMessageBox.critical(self, cfg.programName, "A media file must be loaded in player #1")
             return
 
-        first_media_file = ""
+        first_media_file: str = ""
         for row in range(self.twVideo1.rowCount()):
             if int(self.twVideo1.cellWidget(row, 0).currentText()) == 1:
                 first_media_file = self.twVideo1.item(row, 2).text()
@@ -513,6 +588,13 @@ class Observation(QDialog, Ui_Form):
         else:
             QMessageBox.warning(self, cfg.programName, "Select a data file")
 
+    def not_editable_column_color(self):
+        """
+        return a color for the not editable column
+        """
+        window_color = QApplication.instance().palette().window().color()
+        return QColor(window_color.red() - 5, window_color.green() - 5, window_color.blue() - 5)
+
     def add_data_file(self, mode: str):
         """
         user select a data file to be plotted synchronously with media file
@@ -546,16 +628,14 @@ class Observation(QDialog, Ui_Form):
             QMessageBox.warning(
                 self,
                 cfg.programName,
-                ("It is not yet possible to plot more than 2 external data sources" "This limitation will be removed in future"),
+                ("It is not yet possible to plot more than 2 external data sourcesThis limitation will be removed in future"),
             )
             return
 
         fd = QFileDialog()
         fd.setDirectory(os.path.expanduser("~") if (" abs " in mode) else str(pl.Path(self.project_path).parent))
 
-        fn = fd.getOpenFileName(self, "Add data file", "", "All files (*)")
-        file_name = fn[0] if type(fn) is tuple else fn
-
+        file_name, _ = fd.getOpenFileName(self, "Add data file", "", "All files (*)")
         if not file_name:
             return
 
@@ -662,7 +742,8 @@ class Observation(QDialog, Ui_Form):
             item = QTableWidgetItem(value)
             if col_idx == cfg.PLOT_DATA_CONVERTERS_IDX:
                 item.setFlags(Qt.ItemIsEnabled)
-                item.setBackground(QColor(230, 230, 230))
+                # item.setBackground(QColor(230, 230, 230))
+                item.setBackground(self.not_editable_column_color())
             self.tw_data_files.setItem(self.tw_data_files.rowCount() - 1, col_idx, item)
 
         # substract first value
@@ -841,6 +922,7 @@ class Observation(QDialog, Ui_Form):
             ret = dlg.exec_()
         """
 
+        """
         not_tagged_media_list: list = []
         for row in range(self.twVideo1.rowCount()):
             if self.twVideo1.item(row, 2).text() not in media_not_found_list:
@@ -879,6 +961,8 @@ class Observation(QDialog, Ui_Form):
                 return 1
         else:
             return 0  # OK all media have a 'creation time' tag
+        """
+        return 0
 
     def closeEvent(self, event):
         """
@@ -1062,13 +1146,17 @@ class Observation(QDialog, Ui_Form):
                     return False
 
             # check media creation time tag in metadata
-            # Disable because the check will be made at the oservation start
+            # Disable because the check will be made at the observation start
             """
             if self.cb_media_creation_date_as_offset.isChecked():
                 if self.check_creation_date():
                     return False
             """
 
+            # check media creation date time (if option enabled)
+            if self.check_media_creation_date():
+                return False
+
         if self.rb_images.isChecked():  # observation based on images directory
             if not self.lw_images_directory.count():
                 QMessageBox.critical(self, cfg.programName, "You have to select at least one images directory")
@@ -1191,8 +1279,7 @@ class Observation(QDialog, Ui_Form):
         # enable stop ongoing state events if n. media > 1
         self.cbCloseCurrentBehaviorsBetweenVideo.setEnabled(self.twVideo1.rowCount() > 0)
 
-        # DEVELOPMENT (REMOVE BEFORE RELEASE)
-        self.cb_media_creation_date_as_offset.setEnabled(False)
+        # self.creation_date_as_offset()
 
     def add_media(self, mode: str):
         """
@@ -1231,8 +1318,7 @@ class Observation(QDialog, Ui_Form):
             fd.setDirectory(os.path.expanduser("~") if (" abs " in mode) else str(pl.Path(self.project_path).parent))
 
         if "media " in mode:
-            fn = fd.getOpenFileNames(self, "Add media file(s)", "", "All files (*)")
-            file_paths = fn[0] if type(fn) is tuple else fn
+            file_paths, _ = fd.getOpenFileNames(self, "Add media file(s)", "", "All files (*)")
 
             if file_paths:
                 # store directory for next usage
@@ -1274,6 +1360,15 @@ class Observation(QDialog, Ui_Form):
                             )
                             if response == cfg.CANCEL:
                                 break
+                # ask to use directory name / path as observation id
+                if response != cfg.CANCEL:
+                    selected_obs_id = dialog.MessageDialog(
+                        cfg.programName,
+                        "Select the observation id",
+                        [dir_name, str(pl.Path(dir_name).name), cfg.CANCEL],
+                    )
+                    if selected_obs_id != cfg.CANCEL:
+                        self.leObservationId.setText(selected_obs_id)
 
         self.update_media_options()
 

boris/observation_operations.py

@@ -32,7 +32,7 @@ import datetime as dt
 from typing import List, Tuple, Optional
 
 
-from PyQt5.QtWidgets import (
+from PySide6.QtWidgets import (
     QMessageBox,
     QFileDialog,
     QDateTimeEdit,
@@ -42,10 +42,10 @@ from PyQt5.QtWidgets import (
     QMainWindow,
     QDockWidget,
 )
-from PyQt5.QtCore import Qt, QDateTime, QTimer
-from PyQt5.QtGui import QFont, QIcon, QTextCursor
+from PySide6.QtCore import Qt, QDateTime, QTimer
+from PySide6.QtGui import QFont, QIcon, QTextCursor
 
-from PyQt5 import QtTest
+from PySide6 import QtTest
 
 from . import menu_options
 from . import config as cfg
@@ -137,7 +137,7 @@ def observations_list(self):
             QMessageBox.warning(
                 self,
                 cfg.programName,
-                (f"The observation <b>{self.observationId}</b> is running!<br>" "Close it before editing."),
+                (f"The observation <b>{self.observationId}</b> is running!<br>Close it before editing."),
             )
 
     logging.debug("end observations list")
@@ -490,7 +490,7 @@ def observation_length(pj: dict, selected_observations: list) -> tuple:
         if (
             dialog.MessageDialog(
                 cfg.programName,
-                (f"The observation length is not available (<b>{obs_id}</b>).<br>" "Use last event time as observation length?"),
+                (f"The observation length is not available (<b>{obs_id}</b>).<br>Use last event time as observation length?"),
                 (cfg.YES, cfg.NO),
             )
             == cfg.YES
@@ -655,11 +655,11 @@ def new_observation(self, mode: str = cfg.NEW, obsId: str = "") -> None:
         observationWindow.teDescription.setPlainText(self.pj[cfg.OBSERVATIONS][obsId][cfg.DESCRIPTION])
 
         try:
-            observationWindow.mediaDurations: dict = self.pj[cfg.OBSERVATIONS][obsId][cfg.MEDIA_INFO][cfg.LENGTH]
-            observationWindow.mediaFPS: dict = self.pj[cfg.OBSERVATIONS][obsId][cfg.MEDIA_INFO][cfg.FPS]
+            observationWindow.mediaDurations = self.pj[cfg.OBSERVATIONS][obsId][cfg.MEDIA_INFO][cfg.LENGTH]
+            observationWindow.mediaFPS = self.pj[cfg.OBSERVATIONS][obsId][cfg.MEDIA_INFO][cfg.FPS]
         except Exception:
-            observationWindow.mediaDurations: dict = {}
-            observationWindow.mediaFPS: dict = {}
+            observationWindow.mediaDurations = {}
+            observationWindow.mediaFPS = {}
 
         try:
             if cfg.HAS_VIDEO in self.pj[cfg.OBSERVATIONS][obsId][cfg.MEDIA_INFO]:
@@ -743,7 +743,7 @@ def new_observation(self, mode: str = cfg.NEW, obsId: str = "") -> None:
             observationWindow.cb_media_creation_date_as_offset.setEnabled(True)
 
             # DEVELOPMENT (REMOVE BEFORE RELEASE)
-            observationWindow.cb_media_creation_date_as_offset.setEnabled(False)
+            # observationWindow.cb_media_creation_date_as_offset.setEnabled(False)
 
             observationWindow.cb_media_creation_date_as_offset.setChecked(
                 self.pj[cfg.OBSERVATIONS][obsId].get(cfg.MEDIA_CREATION_DATE_AS_OFFSET, False)
@@ -1083,7 +1083,7 @@ def close_observation(self):
     self.saved_state = self.saveState()
 
     if self.playerType == cfg.MEDIA:
-        self.media_scan_sampling_mem: list = []
+        self.media_scan_sampling_mem = []
         logging.info("Stop plot timer")
         self.plot_timer.stop()
 
@@ -1180,31 +1180,6 @@ def check_creation_date(self) -> Tuple[int, dict]:
 
     """
 
-    # check if media files exist
-
-    """
-    media_not_found_list: list = []
-    for row in range(self.twVideo1.rowCount()):
-        if not pl.Path(self.twVideo1.item(row, 2).text()).is_file():
-            media_not_found_list.append(self.twVideo1.item(row, 2).text())
-
-    if media_list:
-        dlg = dialog.Results_dialog()
-        dlg.setWindowTitle("BORIS")
-        dlg.pbOK.setText("OK")
-        dlg.pbCancel.setVisible(False)
-        dlg.ptText.clear()
-        dlg.ptText.appendHtml(
-            (
-                "Some media file(s) were not found:<br>"
-                f"{'<br>'.join(media_list)}<br><br>"
-                "You cannot select the <b>Use the media creation date/time option</b>."
-            )
-        )
-        dlg.ptText.moveCursor(QTextCursor.Start)
-        ret = dlg.exec_()
-    """
-
     not_tagged_media_list: list = []
     media_creation_time: dict = {}
 
@@ -1266,7 +1241,7 @@ def initialize_new_media_observation(self) -> bool:
 
     logging.debug("function: initialize new observation for media file(s)")
 
-    for dw in [self.dwEthogram, self.dwSubjects, self.dwEvents]:
+    for dw in (self.dwEthogram, self.dwSubjects, self.dwEvents):
         dw.setVisible(True)
 
     ok, msg = project_functions.check_if_media_available(self.pj[cfg.OBSERVATIONS][self.observationId], self.projectFileName)
@@ -1313,12 +1288,15 @@ def initialize_new_media_observation(self) -> bool:
     self.dw_player: list = []
 
     # check if media creation time used as offset
+    # TODO check if cfg.MEDIA_CREATION_TIME dict is present
+    """
     if self.pj[cfg.OBSERVATIONS][self.observationId].get(cfg.MEDIA_CREATION_DATE_AS_OFFSET, False):
         r, media_creation_time = check_creation_date(self)
 
         if r:
             return False
         self.pj[cfg.OBSERVATIONS][self.observationId][cfg.MEDIA_INFO][cfg.MEDIA_CREATION_TIME] = dict(media_creation_time)
+    """
 
     # create dock widgets for players
     for i in range(cfg.N_PLAYER):
@@ -1888,7 +1866,7 @@ def initialize_new_media_observation(self) -> bool:
     self.mpv_eof_reached_signal.connect(self.mpv_eof_reached)
     self.video_click_signal.connect(self.player_clicked)
 
-    self.actionPlay.setIcon(QIcon(":/play"))
+    self.actionPlay.setIcon(QIcon(f":/play_{self.theme_mode()}"))
 
     self.display_statusbar_info(self.observationId)
 
@@ -2368,7 +2346,7 @@ def create_observations(self):
                 QMessageBox.critical(
                     self,
                     cfg.programName,
-                    (f"The observation <b>{media_file}</b> already exists." "<br><br>Aborting the creation of observations"),
+                    (f"The observation <b>{media_file}</b> already exists.<br><br>Aborting the creation of observations"),
                 )
                 return