boris-behav-obs 9.0.6__py2.py3-none-any.whl → 9.0.7__py2.py3-none-any.whl

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"

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/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/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:

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.7"
+__version_date__ = "2025-02-27"

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.dist-info → boris_behav_obs-9.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: boris-behav-obs
-Version: 9.0.6
+Version: 9.0.7
 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.dist-info → boris_behav_obs-9.0.7.dist-info}/RECORD

@@ -10,13 +10,13 @@ boris/behaviors_coding_map.py,sha256=Pat6U2JHxH8epWH42ZlwzZJ0Rmgl-BKQ5KARjp3GbNg
 boris/boris_cli.py,sha256=n0OiVvZM1gM6E7yKaff9wlgmpAGK4TK052VRi8AabJo,13196
 boris/cmd_arguments.py,sha256=oWb-FvhKLbKJhATlTHy9muWu8XnnUfOZ-3Fmz2M8Yzc,1848
 boris/coding_pad.py,sha256=fBKdp7DDyupySJosIYtqNd8s2E-GruzCgVhDFsoVWKE,10986
-boris/config.py,sha256=G5M8RtV3atjGYi1aPLEV3CqSHcmjPehJ5PelsEngZZs,17072
+boris/config.py,sha256=19BiZHfFJqgjnAXFqQ5LGb0XSOSYgpQk9NsAs6Rijj4,17185
 boris/config_file.py,sha256=RC6lmO9UN_yKz_OgVmviz8rv2f4GXS-0VlRBSoSUcUg,13521
 boris/connections.py,sha256=7vTfpZjn225uvEx2VQdV1RgCDP1znW0XAMy8Zu-CSpg,19294
 boris/converters.py,sha256=c1Jps-URoglY5ILQHz-pCCf6-4DFUHZLtqr_ofsrFg0,11722
 boris/converters_ui.py,sha256=uu7LOBV_fKv2DBdOqsqPwjGsjgONr5ODBoscAA-EP48,9900
 boris/cooccurence.py,sha256=dzEMxJ0bLKychCZ7i5vS5LtKEHwISehUenc5k5RnPos,9826
-boris/core.py,sha256=9Ss8Y6GmQX0u3EUQ7A13EyD3eYUxeqcp6Yh04AiEaq0,233702
+boris/core.py,sha256=P6xpIqnEZwE6SGfCFB2g2Flec6Wsx9CUXg7O8Hmh2bg,233322
 boris/core_qrc.py,sha256=T3ki5e2Pj0I0QBGz63MPUgZzl8F_VHZwSq074mRNBDU,650669
 boris/core_ui.py,sha256=SeC26uveDCjrCBLsRPuQ6FaapKfON_HIRcQStEDLhl4,76384
 boris/db_functions.py,sha256=Uw9wWH_Pe-qNzpV1k21YG_jKsoOmfY_iiK_7ARZHGDc,13352
@@ -42,7 +42,7 @@ boris/map_creator.py,sha256=-A7LvdPZ0vPiY9tifaLAFWZuOvl3GkQze1hd_3vASWw,29053
 boris/measurement_widget.py,sha256=lZV62KtK6TjdoNbKxj3uyNAuL5dfnQnn7mYwzMo-dOM,4480
 boris/media_file.py,sha256=QzUC0mT905SzlONvcXUJB2OCxhj8kJ0h0W6PN1ssSIY,4722
 boris/menu_options.py,sha256=UEB3GxRh6YKNCg67qbhOVhJW1ZOznuPe15bADc_CNTI,7062
-boris/modifiers_coding_map.py,sha256=wKJM379hjhmaZS2XFn3NZctBu8sRy164VUuiabIQu4o,4564
+boris/modifiers_coding_map.py,sha256=oT56ZY_PXhEJsMoblEsyNMAPbDpv7ZMOCnvmt7Ibx_Y,4554
 boris/mpv-1.0.3.py,sha256=EXRtzQqFjOn4wMC6482Ilq3fNQ9N1GRP1VxwLzdeaBY,88077
 boris/mpv.py,sha256=EfzIHjPbgewG4w3smEtqEUPZoVwYmMQkL4Q8ZyW-a58,76410
 boris/mpv2.py,sha256=IUI4t4r9GYX7G5OXTjd3RhMMOkDdfal_15buBgksLsk,92152
@@ -77,14 +77,14 @@ boris/synthetic_time_budget.py,sha256=G26GDbScv4DviCDRIG_lo1sY6THGoVYqoR4cRpSuEG
 boris/time_budget_functions.py,sha256=vInLbWyswtB0OE_1VATjCCmEdhnwgHuQudNnvVWh2gQ,52022
 boris/time_budget_widget.py,sha256=2YRMe1h_X3K4aSs1AnGUDblvi-QYkdHAZwicudeN_Es,42418
 boris/transitions.py,sha256=_aZJfJWv3EBrtmQ7qsdTCayQo6uWU7BXqtQQgflEhr4,12250
-boris/utilities.py,sha256=MHGP0aV_Uat4N7MfILBxoHYfjJSZFVkeDsU8NWV70ww,52707
-boris/version.py,sha256=Qrwo_OgrRl21fbEwyTlh8deRovsnJZd__1oHI35Mbzw,787
+boris/utilities.py,sha256=hqlKgKvdYHdpQ6nhXDruS_3NOvB9CXRi3b7RpEamU0c,52742
+boris/version.py,sha256=QP01PQ3_fv1198HqhcBKklHPnQx00Fli6Ppc0oTgo0Y,787
 boris/video_equalizer.py,sha256=FartoGghFK-T53zklP70rPKYqTuzL8qdvfGlsOF2wwc,5854
 boris/video_equalizer_ui.py,sha256=1CG3s79eM4JAbaCx3i1ILZXLceb41_gGXlOLNfpBgnw,10142
 boris/video_operations.py,sha256=mh3iR__Sm2KnV44L_sW2pOo3AgLwlM7wiTnnqQiAVs4,9381
 boris/view_df.py,sha256=AKScLASX2Uatw7rqPbsnio83eVT4GZYCFhL091eMvlY,3370
 boris/view_df_ui.py,sha256=CaMeRH_vQ00CTDDFQn73ZZaS-r8BSTWpL-dMCFqzJ_Q,2775
-boris/write_event.py,sha256=vcgoKwd5I9iKVz9LjV0Fj91XoVkEfUh7UFSMiz5yrMk,23835
+boris/write_event.py,sha256=LV6HT1PMAz2-2EotEIbKsHiO7E4IBxp01BCphWyoAOk,23766
 boris/analysis_plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 boris/analysis_plugins/number_of_occurences.py,sha256=GU3TSKnmZ7_wEcKu7mw9-7FUz3jTh6BQffOphbFjLS0,2017
 boris/analysis_plugins/number_of_occurences_by_independent_variable.py,sha256=fkyOuc1AiOSnrz7L6Ocd742XmDHhhQEtgi2KSiTOG4c,2252
@@ -95,9 +95,9 @@ boris/portion/dict.py,sha256=SyHxc7PfDw2ufNLFQycwJtzmRfL48rDp4UrM2KN7IWc,11282
 boris/portion/func.py,sha256=3TkQtFKLfsqntwd27HSGHceFhnXHmT-EbNMqktElC5Q,2174
 boris/portion/interval.py,sha256=bAdUiJjGeUAPgsBAImwNeviiwfQq5odfhFZccAWzOTA,20299
 boris/portion/io.py,sha256=ppNeRpiLNrocF1yzGeuEUIhYMf2LfsR-cji3d0nmvUs,6371
-boris_behav_obs-9.0.6.dist-info/LICENSE.TXT,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
-boris_behav_obs-9.0.6.dist-info/METADATA,sha256=UHFCvEhJreg4tOaNf5inmNMuBQ9e56pLziR8wYKKqQs,42102
-boris_behav_obs-9.0.6.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
-boris_behav_obs-9.0.6.dist-info/entry_points.txt,sha256=-Vl37ZFjZYK5wTSDf5LAzd2cVLON1Pfy1xkx490Wxak,47
-boris_behav_obs-9.0.6.dist-info/top_level.txt,sha256=fJSgm62S7WesiwTorGbOO4nNN0yzgZ3klgfGi3Px4qI,6
-boris_behav_obs-9.0.6.dist-info/RECORD,,
+boris_behav_obs-9.0.7.dist-info/LICENSE.TXT,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
+boris_behav_obs-9.0.7.dist-info/METADATA,sha256=yCgZy-GA2MFqCQVwhqubnJ5RWq1ZMJyORXwmEuoRIUI,42102
+boris_behav_obs-9.0.7.dist-info/WHEEL,sha256=rF4EZyR2XVS6irmOHQIJx2SUqXLZKRMUrjsg8UwN-XQ,109
+boris_behav_obs-9.0.7.dist-info/entry_points.txt,sha256=-Vl37ZFjZYK5wTSDf5LAzd2cVLON1Pfy1xkx490Wxak,47
+boris_behav_obs-9.0.7.dist-info/top_level.txt,sha256=fJSgm62S7WesiwTorGbOO4nNN0yzgZ3klgfGi3Px4qI,6
+boris_behav_obs-9.0.7.dist-info/RECORD,,

{boris_behav_obs-9.0.6.dist-info → boris_behav_obs-9.0.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any