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 Jan 22, 2025
2 parents 30eb871 + a272ceb commit a6305e7
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
9 changes: 6 additions & 3 deletions simba/mixins/pop_up_mixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,14 @@
from PIL import ImageTk

from simba.mixins.config_reader import ConfigReader
from simba.ui.tkinter_functions import (DropDownMenu, Entry_Box, FileSelect, SimbaButton, hxtScrollbar)
from simba.utils.checks import (check_float, check_instance, check_int, check_valid_lst)
from simba.ui.tkinter_functions import (DropDownMenu, Entry_Box, FileSelect,
SimbaButton, hxtScrollbar)
from simba.utils.checks import (check_float, check_instance, check_int,
check_valid_lst)
from simba.utils.enums import Formats, Options
from simba.utils.errors import CountError, NoFilesFoundError
from simba.utils.lookups import (get_color_dict, get_icons_paths, get_named_colors)
from simba.utils.lookups import (get_color_dict, get_icons_paths,
get_named_colors)
from simba.utils.read_write import find_core_cnt


Expand Down
10 changes: 6 additions & 4 deletions simba/roi_tools/ROI_reset.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
from typing import Union
import os
from tkinter import *
from typing import Union

import pandas as pd
from simba.utils.enums import ConfigKey, Keys, Paths, Links

from simba.ui.tkinter_functions import TwoOptionQuestionPopUp
from simba.utils.checks import (check_file_exist_and_readable,
check_valid_dataframe)
from simba.utils.enums import ConfigKey, Keys, Links, Paths
from simba.utils.errors import NoROIDataError
from simba.utils.printing import stdout_trash
from simba.utils.read_write import get_fn_ext, read_config_file, remove_files
from simba.utils.checks import check_file_exist_and_readable,check_valid_dataframe
from simba.ui.tkinter_functions import TwoOptionQuestionPopUp


def reset_video_ROIs(config_path: Union[str, os.PathLike],
Expand Down

0 comments on commit a6305e7

Please sign in to comment.