boris-behav-obs 9.1__tar.gz → 9.1.1__tar.gz

{boris_behav_obs-9.1 → boris_behav_obs-9.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: boris-behav-obs
-Version: 9.1
+Version: 9.1.1
 Summary: BORIS - Behavioral Observation Research Interactive Software
 Author-email: Olivier Friard <olivier.friard@unito.it>
 License:                     GNU GENERAL PUBLIC LICENSE

{boris_behav_obs-9.1 → boris_behav_obs-9.1.1}/boris/connections.py

@@ -160,7 +160,9 @@ def connections(self):
     self.actionAll_transitions.triggered.connect(lambda: transitions.transitions_matrix(self, "frequency"))
     self.actionNumber_of_transitions.triggered.connect(lambda: transitions.transitions_matrix(self, "number"))
 
-    self.actionFrequencies_of_transitions_after_behaviors.triggered.connect(lambda: self.transitions_matrix("frequencies_after_behaviors"))
+    self.actionFrequencies_of_transitions_after_behaviors.triggered.connect(
+        lambda: transitions.transitions_matrix(self, "frequencies_after_behaviors")
+    )
 
     # menu playback
     self.actionJumpTo.triggered.connect(self.jump_to)

{boris_behav_obs-9.1 → boris_behav_obs-9.1.1}/boris/dialog.py

@@ -20,15 +20,16 @@ This file is part of BORIS.
 
 """
 
+from decimal import Decimal as dec
+from typing import Union
+import datetime as dt
 import logging
-import sys
+import math
 import pathlib as pl
-import traceback
 import platform
-import datetime as dt
 import subprocess
-from decimal import Decimal as dec
-from typing import Union
+import sys
+import traceback
 
 from PySide6.QtCore import Qt, Signal, qVersion, QRect, QTime, QDateTime, QSize
 from PySide6.QtWidgets import (
@@ -409,6 +410,9 @@ class get_time_widget(QWidget):
         set time on time widget
         """
 
+        if math.isnan(new_time):
+            return
+
         self.pb_sign.setText("-" if new_time < 0 else "+")
 
         # seconds

{boris_behav_obs-9.1 → boris_behav_obs-9.1.1}/boris/edit_event.py

@@ -21,6 +21,7 @@ This file is part of BORIS.
 """
 
 from decimal import Decimal as dec
+import math
 
 from PySide6.QtWidgets import (
     QDialog,
@@ -67,14 +68,7 @@ class DlgEditEvent(QDialog, Ui_Form):
             for w in (self.lb_frame_idx, self.sb_frame_idx, self.cb_set_frame_idx_na):
                 w.setVisible(False)
 
-        if (observation_type in (cfg.LIVE, cfg.MEDIA)) or (observation_type == cfg.IMAGES and self.time_value != cfg.NA):
-            # self.time_widget = duration_widget.Duration_widget(self.time_value)
-            # if time_format == cfg.S:
-            #    self.time_widget.set_format_s()
-            # if time_format == cfg.HHMMSS:
-            #    self.time_widget.set_format_hhmmss()
-
-            # future time widget
+        if (observation_type in (cfg.LIVE, cfg.MEDIA)) or (observation_type == cfg.IMAGES and not math.isnan(self.time_value)):
             self.time_widget = dialog.get_time_widget(self.time_value)
 
             if time_format == cfg.S:
@@ -87,6 +81,7 @@ class DlgEditEvent(QDialog, Ui_Form):
             self.horizontalLayout_2.insertWidget(0, self.time_widget)
 
         if observation_type == cfg.IMAGES:
+            self.time_widget = dialog.get_time_widget(self.time_value)
             # hide frame index widgets
             for w in (self.lb_frame_idx, self.sb_frame_idx, self.cb_set_frame_idx_na, self.pb_set_to_current_time):
                 w.setVisible(False)

{boris_behav_obs-9.1 → boris_behav_obs-9.1.1}/boris/event_operations.py

@@ -78,10 +78,13 @@ def add_event(self):
     )
     editWindow.setWindowTitle("Add a new event")
 
-    sortedSubjects = [""] + sorted([self.pj[cfg.SUBJECTS][x][cfg.SUBJECT_NAME] for x in self.pj[cfg.SUBJECTS]])
+    sortedSubjects = [cfg.NO_FOCAL_SUBJECT] + sorted([self.pj[cfg.SUBJECTS][x][cfg.SUBJECT_NAME] for x in self.pj[cfg.SUBJECTS]])
+
+    print(f"{sortedSubjects=}")
 
     editWindow.cobSubject.addItems(sortedSubjects)
-    editWindow.cobSubject.setCurrentIndex(editWindow.cobSubject.findText(self.currentSubject, Qt.MatchFixedString))
+    if self.currentSubject:
+        editWindow.cobSubject.setCurrentIndex(editWindow.cobSubject.findText(self.currentSubject, Qt.MatchFixedString))
 
     sortedCodes = sorted([self.pj[cfg.ETHOGRAM][x][cfg.BEHAVIOR_CODE] for x in self.pj[cfg.ETHOGRAM]])
 
@@ -103,7 +106,9 @@ def add_event(self):
                 if self.pj[cfg.ETHOGRAM][idx][cfg.BEHAVIOR_CODE] == editWindow.cobCode.currentText():
                     event = self.full_event(idx)
 
-                    event[cfg.SUBJECT] = editWindow.cobSubject.currentText()
+                    event[cfg.SUBJECT] = (
+                        "" if editWindow.cobSubject.currentText() == cfg.NO_FOCAL_SUBJECT else editWindow.cobSubject.currentText()
+                    )
                     if editWindow.leComment.toPlainText():
                         event[cfg.COMMENT] = editWindow.leComment.toPlainText()
 
@@ -152,7 +157,9 @@ def add_event(self):
                 if self.pj[cfg.ETHOGRAM][idx][cfg.BEHAVIOR_CODE] == editWindow.cobCode.currentText():
                     event = self.full_event(idx)
 
-                    event[cfg.SUBJECT] = editWindow.cobSubject.currentText()
+                    event[cfg.SUBJECT] = (
+                        "" if editWindow.cobSubject.currentText() == cfg.NO_FOCAL_SUBJECT else editWindow.cobSubject.currentText()
+                    )
                     if editWindow.leComment.toPlainText():
                         event[cfg.COMMENT] = editWindow.leComment.toPlainText()
 
@@ -684,10 +691,9 @@ def edit_event(self):
                     if self.pj[cfg.ETHOGRAM][key][cfg.BEHAVIOR_CODE] == edit_window.cobCode.currentText():
                         event = self.full_event(key)
                         # subject
-                        if edit_window.cobSubject.currentText() == cfg.NO_FOCAL_SUBJECT:
-                            event[cfg.SUBJECT] = ""
-                        else:
-                            event[cfg.SUBJECT] = edit_window.cobSubject.currentText()
+                        event[cfg.SUBJECT] = (
+                            "" if edit_window.cobSubject.currentText() == cfg.NO_FOCAL_SUBJECT else edit_window.cobSubject.currentText()
+                        )
 
                         event[cfg.COMMENT] = edit_window.leComment.toPlainText()
 
@@ -746,7 +752,9 @@ def edit_event(self):
                         else:
                             event[cfg.TIME] = edit_window.time_widget.get_time()
 
-                        event[cfg.SUBJECT] = edit_window.cobSubject.currentText()
+                        event[cfg.SUBJECT] = (
+                            "" if edit_window.cobSubject.currentText() == cfg.NO_FOCAL_SUBJECT else edit_window.cobSubject.currentText()
+                        )
                         event[cfg.COMMENT] = edit_window.leComment.toPlainText()
                         event["row"] = pj_event_idx
                         event["original_modifiers"] = self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS][pj_event_idx][

{boris_behav_obs-9.1 → boris_behav_obs-9.1.1}/boris/version.py

@@ -20,5 +20,5 @@ This file is part of BORIS.
 
 """
 
-__version__ = "9.1"
-__version_date__ = "2025-03-10"
+__version__ = "9.1.1"
+__version_date__ = "2025-03-12"

{boris_behav_obs-9.1 → boris_behav_obs-9.1.1}/boris_behav_obs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: boris-behav-obs
-Version: 9.1
+Version: 9.1.1
 Summary: BORIS - Behavioral Observation Research Interactive Software
 Author-email: Olivier Friard <olivier.friard@unito.it>
 License:                     GNU GENERAL PUBLIC LICENSE

{boris_behav_obs-9.1 → boris_behav_obs-9.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "boris-behav-obs"
-version = "9.1"
+version = "9.1.1"
 description = "BORIS - Behavioral Observation Research Interactive Software"
 authors = [{ name="Olivier Friard", email="olivier.friard@unito.it" }]
 readme = "README.rst"
@@ -55,7 +55,7 @@ line-length = 140
 exclude = ["*_ui.py", "mpv*"]
 
 [tool.bumpver]
-current_version = "9.1"
+current_version = "9.1.1"
 version_pattern = "MAJOR.MINOR.PATCH"