boris-behav-obs 9.0.2__tar.gz → 9.0.5__tar.gz

{boris_behav_obs-9.0.2 → boris_behav_obs-9.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: boris-behav-obs
-Version: 9.0.2
+Version: 9.0.5
 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.2 → boris_behav_obs-9.0.5}/boris/__init__.py

@@ -2,7 +2,7 @@
 BORIS
 Behavioral Observation Research Interactive Software
 
-Copyright 2012-2024 Olivier Friard
+Copyright 2012-2025 Olivier Friard
 
 This file is part of BORIS.
 

{boris_behav_obs-9.0.2 → boris_behav_obs-9.0.5}/boris/__main__.py

@@ -1,7 +1,7 @@
 """
 BORIS
 Behavioral Observation Research Interactive Software
-Copyright 2012-2024 Olivier Friard
+Copyright 2012-2025 Olivier Friard
 
 This file is part of BORIS.
 

{boris_behav_obs-9.0.2 → boris_behav_obs-9.0.5}/boris/about.py

@@ -1,7 +1,7 @@
 """
 BORIS
 Behavioral Observation Research Interactive Software
-Copyright 2012-2024 Olivier Friard
+Copyright 2012-2025 Olivier Friard
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -93,7 +93,7 @@ def actionAbout_activated(self):
     about_dialog.setInformativeText(
         (
             f"<b>{cfg.programName}</b> v. {version.__version__} - {version.__version_date__}"
-            "<p>Copyright &copy; 2012-2024 Olivier Friard - Marco Gamba<br>"
+            "<p>Copyright &copy; 2012-2025 Olivier Friard - Marco Gamba<br>"
             "Department of Life Sciences and Systems Biology<br>"
             "University of Torino - Italy<br>"
             "<br>"

{boris_behav_obs-9.0.2 → boris_behav_obs-9.0.5}/boris/add_modifier.py

@@ -1,7 +1,7 @@
 """
 BORIS
 Behavioral Observation Research Interactive Software
-Copyright 2012-2024 Olivier Friard
+Copyright 2012-2025 Olivier Friard
 
 This file is part of BORIS.
 

{boris_behav_obs-9.0.2 → boris_behav_obs-9.0.5}/boris/add_modifier_ui.py

@@ -95,9 +95,9 @@ class Ui_Dialog(object):
         self.tabWidgetModifiersSets = QTabWidget(Dialog)
         self.tabWidgetModifiersSets.setObjectName(u"tabWidgetModifiersSets")
         self.tabWidgetModifiersSets.setMaximumSize(QSize(16777215, 30))
-        self.tabWidgetModifiersSets.setTabPosition(QTabWidget.North)
-        self.tabWidgetModifiersSets.setTabShape(QTabWidget.Rounded)
-        self.tabWidgetModifiersSets.setElideMode(Qt.ElideNone)
+        self.tabWidgetModifiersSets.setTabPosition(QTabWidget.TabPosition.North)
+        self.tabWidgetModifiersSets.setTabShape(QTabWidget.TabShape.Rounded)
+        self.tabWidgetModifiersSets.setElideMode(Qt.TextElideMode.ElideNone)
         self.tabWidgetModifiersSets.setDocumentMode(True)
 
         self.verticalLayout.addWidget(self.tabWidgetModifiersSets)
@@ -158,6 +158,11 @@ class Ui_Dialog(object):
 
         self.horizontalLayout.addWidget(self.pbMoveDown)
 
+        self.pb_sort_modifiers = QPushButton(Dialog)
+        self.pb_sort_modifiers.setObjectName(u"pb_sort_modifiers")
+
+        self.horizontalLayout.addWidget(self.pb_sort_modifiers)
+
         self.pbRemoveModifier = QPushButton(Dialog)
         self.pbRemoveModifier.setObjectName(u"pbRemoveModifier")
 
@@ -166,11 +171,6 @@ class Ui_Dialog(object):
 
         self.verticalLayout.addLayout(self.horizontalLayout)
 
-        self.pb_sort_modifiers = QPushButton(Dialog)
-        self.pb_sort_modifiers.setObjectName(u"pb_sort_modifiers")
-
-        self.verticalLayout.addWidget(self.pb_sort_modifiers)
-
         self.horizontalLayout_3 = QHBoxLayout()
         self.horizontalLayout_3.setObjectName(u"horizontalLayout_3")
         self.pbAddSet = QPushButton(Dialog)
@@ -178,6 +178,16 @@ class Ui_Dialog(object):
 
         self.horizontalLayout_3.addWidget(self.pbAddSet)
 
+        self.pbMoveSetLeft = QPushButton(Dialog)
+        self.pbMoveSetLeft.setObjectName(u"pbMoveSetLeft")
+
+        self.horizontalLayout_3.addWidget(self.pbMoveSetLeft)
+
+        self.pbMoveSetRight = QPushButton(Dialog)
+        self.pbMoveSetRight.setObjectName(u"pbMoveSetRight")
+
+        self.horizontalLayout_3.addWidget(self.pbMoveSetRight)
+
         self.pbRemoveSet = QPushButton(Dialog)
         self.pbRemoveSet.setObjectName(u"pbRemoveSet")
 
@@ -188,16 +198,6 @@ class Ui_Dialog(object):
 
         self.horizontalLayout_4 = QHBoxLayout()
         self.horizontalLayout_4.setObjectName(u"horizontalLayout_4")
-        self.pbMoveSetLeft = QPushButton(Dialog)
-        self.pbMoveSetLeft.setObjectName(u"pbMoveSetLeft")
-
-        self.horizontalLayout_4.addWidget(self.pbMoveSetLeft)
-
-        self.pbMoveSetRight = QPushButton(Dialog)
-        self.pbMoveSetRight.setObjectName(u"pbMoveSetRight")
-
-        self.horizontalLayout_4.addWidget(self.pbMoveSetRight)
-
 
         self.verticalLayout.addLayout(self.horizontalLayout_4)
 
@@ -258,8 +258,8 @@ class Ui_Dialog(object):
         self.lbModifier.setText(QCoreApplication.translate("Dialog", u"Modifier", None))
         self.lbCode.setText(QCoreApplication.translate("Dialog", u"Key code", None))
         self.lbCodeHelp.setText(QCoreApplication.translate("Dialog", u"Key code is case sensitive. Type one character or a function key (F1, F2... F12)", None))
-        self.pbAddModifier.setText("")
-        self.pbModifyModifier.setText("")
+        self.pbAddModifier.setText(QCoreApplication.translate("Dialog", u"->", None))
+        self.pbModifyModifier.setText(QCoreApplication.translate("Dialog", u"<-", None))
         self.lb_name.setText(QCoreApplication.translate("Dialog", u"Set name", None))
         self.lb_description.setText(QCoreApplication.translate("Dialog", u"Description", None))
         self.lbType.setText(QCoreApplication.translate("Dialog", u"Modifier type", None))
@@ -271,12 +271,12 @@ class Ui_Dialog(object):
         self.lbValues.setText(QCoreApplication.translate("Dialog", u"Values", None))
         self.pbMoveUp.setText(QCoreApplication.translate("Dialog", u"Move modifier up", None))
         self.pbMoveDown.setText(QCoreApplication.translate("Dialog", u"Move modifier down", None))
-        self.pbRemoveModifier.setText(QCoreApplication.translate("Dialog", u"Remove modifier", None))
         self.pb_sort_modifiers.setText(QCoreApplication.translate("Dialog", u"Sort modifiers", None))
+        self.pbRemoveModifier.setText(QCoreApplication.translate("Dialog", u"Remove modifier", None))
         self.pbAddSet.setText(QCoreApplication.translate("Dialog", u"Add set of modifiers", None))
-        self.pbRemoveSet.setText(QCoreApplication.translate("Dialog", u"Remove set of modifiers", None))
         self.pbMoveSetLeft.setText(QCoreApplication.translate("Dialog", u"Move set left", None))
         self.pbMoveSetRight.setText(QCoreApplication.translate("Dialog", u"Move set right", None))
+        self.pbRemoveSet.setText(QCoreApplication.translate("Dialog", u"Remove set of modifiers", None))
         self.pb_add_subjects.setText(QCoreApplication.translate("Dialog", u"Add subjects as modifiers", None))
         self.pb_load_file.setText(QCoreApplication.translate("Dialog", u"Load modifiers from file", None))
         self.pbCancel.setText(QCoreApplication.translate("Dialog", u"Cancel", None))

{boris_behav_obs-9.0.2 → boris_behav_obs-9.0.5}/boris/advanced_event_filtering.py

@@ -1,7 +1,7 @@
 """
 BORIS
 Behavioral Observation Research Interactive Software
-Copyright 2012-2024 Olivier Friard
+Copyright 2012-2025 Olivier Friard
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by

{boris_behav_obs-9.0.2 → boris_behav_obs-9.0.5}/boris/analysis_plugins/number_of_occurences.py

@@ -6,8 +6,8 @@ number of occurences of behaviors
 
 import pandas as pd
 
-__version__ = "0.1.0"
-__version_date__ = "2024-11-14"
+__version__ = "0.2.0"
+__version_date__ = "2025-01-25"
 __plugin_name__ = "Number of occurences of behaviors"
 __author__ = "Olivier Friard - University of Torino - Italy"
 
@@ -17,7 +17,10 @@ def run(df: pd.DataFrame):
     Calculate the number of occurrences of behaviors by subject.
     """
 
-    return df.groupby(["Subject", "Behavior"])["Behavior"].count().reset_index(name="number of occurences")
+    string_results: str = ""
+    df_results: pd.DataFrame = df.groupby(["Subject", "Behavior"])["Behavior"].count().reset_index(name="number of occurences")
+
+    return df_results, string_results
 
 
 def main(df: pd.DataFrame, observations_list: list = [], parameters: dict = {}) -> pd.DataFrame:

{boris_behav_obs-9.0.2 → boris_behav_obs-9.0.5}/boris/analysis_plugins/number_of_occurences_by_independent_variable.py

@@ -6,8 +6,8 @@ number of occurences of behaviors by independent_variable
 
 import pandas as pd
 
-__version__ = "0.1.0"
-__version_date__ = "2024-11-14"
+__version__ = "0.2.0"
+__version_date__ = "2025-01-25"
 __plugin_name__ = "Number of occurences of behaviors by subject by independent_variable"
 __author__ = "Olivier Friard - University of Torino - Italy"
 
@@ -17,7 +17,9 @@ def run(df: pd.DataFrame):
     Calculate the number of occurrences of behaviors by subject and by independent_variable.
     """
 
-    results = (
+    str_results: str = ""
+
+    df_results: df.DataFrame = (
         df.groupby(
             [
                 "independent variable 'Weather'",
@@ -29,7 +31,7 @@ def run(df: pd.DataFrame):
         .reset_index(name="number of occurences")
     )
 
-    return results
+    return df_results, str_results
 
 
 def main(df: pd.DataFrame, observations_list: list = [], parameters: dict = {}) -> pd.DataFrame:

{boris_behav_obs-9.0.2 → boris_behav_obs-9.0.5}/boris/analysis_plugins/time_budget.py

@@ -1,11 +1,14 @@
 """
 BORIS plugin
+
+Time budget
 """
 
 import pandas as pd
+import numpy as np
 
-__version__ = "0.1.0"
-__version_date__ = "2024-11-14"
+__version__ = "0.2.0"
+__version_date__ = "2025-01-25"
 __plugin_name__ = "Time budget"
 __author__ = "Olivier Friard - University of Torino - Italy"
 
@@ -20,37 +23,44 @@ def run(df: pd.DataFrame):
     - Standard deviation of behavior duration (in seconds)
     - Inter-event intervals mean (in seconds)
     - Inter-event intervals standard deviation (in seconds)
-    - % of total duration
+    - % of total subject observation duration
     """
 
+    string_results: str = "test\ntest1"
+
+    group_by = ["Subject", "Behavior"]
+
     dfs = [
-        df.groupby(["Subject", "Behavior"])["Behavior"].count().reset_index(name="number of occurences"),
-        df.groupby(["Subject", "Behavior"])["Duration (s)"].sum().reset_index(name="total duration"),
-        df.groupby(["Subject", "Behavior"])["Duration (s)"].mean().astype(float).round(3).reset_index(name="duration mean"),
-        df.groupby(["Subject", "Behavior"])["Duration (s)"].std().astype(float).round(3).reset_index(name="duration std dev"),
+        df.groupby(group_by)["Behavior"].count().reset_index(name="number of occurences"),
+        df.groupby(group_by)["Duration (s)"].sum().reset_index(name="total duration"),
+        df.groupby(group_by)["Duration (s)"].mean().astype(float).round(3).reset_index(name="duration mean"),
+        df.groupby(group_by)["Duration (s)"].std().astype(float).round(3).reset_index(name="duration std dev"),
     ]
 
     # inter events
     df2 = df.sort_values(by=["Observation id", "Subject", "Behavior", "Start (s)"])
     df2["diff"] = df2.groupby(["Observation id", "Subject", "Behavior"])["Start (s)"].shift(periods=-1) - df2["Stop (s)"]
 
-    dfs.append(df2.groupby(["Subject", "Behavior"])["diff"].mean().astype(float).round(3).reset_index(name="inter-event intervals mean"))
+    dfs.append(df2.groupby(group_by)["diff"].mean().astype(float).round(3).reset_index(name="inter-event intervals mean"))
+
+    dfs.append(df2.groupby(group_by)["diff"].std().astype(float).round(3).reset_index(name="inter-event intervals std dev"))
+
+    # % of total subject observation time
 
-    dfs.append(df2.groupby(["Subject", "Behavior"])["diff"].std().astype(float).round(3).reset_index(name="inter-event intervals std dev"))
+    interval = (df.groupby(["Subject"])["Stop (s)"].max() - df.groupby(["Subject"])["Start (s)"].min()).replace(0, np.nan)
 
-    # % of time
     dfs.append(
-        (100 * df.groupby(["Subject", "Behavior"])["Duration (s)"].sum() / df.groupby(["Subject"])["Duration (s)"].sum())
+        (100 * df.groupby(group_by)["Duration (s)"].sum() / interval)
         .astype(float)
         .round(3)
-        .reset_index(name="% of total duration")
+        .reset_index(name="% of total subject observation duration")
     )
 
     merged_df = dfs[0]
     for df in dfs[1:]:
-        merged_df = pd.merge(merged_df, df, on=["Subject", "Behavior"])
+        merged_df = pd.merge(merged_df, df, on=group_by)
 
-    return merged_df
+    return merged_df, string_results
 
 
 def main(df: pd.DataFrame, observations_list: list = [], parameters: dict = {}) -> pd.DataFrame:

{boris_behav_obs-9.0.2 → boris_behav_obs-9.0.5}/boris/behav_coding_map_creator.py

@@ -1,7 +1,7 @@
 """
 BORIS
 Behavioral Observation Research Interactive Software
-Copyright 2012-2024 Olivier Friard
+Copyright 2012-2025 Olivier Friard
 
 This file is part of BORIS.
 

{boris_behav_obs-9.0.2 → boris_behav_obs-9.0.5}/boris/behavior_binary_table.py

@@ -1,7 +1,7 @@
 """
 BORIS
 Behavioral Observation Research Interactive Software
-Copyright 2012-2024 Olivier Friard
+Copyright 2012-2025 Olivier Friard
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by

{boris_behav_obs-9.0.2 → boris_behav_obs-9.0.5}/boris/behaviors_coding_map.py

@@ -1,7 +1,7 @@
 """
 BORIS
 Behavioral Observation Research Interactive Software
-Copyright 2012-2024 Olivier Friard
+Copyright 2012-2025 Olivier Friard
 
 This file is part of BORIS.
 

{boris_behav_obs-9.0.2 → boris_behav_obs-9.0.5}/boris/boris_cli.py

@@ -3,7 +3,7 @@ BORIS CLI
 
 Behavioral Observation Research Interactive Software Command Line Interface
 
-Copyright 2012-2024 Olivier Friard
+Copyright 2012-2025 Olivier Friard
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by

{boris_behav_obs-9.0.2 → boris_behav_obs-9.0.5}/boris/cmd_arguments.py

@@ -1,7 +1,7 @@
 """
 BORIS
 Behavioral Observation Research Interactive Software
-Copyright 2012-2024 Olivier Friard
+Copyright 2012-2025 Olivier Friard
 
 
   This program is free software; you can redistribute it and/or modify

{boris_behav_obs-9.0.2 → boris_behav_obs-9.0.5}/boris/coding_pad.py

@@ -1,7 +1,7 @@
 """
 BORIS
 Behavioral Observation Research Interactive Software
-Copyright 2012-2024 Olivier Friard
+Copyright 2012-2025 Olivier Friard
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by

{boris_behav_obs-9.0.2 → boris_behav_obs-9.0.5}/boris/config.py

@@ -1,7 +1,7 @@
 """
 BORIS
 Behavioral Observation Research Interactive Software
-Copyright 2012-2024 Olivier Friard
+Copyright 2012-2025 Olivier Friard
 
 This file is part of BORIS.
 
@@ -22,6 +22,10 @@ This file is part of BORIS.
 
 programName: str = "BORIS"
 
+MACOS_CODE = "darwin"
+MPV_SOCKET = "/tmp/mpvsocket"
+
+
 ETHOGRAM_REPOSITORY_URL = "https://www.boris.unito.it/static/ethograms"
 
 project_format_version: str = "7.0"
@@ -130,11 +134,21 @@ CHAR_FORBIDDEN_IN_MODIFIERS = "(|),`~"
 ADAPT_FAST_JUMP = "adapt_fast_jump"
 ADAPT_FAST_JUMP_DEFAULT = False
 
+TIME = "time"
+BEHAVIOR_CODE = "code"
+SUBJECT = "subject"
+MODIFIER = "modifier"
+COMMENT = "comment"
+BEHAVIOR_KEY = "key"
+SUBJECT_KEY = "key"
+BEHAVIOR_CATEGORY = "category"
 
-subjectsFields = ["key", SUBJECT_NAME, DESCRIPTION]
+
+subjectsFields = [SUBJECT_KEY, SUBJECT_NAME, DESCRIPTION]
 
 UNPAIRED = "UNPAIRED"
 DISPLAY_SUBTITLES = "display_subtitles"
+CHECK_PROJECT_INTEGRITY = "check_project_integrity"
 
 
 YES = "Yes"
@@ -186,13 +200,6 @@ DATA_PLOT_FIELDS = {
 }
 DATA_PLOT_STYLES = ["b-", "r-", "g-", "bo", "ro", "go"]
 
-TIME = "time"
-BEHAVIOR_CODE = "code"
-SUBJECT = "subject"
-MODIFIER = "modifier"
-COMMENT = "comment"
-BEHAVIOR_KEY = "key"
-BEHAVIOR_CATEGORY = "category"
 
 FILE_PATH = "file_path"
 

{boris_behav_obs-9.0.2 → boris_behav_obs-9.0.5}/boris/config_file.py

@@ -1,7 +1,7 @@
 """
 BORIS
 Behavioral Observation Research Interactive Software
-Copyright 2012-2024 Olivier Friard
+Copyright 2012-2025 Olivier Friard
 
 This file is part of BORIS.
 

{boris_behav_obs-9.0.2 → boris_behav_obs-9.0.5}/boris/connections.py

@@ -1,7 +1,7 @@
 """
 BORIS
 Behavioral Observation Research Interactive Software
-Copyright 2012-2024 Olivier Friard
+Copyright 2012-2025 Olivier Friard
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by

{boris_behav_obs-9.0.2 → boris_behav_obs-9.0.5}/boris/converters.py

@@ -1,7 +1,7 @@
 """
 BORIS
 Behavioral Observation Research Interactive Software
-Copyright 2012-2024 Olivier Friard
+Copyright 2012-2025 Olivier Friard
 
 This file is part of BORIS.
 

{boris_behav_obs-9.0.2 → boris_behav_obs-9.0.5}/boris/cooccurence.py

@@ -1,7 +1,7 @@
 """
 BORIS
 Behavioral Observation Research Interactive Software
-Copyright 2012-2024 Olivier Friard
+Copyright 2012-2025 Olivier Friard
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by