Merge remote-tracking branch 'origin/master'

sgoldenlab · Aug 5, 2024 · 52f8d75 · 52f8d75
2 parents 0fd182c + 75b4569
commit 52f8d75
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/simba/labelling/labelling_advanced_interface.py b/simba/labelling/labelling_advanced_interface.py
@@ -15,8 +15,10 @@
 from simba.mixins.config_reader import ConfigReader
 from simba.utils.checks import check_file_exist_and_readable, check_int
 from simba.utils.enums import Formats, Options, TagNames
-from simba.utils.errors import (AdvancedLabellingError, FrameRangeError, NoDataError)
-from simba.utils.lookups import get_labelling_img_kbd_bindings, get_labelling_video_kbd_bindings
+from simba.utils.errors import (AdvancedLabellingError, FrameRangeError,
+                                NoDataError)
+from simba.utils.lookups import (get_labelling_img_kbd_bindings,
+                                 get_labelling_video_kbd_bindings)
 from simba.utils.printing import log_event, stdout_success
 from simba.utils.read_write import (get_all_clf_names, get_fn_ext,
                                     get_video_meta_data, read_config_entry,

diff --git a/simba/labelling/labelling_interface.py b/simba/labelling/labelling_interface.py
@@ -22,9 +22,12 @@
                                 check_int, check_that_column_exist)
 from simba.utils.enums import Options, TagNames
 from simba.utils.errors import FrameRangeError, NoDataError
-from simba.utils.lookups import get_labelling_img_kbd_bindings, get_labelling_video_kbd_bindings
+from simba.utils.lookups import (get_labelling_img_kbd_bindings,
+                                 get_labelling_video_kbd_bindings)
 from simba.utils.printing import log_event, stdout_success
-from simba.utils.read_write import (get_all_clf_names, get_fn_ext, get_video_meta_data, read_config_entry, read_df, write_df)
+from simba.utils.read_write import (get_all_clf_names, get_fn_ext,
+                                    get_video_meta_data, read_config_entry,
+                                    read_df, write_df)
 
 PLAY_VIDEO_SCRIPT_PATH = os.path.join(os.path.dirname(simba.__file__), "labelling/play_annotation_video.py")
 PADDING = 5

diff --git a/simba/labelling/play_annotation_video.py b/simba/labelling/play_annotation_video.py
@@ -3,15 +3,17 @@
 import os
 import signal
 import sys
+
 import cv2
 import numpy as np
 
+from simba.mixins.plotting_mixin import PlottingMixin
 from simba.utils.checks import check_file_exist_and_readable
 from simba.utils.enums import TextOptions
-from simba.utils.read_write import get_video_meta_data, read_frm_of_video, get_fn_ext
-from simba.utils.warnings import FrameRangeWarning
-from simba.mixins.plotting_mixin import PlottingMixin
 from simba.utils.lookups import get_labelling_video_kbd_bindings
+from simba.utils.read_write import (get_fn_ext, get_video_meta_data,
+                                    read_frm_of_video)
+from simba.utils.warnings import FrameRangeWarning
 
 
 def annotation_video_player():

diff --git a/simba/ui/pop_ups/clf_add_remove_print_pop_up.py b/simba/ui/pop_ups/clf_add_remove_print_pop_up.py
@@ -7,12 +7,14 @@
 from simba.mixins.config_reader import ConfigReader
 from simba.mixins.pop_up_mixin import PopUpMixin
 from simba.pose_processors.pose_reset import PoseResetter
-from simba.ui.tkinter_functions import (CreateLabelFrameWithIcon, DropDownMenu, Entry_Box, FileSelect, SimbaButton, TwoOptionQuestionPopUp)
+from simba.ui.tkinter_functions import (CreateLabelFrameWithIcon, DropDownMenu,
+                                        Entry_Box, FileSelect, SimbaButton,
+                                        TwoOptionQuestionPopUp)
 from simba.utils.checks import check_str
 from simba.utils.enums import ConfigKey, Keys, Links
+from simba.utils.errors import DuplicationError
 from simba.utils.printing import stdout_success, stdout_trash
 from simba.utils.read_write import tabulate_clf_info
-from simba.utils.errors import DuplicationError
 
 
 class AddClfPopUp(PopUpMixin, ConfigReader):