Merge remote-tracking branch 'origin/master'

sgoldenlab · Feb 5, 2025 · 1746bf1 · 1746bf1
2 parents ff9efee + 451b986
commit 1746bf1
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 18 deletions.
diff --git a/simba/SimBA.py b/simba/SimBA.py
@@ -92,6 +92,7 @@
 from simba.ui.pop_ups.direction_animal_to_bodypart_settings_pop_up import \
     DirectionAnimalToBodyPartSettingsPopUp
 from simba.ui.pop_ups.distance_plot_pop_up import DistancePlotterPopUp
+from simba.ui.pop_ups.egocentric_alignment_pop_up import EgocentricAlignPopUp
 from simba.ui.pop_ups.fsttc_pop_up import FSTTCPopUp
 from simba.ui.pop_ups.gantt_pop_up import GanttPlotPopUp
 from simba.ui.pop_ups.heatmap_clf_pop_up import HeatmapClfPopUp
@@ -126,8 +127,8 @@
     SpontaneousAlternationPopUp
 from simba.ui.pop_ups.subset_feature_extractor_pop_up import \
     FeatureSubsetExtractorPopUp
-from simba.ui.pop_ups.third_party_annotator_appender_pop_up import ThirdPartyAnnotatorAppenderPopUp
-from simba.ui.pop_ups.egocentric_alignment_pop_up import EgocentricAlignPopUp
+from simba.ui.pop_ups.third_party_annotator_appender_pop_up import \
+    ThirdPartyAnnotatorAppenderPopUp
 from simba.ui.pop_ups.validation_plot_pop_up import ValidationVideoPopUp
 from simba.ui.pop_ups.video_processing_pop_up import (
     BackgroundRemoverDirectoryPopUp, BackgroundRemoverSingleVideoPopUp,

diff --git a/simba/data_processors/egocentric_aligner.py b/simba/data_processors/egocentric_aligner.py
@@ -4,13 +4,19 @@
 import numpy as np
 import pandas as pd
 
-from simba.utils.checks import (check_if_dir_exists, check_if_valid_rgb_tuple, check_int, check_str, check_valid_boolean, check_valid_dataframe, check_valid_tuple)
+from simba.utils.checks import (check_if_dir_exists, check_if_valid_rgb_tuple,
+                                check_int, check_str, check_valid_boolean,
+                                check_valid_dataframe, check_valid_tuple)
 from simba.utils.data import egocentrically_align_pose_numba
 from simba.utils.enums import Formats, Options
-from simba.utils.printing import SimbaTimer, stdout_success
-from simba.utils.read_write import (bgr_to_rgb_tuple, find_core_cnt, find_files_of_filetypes_in_directory, find_video_of_file, get_fn_ext, read_df, write_df, get_video_meta_data)
-from simba.video_processors.egocentric_video_rotator import EgocentricVideoRotator
 from simba.utils.errors import InvalidInputError
+from simba.utils.printing import SimbaTimer, stdout_success
+from simba.utils.read_write import (bgr_to_rgb_tuple, find_core_cnt,
+                                    find_files_of_filetypes_in_directory,
+                                    find_video_of_file, get_fn_ext,
+                                    get_video_meta_data, read_df, write_df)
+from simba.video_processors.egocentric_video_rotator import \
+    EgocentricVideoRotator
 
 
 class EgocentricalAligner():

diff --git a/simba/ui/pop_ups/egocentric_alignment_pop_up.py b/simba/ui/pop_ups/egocentric_alignment_pop_up.py
@@ -1,15 +1,19 @@
-from typing import Union
-from tkinter import *
 import os
-from simba.ui.tkinter_functions import CreateLabelFrameWithIcon, DropDownMenu, SimbaCheckbox, FolderSelect
-from simba.mixins.pop_up_mixin import PopUpMixin
-from simba.utils.lookups import get_color_dict
-from simba.utils.enums import Links, Keys
-from simba.utils.checks import check_nvidea_gpu_available, check_if_dir_exists
-from simba.utils.read_write import find_all_videos_in_directory, find_files_of_filetypes_in_directory, get_fn_ext
-from simba.utils.errors import NoDataError, SimBAGPUError, InvalidInputError
+from tkinter import *
+from typing import Union
+
 from simba.data_processors.egocentric_aligner import EgocentricalAligner
 from simba.mixins.config_reader import ConfigReader
+from simba.mixins.pop_up_mixin import PopUpMixin
+from simba.ui.tkinter_functions import (CreateLabelFrameWithIcon, DropDownMenu,
+                                        FolderSelect, SimbaCheckbox)
+from simba.utils.checks import check_if_dir_exists, check_nvidea_gpu_available
+from simba.utils.enums import Keys, Links
+from simba.utils.errors import InvalidInputError, NoDataError, SimBAGPUError
+from simba.utils.lookups import get_color_dict
+from simba.utils.read_write import (find_all_videos_in_directory,
+                                    find_files_of_filetypes_in_directory,
+                                    get_fn_ext)
 
 
 class EgocentricAlignPopUp(ConfigReader, PopUpMixin):

diff --git a/simba/ui/pop_ups/video_processing_pop_up.py b/simba/ui/pop_ups/video_processing_pop_up.py
@@ -32,11 +32,12 @@
                                 check_that_hhmmss_start_is_before_end)
 from simba.utils.data import convert_roi_definitions
 from simba.utils.enums import Dtypes, Formats, Keys, Links, Options, Paths
-from simba.utils.errors import (CountError, DuplicationError, NoDataError,
+from simba.utils.errors import (CountError, DuplicationError,
                                 FFMPEGCodecGPUError, FrameRangeError,
                                 InvalidInputError, MixedMosaicError,
-                                NoChoosenClassifierError, NoFilesFoundError,
-                                NotDirectoryError, ResolutionError)
+                                NoChoosenClassifierError, NoDataError,
+                                NoFilesFoundError, NotDirectoryError,
+                                ResolutionError)
 from simba.utils.lookups import (get_color_dict, get_ffmpeg_crossfade_methods,
                                  get_fonts, percent_to_crf_lookup)
 from simba.utils.printing import SimbaTimer, stdout_success