boris-behav-obs 8.27.2__tar.gz → 8.27.4__tar.gz

{boris_behav_obs-8.27.2 → boris_behav_obs-8.27.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: boris-behav-obs
-Version: 8.27.2
+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.2 → boris_behav_obs-8.27.4}/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_behav_obs-8.27.2 → boris_behav_obs-8.27.4}/boris/preferences_ui.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'preferences.ui'
+# Form implementation generated from reading ui file 'boris/preferences.ui'
 #
 # Created by: PyQt5 UI code generator 5.15.6
 #
@@ -331,7 +331,7 @@ class Ui_prefDialog(object):
         self.pb_reset_category_colors.setText(_translate("prefDialog", "Reset colors to default"))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_colors), _translate("prefDialog", "Plot colors"))
         self.label_9.setText(_translate("prefDialog", "Toolbar icons size"))
-        self.cb_darkmode.setText(_translate("prefDialog", "Dark mode"))
+        self.cb_darkmode.setText(_translate("prefDialog", "Dark mode (should be necessary to relaunch BORIS)"))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_interface), _translate("prefDialog", "Interface"))
         self.pb_refresh.setText(_translate("prefDialog", "Refresh"))
         self.pbCancel.setText(_translate("prefDialog", "Cancel"))

{boris_behav_obs-8.27.2 → boris_behav_obs-8.27.4}/boris/project.py

@@ -578,7 +578,7 @@ class projectDialog(QDialog, Ui_dlgProject):
             # convert modifier shortcuts
             if self.twBehaviors.item(row, cfg.behavioursFields[cfg.MODIFIERS]).text():
                 modifiers_dict = (
-                    eval(self.twBehaviors.item(row, cfg.behavioursFields[cfg.MODIFIERS]).text())
+                    json.loads(self.twBehaviors.item(row, cfg.behavioursFields[cfg.MODIFIERS]).text())
                     if self.twBehaviors.item(row, cfg.behavioursFields[cfg.MODIFIERS]).text()
                     else {}
                 )
@@ -593,7 +593,7 @@ class projectDialog(QDialog, Ui_dlgProject):
                     except Exception:
                         logging.warning("error during conversion of modifier short cut to lower case")
 
-                self.twBehaviors.item(row, cfg.behavioursFields[cfg.MODIFIERS]).setText(str(modifiers_dict))
+                self.twBehaviors.item(row, cfg.behavioursFields[cfg.MODIFIERS]).setText(json.dumps(modifiers_dict))
 
     def convert_subjects_keys_to_lower_case(self):
         """
@@ -796,7 +796,7 @@ class projectDialog(QDialog, Ui_dlgProject):
             else:
                 QMessageBox.information(self, cfg.programName, "Change the behavior type on first column to select a coding map")
 
-        # check if double click on category
+        # check if double click on behavior type
         if column == cfg.behavioursFields["type"]:
             self.behavior_type_doubleclicked(row)
 
@@ -808,6 +808,7 @@ class projectDialog(QDialog, Ui_dlgProject):
         if column == cfg.behavioursFields[cfg.BEHAVIOR_CATEGORY]:
             self.category_doubleclicked(row)
 
+        # check if double click on modifiers
         if column == cfg.behavioursFields[cfg.MODIFIERS]:
             # check if behavior has coding map
             if (
@@ -1735,12 +1736,6 @@ class projectDialog(QDialog, Ui_dlgProject):
                                 QMessageBox.critical(self, cfg.programName, "Error removing leading/trailing spaces in modifiers")
 
                         else:
-                            """
-                            if row["modifiers"]:
-                                row["modifiers"] = eval(row["modifiers"])
-                            else:
-                                row["modifiers"] = {}
-                            """
                             row["modifiers"] = json.loads(row["modifiers"]) if row["modifiers"] else {}
                 else:
                     row[field] = ""

{boris_behav_obs-8.27.2 → boris_behav_obs-8.27.4}/boris/project_import_export.py

@@ -133,7 +133,7 @@ def export_ethogram(self) -> None:
             # modifiers
             if self.twBehaviors.item(r, cfg.behavioursFields[cfg.MODIFIERS]).text():
                 # modifiers a string
-                modifiers_dict = eval(self.twBehaviors.item(r, cfg.behavioursFields[cfg.MODIFIERS]).text())
+                modifiers_dict = json.loads(self.twBehaviors.item(r, cfg.behavioursFields[cfg.MODIFIERS]).text())
                 modifiers_list = []
                 for key in modifiers_dict:
                     values = ",".join(modifiers_dict[key]["values"])
@@ -350,19 +350,22 @@ def import_ethogram_from_dict(self, project: dict):
                 item.setBackground(QColor(230, 230, 230))
 
             else:
-                if field == cfg.MODIFIERS and isinstance(project[cfg.ETHOGRAM][i][field], str):
-                    modif_set_dict = {}
-                    if project[cfg.ETHOGRAM][i][field]:
-                        modif_set_list = project[cfg.ETHOGRAM][i][field].split("|")
-                        for modif_set in modif_set_list:
-                            modif_set_dict[str(len(modif_set_dict))] = {
-                                "name": "",
-                                "type": cfg.SINGLE_SELECTION,
-                                "values": modif_set.split(","),
-                            }
-                    project[cfg.ETHOGRAM][i][field] = dict(modif_set_dict)
-
-                item.setText(str(project[cfg.ETHOGRAM][i][field]))
+                if field == cfg.MODIFIERS:
+                    if isinstance(project[cfg.ETHOGRAM][i][field], str):
+                        modif_set_dict = {}
+                        if project[cfg.ETHOGRAM][i][field]:
+                            modif_set_list = project[cfg.ETHOGRAM][i][field].split("|")
+                            for modif_set in modif_set_list:
+                                modif_set_dict[str(len(modif_set_dict))] = {
+                                    "name": "",
+                                    "type": cfg.SINGLE_SELECTION,
+                                    "values": modif_set.split(","),
+                                }
+                        project[cfg.ETHOGRAM][i][field] = dict(modif_set_dict)
+                    else:
+                        item.setText(json.dumps(project[cfg.ETHOGRAM][i][field]))
+                else:
+                    item.setText(project[cfg.ETHOGRAM][i][field])
 
                 if field not in cfg.ETHOGRAM_EDITABLE_FIELDS:
                     item.setFlags(Qt.ItemIsEnabled)
@@ -425,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)
 
@@ -460,8 +466,11 @@ def load_dataframe_into_behaviors_tablewidget(self, df: pd.DataFrame) -> int:
 
 
 def import_behaviors_from_project(self):
+    """
+    import ethogram from a BORIS project file
+    """
     fn = QFileDialog().getOpenFileName(
-        self, "Import behaviors from project file", "", ("Project files (*.boris *.boris.gz);;" "All files (*)")
+        self, "Import behaviors from BORIS project file", "", ("Project files (*.boris *.boris.gz);;" "All files (*)")
     )
     file_name = fn[0] if type(fn) is tuple else fn
 
@@ -474,7 +483,7 @@ def import_behaviors_from_project(self):
 
 def import_behaviors_from_text_file(self):
     """
-    Import behaviors from text file (CSV or TSV)
+    Import ethogram from text file (CSV or TSV)
     """
 
     if self.twBehaviors.rowCount():

{boris_behav_obs-8.27.2 → boris_behav_obs-8.27.4}/boris/version.py

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

{boris_behav_obs-8.27.2 → boris_behav_obs-8.27.4}/boris_behav_obs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: boris-behav-obs
-Version: 8.27.2
+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.2 → boris_behav_obs-8.27.4}/pyproject.toml

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