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

{boris_behav_obs-9.3.3/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.3
+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
@@ -24,7 +24,7 @@ Requires-Dist: matplotlib>=3.3.3
 Requires-Dist: pandas>=2.2.2
 Requires-Dist: tablib[cli,html,ods,pandas,xls,xlsx]>=3
 Requires-Dist: pyreadr
-Requires-Dist: pyside6==6.8.0.2
+Requires-Dist: pyside6==6.9
 Requires-Dist: hachoir>=3.3.0
 Provides-Extra: dev
 Requires-Dist: ruff; extra == "dev"

{boris_behav_obs-9.3.3 → 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.3 → 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)