Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
sronilsson committed May 20, 2024
2 parents fc9ac5d + c01eadb commit 98105a6
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
3 changes: 2 additions & 1 deletion simba/ui/pop_ups/video_processing_pop_up.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
check_if_filepath_list_is_empty,
check_if_string_value_is_valid_video_timestamp,
check_int, check_nvidea_gpu_available,
check_that_hhmmss_start_is_before_end, check_str)
check_str,
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, FrameRangeError, InvalidInputError,
Expand Down
1 change: 1 addition & 0 deletions simba/utils/find_fonts.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import matplotlib.font_manager

from simba.utils.warnings import NoDataFoundWarning


Expand Down
8 changes: 4 additions & 4 deletions simba/utils/lookups.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@

import glob
import os
import platform
import re
import struct
import sys
from pathlib import Path
import platform
from multiprocessing import Lock, Process, Value
from pathlib import Path
from typing import Dict, List, Tuple, Union

import matplotlib.font_manager
import pandas as pd
from matplotlib import cm
import matplotlib.font_manager

import simba
from simba.utils.checks import (check_file_exist_and_readable,
check_if_dir_exists)
from simba.utils.enums import Methods, Paths, OS
from simba.utils.enums import OS, Methods, Paths
from simba.utils.read_write import get_fn_ext
from simba.utils.warnings import NoDataFoundWarning

Expand Down
4 changes: 2 additions & 2 deletions simba/video_processors/video_processing.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
InvalidFileTypeError, InvalidInputError,
InvalidVideoFileError, NoDataError,
NoFilesFoundError, NotDirectoryError)
from simba.utils.lookups import (get_ffmpeg_crossfade_methods,
percent_to_crf_lookup, percent_to_qv_lk, get_fonts)
from simba.utils.lookups import (get_ffmpeg_crossfade_methods, get_fonts,
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,
Expand Down

0 comments on commit 98105a6

Please sign in to comment.