boris-behav-obs 8.25.4__tar.gz → 8.26.1__tar.gz

{boris_behav_obs-8.25.4 → boris_behav_obs-8.26.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: boris-behav-obs
-Version: 8.25.4
+Version: 8.26.1
 Summary: BORIS - Behavioral Observation Research Interactive Software
 Author-email: Olivier Friard <olivier.friard@unito.it>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -697,9 +697,9 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE.TXT
 Requires-Dist: exifread>=3.0.0
-Requires-Dist: numpy>=1.21
+Requires-Dist: numpy>=1.26.4
 Requires-Dist: matplotlib>=3.3.3
-Requires-Dist: pandas>=1.3.5
+Requires-Dist: pandas>=2.2.2
 Requires-Dist: tablib[cli,html,ods,pandas,xls,xlsx]>=3
 Requires-Dist: pyqt5>=5.15
 Requires-Dist: pyreadr

{boris_behav_obs-8.25.4 → boris_behav_obs-8.26.1}/boris/add_modifier.py

@@ -36,7 +36,7 @@ class addModifierDialog(QDialog, Ui_Dialog):
     tabMem = -1
     itemPositionMem = -1
 
-    def __init__(self, modifiers_str, subjects=[], parent=None):
+    def __init__(self, modifiers_str: str, subjects: list = [], ask_at_stop_enabled: bool = False, parent=None):
         super().__init__()
         self.setupUi(self)
 
@@ -44,10 +44,12 @@ class addModifierDialog(QDialog, Ui_Dialog):
         if not self.subjects:
             self.pb_add_subjects.setEnabled(False)
 
+        self.ask_at_stop_enabled = ask_at_stop_enabled
+
         self.pbAddModifier.clicked.connect(self.addModifier)
         self.pbAddModifier.setIcon(QIcon(":/frame_forward"))
-        self.pbAddSet.clicked.connect(self.addSet)
-        self.pbRemoveSet.clicked.connect(self.removeSet)
+        self.pbAddSet.clicked.connect(self.add_set_of_modifiers)
+        self.pbRemoveSet.clicked.connect(self.remove_set_of_modifiers)
         self.pbModifyModifier.clicked.connect(self.modifyModifier)
         self.pbModifyModifier.setIcon(QIcon(":/frame_backward"))
 
@@ -60,22 +62,27 @@ class addModifierDialog(QDialog, Ui_Dialog):
         self.pb_add_subjects.clicked.connect(self.add_subjects)
         self.pb_load_file.clicked.connect(self.add_modifiers_from_file)
 
-        self.pbOK.clicked.connect(lambda: self.pb_pushed("ok"))
-        self.pbCancel.clicked.connect(lambda: self.pb_pushed("cancel"))
+        self.pbOK.clicked.connect(lambda: self.pb_pushed(cfg.OK))
+        self.pbCancel.clicked.connect(lambda: self.pb_pushed(cfg.CANCEL))
 
         self.le_name.textChanged.connect(self.set_name_changed)
         self.le_description.textChanged.connect(self.set_description_changed)
 
         self.cbType.currentIndexChanged.connect(self.type_changed)
 
-        dummy_dict = json.loads(modifiers_str) if modifiers_str else {}
-        modif_values = []
+        # self.cb_ask_at_stop.clicked.connect(self.ask_at_stop_changed)
+
+        dummy_dict: dict = json.loads(modifiers_str) if modifiers_str else {}
+        modif_values: list = []
         for idx in sorted_keys(dummy_dict):
             modif_values.append(dummy_dict[idx])
 
-        self.modifiers_sets_dict = {}
+        self.modifiers_sets_dict: dict = {}
         for modif in modif_values:
             self.modifiers_sets_dict[str(len(self.modifiers_sets_dict))] = dict(modif)
+            if self.ask_at_stop_enabled:
+                if dict(modif).get("ask at stop", False):
+                    self.cb_ask_at_stop.setChecked(True)
 
         self.tabWidgetModifiersSets.currentChanged.connect(self.tabWidgetModifiersSets_changed)
 
@@ -102,6 +109,7 @@ class addModifierDialog(QDialog, Ui_Dialog):
                 self.pb_add_subjects,
                 self.pb_load_file,
                 self.pb_sort_modifiers,
+                self.cb_ask_at_stop,
             ):
                 w.setVisible(False)
             for w in (self.leModifier, self.leCode, self.pbAddModifier, self.pbModifyModifier):
@@ -120,14 +128,14 @@ class addModifierDialog(QDialog, Ui_Dialog):
                         "If you close the window it will be lost.<br>"
                         "Do you want to change modifiers set"
                     ),
-                    ["Close", cfg.CANCEL],
+                    [cfg.CLOSE, cfg.CANCEL],
                 )
                 == cfg.CANCEL
             ):
                 return
-        if button == "ok":
+        if button == cfg.OK:
             self.accept()
-        if button == "cancel":
+        if button == cfg.CANCEL:
             self.reject()
 
     def add_subjects(self):
@@ -247,6 +255,12 @@ class addModifierDialog(QDialog, Ui_Dialog):
         else:
             self.lb_name.setText("Set name")
 
+    # def ask_at_stop_changed(self):
+    #    """
+    #    value changed
+    #    """
+    #    self.modifiers_sets_dict[str(self.tabWidgetModifiersSets.currentIndex())]["ask at stop"] = self.cb_ask_at_stop.isChecked()
+
     def moveSetLeft(self):
         """
         move selected modifiers set left
@@ -304,7 +318,7 @@ class addModifierDialog(QDialog, Ui_Dialog):
                 self.lwModifiers.item(x).text() for x in range(self.lwModifiers.count())
             ]
 
-    def addSet(self):
+    def add_set_of_modifiers(self):
         """
         Add a set of modifiers
         """
@@ -315,6 +329,7 @@ class addModifierDialog(QDialog, Ui_Dialog):
                 "name": "",
                 "description": "",
                 "type": cfg.SINGLE_SELECTION,
+                "ask at stop": False,
                 "values": [],
             }
             self.tabWidgetModifiersSets.addTab(QWidget(), f"Set #{len(self.modifiers_sets_dict)}")
@@ -342,6 +357,8 @@ class addModifierDialog(QDialog, Ui_Dialog):
                 self.pb_sort_modifiers,
             ):
                 w.setVisible(True)
+            self.cb_ask_at_stop.setVisible(self.ask_at_stop_enabled)
+
             for w in (self.leModifier, self.leCode, self.pbAddModifier, self.pbModifyModifier):
                 w.setEnabled(True)
             return
@@ -351,6 +368,7 @@ class addModifierDialog(QDialog, Ui_Dialog):
                 "name": "",
                 "description": "",
                 "type": cfg.SINGLE_SELECTION,
+                "ask at stop": False,
                 "values": [],
             }
             self.tabWidgetModifiersSets.addTab(QWidget(), f"Set #{len(self.modifiers_sets_dict)}")
@@ -364,7 +382,7 @@ class addModifierDialog(QDialog, Ui_Dialog):
                 "It is not possible to add a modifiers' set while the current modifiers' set is empty.",
             )
 
-    def removeSet(self):
+    def remove_set_of_modifiers(self):
         """
         remove set of modifiers
         """
@@ -403,14 +421,15 @@ class addModifierDialog(QDialog, Ui_Dialog):
                         self.pbRemoveSet,
                         self.pbMoveSetLeft,
                         self.pbMoveSetRight,
+                        self.cb_ask_at_stop,
                     ):
                         w.setVisible(False)
-                    for w in [self.leModifier, self.leCode, self.pbAddModifier, self.pbModifyModifier]:
+                    for w in (self.leModifier, self.leCode, self.pbAddModifier, self.pbModifyModifier):
                         w.setEnabled(False)
 
                 if not len(self.modifiers_sets_dict):
                     # set invisible and unavailable buttons and others elements
-                    for w in [
+                    for w in (
                         self.lb_name,
                         self.le_name,
                         self.lbType,
@@ -428,7 +447,7 @@ class addModifierDialog(QDialog, Ui_Dialog):
                         self.pb_add_subjects,
                         self.pb_load_file,
                         self.pb_sort_modifiers,
-                    ]:
+                    ):
                         w.setVisible(False)
                     for w in [self.leModifier, self.leCode, self.pbAddModifier, self.pbModifyModifier]:
                         w.setEnabled(False)
@@ -500,6 +519,7 @@ class addModifierDialog(QDialog, Ui_Dialog):
                     "name": "",
                     "description": "",
                     "type": cfg.SINGLE_SELECTION,
+                    "ask at stop": False,
                     "values": [],
                 }
 
@@ -530,6 +550,7 @@ class addModifierDialog(QDialog, Ui_Dialog):
                         "name": "",
                         "description": "",
                         "type": cfg.SINGLE_SELECTION,
+                        "ask at stop": False,
                         "values": [],
                     }
 
@@ -582,6 +603,8 @@ class addModifierDialog(QDialog, Ui_Dialog):
             self.lwModifiers.clear()
             self.leCode.clear()
             self.leModifier.clear()
+            # if self.ask_at_stop_enabled:
+            #    self.cb_ask_at_stop.setChecked(False)
 
             self.tabMem = tabIndex
 
@@ -589,14 +612,21 @@ class addModifierDialog(QDialog, Ui_Dialog):
                 self.le_name.setText(self.modifiers_sets_dict[str(tabIndex)]["name"])
                 self.le_description.setText(self.modifiers_sets_dict[str(tabIndex)].get("description", ""))
                 self.cbType.setCurrentIndex(self.modifiers_sets_dict[str(tabIndex)]["type"])
+                # if self.ask_at_stop_enabled:
+                #    self.cb_ask_at_stop.setChecked(self.modifiers_sets_dict[str(tabIndex)].get("ask at stop", False))
+
                 self.lwModifiers.addItems(self.modifiers_sets_dict[str(tabIndex)]["values"])
 
-    def getModifiers(self) -> str:
+    def get_modifiers(self) -> str:
         """
         returns modifiers as string
         """
-        keys_to_delete = []
+        keys_to_delete: list = []
         for idx in self.modifiers_sets_dict:
+            # add ask_at_stop value (boolean) to each set of modifiers
+            if self.ask_at_stop_enabled:
+                self.modifiers_sets_dict[idx]["ask at stop"] = self.cb_ask_at_stop.isChecked()
+            # delete modifiers without values for selection
             if (
                 self.modifiers_sets_dict[idx]["type"] in (cfg.SINGLE_SELECTION, cfg.MULTI_SELECTION)
                 and not self.modifiers_sets_dict[idx]["values"]

{boris_behav_obs-8.25.4 → boris_behav_obs-8.26.1}/boris/add_modifier_ui.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'add_modifier.ui'
+# Form implementation generated from reading ui file 'boris/add_modifier.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.7
+# Created by: PyQt5 UI code generator 5.15.6
 #
 # WARNING: Any manual changes made to this file will be lost when pyuic5 is
 # run again.  Do not edit this file unless you know what you are doing.
@@ -14,9 +14,12 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_Dialog(object):
     def setupUi(self, Dialog):
         Dialog.setObjectName("Dialog")
-        Dialog.resize(638, 636)
+        Dialog.resize(1088, 654)
         self.verticalLayout_5 = QtWidgets.QVBoxLayout(Dialog)
         self.verticalLayout_5.setObjectName("verticalLayout_5")
+        self.cb_ask_at_stop = QtWidgets.QCheckBox(Dialog)
+        self.cb_ask_at_stop.setObjectName("cb_ask_at_stop")
+        self.verticalLayout_5.addWidget(self.cb_ask_at_stop)
         self.verticalLayout_4 = QtWidgets.QVBoxLayout()
         self.verticalLayout_4.setObjectName("verticalLayout_4")
         self.horizontalLayout_5 = QtWidgets.QHBoxLayout()
@@ -101,10 +104,10 @@ class Ui_Dialog(object):
         self.pbMoveDown = QtWidgets.QPushButton(Dialog)
         self.pbMoveDown.setObjectName("pbMoveDown")
         self.horizontalLayout.addWidget(self.pbMoveDown)
-        self.verticalLayout.addLayout(self.horizontalLayout)
         self.pbRemoveModifier = QtWidgets.QPushButton(Dialog)
         self.pbRemoveModifier.setObjectName("pbRemoveModifier")
-        self.verticalLayout.addWidget(self.pbRemoveModifier)
+        self.horizontalLayout.addWidget(self.pbRemoveModifier)
+        self.verticalLayout.addLayout(self.horizontalLayout)
         self.pb_sort_modifiers = QtWidgets.QPushButton(Dialog)
         self.pb_sort_modifiers.setObjectName("pb_sort_modifiers")
         self.verticalLayout.addWidget(self.pb_sort_modifiers)
@@ -156,6 +159,7 @@ class Ui_Dialog(object):
     def retranslateUi(self, Dialog):
         _translate = QtCore.QCoreApplication.translate
         Dialog.setWindowTitle(_translate("Dialog", "Set modifiers"))
+        self.cb_ask_at_stop.setText(_translate("Dialog", "Ask for modifier(s) when behavior stops"))
         self.lbModifier.setText(_translate("Dialog", "Modifier"))
         self.lbCode.setText(_translate("Dialog", "Key code"))
         self.lbCodeHelp.setText(_translate("Dialog", "Key code is case sensitive. Type one character or a function key (F1, F2... F12)"))

{boris_behav_obs-8.25.4 → boris_behav_obs-8.26.1}/boris/advanced_event_filtering.py

@@ -155,7 +155,7 @@ class Advanced_event_filtering_dialog(QDialog):
         hbox.addItem(QSpacerItem(241, 20, QSizePolicy.Expanding, QSizePolicy.Minimum))
         self.pb_save = QPushButton("Save results", clicked=self.save_results)
         hbox.addWidget(self.pb_save)
-        self.pb_close = QPushButton("Close", clicked=self.close)
+        self.pb_close = QPushButton(cfg.CLOSE, clicked=self.close)
         hbox.addWidget(self.pb_close)
         vbox.addLayout(hbox)
 
@@ -429,7 +429,7 @@ def event_filtering(self):
     for row in cursor.fetchall():
         obs, subj, behav, start, stop = row
         if obs not in events:
-            events[obs]: dict = {}
+            events[obs] = {}
 
         # use function in base at event (state or point)
         interval_func = icc if start == stop else ico

{boris_behav_obs-8.25.4 → boris_behav_obs-8.26.1}/boris/behav_coding_map_creator.py

@@ -138,7 +138,7 @@ class BehaviorsMapCreatorWindow(QMainWindow):
         self.addToProject.triggered.connect(self.add_to_project)
 
         self.exitAction = QAction(QIcon(), "&Close", self)
-        self.exitAction.setStatusTip("Close")
+        self.exitAction.setStatusTip(cfg.CLOSE)
         self.exitAction.triggered.connect(self.close)
 
         menubar = self.menuBar()

{boris_behav_obs-8.25.4 → boris_behav_obs-8.26.1}/boris/behaviors_coding_map.py

@@ -102,7 +102,7 @@ class BehaviorsCodingMapWindowClass(QWidget):
         self.leareaCode = QLineEdit(self)
         hBoxLayout1.addWidget(self.leareaCode)
 
-        self.btClose = QPushButton("Close")
+        self.btClose = QPushButton(cfg.CLOSE)
         self.btClose.clicked.connect(self.close)
         hBoxLayout1.addWidget(self.btClose)
 

{boris_behav_obs-8.25.4 → boris_behav_obs-8.26.1}/boris/config.py

@@ -82,6 +82,7 @@ EVENTS = "events"
 TIME_OFFSET = "time offset"
 
 CODING_MAP = "coding_map"
+CODING_MAP_sp = "coding map"  # space between words (no underscore)
 BEHAVIORS_CODING_MAP = "behaviors_coding_map"
 SUBJECTS = "subjects_conf"
 ETHOGRAM = "behaviors_conf"
@@ -139,6 +140,7 @@ YES = "Yes"
 NO = "No"
 CANCEL = "Cancel"
 APPEND = "Append"
+CLOSE = "Close"
 REPLACE = "Replace"
 REMOVE = "Remove"
 SAVE = "Save"
@@ -210,17 +212,6 @@ TIME_LAPSE = "time_lapse_delay"
 
 
 # fields for event configuration
-"""
-fields = {
-    "type": 0,
-    "key": 1,
-    "code": 2,
-    "description": 3,
-    "modifiers": 4,
-    "excluded": 5,
-    "coding map": 6,
-}
-"""
 
 ETHOGRAM_TABLE_COLUMNS: dict = {
     0: "key",
@@ -245,18 +236,6 @@ behavioursFields: dict = {
     "excluded": 7,
     "coding map": 8,
 }
-"""
-ETHOGRAM_FIELDS = [
-    "type",
-    "key",
-    "code",
-    "description",
-    "category",
-    "modifiers",
-    "excluded",
-    "coding map",
-]
-"""
 ETHOGRAM_EDITABLE_FIELDS: tuple = ("key", "code", "description")
 
 PROJECT_BEHAVIORS_KEY_FIELD_IDX = 1
@@ -471,6 +450,9 @@ WAVEFORM_PLOT = "waveform"
 SPECTROGRAM_PLOT = "spectrogram"
 EVENTS_PLOT = "plot_events"
 
+PLAYING = "playing"
+PAUSED = "paused"
+STOPPED = "stopped"
 
 POINT_EVENT_ST_DURATION = 0.5
 
@@ -481,6 +463,8 @@ SLIDER_MAXIMUM = 1000
 
 FRAME_DEFAULT_CACHE_SIZE = 1
 
+EXCLUDED = "excluded"
+
 # modifiers
 MODIFIERS = "modifiers"
 SINGLE_SELECTION = 0

{boris_behav_obs-8.25.4 → boris_behav_obs-8.26.1}/boris/config_file.py

@@ -316,8 +316,6 @@ def save(self, lastCheckForNewVersion=0):
 
     settings = QSettings(str(file_path), QSettings.IniFormat)
 
-    print(f"{self.config_param=}")
-
     settings.setValue("config", self.config_param)
 
     settings.setValue("geometry", self.saveGeometry())

{boris_behav_obs-8.25.4 → boris_behav_obs-8.26.1}/boris/core.py

@@ -20,7 +20,6 @@ This file is part of BORIS.
 
 """
 
-
 import os
 import sys
 
@@ -1365,13 +1364,14 @@ class MainWindow(QMainWindow, Ui_MainWindow):
 
         try:
             versionURL = "https://www.boris.unito.it/static/ver4.dat"
-            lastVersion = urllib.request.urlopen(versionURL).read().strip().decode("utf-8")
-            if util.versiontuple(lastVersion) > util.versiontuple(__version__):
+            last_version = urllib.request.urlopen(versionURL).read().strip().decode("utf-8")
+            if util.versiontuple(last_version) > util.versiontuple(__version__):
                 msg = (
-                    f"A new version is available: v. <b>{lastVersion}</b><br>"
+                    f"A new version is available: v. <b>{last_version}</b><br>"
                     'Go to <a href="https://www.boris.unito.it">'
                     "https://www.boris.unito.it</a> to install it."
                 )
+                # https://github.com/olivierfriard/BORIS/archive/refs/tags/v{last_version}.zip
             else:
                 msg = f"The version you are using is the last one: <b>{__version__}</b>"
             newsURL = "https://www.boris.unito.it/static/news.dat"
@@ -3611,6 +3611,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
                 if dialog.MessageDialog(cfg.programName, "Delete the current events?", (cfg.YES, cfg.NO)) == cfg.YES:
                     self.pj[cfg.OBSERVATIONS][self.observationId][cfg.EVENTS] = []
                 self.project_changed()
+                self.load_tw_events(self.observationId)
 
             self.pb_live_obs.setText("Stop live observation")
 
@@ -4651,9 +4652,9 @@ class MainWindow(QMainWindow, Ui_MainWindow):
 
         event = dict(self.pj[cfg.ETHOGRAM][behavior_idx])
         # check if coding map for modifiers
-        if "coding map" in self.pj[cfg.ETHOGRAM][behavior_idx] and self.pj[cfg.ETHOGRAM][behavior_idx]["coding map"]:
+        if util.has_coding_map(self.pj[cfg.ETHOGRAM], behavior_idx):
             # pause if media and media playing
-            if self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] in [cfg.MEDIA]:
+            if self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] == cfg.MEDIA:
                 if self.playerType == cfg.MEDIA:
                     if self.is_playing():
                         flag_player_playing = True

{boris_behav_obs-8.25.4 → boris_behav_obs-8.26.1}/boris/dialog.py

@@ -1027,8 +1027,8 @@ class FindInEvents(QWidget):
         hbox2 = QHBoxLayout()
         self.pbOK = QPushButton("Find")
         self.pbOK.clicked.connect(lambda: self.click("FIND"))
-        self.pbCancel = QPushButton("Close")
-        self.pbCancel.clicked.connect(lambda: self.click("CLOSE"))
+        self.pbCancel = QPushButton(cfg.CLOSE)
+        self.pbCancel.clicked.connect(lambda: self.click(cfg.CLOSE))
         hbox2.addWidget(self.pbCancel)
         hbox2.addWidget(self.pbOK)
         hbox.addLayout(hbox2)

{boris_behav_obs-8.25.4 → boris_behav_obs-8.26.1}/boris/geometric_measurement.py

@@ -182,7 +182,7 @@ class wgMeasurement(QDialog):
 
         self.pb_save = QPushButton("Save results", clicked=self.pb_save_clicked)
         hbox3.addWidget(self.pb_save)
-        self.pb_close = QPushButton("Close", clicked=self.pbClose_clicked)
+        self.pb_close = QPushButton(cfg.CLOSE, clicked=self.pbClose_clicked)
         hbox3.addWidget(self.pb_close)
         vbox.addLayout(hbox3)
 

{boris_behav_obs-8.25.4 → boris_behav_obs-8.26.1}/boris/measurement_widget.py

@@ -111,7 +111,7 @@ class wgMeasurement(QWidget):
         self.pbSave = QPushButton("Save results", clicked=self.pbSave_clicked)
         hbox3.addWidget(self.pbSave)
 
-        self.pbClose = QPushButton("Close", clicked=self.pbClose_clicked)
+        self.pbClose = QPushButton(cfg.CLOSE, clicked=self.pbClose_clicked)
         hbox3.addWidget(self.pbClose)
 
         vbox.addLayout(hbox3)

{boris_behav_obs-8.25.4 → boris_behav_obs-8.26.1}/boris/observation.py

@@ -706,7 +706,7 @@ class Observation(QDialog, Ui_Form):
         w = dialog.View_data()
         w.setWindowTitle("View data")
         w.lb.setText(f"View first and last rows of <b>{pl.Path(data_file_path).name}</b> file")
-        w.pbOK.setText("Close")
+        w.pbOK.setText(cfg.CLOSE)
         w.label.setText("Index of columns to plot")
         w.le.setEnabled(False)
         w.le.setText(columns_to_plot)

{boris_behav_obs-8.25.4 → boris_behav_obs-8.26.1}/boris/otx_parser.py

@@ -31,7 +31,7 @@ import zipfile
 import pathlib as pl
 from xml.dom import minidom
 import logging
-from typing import Optional, Tuple
+from typing import Tuple
 
 try:
     from . import config as cfg

{boris_behav_obs-8.25.4 → boris_behav_obs-8.26.1}/boris/preferences.py

@@ -204,8 +204,6 @@ def preferences(self):
     preferencesWindow.sb_toolbar_icon_size.setValue(self.config_param.get(cfg.TOOLBAR_ICON_SIZE, cfg.DEFAULT_TOOLBAR_ICON_SIZE_VALUE))
     preferencesWindow.cb_darkmode.setChecked(self.config_param.get(cfg.DARK_MODE, cfg.DARK_MODE_DEFAULT_VALUE))
 
-    self.config_param[cfg.DARK_MODE] = preferencesWindow.cb_darkmode.isChecked()
-
     gui_utilities.restore_geometry(preferencesWindow, "preferences", (700, 500))
 
     if preferencesWindow.exec_():

{boris_behav_obs-8.25.4 → boris_behav_obs-8.26.1}/boris/project.py

@@ -760,7 +760,7 @@ class projectDialog(QDialog, Ui_dlgProject):
         # check if double click on 'coding map' column
         if column == cfg.behavioursFields["coding map"]:
             if "with coding map" in self.twBehaviors.item(row, cfg.behavioursFields[cfg.TYPE]).text():
-                self.behaviorTypeChanged(row)
+                self.behavior_type_changed(row)
             else:
                 QMessageBox.information(self, cfg.programName, "Change the behavior type on first column to select a coding map")
 
@@ -790,10 +790,15 @@ class projectDialog(QDialog, Ui_dlgProject):
                     subjectName = self.twSubjects.item(subject_row, 1).text().strip() if self.twSubjects.item(subject_row, 1) else ""
                     subjects_list.append((subjectName, key))
 
-                addModifierWindow = add_modifier.addModifierDialog(self.twBehaviors.item(row, column).text(), subjects=subjects_list)
+                addModifierWindow = add_modifier.addModifierDialog(
+                    self.twBehaviors.item(row, column).text(),
+                    subjects=subjects_list,
+                    ask_at_stop_enabled=self.twBehaviors.item(row, cfg.behavioursFields["type"]).text() == cfg.STATE_EVENT,
+                )
                 addModifierWindow.setWindowTitle(f'Set modifiers for "{self.twBehaviors.item(row, 2).text()}" behavior')
+
                 if addModifierWindow.exec_():
-                    self.twBehaviors.item(row, column).setText(addModifierWindow.getModifiers())
+                    self.twBehaviors.item(row, column).setText(addModifierWindow.get_modifiers())
 
     def behavior_type_doubleclicked(self, row):
         """
@@ -810,7 +815,7 @@ class projectDialog(QDialog, Ui_dlgProject):
         if ok and new_type:
             self.twBehaviors.item(row, cfg.behavioursFields["type"]).setText(new_type)
 
-            self.behaviorTypeChanged(row)
+            self.behavior_type_changed(row)
 
     def color_doubleclicked(self, row: int) -> None:
         """
@@ -1325,16 +1330,16 @@ class projectDialog(QDialog, Ui_dlgProject):
             self.twBehaviors.setItem(self.twBehaviors.rowCount() - 1, cfg.behavioursFields[field_type], item)
         self.twBehaviors.scrollToBottom()
 
-    def behaviorTypeChanged(self, row):
+    def behavior_type_changed(self, row: int) -> None:
         """
         event type combobox changed
         """
 
-        if "with coding map" in self.twBehaviors.item(row, cfg.behavioursFields[cfg.TYPE]).text():
+        if cfg.CODING_MAP_sp in self.twBehaviors.item(row, cfg.behavioursFields[cfg.TYPE]).text():
             # let user select a coding maop
             fn = QFileDialog().getOpenFileName(
                 self,
-                "Select a coding map for " f"{self.twBehaviors.item(row, cfg.behavioursFields['code']).text()} behavior",
+                "Select a modifier coding map for " f"{self.twBehaviors.item(row, cfg.behavioursFields['code']).text()} behavior",
                 "",
                 "BORIS map files (*.boris_map);;All files (*)",
             )
@@ -1344,12 +1349,12 @@ class projectDialog(QDialog, Ui_dlgProject):
                 try:
                     new_map = json.loads(open(fileName, "r").read())
                 except Exception:
-                    QMessageBox.critical(self, cfg.programName, "Error reding the file")
+                    QMessageBox.critical(self, cfg.programName, "Error reding the coding map")
                     return
                 self.pj[cfg.CODING_MAP][new_map["name"]] = new_map
 
                 # add modifiers from coding map areas
-                modifstr = str(
+                modifstr = json.dumps(
                     {
                         "0": {
                             "name": new_map["name"],
@@ -1581,7 +1586,7 @@ class projectDialog(QDialog, Ui_dlgProject):
     def check_ethogram(self) -> dict:
         """
         check ethogram for various parameter
-        returns ethogram dict or {cfg.CANCEL: True"} in case of error
+        returns ethogram dict or {cfg.CANCEL: True} in case of error
 
         """
         # store behaviors
@@ -1602,7 +1607,11 @@ class projectDialog(QDialog, Ui_dlgProject):
 
             if self.twBehaviors.item(r, cfg.behavioursFields["modifiers"]).text():
                 try:
-                    modifiers_dict = eval(self.twBehaviors.item(r, cfg.behavioursFields["modifiers"]).text())
+                    modifiers_dict = (
+                        json.loads(self.twBehaviors.item(r, cfg.behavioursFields["modifiers"]).text())
+                        if self.twBehaviors.item(r, cfg.behavioursFields["modifiers"]).text()
+                        else {}
+                    )
                     for k in modifiers_dict:
                         for value in modifiers_dict[k]["values"]:
                             modif_code = value.split(" (")[0]
@@ -1672,7 +1681,7 @@ class projectDialog(QDialog, Ui_dlgProject):
                     if field == "modifiers" and row["modifiers"]:
                         if remove_leading_trailing_spaces_in_modifiers == cfg.YES:
                             try:
-                                modifiers_dict = eval(row["modifiers"])
+                                modifiers_dict = json.loads(row["modifiers"]) if row["modifiers"] else {}
                                 for k in modifiers_dict:
                                     for idx, value in enumerate(modifiers_dict[k]["values"]):
                                         modif_code = value.split(" (")[0]
@@ -1688,7 +1697,13 @@ class projectDialog(QDialog, Ui_dlgProject):
                                 QMessageBox.critical(self, cfg.programName, "Error removing leading/trailing spaces in modifiers")
 
                         else:
-                            row["modifiers"] = eval(row["modifiers"])
+                            """
+                            if row["modifiers"]:
+                                row["modifiers"] = eval(row["modifiers"])
+                            else:
+                                row["modifiers"] = {}
+                            """
+                            row["modifiers"] = json.loads(row["modifiers"]) if row["modifiers"] else {}
                 else:
                     row[field] = ""
 
@@ -1714,7 +1729,7 @@ class projectDialog(QDialog, Ui_dlgProject):
             return {cfg.CANCEL: True}
 
         # check if behavior belong to category that is not in categories list
-        behavior_category = []
+        behavior_category: list = []
         for idx in checked_ethogram:
             if cfg.BEHAVIOR_CATEGORY in checked_ethogram[idx]:
                 if checked_ethogram[idx][cfg.BEHAVIOR_CATEGORY]: