Merge branch 'dev' of https://github.com/RichieHakim/face-rhythm into dev

Author: RichieHakim

face_rhythm/alignment.py

@@ -9,7 +9,7 @@
 import ffmpeg
 import matplotlib.pyplot as plt
 import cv2
-from tqdm import tqdm
+from tqdm.auto import tqdm
 
 from face_rhythm import rois
 

face_rhythm/data_importing.py

@@ -4,7 +4,7 @@
 import multiprocessing as mp
 
 import numpy as np
-from tqdm import tqdm
+from tqdm.auto import tqdm
 import decord
 
 from .util import FR_Module

face_rhythm/decomposition.py

@@ -6,7 +6,7 @@
 import re
 
 import numpy as np
-from tqdm import tqdm
+from tqdm.auto import tqdm
 import torch
 import tensorly as tl
 import einops

face_rhythm/helpers.py

@@ -16,7 +16,7 @@
 import cv2
 import decord
 import torch
-from tqdm import tqdm
+from tqdm.auto import tqdm
 import yaml
 import zipfile
 import pickle

face_rhythm/pipelines.py

@@ -94,10 +94,13 @@ def pipeline_basic(params):
 
     if 'load_videos' in params['steps']:
 
+        ## Load video data from the specified directory.\
+        print(f'Loading video data from {directory_videos}...') if params['project']['verbose'] > 1 else None
         paths_videos = fr.helpers.find_paths(
             dir_outer=directory_videos,
             reMatch=filename_videos_strMatch,  ## string to use to search for files in directory. Uses regular expressions!
             depth=0,  ## how many folders deep to search
+            verbose=params['project']['verbose'],
         )[:]
 
         pprint('Paths to videos:') if params['project']['verbose'] > 1 else None

face_rhythm/point_tracking.py

@@ -2,7 +2,7 @@
 import time
 
 import numpy as np
-from tqdm import tqdm
+from tqdm.auto import tqdm
 import decord
 import cv2
 import torch

face_rhythm/rois.py

@@ -5,7 +5,7 @@
 import cv2
 import numpy as np
 import scipy.interpolate
-from tqdm import tqdm
+from tqdm.auto import tqdm
 import matplotlib.pyplot as plt
 
 from .util import FR_Module
@@ -144,7 +144,20 @@ def __init__(
             )
             self.set_point_positions(point_positions) if point_positions is not None else None
 
+        self._fill_config_runInfo_runData(
+            path_file=self._path_file,
+            coords_rois=self.roi_points,
+            point_positions=self.point_positions,
+            mask_images=self.mask_images,
+        )
 
+    def _fill_config_runInfo_runData(
+        self,
+        path_file=None,
+        coords_rois=None,
+        point_positions=None,
+        mask_images=None,
+    ):
         ## For FR_Module compatibility
         self.config = {
             "select_mode": self._select_mode,
@@ -164,8 +177,6 @@ def __init__(
             "point_positions": self.point_positions,
             "exampleImage": self.exampleImage,
         }
-        # ## Append the self.run_info data to self.run_data
-        # self.run_data.update(self.run_info)
 
     def make_points(self, rois, point_spacing=10):
         """
@@ -329,8 +340,34 @@ def plot_rois(self, image=None, **kwargs_imshow):
         ## show figure
         plt.show()
         return fig, ax
+    
+    def fliplr(self):
+        """
+        Flip the ROIs left-right. In place
+        """
+        if hasattr(self, 'exampleImage'):
+            if self.exampleImage is not None:
+                self.exampleImage = np.fliplr(self.exampleImage)
 
-
+        if hasattr(self, 'mask_images'):
+            if self.mask_images is not None:
+                self.mask_images = {k: np.fliplr(m) for k, m in self.mask_images.items()}
+                
+        if hasattr(self, 'roi_points'):
+            if self.roi_points is not None:
+                for k, p in self.roi_points.items():
+                    self.roi_points[k][:, 0] = self.img_hw[1] - p[:, 0]
+                    
+        if hasattr(self, 'point_positions'):
+            if self.point_positions is not None:
+                self.point_positions[:, 0] = self.img_hw[1] - self.point_positions[:, 0]
+
+        self._fill_config_runInfo_runData(
+            path_file=self._path_file,
+            coords_rois=self.roi_points,
+            point_positions=self.point_positions,
+            mask_images=self.mask_images,
+        )
 
 class _Select_ROI:
     """

face_rhythm/spectral_analysis.py

@@ -4,7 +4,7 @@
 
 import numpy as np
 import torch
-from tqdm import tqdm
+from tqdm.auto import tqdm
 
 from .util import FR_Module
 from . import helpers

face_rhythm/visualization.py

@@ -7,7 +7,7 @@
 import cv2
 import torch
 # import scipy.sparse
-from tqdm import tqdm
+from tqdm.auto import tqdm
 
 from .helpers import BufferedVideoReader