Merge remote-tracking branch 'origin/master'

sgoldenlab · May 13, 2024 · 73b2bc3 · 73b2bc3
2 parents 2b1a56c + 112adc8
commit 73b2bc3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/simba/SimBA.py b/simba/SimBA.py
@@ -121,20 +121,20 @@
 from simba.ui.pop_ups.validation_plot_pop_up import ValidationVideoPopUp
 from simba.ui.pop_ups.video_processing_pop_up import (
     BrightnessContrastPopUp, CalculatePixelsPerMMInVideoPopUp,
-    ChangeFpsMultipleVideosPopUp, ChangeFpsSingleVideoPopUp, CLAHEPopUp, ClipSingleVideoByFrameNumbers,
-    ClipVideoPopUp, ConcatenatingVideosPopUp, ConcatenatorPopUp,
-    ConvertROIDefinitionsPopUp, CreateGIFPopUP,
-    CropVideoCirclesPopUp, CropVideoPolygonsPopUp, CropVideoPopUp,
-    DownsampleMultipleVideosPopUp, DownsampleSingleVideoPopUp,
+    ChangeFpsMultipleVideosPopUp, ChangeFpsSingleVideoPopUp, CLAHEPopUp,
+    ClipSingleVideoByFrameNumbers, ClipVideoPopUp, ConcatenatingVideosPopUp,
+    ConcatenatorPopUp, Convert2AVIPopUp, Convert2bmpPopUp, Convert2jpegPopUp,
+    Convert2MOVPopUp, Convert2MP4PopUp, Convert2PNGPopUp, Convert2TIFFPopUp,
+    Convert2WEBMPopUp, Convert2WEBPPopUp, ConvertROIDefinitionsPopUp,
+    CreateGIFPopUP, CropVideoCirclesPopUp, CropVideoPolygonsPopUp,
+    CropVideoPopUp, DownsampleMultipleVideosPopUp, DownsampleSingleVideoPopUp,
     DownsampleVideoPopUp, ExtractAllFramesPopUp, ExtractAnnotationFramesPopUp,
     ExtractSEQFramesPopUp, ExtractSpecificFramesPopUp,
     GreyscaleSingleVideoPopUp, ImportFrameDirectoryPopUp,
     InitiateClipMultipleVideosByFrameNumbersPopUp,
     InitiateClipMultipleVideosByTimestampsPopUp, InteractiveClahePopUp,
     MergeFrames2VideoPopUp, MultiCropPopUp, MultiShortenPopUp,
-    SuperImposeFrameCountPopUp, VideoRotatorPopUp, VideoTemporalJoinPopUp,
-    Convert2TIFFPopUp, Convert2bmpPopUp, Convert2WEBPPopUp, Convert2jpegPopUp, Convert2PNGPopUp,
-    Convert2MP4PopUp, Convert2MOVPopUp, Convert2WEBMPopUp, Convert2AVIPopUp)
+    SuperImposeFrameCountPopUp, 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
@@ -47,16 +47,17 @@
     VideoRotator, batch_convert_video_format, batch_create_frames,
     batch_video_to_greyscale, change_fps_of_multiple_videos, change_img_format,
     change_single_video_fps, clahe_enhance_video, clip_video_in_range,
-    clip_videos_by_frame_ids, convert_to_mp4,
+    clip_videos_by_frame_ids, convert_to_avi, convert_to_bmp, convert_to_jpeg,
+    convert_to_mov, convert_to_mp4, convert_to_png, convert_to_tiff,
+    convert_to_webm, convert_to_webp,
     convert_video_powerpoint_compatible_format, copy_img_folder,
     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, frames_to_movie, gif_creator,
     multi_split_video, remove_beginning_of_video, resize_videos_by_height,
     resize_videos_by_width, superimpose_frame_count, video_concatenator,
-    video_to_greyscale, convert_to_jpeg, convert_to_bmp, convert_to_webp, convert_to_tiff, convert_to_png,
-    convert_to_mov, convert_to_avi, convert_to_webm)
+    video_to_greyscale)
 
 sys.setrecursionlimit(10**7)
 

diff --git a/simba/video_processors/video_processing.py b/simba/video_processors/video_processing.py
@@ -31,24 +31,24 @@
                                 check_if_dir_exists,
                                 check_if_filepath_list_is_empty,
                                 check_if_string_value_is_valid_video_timestamp,
-                                check_int, check_nvidea_gpu_available,
-                                check_str,
+                                check_instance, check_int,
+                                check_nvidea_gpu_available, check_str,
                                 check_that_hhmmss_start_is_before_end,
-                                check_valid_lst, check_valid_tuple, check_instance)
+                                check_valid_lst, check_valid_tuple)
 from simba.utils.enums import OS, ConfigKey, Formats, Options, Paths
 from simba.utils.errors import (CountError, DirectoryExistError,
                                 FFMPEGCodecGPUError, FFMPEGNotFoundError,
                                 FileExistError, FrameRangeError,
                                 InvalidFileTypeError, InvalidInputError,
                                 InvalidVideoFileError, NoDataError,
                                 NoFilesFoundError, NotDirectoryError)
+from simba.utils.lookups import percent_to_crf_lookup, percent_to_qv_lk
 from simba.utils.printing import SimbaTimer, stdout_success
 from simba.utils.read_write import (
     check_if_hhmmss_timestamp_is_valid_part_of_video,
-    find_all_videos_in_directory, find_core_cnt, get_fn_ext,
-    get_video_meta_data, read_config_entry, read_config_file,
-    read_frm_of_video, find_files_of_filetypes_in_directory)
-from simba.utils.lookups import percent_to_crf_lookup, percent_to_qv_lk
+    find_all_videos_in_directory, find_core_cnt,
+    find_files_of_filetypes_in_directory, get_fn_ext, get_video_meta_data,
+    read_config_entry, read_config_file, read_frm_of_video)
 from simba.utils.warnings import (FileExistWarning, InValidUserInputWarning,
                                   SameInputAndOutputWarning)
 from simba.video_processors.extract_frames import video_to_frames