simba-uw-tf-dev 4.5.9__tar.gz → 4.6.2__tar.gz

{simba_uw_tf_dev-4.5.9 → simba_uw_tf_dev-4.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simba_uw_tf_dev
-Version: 4.5.9
+Version: 4.6.2
 Summary: Toolkit for computer classification and analysis of behaviors in experimental animals
 Home-page: https://github.com/sgoldenlab/simba
 Author: Simon Nilsson, Jia Jie Choong, Sophia Hwang

{simba_uw_tf_dev-4.5.9 → simba_uw_tf_dev-4.6.2}/setup.py

@@ -29,7 +29,7 @@ with open(GPU_REQUIREMENTS_PATH, "r") as f:
 # Setup configuration
 setuptools.setup(
     name="simba_uw_tf_dev",
-    version="4.5.9",
+    version="4.6.2",
     author="Simon Nilsson, Jia Jie Choong, Sophia Hwang",
     author_email="sronilsson@gmail.com",
     description="Toolkit for computer classification and analysis of behaviors in experimental animals",

{simba_uw_tf_dev-4.5.9 → simba_uw_tf_dev-4.6.2}/simba/SimBA.py

@@ -966,8 +966,8 @@ class App(object):
         video_process_menu.add_cascade(label="Drop body-parts from tracking data", compound="left", image=self.menu_icons["trash"]["img"], command=DropTrackingDataPopUp, font=Formats.FONT_REGULAR.value)
         extract_frames_menu = Menu(video_process_menu, font=Formats.FONT_REGULAR.value)
         extract_frames_menu.add_command(label="Extract defined frames", command=ExtractSpecificFramesPopUp, font=Formats.FONT_REGULAR.value, image=self.menu_icons["frames"]["img"], compound="left")
-        extract_frames_menu.add_command(label="Extract frames from single video", command=SingleVideo2FramesPopUp, font=Formats.FONT_REGULAR.value, image=self.menu_icons["video"]["img"], compound="left")
-        extract_frames_menu.add_command(label="Extract frames from multiple video", command=MultipleVideos2FramesPopUp, font=Formats.FONT_REGULAR.value, image=self.menu_icons["stack"]["img"], compound="left")
+        extract_frames_menu.add_command(label="Extract frames from single video", command=SingleVideo2FramesPopUp, font=Formats.FONT_REGULAR.value, image=self.menu_icons["frames_2"]["img"], compound="left")
+        extract_frames_menu.add_command(label="Extract frames from multiple videos", command=MultipleVideos2FramesPopUp, font=Formats.FONT_REGULAR.value, image=self.menu_icons["stack"]["img"], compound="left")
         extract_frames_menu.add_command(label="Extract frames from seq files", command=ExtractSEQFramesPopUp, font=Formats.FONT_REGULAR.value, image=self.menu_icons["fire"]["img"], compound="left")
         video_process_menu.add_cascade(label="Extract frames...", compound="left", image=self.menu_icons["frames"]["img"], menu=extract_frames_menu, font=Formats.FONT_REGULAR.value)
 

{simba_uw_tf_dev-4.5.9 → simba_uw_tf_dev-4.6.2}/simba/assets/lookups/tooptips.json

@@ -29,5 +29,14 @@
   "LOCATION_FRAME_COUNT": "The location in the video where the \n frame count is positioned.",
   "ROTATE_FILL_COLOR": "When video is rotated, there may be empty space not \n covered by the video. What color should this space have?",
   "VIDEO_DIR": "Directory containing videos.",
-  "SAVE_DIR": "Directory where to save results."
+  "SAVE_DIR": "Directory where to save results.",
+  "CONCAT_HEIGHT": "If join involves aligning videos horizontally, this values \nwill be used to ensure videos have the same height. ",
+  "CONCAT_WIDTH": "If join involves aligning videos vertically, this values \nwill be used to ensure videos have the same width. ",
+  "CONCAT_RES_HEADER": "When stacking videos horizontally and/or vertically, \n the videos need to be same height and/or width. Here, \n select what resolution to use.",
+  "EGOCENTRIC_DATA_DIR": "Folder containing pose-estimation CSV data.\n Can be sub-directory in 'project_folder/csv' folder.\n Should contain same file names as the VIDEO files",
+  "EGOCENTRIC_VIDEO_DIR": "Folder containing videos.\n Should contain same file names as the DATA files.",
+  "EGOCENTRIC_ANCHOR": "This body-part will be placed in the center of the video",
+  "EGOCENTRIC_DIRECTION_ANCHOR": "This body-part will be placed at N degrees relative to the anchor",
+  "EGOCENTRIC_DIRECTION": "The anchor body-part will always be placed at these degrees relative to the center anchor",
+  "CORE_COUNT": "Higher core counts speeds up processing but may require more RAM memory"
 }

{simba_uw_tf_dev-4.5.9 → simba_uw_tf_dev-4.6.2}/simba/plotting/frame_mergerer_ffmpeg.py

@@ -1,196 +1,137 @@
-__author__ = "Simon Nilsson; sronilsson@gmail.com"
-
-import os
-import shutil
-from datetime import datetime
-from typing import List, Optional, Union
-
-try:
-    from typing import Literal
-except ImportError:
-    from typing_extensions import Literal
-
-from simba.mixins.config_reader import ConfigReader
-from simba.utils.checks import (check_ffmpeg_available,
-                                check_file_exist_and_readable, check_int,
-                                check_nvidea_gpu_available, check_str,
-                                check_valid_lst)
-from simba.utils.enums import Paths, TagNames
-from simba.utils.errors import FFMPEGCodecGPUError
-from simba.utils.printing import SimbaTimer, log_event, stdout_success
-from simba.utils.read_write import copy_files_to_directory, get_fn_ext
-from simba.video_processors.video_processing import (
-    horizontal_video_concatenator, mixed_mosaic_concatenator,
-    mosaic_concatenator, vertical_video_concatenator)
-
-HORIZONTAL = "horizontal"
-VERTICAL = "vertical"
-MOSAIC = "mosaic"
-MIXED_MOSAIC = "mixed_mosaic"
-ACCEPTED_TYPES = [HORIZONTAL, VERTICAL, MOSAIC, MIXED_MOSAIC]
-
-
-class FrameMergererFFmpeg(ConfigReader):
-    """
-    Merge separate visualizations of classifications, descriptive statistics etc., into  single video mosaic.
-
-    .. note::
-       `GitHub tutorial <https://github.com/sgoldenlab/simba/blob/master/docs/tutorial.md#step-12-merge-frames>`_.
-
-        .. image:: _static/img/mosaic_videos.gif
-          :width: 600
-          :align: center
-
-    :parameter str config_path: Optional path to SimBA project config file in Configparser format.
-    :parameter Literal["horizontal", "vertical", "mosaic", "mixed_mosaic"] concat_type: Type of concatenation. OPTIONS: 'horizontal', 'vertical', 'mosaic', 'mixed_mosaic'.
-    :parameter List[Union[str, os.PathLike]] video_paths: List with videos to concatenate.
-    :parameter Optional[int] video_height: Optional height of the canatenated videos. Required if concat concat_type is not mixed_mosaic.
-    :parameter int video_width: Optional wisth of the canatenated videos. Required if concat concat_type is not mixed_mosaic.
-    :parameter Optional[bool] gpu: If True, use NVIDEA FFMpeg GPU codecs. Default False.
-
-    :example:
-    >>> video_paths = ['/Users/simon/Desktop/envs/simba/troubleshooting/mouse_open_field/project_folder/videos/SI_DAY3_308_CD1_PRESENT_downsampled.mp4', '/Users/simon/Desktop/envs/simba/troubleshooting/mouse_open_field/project_folder/videos/SI_DAY3_308_CD1_PRESENT_downsampled.mp4']
-    >>> merger = FrameMergererFFmpeg(config_path='/Users/simon/Desktop/envs/simba/troubleshooting/two_black_animals_14bp/project_folder/project_config.ini', video_paths=videos, video_height=600, video_width=600, concat_type='mosaic')
-    >>> merger.run()
-    """
-
-    def __init__(
-        self,
-        concat_type: Literal["horizontal", "vertical", "mosaic", "mixed_mosaic"],
-        video_paths: List[Union[str, os.PathLike]],
-        video_height: Optional[int] = None,
-        video_width: Optional[int] = None,
-        config_path: Optional[str] = None,
-        gpu: Optional[bool] = False,
-    ):
-
-        if gpu and not check_nvidea_gpu_available():
-            raise FFMPEGCodecGPUError(
-                msg="NVIDEA GPU not available (as evaluated by nvidea-smi returning None",
-                source=self.__class__.__name__,
-            )
-        check_ffmpeg_available()
-        check_str(
-            name=f"{FrameMergererFFmpeg.__name__} concat_type",
-            value=concat_type,
-            options=ACCEPTED_TYPES,
-        )
-        check_valid_lst(
-            data=video_paths,
-            source=f"{self.__class__.__name__} video_paths",
-            valid_dtypes=(str,),
-            min_len=2,
-        )
-        for i in video_paths:
-            check_file_exist_and_readable(file_path=i)
-        if concat_type != MIXED_MOSAIC:
-            check_int(
-                name=f"{FrameMergererFFmpeg.__name__} video_height",
-                value=video_height,
-                min_value=0,
-            )
-            check_int(
-                name=f"{FrameMergererFFmpeg.__name__} video_width",
-                value=video_height,
-                min_value=0,
-            )
-        if config_path is not None:
-            ConfigReader.__init__(self, config_path=config_path)
-            log_event(
-                logger_name=str(__class__.__name__),
-                log_type=TagNames.CLASS_INIT.value,
-                msg=self.create_log_msg_from_init_args(locals=locals()),
-            )
-            self.output_dir = os.path.join(
-                self.project_path, Paths.CONCAT_VIDEOS_DIR.value
-            )
-            self.output_path = os.path.join(
-                self.project_path,
-                Paths.CONCAT_VIDEOS_DIR.value,
-                f"merged_video_{self.datetime}.mp4",
-            )
-        else:
-            self.timer = SimbaTimer(start=True)
-            self.datetime = datetime.now().strftime("%Y%m%d%H%M%S")
-            self.output_dir, _, _ = get_fn_ext(filepath=video_paths[0])
-            self.output_path = os.path.join(
-                self.output_dir, f"merged_video_{self.datetime}.mp4"
-            )
-
-        self.video_height, self.video_width, self.gpu = video_height, video_width, gpu
-        self.video_paths, self.concat_type = video_paths, concat_type
-        if not os.path.exists(self.output_dir):
-            os.makedirs(self.output_dir)
-
-    def run(self):
-        if self.concat_type == HORIZONTAL:
-            _ = horizontal_video_concatenator(
-                video_paths=self.video_paths,
-                save_path=self.output_path,
-                height_px=self.video_height,
-                gpu=self.gpu,
-                verbose=True,
-            )
-        elif self.concat_type == VERTICAL:
-            _ = vertical_video_concatenator(
-                video_paths=self.video_paths,
-                save_path=self.output_path,
-                width_px=self.video_width,
-                gpu=self.gpu,
-                verbose=True,
-            )
-        elif self.concat_type == MOSAIC:
-            _ = mosaic_concatenator(
-                video_paths=self.video_paths,
-                save_path=self.output_path,
-                width_px=self.video_width,
-                height_px=self.video_height,
-                gpu=self.gpu,
-                verbose=True,
-            )
-        else:
-            _ = mixed_mosaic_concatenator(
-                video_paths=self.video_paths,
-                save_path=self.output_path,
-                gpu=self.gpu,
-                verbose=True,
-            )
-        self.timer.stop_timer()
-        stdout_success(
-            msg=f"Merged video saved at {self.output_path}",
-            source=self.__class__.__name__,
-            elapsed_time=self.timer.elapsed_time_str,
-        )
-
-
-# videos = ['/Users/simon/Desktop/envs/simba/troubleshooting/mouse_open_field/project_folder/videos/SI_DAY3_308_CD1_PRESENT_downsampled.mp4', '/Users/simon/Desktop/envs/simba/troubleshooting/mouse_open_field/project_folder/videos/SI_DAY3_308_CD1_PRESENT_downsampled.mp4']
-#
-# merger = FrameMergererFFmpeg(config_path='/Users/simon/Desktop/envs/simba/troubleshooting/two_black_animals_14bp/project_folder/project_config.ini',
-#                     video_paths=videos,
-#                     video_height=600,
-#                     video_width=600,
-#                     concat_type='vertical') #horizontal, vertical, mosaic, mixed_mosaic
-# merger.run()
-
-
-#
-# FrameMergererFFmpeg(config_path=None,
-#                     frame_types={'Video 1': '/Users/simon/Desktop/envs/troubleshooting/two_black_animals_14bp/project_folder/videos/Together_1.avi',
-#                                  'Video 2': '/Users/simon/Desktop/envs/troubleshooting/two_black_animals_14bp/project_folder/videos/Together_1.avi'},
-#                     video_height=640,
-#                     video_width=480,
-#                     concat_type='vertical') #horizontal, vertical, mosaic, mixed_mosaic
-#
-#
-
-
-# FrameMergererFFmpeg(config_path=None,
-#                     frame_types={'Video 1': r'C:\Users\Nape_Computer_2\Desktop\test_videos\Box1_PM2_day_5_20211104T171021.mp4',
-#                                  'Video 2': r'C:\Users\Nape_Computer_2\Desktop\test_videos\Box1_PM2_day_5_20211104T171021.mp4',
-#                                  'Video 3': r'C:\Users\Nape_Computer_2\Desktop\test_videos\Box1_PM2_day_5_20211104T171021.mp4',
-#                                  'Video 4': r'C:\Users\Nape_Computer_2\Desktop\test_videos\Box1_PM2_day_5_20211104T171021.mp4'},
-#                     video_height=640,
-#                     video_width=480,
-#                     concat_type='mixed_mosaic',
-#                     gpu=False) #horizontal, vertical, mosaic, mixed_mosaic
-#
+__author__ = "Simon Nilsson; sronilsson@gmail.com"
+
+import os
+import shutil
+from datetime import datetime
+from typing import List, Optional, Union
+
+try:
+    from typing import Literal
+except ImportError:
+    from typing_extensions import Literal
+
+from simba.mixins.config_reader import ConfigReader
+from simba.utils.checks import (check_ffmpeg_available,
+                                check_file_exist_and_readable, check_int,
+                                check_nvidea_gpu_available, check_str,
+                                check_valid_boolean, check_valid_lst)
+from simba.utils.enums import Paths, TagNames
+from simba.utils.errors import FFMPEGCodecGPUError
+from simba.utils.printing import SimbaTimer, log_event, stdout_success
+from simba.utils.read_write import copy_files_to_directory, get_fn_ext
+from simba.video_processors.video_processing import (
+    horizontal_video_concatenator, mixed_mosaic_concatenator,
+    mosaic_concatenator, vertical_video_concatenator)
+
+HORIZONTAL = "horizontal"
+VERTICAL = "vertical"
+MOSAIC = "mosaic"
+MIXED_MOSAIC = "mixed_mosaic"
+ACCEPTED_TYPES = [HORIZONTAL, VERTICAL, MOSAIC, MIXED_MOSAIC]
+
+
+class FrameMergererFFmpeg(ConfigReader):
+    """
+    Merge separate visualizations of classifications, descriptive statistics etc., into  single video mosaic.
+
+    .. note::
+       `GitHub tutorial <https://github.com/sgoldenlab/simba/blob/master/docs/tutorial.md#step-12-merge-frames>`_.
+
+        .. image:: _static/img/mosaic_videos.gif
+          :width: 600
+          :align: center
+
+    :parameter str config_path: Optional path to SimBA project config file in Configparser format.
+    :parameter Literal["horizontal", "vertical", "mosaic", "mixed_mosaic"] concat_type: Type of concatenation. OPTIONS: 'horizontal', 'vertical', 'mosaic', 'mixed_mosaic'.
+    :parameter List[Union[str, os.PathLike]] video_paths: List with videos to concatenate.
+    :param int quality: Video quality (CRF value). Lower values = higher quality. Range 0-52. Default 23.
+    :parameter Optional[int] video_height: Optional height of the canatenated videos. Required if concat concat_type is not mixed_mosaic.
+    :parameter int video_width: Optional wisth of the canatenated videos. Required if concat concat_type is not mixed_mosaic.
+    :parameter Optional[bool] gpu: If True, use NVIDEA FFMpeg GPU codecs. Default False.
+
+    :example:
+    >>> video_paths = ['/Users/simon/Desktop/envs/simba/troubleshooting/mouse_open_field/project_folder/videos/SI_DAY3_308_CD1_PRESENT_downsampled.mp4', '/Users/simon/Desktop/envs/simba/troubleshooting/mouse_open_field/project_folder/videos/SI_DAY3_308_CD1_PRESENT_downsampled.mp4']
+    >>> merger = FrameMergererFFmpeg(config_path='/Users/simon/Desktop/envs/simba/troubleshooting/two_black_animals_14bp/project_folder/project_config.ini', video_paths=videos, video_height=600, video_width=600, concat_type='mosaic')
+    >>> merger.run()
+    """
+
+    def __init__( self,
+                 concat_type: Literal["horizontal", "vertical", "mosaic", "mixed_mosaic"],
+                 video_paths: List[Union[str, os.PathLike]],
+                 video_height: Optional[int] = None,
+                 video_width: Optional[int] = None,
+                 config_path: Optional[str] = None,
+                 quality: int = 23,
+                 gpu: bool = False):
+
+        if gpu and not check_nvidea_gpu_available():
+            raise FFMPEGCodecGPUError(msg="NVIDEA GPU not available (as evaluated by nvidea-smi returning None", source=self.__class__.__name__)
+        check_ffmpeg_available()
+        check_str(name=f"{FrameMergererFFmpeg.__name__} concat_type", value=concat_type, options=ACCEPTED_TYPES)
+        check_valid_lst(data=video_paths, source=f"{self.__class__.__name__} video_paths", valid_dtypes=(str,), min_len=2)
+        check_valid_boolean(value=gpu, source=f'{self.__class__.__name__} gpu', raise_error=True)
+        self.quality = 23 if not check_int(name='quality', value=quality, min_value=0, max_value=52, raise_error=False)[0] else int(quality)
+        for i in video_paths:
+            check_file_exist_and_readable(file_path=i)
+        if concat_type != MIXED_MOSAIC:
+            check_int(name=f"{FrameMergererFFmpeg.__name__} video_height", value=video_height, min_value=0)
+            check_int(name=f"{FrameMergererFFmpeg.__name__} video_width", value=video_height, min_value=0)
+        if config_path is not None:
+            ConfigReader.__init__(self, config_path=config_path)
+            log_event(logger_name=str(__class__.__name__), log_type=TagNames.CLASS_INIT.value, msg=self.create_log_msg_from_init_args(locals=locals()))
+            self.output_dir = os.path.join(self.project_path, Paths.CONCAT_VIDEOS_DIR.value)
+            self.output_path = os.path.join(self.project_path, Paths.CONCAT_VIDEOS_DIR.value, f"merged_video_{self.datetime}.mp4")
+        else:
+            self.timer = SimbaTimer(start=True)
+            self.datetime = datetime.now().strftime("%Y%m%d%H%M%S")
+            self.output_dir, _, _ = get_fn_ext(filepath=video_paths[0])
+            self.output_path = os.path.join(self.output_dir, f"merged_video_{self.datetime}.mp4")
+
+        self.video_height, self.video_width, self.gpu = video_height, video_width, gpu
+        self.video_paths, self.concat_type = video_paths, concat_type
+        if not os.path.exists(self.output_dir): os.makedirs(self.output_dir)
+
+    def run(self):
+        if self.concat_type == HORIZONTAL:
+            _ = horizontal_video_concatenator(video_paths=self.video_paths, save_path=self.output_path, height_px=self.video_height, gpu=self.gpu, quality=self.quality, verbose=True)
+        elif self.concat_type == VERTICAL:
+            _ = vertical_video_concatenator(video_paths=self.video_paths, save_path=self.output_path, width_px=self.video_width, gpu=self.gpu, quality=self.quality, verbose=True)
+        elif self.concat_type == MOSAIC:
+            _ = mosaic_concatenator(video_paths=self.video_paths, save_path=self.output_path, width_px=self.video_width, height_px=self.video_height, gpu=self.gpu, quality=self.quality, verbose=True)
+        else:
+            _ = mixed_mosaic_concatenator(video_paths=self.video_paths, save_path=self.output_path, gpu=self.gpu, verbose=True)
+        self.timer.stop_timer()
+        stdout_success(msg=f"Merged video saved at {self.output_path}", source=self.__class__.__name__, elapsed_time=self.timer.elapsed_time_str)
+
+
+# videos = ['/Users/simon/Desktop/envs/simba/troubleshooting/mouse_open_field/project_folder/videos/SI_DAY3_308_CD1_PRESENT_downsampled.mp4', '/Users/simon/Desktop/envs/simba/troubleshooting/mouse_open_field/project_folder/videos/SI_DAY3_308_CD1_PRESENT_downsampled.mp4']
+#
+# merger = FrameMergererFFmpeg(config_path='/Users/simon/Desktop/envs/simba/troubleshooting/two_black_animals_14bp/project_folder/project_config.ini',
+#                     video_paths=videos,
+#                     video_height=600,
+#                     video_width=600,
+#                     concat_type='vertical') #horizontal, vertical, mosaic, mixed_mosaic
+# merger.run()
+
+
+#
+# FrameMergererFFmpeg(config_path=None,
+#                     frame_types={'Video 1': '/Users/simon/Desktop/envs/troubleshooting/two_black_animals_14bp/project_folder/videos/Together_1.avi',
+#                                  'Video 2': '/Users/simon/Desktop/envs/troubleshooting/two_black_animals_14bp/project_folder/videos/Together_1.avi'},
+#                     video_height=640,
+#                     video_width=480,
+#                     concat_type='vertical') #horizontal, vertical, mosaic, mixed_mosaic
+#
+#
+
+
+# FrameMergererFFmpeg(config_path=None,
+#                     frame_types={'Video 1': r'C:\Users\Nape_Computer_2\Desktop\test_videos\Box1_PM2_day_5_20211104T171021.mp4',
+#                                  'Video 2': r'C:\Users\Nape_Computer_2\Desktop\test_videos\Box1_PM2_day_5_20211104T171021.mp4',
+#                                  'Video 3': r'C:\Users\Nape_Computer_2\Desktop\test_videos\Box1_PM2_day_5_20211104T171021.mp4',
+#                                  'Video 4': r'C:\Users\Nape_Computer_2\Desktop\test_videos\Box1_PM2_day_5_20211104T171021.mp4'},
+#                     video_height=640,
+#                     video_width=480,
+#                     concat_type='mixed_mosaic',
+#                     gpu=False) #horizontal, vertical, mosaic, mixed_mosaic
+#

{simba_uw_tf_dev-4.5.9 → simba_uw_tf_dev-4.6.2}/simba/ui/pop_ups/clf_add_remove_print_pop_up.py

@@ -7,21 +7,22 @@ from typing import Union
 from simba.mixins.config_reader import ConfigReader
 from simba.mixins.pop_up_mixin import PopUpMixin
 from simba.pose_processors.pose_reset import PoseResetter
-from simba.ui.tkinter_functions import (CreateLabelFrameWithIcon, DropDownMenu,
-                                        Entry_Box, FileSelect, SimbaButton,
+from simba.ui.tkinter_functions import (CreateLabelFrameWithIcon, Entry_Box,
+                                        FileSelect, SimbaButton, SimBADropDown,
                                         TwoOptionQuestionPopUp)
 from simba.utils.checks import check_str
 from simba.utils.enums import ConfigKey, Keys, Links
-from simba.utils.errors import DuplicationError
+from simba.utils.errors import DuplicationError, NoDataError
 from simba.utils.printing import stdout_success, stdout_trash
 from simba.utils.read_write import tabulate_clf_info
 
 
 class AddClfPopUp(PopUpMixin, ConfigReader):
-    def __init__(self, config_path: Union[str, os.PathLike]):
-        PopUpMixin.__init__(self, config_path=config_path, title="ADD CLASSIFIER")
+    def __init__(self,
+                 config_path: Union[str, os.PathLike]):
+        PopUpMixin.__init__(self, config_path=config_path, title="ADD CLASSIFIER", icon='plus')
         ConfigReader.__init__(self, config_path=config_path, read_video_info=False)
-        self.clf_eb = Entry_Box(self.main_frm, "CLASSIFIER NAME:", "15")
+        self.clf_eb = Entry_Box(parent=self.main_frm, fileDescription="CLASSIFIER NAME:", labelwidth=25, entry_box_width=30, justify='center', img='decision_tree_small')
         add_btn = SimbaButton(parent=self.main_frm, txt="ADD CLASSIFIER", cmd=self.run, img='rocket')
         self.clf_eb.grid(row=0, column=0, sticky=NW)
         add_btn.grid(row=1, column=0, sticky=NW)
@@ -43,36 +44,42 @@ class AddClfPopUp(PopUpMixin, ConfigReader):
 
 class RemoveAClassifierPopUp(PopUpMixin, ConfigReader):
     def __init__(self, config_path: Union[str, os.PathLike]):
-        PopUpMixin.__init__(self, title="Warning: Remove classifier(s) settings")
+
         ConfigReader.__init__(self, config_path=config_path, read_video_info=False)
+        if not isinstance(self.clf_names, (list, tuple)) or len(self.clf_names) < 1:
+            raise NoDataError(msg='The SimBA project has no classifiers: Cannot remove a classifier.', source=self.__class__.__name__)
+        PopUpMixin.__init__(self, title="WARNING: REMOVE CLASSIFIER", icon='trash_red')
         self.remove_clf_frm = CreateLabelFrameWithIcon( parent=self.main_frm, header="SELECT A CLASSIFIER TO REMOVE", icon_name=Keys.DOCUMENTATION.value, icon_link=Links.REMOVE_CLF.value)
-        self.clf_dropdown = DropDownMenu(self.remove_clf_frm, "Classifier", self.clf_names, "12")
-        self.clf_dropdown.setChoices(self.clf_names[0])
-
+        self.clf_dropdown = SimBADropDown(parent=self.remove_clf_frm, dropdown_options=self.clf_names, label_width=20, dropdown_width=40, label='CLASSIFIER:', value=self.clf_names[0])
         run_btn = SimbaButton(parent=self.main_frm, txt="REMOVE CLASSIFIER", cmd=self.run, img='trash')
-        self.remove_clf_frm.grid(row=0, sticky=W)
-        self.clf_dropdown.grid(row=0, sticky=W)
+        self.remove_clf_frm.grid(row=0, column=0, sticky=W)
+        self.clf_dropdown.grid(row=0, column=0, sticky=W)
         run_btn.grid(row=1, pady=10)
 
     def run(self):
-        for i in range(len(self.clf_names)):
-            self.config.remove_option("SML settings", f"model_path_{i+1}")
-            self.config.remove_option("SML settings", f"target_name_{i+1}")
-            self.config.remove_option("threshold_settings", f"threshold_{i+1}")
-            self.config.remove_option("Minimum_bout_lengths", f"min_bout_{i+1}")
-        self.clf_names.remove(self.clf_dropdown.getChoices())
-        self.config.set("SML settings", "no_targets", str(len(self.clf_names)))
-
-        for clf_cnt, clf_name in enumerate(self.clf_names):
-            self.config.set("SML settings", f"model_path_{clf_cnt + 1}", "")
-            self.config.set("SML settings", f"target_name_{clf_cnt + 1}", clf_name)
-            self.config.set("threshold_settings", f"threshold_{clf_cnt + 1}", "None")
-            self.config.set("Minimum_bout_lengths", f"min_bout_{clf_cnt + 1}", "None")
-
-        with open(self.config_path, "w") as f:
-            self.config.write(f)
-
-        stdout_trash(msg=f"{self.clf_dropdown.getChoices()} classifier removed from SimBA project.", source=self.__class__.__name__)
+        clf_to_remove = self.clf_dropdown.get_value()
+        question = TwoOptionQuestionPopUp(title="WARNING!", question=f"Do you want to remove the {clf_to_remove} \nclassifier from the SimBA project?", option_one="YES", option_two="NO")
+        if question.selected_option == "YES":
+            for i in range(len(self.clf_names)):
+                self.config.remove_option("SML settings", f"model_path_{i+1}")
+                self.config.remove_option("SML settings", f"target_name_{i+1}")
+                self.config.remove_option("threshold_settings", f"threshold_{i+1}")
+                self.config.remove_option("Minimum_bout_lengths", f"min_bout_{i+1}")
+            self.clf_names.remove(self.clf_dropdown.getChoices())
+            self.config.set("SML settings", "no_targets", str(len(self.clf_names)))
+
+            for clf_cnt, clf_name in enumerate(self.clf_names):
+                self.config.set("SML settings", f"model_path_{clf_cnt + 1}", "")
+                self.config.set("SML settings", f"target_name_{clf_cnt + 1}", clf_name)
+                self.config.set("threshold_settings", f"threshold_{clf_cnt + 1}", "None")
+                self.config.set("Minimum_bout_lengths", f"min_bout_{clf_cnt + 1}", "None")
+
+            with open(self.config_path, "w") as f:
+                self.config.write(f)
+
+            stdout_trash(msg=f"{self.clf_dropdown.getChoices()} classifier removed from SimBA project.", source=self.__class__.__name__)
+        else:
+            pass
 
 
 # _ = RemoveAClassifierPopUp(config_path='/Users/simon/Desktop/envs/troubleshooting/Two_animals_16bps/project_folder/project_config.ini')

{simba_uw_tf_dev-4.5.9 → simba_uw_tf_dev-4.6.2}/simba/ui/pop_ups/egocentric_alignment_pop_up.py

@@ -5,13 +5,12 @@ 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.ui.tkinter_functions import (CreateLabelFrameWithIcon, FolderSelect,
                                         SimBADropDown)
 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.lookups import find_closest_string, get_color_dict
 from simba.utils.read_write import (find_all_videos_in_directory,
                                     find_files_of_filetypes_in_directory,
                                     get_fn_ext, str_2_bool)
@@ -31,19 +30,19 @@ class EgocentricAlignPopUp(ConfigReader, PopUpMixin):
         ConfigReader.__init__(self, config_path=config_path, read_video_info=False, create_logger=False)
         self.clr_dict = get_color_dict()
         gpu_status = NORMAL if check_nvidea_gpu_available() else DISABLED
-
-
         settings_frm = CreateLabelFrameWithIcon(parent=self.main_frm, header="SETTINGS", icon_name=Keys.DOCUMENTATION.value, icon_link=Links.VIDEO_TOOLS.value)
-        self.data_dir = FolderSelect(settings_frm, "DATA DIRECTORY:", lblwidth=45, initialdir=self.outlier_corrected_dir, lbl_icon='folder')
-        self.videos_dir = FolderSelect(settings_frm, "VIDEO DIRECTORY:", lblwidth=45, initialdir=self.video_dir, lbl_icon='folder')
-        self.save_dir = FolderSelect(settings_frm, "SAVE DIRECTORY:", lblwidth=45, initialdir=self.video_dir, lbl_icon='folder')
+        self.data_dir = FolderSelect(settings_frm, "DATA DIRECTORY:", lblwidth=45, initialdir=self.outlier_corrected_dir, lbl_icon='folder', tooltip_key='EGOCENTRIC_DATA_DIR')
+        self.videos_dir = FolderSelect(settings_frm, "VIDEO DIRECTORY:", lblwidth=45, initialdir=self.video_dir, lbl_icon='folder', tooltip_key='EGOCENTRIC_VIDEO_DIR')
+        self.save_dir = FolderSelect(settings_frm, "SAVE DIRECTORY:", lblwidth=45, initialdir=self.project_path, lbl_icon='folder', tooltip_key='SAVE_DIR')
+        default_center = find_closest_string(target='center', string_list=self.body_parts_lst)[0]
+        default_direction = find_closest_string(target='nose', string_list=self.body_parts_lst)[0]
 
-        self.center_anchor_dropdown = SimBADropDown(parent=settings_frm, label="CENTER ANCHOR:", dropdown_options=self.body_parts_lst, label_width=45, dropdown_width=45, img='center', value=self.body_parts_lst[0])
-        self.direction_anchor_dropdown = SimBADropDown(parent=settings_frm, label="DIRECTION ANCHOR:", dropdown_options=self.body_parts_lst, label_width=45, dropdown_width=45, img='direction', value=self.body_parts_lst[1])
-        self.direction_dropdown = SimBADropDown(parent=settings_frm, label="DIRECTION:", dropdown_options=list(range(0, 361)), label_width=45, dropdown_width=45, img='direction_2', value=0)
-        self.fill_clr_dropdown = SimBADropDown(parent=settings_frm, label="ROTATION COLOR:", dropdown_options=list(self.clr_dict.keys()), label_width=45, dropdown_width=45, img='fill', value='Black')
-        self.core_cnt_dropdown = SimBADropDown(parent=settings_frm, label="CPU COUNT:", dropdown_options=list(range(1, self.cpu_cnt + 1)), label_width=45, dropdown_width=45, img='cpu_small', value=self.cpu_cnt)
-        self.gpu_dropdown = SimBADropDown(parent=settings_frm, label='USE GPU:', dropdown_options=['TRUE', 'FALSE'], label_width=45, dropdown_width=45, img='gpu_3', value='FALSE', state=gpu_status)
+        self.center_anchor_dropdown = SimBADropDown(parent=settings_frm, label="CENTER ANCHOR:", dropdown_options=self.body_parts_lst, label_width=45, dropdown_width=45, img='center', value=default_center, tooltip_key='EGOCENTRIC_ANCHOR')
+        self.direction_anchor_dropdown = SimBADropDown(parent=settings_frm, label="DIRECTION ANCHOR:", dropdown_options=self.body_parts_lst, label_width=45, dropdown_width=45, img='direction', value=default_direction, tooltip_key='EGOCENTRIC_DIRECTION_ANCHOR')
+        self.direction_dropdown = SimBADropDown(parent=settings_frm, label="DIRECTION:", dropdown_options=list(range(0, 361)), label_width=45, dropdown_width=45, img='direction_2', value=0, tooltip_key='EGOCENTRIC_DIRECTION')
+        self.fill_clr_dropdown = SimBADropDown(parent=settings_frm, label="ROTATION COLOR:", dropdown_options=list(self.clr_dict.keys()), label_width=45, dropdown_width=45, img='fill', value='Black', tooltip_key='ROTATE_FILL_COLOR')
+        self.core_cnt_dropdown = SimBADropDown(parent=settings_frm, label="CPU COUNT:", dropdown_options=list(range(1, self.cpu_cnt + 1)), label_width=45, dropdown_width=45, img='cpu_small', value=int(self.cpu_cnt/2), tooltip_key='CORE_COUNT')
+        self.gpu_dropdown = SimBADropDown(parent=settings_frm, label='USE GPU:', dropdown_options=['TRUE', 'FALSE'], label_width=45, dropdown_width=45, img='gpu_3', value='FALSE', state=gpu_status, tooltip_key='USE_GPU')
 
         settings_frm.grid(row=0, column=0, sticky=NW)
         self.data_dir.grid(row=0, column=0, sticky=NW)
@@ -62,9 +61,10 @@ class EgocentricAlignPopUp(ConfigReader, PopUpMixin):
         data_dir, video_dir = self.data_dir.folder_path, self.videos_dir.folder_path
         save_dir = self.save_dir.folder_path
         gpu = str_2_bool(self.gpu_dropdown.get_value())
-        check_if_dir_exists(in_dir=data_dir);
-        check_if_dir_exists(in_dir=video_dir);
+        check_if_dir_exists(in_dir=data_dir)
+        check_if_dir_exists(in_dir=video_dir)
         check_if_dir_exists(in_dir=save_dir)
+        core_cnt = int(self.core_cnt_dropdown.get_value())
         if (save_dir == data_dir) or (save_dir == video_dir):
             raise InvalidInputError(msg='The save directory cannot be the same as the data/video directories',source=self.__class__.__name__)
         center_anchor, direction_anchor = self.center_anchor_dropdown.getChoices(), self.direction_anchor_dropdown.getChoices()
@@ -72,12 +72,10 @@ class EgocentricAlignPopUp(ConfigReader, PopUpMixin):
         direction = int(self.direction_dropdown.getChoices())
         if gpu and not check_nvidea_gpu_available():
             raise SimBAGPUError(msg='No NVIDEA GPU detected.', source=self.__class__.__name__)
-        data_file_paths = find_files_of_filetypes_in_directory(directory=data_dir, extensions=[f'.{self.file_type}'],
-                                                               raise_error=True)
+        data_file_paths = find_files_of_filetypes_in_directory(directory=data_dir, extensions=[f'.{self.file_type}'], raise_error=True)
         data_file_paths = [os.path.join(data_dir, x) for x in data_file_paths]
         data_file_names = [get_fn_ext(filepath=x)[1] for x in data_file_paths]
-        video_file_paths = list(
-            find_all_videos_in_directory(directory=video_dir, as_dict=True, raise_error=True).values())
+        video_file_paths = list( find_all_videos_in_directory(directory=video_dir, as_dict=True, raise_error=True).values())
         video_file_names = [get_fn_ext(filepath=x)[1] for x in video_file_paths]
         missing_video_files = [x for x in video_file_names if x not in data_file_names]
         if len(missing_video_files) > 0: raise NoDataError(
@@ -89,6 +87,7 @@ class EgocentricAlignPopUp(ConfigReader, PopUpMixin):
                                       anchor_2=direction_anchor,
                                       direction=direction,
                                       anchor_location=None,
+                                      core_cnt=core_cnt,
                                       fill_clr=self.clr_dict[fill_clr],
                                       verbose=True,
                                       gpu=gpu,
@@ -97,4 +96,4 @@ class EgocentricAlignPopUp(ConfigReader, PopUpMixin):
         aligner.run()
 
 
-#_ = EgocentricAlignPopUp(config_path=r"C:\troubleshooting\mitra\project_folder\project_config.ini")
+#_ = EgocentricAlignPopUp(config_path=r"D:\troubleshooting\mitra\project_folder\project_config.ini")

{simba_uw_tf_dev-4.5.9 → simba_uw_tf_dev-4.6.2}/simba/ui/pop_ups/interpolate_pop_up.py

@@ -35,8 +35,6 @@ class InterpolatePopUp(PopUpMixin, ConfigReader):
         self.config_path = config_path
 
         self.settings_frm= CreateLabelFrameWithIcon(parent=self.main_frm, header="SETTINGS", icon_name='settings')
-
-        #self.settings_frm = LabelFrame(self.main_frm, text="SETTINGS", font=Formats.FONT_HEADER.value)
         instruction_lbl_1 = SimBALabel(parent=self.settings_frm, txt=INSTRUCTIONS_LBL_1, font=Formats.FONT_REGULAR_ITALICS.value, justify='center')
         self.type_dropdown = SimBADropDown(parent=self.settings_frm, dropdown_options=['MISSING BODY-PARTS', 'MISSING ANIMALS'], label="INTERPOLATION TYPE:", label_width=35, value='MISSING BODY-PARTS', dropdown_width=35, img='file_type')
         self.method_dropdown = SimBADropDown(parent=self.settings_frm, dropdown_options=['NEAREST', 'LINEAR', 'QUADRATIC'], label="INTERPOLATION METHOD:", label_width=35, value='NEAREST', dropdown_width=35, img='equation_small')
@@ -50,7 +48,7 @@ class InterpolatePopUp(PopUpMixin, ConfigReader):
 
         self.single_file_frm = LabelFrame(self.main_frm, text="INTERPOLATE SINGLE DATA FILE", font=Formats.FONT_HEADER.value)
         instruction_lbl_single = SimBALabel(parent=self.single_file_frm, txt=INSTRUCTIONS_LBL_2, font=Formats.FONT_REGULAR_ITALICS.value, justify='center')
-        self.selected_file = FileSelect(self.single_file_frm, "DATA PATH:", lblwidth=35, file_types=[("VIDEO FILE", ".csv .parquet")], initialdir=self.project_path)
+        self.selected_file = FileSelect(self.single_file_frm, "DATA PATH:", lblwidth=35, file_types=[("VIDEO FILE", ".csv .parquet")], initialdir=self.project_path, lbl_icon='file')
         self.run_btn_single = SimbaButton(parent=self.single_file_frm, txt="RUN SINGLE DATA FILE INTERPOLATION", img='rocket', txt_clr="blue", font=Formats.FONT_REGULAR.value, cmd=self.run, cmd_kwargs={'multiple': False})
 
         self.single_file_frm.grid(row=1, column=0, sticky=NW)
@@ -60,7 +58,7 @@ class InterpolatePopUp(PopUpMixin, ConfigReader):
 
         self.multiple_file_frm = LabelFrame(self.main_frm, text="INTERPOLATE DIRECTORY OF DATA", font=Formats.FONT_HEADER.value)
         instruction_lbl_multiple = SimBALabel(parent=self.multiple_file_frm, txt=INSTRUCTIONS_LBL_3, font=Formats.FONT_REGULAR_ITALICS.value, justify='center')
-        self.selected_dir = FolderSelect(self.multiple_file_frm, "SELECT DIRECTORY OF DATA FILES:", lblwidth=35, initialdir=self.project_path)
+        self.selected_dir = FolderSelect(self.multiple_file_frm, "SELECT DIRECTORY OF DATA FILES:", lblwidth=35, initialdir=self.project_path, lbl_icon='folder')
         self.run_btn_multiple = SimbaButton(parent=self.multiple_file_frm, txt="RUN DATA DIRECTORY INTERPOLATION", img='rocket', txt_clr="blue", font=Formats.FONT_REGULAR.value, cmd=self.run, cmd_kwargs={'multiple': True})
         self.multiple_file_frm.grid(row=2, column=0, sticky=NW)
         instruction_lbl_multiple.grid(row=0, column=0, sticky=NW)