boris-behav-obs 8.27.3__py2.py3-none-any.whl → 8.27.5__py2.py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- boris/about.py +6 -2
- boris/dialog.py +1 -0
- boris/export_events.py +7 -0
- boris/mpv-1.0.3.py +2102 -0
- boris/mpv2.py +127 -36
- boris/player_dock_widget.py +5 -0
- boris/project_import_export.py +4 -1
- boris/utilities.py +6 -2
- boris/version.py +2 -2
- {boris_behav_obs-8.27.3.dist-info → boris_behav_obs-8.27.5.dist-info}/METADATA +2 -2
- {boris_behav_obs-8.27.3.dist-info → boris_behav_obs-8.27.5.dist-info}/RECORD +15 -14
- {boris_behav_obs-8.27.3.dist-info → boris_behav_obs-8.27.5.dist-info}/WHEEL +1 -1
- {boris_behav_obs-8.27.3.dist-info → boris_behav_obs-8.27.5.dist-info}/LICENSE.TXT +0 -0
- {boris_behav_obs-8.27.3.dist-info → boris_behav_obs-8.27.5.dist-info}/entry_points.txt +0 -0
- {boris_behav_obs-8.27.3.dist-info → boris_behav_obs-8.27.5.dist-info}/top_level.txt +0 -0
boris/about.py
CHANGED
|
@@ -43,9 +43,13 @@ def actionAbout_activated(self):
|
|
|
43
43
|
|
|
44
44
|
programs_versions: list = ["MPV media player"]
|
|
45
45
|
|
|
46
|
-
mpv_lib_version, mpv_lib_file_path = util.mpv_lib_version()
|
|
46
|
+
mpv_lib_version, mpv_lib_file_path, mpv_api_version = util.mpv_lib_version()
|
|
47
47
|
programs_versions.append(
|
|
48
|
-
|
|
48
|
+
(
|
|
49
|
+
f"Library version: {mpv_lib_version} file: {mpv_lib_file_path}\n"
|
|
50
|
+
f"MPV API version: {mpv_api_version}\n"
|
|
51
|
+
f"python-mpv version: {util.python_mpv_script_version()}"
|
|
52
|
+
)
|
|
49
53
|
)
|
|
50
54
|
|
|
51
55
|
# ffmpeg
|
boris/dialog.py
CHANGED
|
@@ -100,6 +100,7 @@ def global_error_message(exception_type, exception_value, traceback_object):
|
|
|
100
100
|
f"Python {platform.python_version()} ({'64-bit' if sys.maxsize > 2**32 else '32-bit'})\n"
|
|
101
101
|
f"Qt {QT_VERSION_STR} - PyQt {PYQT_VERSION_STR}\n"
|
|
102
102
|
f"MPV library version: {util.mpv_lib_version()[0]}\n"
|
|
103
|
+
f"MPV API version: {util.mpv_lib_version()[2]}\n"
|
|
103
104
|
f"MPV library file path: {util.mpv_lib_version()[1]}\n\n"
|
|
104
105
|
f"Error succeded at {dt.datetime.now():%Y-%m-%d %H:%M}\n\n"
|
|
105
106
|
)
|
boris/export_events.py
CHANGED
|
@@ -461,6 +461,8 @@ def export_aggregated_events(self):
|
|
|
461
461
|
_, max_modifiers = export_observation.export_aggregated_events(self.pj, parameters, obs_id)
|
|
462
462
|
tot_max_modifiers = max(tot_max_modifiers, max_modifiers)
|
|
463
463
|
|
|
464
|
+
logging.debug(f"tot_max_modifiers: {tot_max_modifiers}")
|
|
465
|
+
|
|
464
466
|
data_grouped_obs = tablib.Dataset()
|
|
465
467
|
|
|
466
468
|
mem_command: str = "" # remember user choice when file already exists
|
|
@@ -517,6 +519,8 @@ def export_aggregated_events(self):
|
|
|
517
519
|
if not r:
|
|
518
520
|
QMessageBox.warning(None, cfg.programName, msg, QMessageBox.Ok | QMessageBox.Default, QMessageBox.NoButton)
|
|
519
521
|
|
|
522
|
+
"""
|
|
523
|
+
# disabled after introduction of the force_number_modifiers parameter in export_aggregated_events function
|
|
520
524
|
if len(data_single_obs_sorted) and max_modifiers < tot_max_modifiers:
|
|
521
525
|
for i in range(tot_max_modifiers - max_modifiers):
|
|
522
526
|
data_single_obs_sorted.insert_col(
|
|
@@ -524,9 +528,12 @@ def export_aggregated_events(self):
|
|
|
524
528
|
col=[""] * (len(list(data_single_obs_sorted))),
|
|
525
529
|
header=f"Modif #{i}",
|
|
526
530
|
)
|
|
531
|
+
"""
|
|
532
|
+
|
|
527
533
|
data_grouped_obs.extend(data_single_obs_sorted)
|
|
528
534
|
|
|
529
535
|
data_grouped_obs_all = tablib.Dataset(headers=list(fields_type(tot_max_modifiers).keys()))
|
|
536
|
+
|
|
530
537
|
data_grouped_obs_all.extend(data_grouped_obs)
|
|
531
538
|
data_grouped_obs_all.title = "Aggregated events"
|
|
532
539
|
|