Merge remote-tracking branch 'origin/master'

sgoldenlab · Jun 1, 2024 · 2b11d8a · 2b11d8a
2 parents 8eb8aa6 + ee213d8
commit 2b11d8a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/simba/SimBA.py b/simba/SimBA.py
@@ -127,8 +127,9 @@
     Convert2AVIPopUp, Convert2BlackWhitePopUp, Convert2bmpPopUp,
     Convert2jpegPopUp, Convert2MOVPopUp, Convert2MP4PopUp, Convert2PNGPopUp,
     Convert2TIFFPopUp, Convert2WEBMPopUp, Convert2WEBPPopUp,
-    ConvertROIDefinitionsPopUp, CreateGIFPopUP, CropVideoCirclesPopUp,
-    CropVideoPolygonsPopUp, CropVideoPopUp, DownsampleMultipleVideosPopUp,
+    ConvertROIDefinitionsPopUp, CreateAverageFramePopUp, CreateGIFPopUP,
+    CropVideoCirclesPopUp, CropVideoPolygonsPopUp, CropVideoPopUp,
+    CrossfadeVideosPopUp, DownsampleMultipleVideosPopUp,
     DownsampleSingleVideoPopUp, DownsampleVideoPopUp, ExtractAllFramesPopUp,
     ExtractAnnotationFramesPopUp, ExtractSEQFramesPopUp,
     ExtractSpecificFramesPopUp, FlipVideosPopUp, GreyscaleSingleVideoPopUp,
@@ -139,7 +140,7 @@
     SuperImposeFrameCountPopUp, SuperimposeProgressBarPopUp,
     SuperimposeTextPopUp, SuperimposeTimerPopUp, SuperimposeVideoNamesPopUp,
     SuperimposeVideoPopUp, SuperimposeWatermarkPopUp, UpsampleVideosPopUp,
-    VideoRotatorPopUp, VideoTemporalJoinPopUp, CreateAverageFramePopUp, CrossfadeVideosPopUp)
+    VideoRotatorPopUp, VideoTemporalJoinPopUp)
 from simba.ui.pop_ups.visualize_pose_in_dir_pop_up import \
     VisualizePoseInFolderPopUp
 from simba.ui.tkinter_functions import DropDownMenu, Entry_Box, FileSelect

diff --git a/simba/ui/pop_ups/video_processing_pop_up.py b/simba/ui/pop_ups/video_processing_pop_up.py
@@ -35,7 +35,8 @@
                                 InvalidInputError, MixedMosaicError,
                                 NoChoosenClassifierError, NoFilesFoundError,
                                 NotDirectoryError, ResolutionError)
-from simba.utils.lookups import get_color_dict, get_fonts, get_ffmpeg_crossfade_methods
+from simba.utils.lookups import (get_color_dict, get_ffmpeg_crossfade_methods,
+                                 get_fonts)
 from simba.utils.printing import SimbaTimer, stdout_success
 from simba.utils.read_write import (
     check_if_hhmmss_timestamp_is_valid_part_of_video,
@@ -59,15 +60,16 @@
     convert_video_powerpoint_compatible_format, copy_img_folder,
     create_average_frm, crop_multiple_videos, crop_multiple_videos_circles,
     crop_multiple_videos_polygons, crop_single_video, crop_single_video_circle,
-    crop_single_video_polygon, downsample_video, extract_frame_range,
-    extract_frames_single_video, flip_videos, frames_to_movie, gif_creator,
-    multi_split_video, remove_beginning_of_video, resize_videos_by_height,
-    resize_videos_by_width, reverse_videos, roi_blurbox, rotate_video,
-    superimpose_elapsed_time, superimpose_frame_count, superimpose_freetext,
-    superimpose_overlay_video, superimpose_video_names,
-    superimpose_video_progressbar, temporal_concatenation, upsample_fps,
-    video_bg_substraction_mp, video_bg_subtraction, video_concatenator,
-    video_to_bw, video_to_greyscale, watermark_video, crossfade_two_videos)
+    crop_single_video_polygon, crossfade_two_videos, downsample_video,
+    extract_frame_range, extract_frames_single_video, flip_videos,
+    frames_to_movie, gif_creator, multi_split_video, remove_beginning_of_video,
+    resize_videos_by_height, resize_videos_by_width, reverse_videos,
+    roi_blurbox, rotate_video, superimpose_elapsed_time,
+    superimpose_frame_count, superimpose_freetext, superimpose_overlay_video,
+    superimpose_video_names, superimpose_video_progressbar,
+    temporal_concatenation, upsample_fps, video_bg_substraction_mp,
+    video_bg_subtraction, video_concatenator, video_to_bw, video_to_greyscale,
+    watermark_video)
 
 sys.setrecursionlimit(10**7)