Merge branch 'dev-simba' into dev

# Conflicts:
#	DeepLabStream.py
#	utils/poser.py

Author: JensBlack

DeepLabStream.py

@@ -20,7 +20,7 @@
 from utils.configloader import RESOLUTION, FRAMERATE, OUT_DIR, MODEL_NAME,  MULTI_CAM, STACK_FRAMES, \
     ANIMALS_NUMBER, STREAMS, STREAMING_SOURCE
 from utils.poser import load_deeplabcut, get_pose, find_local_peaks_new, calculate_skeletons,\
-    get_ma_pose, calculate_ma_skeletons, calculate_skeletons_dlc_live
+    get_ma_pose, calculate_ma_skeletons, calculate_skeletons_dlc_live, transform_2skeleton
 from utils.plotter import plot_bodyparts, plot_metadata_frame
 
 
@@ -284,7 +284,9 @@ def get_pose_mp(input_q, output_q):
                     index, frame = input_q.get()
                     if MODEL_ORIGIN == 'DLC':
                         scmap, locref, pose = get_pose(frame, config, sess, inputs, outputs)
-                        peaks = find_local_peaks_new(scmap, locref, ANIMALS_NUMBER, config)
+                        # TODO: REmove alterations to original
+                        #peaks = find_local_peaks_new(scmap, locref, ANIMALS_NUMBER, config)
+                        peaks = pose
                     if MODEL_ORIGIN == 'MADLC':
                         peaks = get_ma_pose(frame, config, sess, inputs, outputs)
 
@@ -407,7 +409,9 @@ def get_analysed_frames(self) -> tuple:
 
                     # Getting the analysed data
                     analysed_index, peaks = self._multiprocessing[camera]['output'].get()
-                    skeletons = calculate_skeletons(peaks, ANIMALS_NUMBER)
+                    #TODO: REMOVE IF USELESS
+                    skeletons = [transform_2skeleton(peaks)]
+                    #skeletons = calculate_skeletons(peaks, ANIMALS_NUMBER)
                     print('', end='\r', flush=True)  # this is the line you should not remove
                     analysed_frame, depth_map, input_time = self.get_stored_frames(camera)
                     analysis_time = time.time() - input_time