boris-behav-obs 8.26__py2.py3-none-any.whl → 8.27__py2.py3-none-any.whl

boris/core.py

@@ -53,6 +53,8 @@ import gzip
 from collections import deque
 
 import matplotlib
+import zipfile
+import shutil
 
 matplotlib.use("Qt5Agg")
 
@@ -1360,28 +1362,81 @@ class MainWindow(QMainWindow, Ui_MainWindow):
     def actionCheckUpdate_activated(self, flagMsgOnlyIfNew=False):
         """
         check BORIS web site for updates
+        ask user for updating
         """
 
+        versionURL = "https://www.boris.unito.it/static/ver4.dat"
         try:
-            versionURL = "https://www.boris.unito.it/static/ver4.dat"
             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>{last_version}</b><br>"
-                    'Go to <a href="https://www.boris.unito.it">'
-                    "https://www.boris.unito.it</a> to install it."
+        except Exception:
+            QMessageBox.warning(self, cfg.programName, "Can not check for updates...")
+            return
+
+        # record check timestamp
+        config_file.save(self, lastCheckForNewVersion=int(time.mktime(time.localtime())))
+
+        if util.versiontuple(last_version) > util.versiontuple(__version__):
+            if (
+                dialog.MessageDialog(
+                    cfg.programName,
+                    (
+                        f"A new version is available: v. {last_version}.<br><br>"
+                        'For updating manually go to <a href="https://www.boris.unito.it">https://www.boris.unito.it</a>.<br>'
+                    ),
+                    (cfg.CANCEL, "Update automatically"),
                 )
-                # 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>"
+                == cfg.CANCEL
+            ):
+                return
+
+        else:
+            msg = f"The version you are using is the last one: <b>{__version__}</b>"
+            QMessageBox.information(self, cfg.programName, msg)
+
+            # any news?
             newsURL = "https://www.boris.unito.it/static/news.dat"
             news = urllib.request.urlopen(newsURL).read().strip().decode("utf-8")
-            config_file.save(self, lastCheckForNewVersion=int(time.mktime(time.localtime())))
-            QMessageBox.information(self, cfg.programName, msg)
             if news:
                 QMessageBox.information(self, cfg.programName, news)
+            return
+
+        # check if a .git is present
+        if (pl.Path(__file__).parent.parent / pl.Path(".git")).is_dir():
+            QMessageBox.critical(self, cfg.programName, "A .git directory is present, BORIS cannot be automatically updated.")
+            return
+
+        # download zip archive
+        try:
+            zip_content = urllib.request.urlopen(f"https://github.com/olivierfriard/BORIS/archive/refs/tags/v{last_version}.zip").read()
         except Exception:
-            QMessageBox.warning(self, cfg.programName, "Can not check for updates...")
+            QMessageBox.critical(self, cfg.programName, "Cannot download the new version")
+            return
+
+        temp_zip = tempfile.NamedTemporaryFile(suffix=".zip")
+        try:
+            with open(temp_zip.name, "wb") as f_out:
+                f_out.write(zip_content)
+        except Exception:
+            QMessageBox.critical(self, cfg.programName, "A problem occurred during saving the new version of BORIS.")
+            return
+
+        # extract to temp dir
+        try:
+            temp_dir = tempfile.TemporaryDirectory()
+            with zipfile.ZipFile(temp_zip.name, "r") as zip_ref:
+                zip_ref.extractall(temp_dir.name)
+        except Exception:
+            QMessageBox.critical(self, cfg.programName, "A problem occurred during the unzip of the new version.")
+            return
+
+        # copy from temp dir to current BORIS dir
+        try:
+            shutil.copytree(f"{temp_dir.name}/BORIS-{last_version}", pl.Path(__file__).parent.parent, dirs_exist_ok=True)
+        except Exception:
+            QMessageBox.critical(self, cfg.programName, "A problem occurred during the copy the new version of BORIS.")
+            return
+
+        QMessageBox.information(self, cfg.programName, f"BORIS was updated to v. {last_version}. Restart the program to apply the changes.")
 
     def seek_mediaplayer(self, new_time: dec, player=0) -> int:
         """

boris/preferences.py

@@ -54,7 +54,6 @@ class Preferences(QDialog, Ui_prefDialog):
         self.pbCancel.clicked.connect(self.reject)
 
         self.flag_refresh = False
-        self.flag_reset_frames_memory = False
 
     def refresh_preferences(self):
         """

boris/select_modifiers.py

@@ -43,6 +43,10 @@ from . import utilities as util
 
 
 class ModifiersList(QDialog):
+    """
+    class for selection the modifier(s)
+    """
+
     def __init__(self, code: str, modifiers_dict: dict, currentModifier: str):
         super().__init__()
         self.setWindowTitle(cfg.programName)
@@ -60,11 +64,11 @@ class ModifiersList(QDialog):
         self.modifiersSetNumber = 0
 
         for idx in util.sorted_keys(modifiers_dict):
-            if self.modifiers_dict[idx]["type"] not in [
+            if self.modifiers_dict[idx]["type"] not in (
                 cfg.SINGLE_SELECTION,
                 cfg.MULTI_SELECTION,
                 cfg.NUMERIC_MODIFIER,
-            ]:
+            ):
                 continue
 
             V2layout = QVBoxLayout()
@@ -75,10 +79,13 @@ class ModifiersList(QDialog):
             lb.setText(f"Modifier <b>{self.modifiers_dict[idx]['name']}</b>")
             V2layout.addWidget(lb)
 
-            if self.modifiers_dict[idx]["type"] in [
+            lb = QLabel(f"<small>{self.modifiers_dict[idx]['description']}</small>")
+            V2layout.addWidget(lb)
+
+            if self.modifiers_dict[idx]["type"] in (
                 cfg.SINGLE_SELECTION,
                 cfg.MULTI_SELECTION,
-            ]:
+            ):
                 lw = QListWidget()
                 self.modifiers_dict[idx]["widget"] = lw
                 lw.setObjectName(f"lw_modifiers_({self.modifiers_dict[idx]['type']})")
@@ -114,6 +121,7 @@ class ModifiersList(QDialog):
             if self.modifiers_dict[idx]["type"] in [cfg.NUMERIC_MODIFIER]:
                 le = QLineEdit()
                 self.modifiers_dict[idx]["widget"] = le
+                le.setObjectName(f"le_modifiers_({self.modifiers_dict[idx]['type']})")
 
                 if currentModifierList != [""] and currentModifierList[int(idx)] != "None":
                     le.setText(currentModifierList[int(idx)])
@@ -160,10 +168,14 @@ class ModifiersList(QDialog):
 
             # accept and close dialog if enter pressed
             if ek == Qt.Key_Enter or ek == Qt.Key_Return:  # enter or enter from numeric pad
-                self.accept()
+                if not self.pbOK_clicked():
+                    return False
                 return True
 
+            modifiersSetIndex = 0
             for widget in self.children():
+                if "_modifiers" in widget.objectName():
+                    modifiersSetIndex = modifiersSetIndex + 1
                 if "lw_modifiers" in widget.objectName():
                     if self.modifiersSetNumber == 1:
                         # check if modifiers have code
@@ -172,7 +184,7 @@ class ModifiersList(QDialog):
                                 break
                         else:
                             # modifiers have no associated code: the modifier starting with hit key will be selected
-                            if ek not in [Qt.Key_Down, Qt.Key_Up]:
+                            if ek not in (Qt.Key_Down, Qt.Key_Up):
                                 if ek == Qt.Key_Space and f"({cfg.MULTI_SELECTION})" in widget.objectName():  # checking using SPACE bar
                                     if widget.item(widget.currentRow()).checkState() == Qt.Checked:
                                         widget.item(widget.currentRow()).setCheckState(Qt.Unchecked)
@@ -198,6 +210,7 @@ class ModifiersList(QDialog):
                                     return
 
                     for index in range(widget.count()):
+                        # check function kesy (F1, F2...)
                         if ek in cfg.function_keys:
                             if f"({cfg.function_keys[ek]})" in widget.item(index).text().upper():
                                 if f"({cfg.SINGLE_SELECTION})" in widget.objectName():
@@ -206,6 +219,10 @@ class ModifiersList(QDialog):
                                     if self.modifiersSetNumber == 1:
                                         self.accept()
                                         return True
+                                    # else move to next set of mofifiers
+                                    elif modifiersSetIndex != self.modifiersSetNumber:
+                                        widget.parent().focusNextChild()
+                                        return True
 
                                 if f"({cfg.MULTI_SELECTION})" in widget.objectName():
                                     if widget.item(index).checkState() == Qt.Checked:
@@ -220,6 +237,10 @@ class ModifiersList(QDialog):
                                 if self.modifiersSetNumber == 1:
                                     self.accept()
                                     return True
+                                # else move to next set of mofifiers
+                                elif modifiersSetIndex != self.modifiersSetNumber:
+                                    widget.parent().focusNextChild()
+                                    return True
 
                             if f"({cfg.MULTI_SELECTION})" in widget.objectName():
                                 if widget.item(index).checkState() == Qt.Checked:
@@ -271,6 +292,9 @@ class ModifiersList(QDialog):
         return self.modifiers_dict
 
     def pbOK_clicked(self):
+        """
+        OK button is clicked
+        """
         for idx in util.sorted_keys(self.modifiers_dict):
             if self.modifiers_dict[idx]["type"] == cfg.NUMERIC_MODIFIER:
                 if self.modifiers_dict[idx]["widget"].text():
@@ -280,8 +304,8 @@ class ModifiersList(QDialog):
                         QMessageBox.warning(
                             self,
                             cfg.programName,
-                            "<b>{}</b> is not a numeric value".format(self.modifiers_dict[idx]["widget"].text()),
+                            f"<b>{self.modifiers_dict[idx]['widget'].text()}</b> is not a numeric value",
                         )
-                        return
+                        return False
 
         self.accept()

boris/version.py

@@ -20,5 +20,5 @@ This file is part of BORIS.
 
 """
 
-__version__ = "8.26"
-__version_date__ = "2024-06-04"
+__version__ = "8.27"
+__version_date__ = "2024-06-06"

{boris_behav_obs-8.26.dist-info → boris_behav_obs-8.27.dist-info}/METADATA

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

{boris_behav_obs-8.26.dist-info → boris_behav_obs-8.27.dist-info}/RECORD

@@ -16,7 +16,7 @@ boris/connections.py,sha256=RIQsaooiz6pzc2jJMHw9CQSyX39TgbM5JAwifCu5eWQ,19280
 boris/converters.py,sha256=FymqUxLEVLQwsUv6EVF7MRPowN1e87aVT2d3XjZJgAM,11771
 boris/converters_ui.py,sha256=firMWVgS3c492FF-YFv3FehOBLsbBHKaLEaVcoVctgc,8745
 boris/cooccurence.py,sha256=scazxKCmFQjBvv7oS9h7ylB8GJdkSmwy1LJZeUv5DOY,9824
-boris/core.py,sha256=y_7xvlLojM-Jdu3FlAwzWLQoiiGtHIC2Eo6Qm2SaHhk,222161
+boris/core.py,sha256=xkgkxUjAg-mqXORTQUKKPH8FMRMUkAH7UY8QC1NHeJQ,224211
 boris/core_qrc.py,sha256=5YMpr7ckI4TbXaeSyCMhNJBAlrGPeLes62RedU3EbWs,865287
 boris/core_ui.py,sha256=Z_6Ehp93fRVnPGyKRtgX2GcXRXb8QZojXipHSpJ_f3M,69854
 boris/db_functions.py,sha256=YyI2LMSFn772aMGdkOIpfXbPuoSWEvDckZZKevwvB-4,13326
@@ -58,7 +58,7 @@ boris/plot_events.py,sha256=HAKrdS3qf0A_PG1pGo0FRyk62femDxfxGss3w8CrlUw,23541
 boris/plot_events_rt.py,sha256=UfO1NKSqBR7j-vnfG8CKuOcdg5o8QQI_0eYdcz29Ufc,8358
 boris/plot_spectrogram_rt.py,sha256=yc8ifg9HCl-v_upMHkH_rmIZLhWBYkWBOhtKftvRvh0,8394
 boris/plot_waveform_rt.py,sha256=kNk6NVjM3wT3MpAw5zE9ktH94Pkd2AJ4ppv6uM6BVBc,7502
-boris/preferences.py,sha256=5KxUwP10mnsAk8CH3eSlzvd8mtsHsFJfWhzot3QOy3Y,11540
+boris/preferences.py,sha256=W_BHck8lxODvZ9NzIgfvhvXAwUI5A66aJVmdTRTxZMo,11494
 boris/preferences_ui.py,sha256=LQ46jW9kltJBQD85EHd5cCmlHG4c9N6v6YQLQvUisGM,21935
 boris/project.py,sha256=i9XT744HoJhlV93C0QuEMD8tNmzIHL0E-iZ4PIOSadc,82219
 boris/project_functions.py,sha256=R3DS_faDuMGKTpMnV0OhqgZp9yO1ojoA5wUIXdtHNIE,70972
@@ -66,7 +66,7 @@ boris/project_import_export.py,sha256=lCL4fOZuG5MaEf_wfDSHiE7-M2ZQsIbUR7KpHZjb1U
 boris/project_ui.py,sha256=TRJlsqq4XbIl8k2f20BKr2PtKa0QNjFNr6UnMieZYqU,35915
 boris/qrc_boris.py,sha256=4U2cD_fIBTtsTPhirOl9I3kTArOhXWYvfuO_A0M9N0I,675001
 boris/qrc_boris5.py,sha256=6bwT8OVtIr84nVIYp2ldUL7XL6WJi9zgJow6kgRxuIQ,161601
-boris/select_modifiers.py,sha256=jbzXKTuAuWnIVsykAuzlQmTqkAcmQsJl7c3cJiPbw_w,12051
+boris/select_modifiers.py,sha256=TAo7xi5bhiMp9WOAwEPq9xc8i4Nsa2QrcpoCrUgPwhE,13178
 boris/select_observations.py,sha256=snMC23nYD_qi88q95rXqV-NqbGO5BrLrC-CKlmVR3ok,14441
 boris/select_subj_behav.py,sha256=bX-YCeysK5QowYgoxQyy-9qeZmhzWM4SwArXxSAa5ho,10342
 boris/state_events.py,sha256=AcZmD0pIJ4AszTQe9conWlh8gJhwdBjZiGm1KOXt804,7768
@@ -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=SiBJBuTJeNtnGUhsWns3oikAq4V1gYNKHndPqWMiojY,786
+boris/version.py,sha256=Ehz76ElnqLfCRvK7eQyPLadOAPMH0TDtvJpN74k3_b4,786
 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.26.dist-info/LICENSE.TXT,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
-boris_behav_obs-8.26.dist-info/METADATA,sha256=nDb9oLy7TwmQToZgmmA3QqO4oPP9gIQE3AxfETicOC0,45541
-boris_behav_obs-8.26.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-boris_behav_obs-8.26.dist-info/entry_points.txt,sha256=fuO7JxKFLOm6xp6m3JHRA1UO_QW1dYU-F0IooA1NqQs,37
-boris_behav_obs-8.26.dist-info/top_level.txt,sha256=fJSgm62S7WesiwTorGbOO4nNN0yzgZ3klgfGi3Px4qI,6
-boris_behav_obs-8.26.dist-info/RECORD,,
+boris_behav_obs-8.27.dist-info/LICENSE.TXT,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
+boris_behav_obs-8.27.dist-info/METADATA,sha256=GQwIPQiremyM289rbtZcW7rjDQOlF9X8HfVV5OSsQSo,45541
+boris_behav_obs-8.27.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+boris_behav_obs-8.27.dist-info/entry_points.txt,sha256=fuO7JxKFLOm6xp6m3JHRA1UO_QW1dYU-F0IooA1NqQs,37
+boris_behav_obs-8.27.dist-info/top_level.txt,sha256=fJSgm62S7WesiwTorGbOO4nNN0yzgZ3klgfGi3Px4qI,6
+boris_behav_obs-8.27.dist-info/RECORD,,