boris-behav-obs 8.27.3__py2.py3-none-any.whl → 8.27.4__py2.py3-none-any.whl

boris/export_events.py

@@ -461,6 +461,8 @@ def export_aggregated_events(self):
         _, max_modifiers = export_observation.export_aggregated_events(self.pj, parameters, obs_id)
         tot_max_modifiers = max(tot_max_modifiers, max_modifiers)
 
+    logging.debug(f"tot_max_modifiers: {tot_max_modifiers}")
+
     data_grouped_obs = tablib.Dataset()
 
     mem_command: str = ""  # remember user choice when file already exists
@@ -517,6 +519,8 @@ def export_aggregated_events(self):
             if not r:
                 QMessageBox.warning(None, cfg.programName, msg, QMessageBox.Ok | QMessageBox.Default, QMessageBox.NoButton)
 
+        """
+        # disabled after introduction of the force_number_modifiers parameter in export_aggregated_events function
         if len(data_single_obs_sorted) and max_modifiers < tot_max_modifiers:
             for i in range(tot_max_modifiers - max_modifiers):
                 data_single_obs_sorted.insert_col(
@@ -524,9 +528,12 @@ def export_aggregated_events(self):
                     col=[""] * (len(list(data_single_obs_sorted))),
                     header=f"Modif #{i}",
                 )
+        """
+
         data_grouped_obs.extend(data_single_obs_sorted)
 
     data_grouped_obs_all = tablib.Dataset(headers=list(fields_type(tot_max_modifiers).keys()))
+
     data_grouped_obs_all.extend(data_grouped_obs)
     data_grouped_obs_all.title = "Aggregated events"
 

boris/project_import_export.py

@@ -428,7 +428,10 @@ def load_dataframe_into_behaviors_tablewidget(self, df: pd.DataFrame) -> int:
     for _, row in df.iterrows():
         behavior = {"coding map": ""}
         for x in ethogram_header:
-            behavior[x] = row[ethogram_header[x].upper()] if str(row[ethogram_header[x].upper()]) != "nan" else ""
+            if ethogram_header[x].upper() in row:
+                behavior[x] = row[ethogram_header[x].upper()] if str(row[ethogram_header[x].upper()]) != "nan" else ""
+            else:
+                behavior[x] = ""
 
         self.twBehaviors.setRowCount(self.twBehaviors.rowCount() + 1)
 

boris/version.py

@@ -20,5 +20,5 @@ This file is part of BORIS.
 
 """
 
-__version__ = "8.27.3"
-__version_date__ = "2024-08-19"
+__version__ = "8.27.4"
+__version_date__ = "2024-08-20"

{boris_behav_obs-8.27.3.dist-info → boris_behav_obs-8.27.4.dist-info}/METADATA

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

{boris_behav_obs-8.27.3.dist-info → boris_behav_obs-8.27.4.dist-info}/RECORD

@@ -29,7 +29,7 @@ boris/event_operations.py,sha256=JYIZC4ObShZ-SPxNQaQZwKs8xJn4Dj0lvIiNgzc28Jo,389
 boris/events_cursor.py,sha256=Jfu7yV1MG7HikNmMQmOVJ7ntmEZzDZn5HHp3va8llwM,1983
 boris/events_snapshots.py,sha256=BGfIba0_TxHW2UHaEOZF7hqM1jv5roI6KaGuWajfavg,27580
 boris/exclusion_matrix.py,sha256=xaEFLy2Zv5SWryMz1D0cEpywsAuZxZuBaaGYLaBGhng,5270
-boris/export_events.py,sha256=35tu9K9kEXlossdWjTNs74YuIs-ZQBSzw7MRnRIUK3Q,37826
+boris/export_events.py,sha256=leFq9QXSF6cTwK5TBAOjbv2Tco1im5Rk-RfU8E_On80,38029
 boris/export_observation.py,sha256=TC_Mxyor5e0HZViG9xxAX_V18i61ihFnVmhioNOy_Dw,49821
 boris/external_processes.py,sha256=069iEVOfDI-7zUYPH7WlYBEnKqTR18mjj8dReBkUACE,11965
 boris/geometric_measurement.py,sha256=jd6HiWJNrjqRInG452a8Ke44Zj4QyNSYa9JKO8DZzOo,34609
@@ -62,7 +62,7 @@ boris/preferences.py,sha256=W_BHck8lxODvZ9NzIgfvhvXAwUI5A66aJVmdTRTxZMo,11494
 boris/preferences_ui.py,sha256=fz0jHW7Nqw2P68FLBqheaGrQsZATNz8d8J00TVMX_Ig,21981
 boris/project.py,sha256=wMOcWsz7tA-efmHOrKe0_s5I4Vy-u1u_fUTWzxTVdp8,83465
 boris/project_functions.py,sha256=R3DS_faDuMGKTpMnV0OhqgZp9yO1ojoA5wUIXdtHNIE,70972
-boris/project_import_export.py,sha256=Vrif3p4XiGYf0zcbmV8lUKSYAQBlWu8e762rEmP0kaQ,38358
+boris/project_import_export.py,sha256=E2Jv4CQQpFxGspLZdAIxBcB-aCM7SlfobR5ZlC2QqHk,38463
 boris/project_ui.py,sha256=TRJlsqq4XbIl8k2f20BKr2PtKa0QNjFNr6UnMieZYqU,35915
 boris/qrc_boris.py,sha256=4U2cD_fIBTtsTPhirOl9I3kTArOhXWYvfuO_A0M9N0I,675001
 boris/qrc_boris5.py,sha256=6bwT8OVtIr84nVIYp2ldUL7XL6WJi9zgJow6kgRxuIQ,161601
@@ -76,7 +76,7 @@ boris/time_budget_functions.py,sha256=L-0PuPWYR33UMfqmxpcCVH-w4mLLrtZ8b8kBTmBwls
 boris/time_budget_widget.py,sha256=9WV-iKYSl1f3HBrGcL-eHDjUswrFQh6-WUcffTtce1Y,42852
 boris/transitions.py,sha256=2zucdoa2jTpWtM6nWHr8lOvjXkrQmo9j71fz_fMLALU,11998
 boris/utilities.py,sha256=07qXAQ6aGyiSC2h6RMJ031OlXYy05-KTLJtnQtXn6FU,48724
-boris/version.py,sha256=SA4oy39PhzqMXmo1rg8CQQ23Zm7hv2vxrs__W1TBhNk,788
+boris/version.py,sha256=fs3Hih6V9-QWHmasEF1Pyx9fUiAoLh6LqowVIuNvHwc,788
 boris/video_equalizer.py,sha256=QpVgmdqX_E4HnMa2f_Qo_fKJTl9nBoTQd_ykv9RWlIQ,5862
 boris/video_equalizer_ui.py,sha256=A2_Sz9AAVnJygTRUeK_YXxf-WWQpxSSlFw0MjkxiwSg,9762
 boris/video_operations.py,sha256=96jR-3snNn9VeEURRD6rCwvOL2sSHXoqlP_gYFwgO8A,9379
@@ -105,9 +105,9 @@ boris/qdarkstyle/utils/__init__.py,sha256=Nlma8-zbHoJc5n2NVT7OvwxPG5765JnsmMeGzr
 boris/qdarkstyle/utils/__main__.py,sha256=J1biUyDzfutKU1n9NdH9WnD0gFHaF-OJA4Q-n6Q2ehs,3309
 boris/qdarkstyle/utils/images.py,sha256=af-BJllzWgVoVz6QMvhFcKqvF3mo44AThaBjuAuHtNE,14444
 boris/qdarkstyle/utils/scss.py,sha256=n7WNo6pPRft8-dU7_gfjB_jA-JZAy50-S792RwR7Ri0,9366
-boris_behav_obs-8.27.3.dist-info/LICENSE.TXT,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
-boris_behav_obs-8.27.3.dist-info/METADATA,sha256=cW0c3nD4XfG3rDY9t3mP290LsT0QvcP-JEHueoEekGE,45533
-boris_behav_obs-8.27.3.dist-info/WHEEL,sha256=M4n4zmFKzQZk4mLCcycNIzIXO7YPKE_b5Cw4PnhHEg8,109
-boris_behav_obs-8.27.3.dist-info/entry_points.txt,sha256=fuO7JxKFLOm6xp6m3JHRA1UO_QW1dYU-F0IooA1NqQs,37
-boris_behav_obs-8.27.3.dist-info/top_level.txt,sha256=fJSgm62S7WesiwTorGbOO4nNN0yzgZ3klgfGi3Px4qI,6
-boris_behav_obs-8.27.3.dist-info/RECORD,,
+boris_behav_obs-8.27.4.dist-info/LICENSE.TXT,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
+boris_behav_obs-8.27.4.dist-info/METADATA,sha256=sJFqhkz8Uj1lgAcSntH461AuI4YUlExjdalt79XyxWw,45533
+boris_behav_obs-8.27.4.dist-info/WHEEL,sha256=OWYSMTYHNOLxNw0Mxija-Qn3HdviNLu4kabRWA1yLB4,109
+boris_behav_obs-8.27.4.dist-info/entry_points.txt,sha256=fuO7JxKFLOm6xp6m3JHRA1UO_QW1dYU-F0IooA1NqQs,37
+boris_behav_obs-8.27.4.dist-info/top_level.txt,sha256=fJSgm62S7WesiwTorGbOO4nNN0yzgZ3klgfGi3Px4qI,6
+boris_behav_obs-8.27.4.dist-info/RECORD,,

{boris_behav_obs-8.27.3.dist-info → boris_behav_obs-8.27.4.dist-info}/WHEEL

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