boris-behav-obs 9.0.6__tar.gz → 9.0.8__tar.gz

{boris_behav_obs-9.0.6 → boris_behav_obs-9.0.8}/PKG-INFO

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

{boris_behav_obs-9.0.6 → boris_behav_obs-9.0.8}/boris/config.py

@@ -254,13 +254,16 @@ MEDIA_FILE_PATH_IDX = 2
 HAS_AUDIO_IDX = 6
 
 STATE_EVENT = "State event"
+STATE_EVENT_WITH_CODING_MAP = "State event with coding map"
+
 POINT_EVENT = "Point event"
+POINT_EVENT_WITH_CODING_MAP = "Point event with coding map"
 
 BEHAVIOR_TYPES = [
-    "Point event",
-    "State event",
-    "Point event with coding map",
-    "State event with coding map",
+    POINT_EVENT,
+    STATE_EVENT,
+    POINT_EVENT_WITH_CODING_MAP,
+    STATE_EVENT_WITH_CODING_MAP,
 ]
 
 DEFAULT_BEHAVIOR_TYPE = "Point event"
@@ -421,10 +424,6 @@ PROJECT_FILE_INDENTATION_DEFAULT_VALUE = None
 TOOLBAR_ICON_SIZE = "toolbar icon size"
 DEFAULT_TOOLBAR_ICON_SIZE_VALUE = 24
 
-"""
-DARK_MODE = "dark_mode"
-DARK_MODE_DEFAULT_VALUE = False
-"""
 
 VIDEO_VIEWER = 0
 PICTURE_VIEWER = 1

{boris_behav_obs-9.0.6 → boris_behav_obs-9.0.8}/boris/core.py

@@ -2264,6 +2264,8 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         """
         populate table view with events
         """
+        logging.debug("populate tv_events")
+
         model = self.tv_events.model()
         if model is not None:
             self.tv_events.setModel(None)
@@ -2273,7 +2275,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         mem_behav: dict = {}
         state_events_list = util.state_behavior_codes(self.pj[cfg.ETHOGRAM])
 
-        state = [""] * len(self.pj[cfg.OBSERVATIONS][obs_id][cfg.EVENTS])
+        state: list = [""] * len(self.pj[cfg.OBSERVATIONS][obs_id][cfg.EVENTS])
 
         for idx, row in enumerate(self.pj[cfg.OBSERVATIONS][obs_id][cfg.EVENTS]):
             code = row[cfg.PJ_OBS_FIELDS[self.playerType][cfg.BEHAVIOR_CODE]]
@@ -2339,17 +2341,16 @@ class MainWindow(QMainWindow, Ui_MainWindow):
 
         logging.debug(f"begin load events from obs in tableView: {obs_id}")
 
-        # t1 = time.time()
+        # print(self.pj[cfg.OBSERVATIONS][obs_id][cfg.EVENTS])
+
         self.populate_tv_events(
             obs_id,
-            [s.capitalize() for s in cfg.TW_EVENTS_FIELDS[self.playerType]],
+            [s.capitalize() for s in cfg.TW_EVENTS_FIELDS[self.playerType]],  # header
             self.timeFormat,
             self.filtered_behaviors,
             self.filtered_subjects,
         )
 
-        # print("load table view:", time.time() - t1)
-
         return
 
         """
@@ -3931,11 +3932,6 @@ class MainWindow(QMainWindow, Ui_MainWindow):
             ethogram_idx = [x for x in self.pj[cfg.ETHOGRAM] if self.pj[cfg.ETHOGRAM][x][cfg.BEHAVIOR_CODE] == code][0]
 
             event = self.full_event(ethogram_idx)
-            # MEDIA / LIVE
-            """
-            if self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] in (cfg.MEDIA, cfg.LIVE):
-                time_ = self.getLaps()
-            """
 
             # IMAGES
             if self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] == cfg.IMAGES:
@@ -3948,11 +3944,6 @@ class MainWindow(QMainWindow, Ui_MainWindow):
 
             time_, cumulative_time = self.get_obs_time()
 
-            """
-            print(time_)
-            print(cumulative_time)
-            """
-
             if self.pj[cfg.OBSERVATIONS][self.observationId].get(cfg.MEDIA_CREATION_DATE_AS_OFFSET, False):
                 write_event.write_event(self, event, time_)
             else:
@@ -4795,7 +4786,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
                         flag_player_playing = True
                         self.pause_video()
 
-            self.codingMapWindow = modifiers_coding_map.ModifiersCodingMapWindowClass(
+            self.codingMapWindow = modifiers_coding_map.ModifiersCodingMapWindow(
                 self.pj[cfg.CODING_MAP][self.pj[cfg.ETHOGRAM][behavior_idx]["coding map"]]
             )
 
@@ -4872,7 +4863,6 @@ class MainWindow(QMainWindow, Ui_MainWindow):
 
     def keyPressEvent(self, event) -> None:
         """
-        http://qt-project.org/doc/qt-5.0/qtcore/qt.html#Key-enum
         https://github.com/pyqt/python-qt5/blob/master/PySide6/qml/builtins.qmltypes
 
         ESC: 16777216
@@ -5182,8 +5172,6 @@ class MainWindow(QMainWindow, Ui_MainWindow):
                 else:
                     write_event.write_event(self, event, memLaps)
 
-                # write_event.write_event(self, event, memLaps)
-
             elif subject_idx is not None:
                 self.update_subject(self.pj[cfg.SUBJECTS][subject_idx][cfg.SUBJECT_NAME])
 

{boris_behav_obs-9.0.6 → boris_behav_obs-9.0.8}/boris/event_operations.py

@@ -40,6 +40,7 @@ from .edit_event import DlgEditEvent, EditSelectedEvents
 
 from PySide6.QtWidgets import QMessageBox, QInputDialog, QLineEdit, QAbstractItemView, QApplication
 from PySide6.QtCore import QTime, Qt
+from PySide6.QtGui import QClipboard
 
 
 def add_event(self):
@@ -879,8 +880,8 @@ def copy_selected_events(self):
     print(f"{copied_events=}")
 
     cb = QApplication.clipboard()
-    cb.clear(mode=cb.Clipboard)
-    cb.setText("\n".join(copied_events), mode=cb.Clipboard)
+    cb.clear(mode=QClipboard.Mode.Clipboard)
+    cb.setText("\n".join(copied_events), mode=QClipboard.Mode.Clipboard)
 
     logging.debug("Selected events copied in clipboard")
 

{boris_behav_obs-9.0.6 → boris_behav_obs-9.0.8}/boris/modifiers_coding_map.py

@@ -39,7 +39,7 @@ from PySide6.QtWidgets import (
 )
 
 
-class ModifiersCodingMapWindowClass(QDialog):
+class ModifiersCodingMapWindow(QDialog):
     class View(QGraphicsView):
         mousePress = Signal(QMouseEvent)
 
@@ -56,7 +56,7 @@ class ModifiersCodingMapWindowClass(QDialog):
             self.scene().update()
 
     def __init__(self, modifiers_coding_map):
-        super(ModifiersCodingMapWindowClass, self).__init__()
+        super(ModifiersCodingMapWindow, self).__init__()
 
         self.areasList = {}
         self.polygonsList2 = {}

{boris_behav_obs-9.0.6 → boris_behav_obs-9.0.8}/boris/utilities.py

@@ -531,7 +531,7 @@ def state_behavior_codes(ethogram: dict) -> list:
         list: list of behavior codes defined as STATE event
 
     """
-    return [ethogram[x][cfg.BEHAVIOR_CODE] for x in ethogram if ethogram[x][cfg.TYPE] == cfg.STATE_EVENT]
+    return [ethogram[x][cfg.BEHAVIOR_CODE] for x in ethogram if ethogram[x][cfg.TYPE] in (cfg.STATE_EVENT, cfg.STATE_EVENT_WITH_CODING_MAP)]
 
 
 def point_behavior_codes(ethogram: dict) -> list:
@@ -545,7 +545,7 @@ def point_behavior_codes(ethogram: dict) -> list:
         list: list of behavior codes defined as POINT event
 
     """
-    return [ethogram[x][cfg.BEHAVIOR_CODE] for x in ethogram if cfg.POINT in ethogram[x][cfg.TYPE].upper()]
+    return [ethogram[x][cfg.BEHAVIOR_CODE] for x in ethogram if ethogram[x][cfg.TYPE] in (cfg.POINT_EVENT, cfg.POINT_EVENT_WITH_CODING_MAP)]
 
 
 def group_events(pj: dict, obs_id: str, include_modifiers: bool = False) -> dict:

{boris_behav_obs-9.0.6 → boris_behav_obs-9.0.8}/boris/version.py

@@ -20,5 +20,5 @@ This file is part of BORIS.
 
 """
 
-__version__ = "9.0.6"
-__version_date__ = "2025-02-17"
+__version__ = "9.0.8"
+__version_date__ = "2025-03-06"

{boris_behav_obs-9.0.6 → boris_behav_obs-9.0.8}/boris/write_event.py

@@ -272,8 +272,6 @@ def write_event(self, event: dict, mem_time: dec) -> int:
                     # check if editing (original_modifiers key)
                     currentModifiers = event.get("original_modifiers", "")
 
-                    # print(f"{event=}")
-
                     modifiers_selector = select_modifiers.ModifiersList(
                         event[cfg.BEHAVIOR_CODE], eval(str(event[cfg.MODIFIERS])), currentModifiers
                     )
@@ -351,8 +349,6 @@ def write_event(self, event: dict, mem_time: dec) -> int:
                     if ev[cfg.EVENT_BEHAVIOR_FIELD_IDX] == cs:
                         cm[cs] = ev[cfg.EVENT_MODIFIER_FIELD_IDX]
 
-        # print(f"{cm=}")
-
         if flag_ask_at_stop:
             # set modifier to START behavior
             if event[cfg.BEHAVIOR_CODE] in csj:

{boris_behav_obs-9.0.6 → boris_behav_obs-9.0.8}/boris_behav_obs.egg-info/PKG-INFO

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

{boris_behav_obs-9.0.6 → boris_behav_obs-9.0.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "boris-behav-obs"
-version = "9.0.6"
+version = "9.0.8"
 description = "BORIS - Behavioral Observation Research Interactive Software"
 authors = [{ name="Olivier Friard", email="olivier.friard@unito.it" }]
 readme = "README.rst"
@@ -50,16 +50,12 @@ build-backend = "setuptools.build_meta"
 [tool.distutils.bdist_wheel]
 universal = true
 
-[tool.black]
-line-length = 140
-
-
 [tool.ruff]
 line-length = 140
 exclude = ["*_ui.py", "mpv*"]
 
 [tool.bumpver]
-current_version = "9.0.6"
+current_version = "9.0.8"
 version_pattern = "MAJOR.MINOR.PATCH"