Skip to content

Commit a75eed5

Browse files
committed
added PASS_SEPARATE Parameter to advanced_settings.ini
1 parent 9256b73 commit a75eed5

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

DeepLabStream.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from utils.generic import VideoManager, GenericManager
2121

2222
from utils.configloader import RESOLUTION, FRAMERATE, OUT_DIR, MODEL_NAME, MULTI_CAM, STACK_FRAMES, \
23-
ANIMALS_NUMBER, FLATTEN_MA, STREAMS, STREAMING_SOURCE, MODEL_ORIGIN, CROP, CROP_X, CROP_Y
23+
ANIMALS_NUMBER, FLATTEN_MA, PASS_SEPARATE, STREAMS, STREAMING_SOURCE, MODEL_ORIGIN, CROP, CROP_X, CROP_Y
2424
from utils.plotter import plot_bodyparts,plot_metadata_frame
2525
from utils.poser import load_deeplabcut,load_dpk,load_dlc_live,load_sleap, get_pose,calculate_skeletons, \
2626
find_local_peaks_new,get_ma_pose
@@ -456,7 +456,7 @@ def get_analysed_frames(self) -> tuple:
456456
self._experiment_running = False
457457

458458
if self._experiment_running and not self._experiment.experiment_finished:
459-
if ANIMALS_NUMBER > 1 and not FLATTEN_MA:
459+
if ANIMALS_NUMBER > 1 and not FLATTEN_MA and not PASS_SEPARATE:
460460
self._experiment.check_skeleton(analysed_image,skeletons)
461461
else:
462462
for skeleton in skeletons:

utils/advanced_settings.ini

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
STREAMS = color, depth, infrared
55
MULTIPLE_DEVICES = False
66
STACK_FRAMES = False
7+
PASS_SEPARATE = False
78
ANIMALS_NUMBER = 1
89

910
CROP = False
10-
CROP_X = 0, 50
11-
CROP_Y = 0, 50
11+
CROP_X = 0, 20
12+
CROP_Y = 0, 20
1213

1314
[Pose Estimation]
1415
FLATTEN_MA = FALSE

utils/configloader.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ def get_script_path():
7171
'STACK_FRAMES') is not None else False
7272
ANIMALS_NUMBER = adv_dsc_config['Streaming'].getint('ANIMALS_NUMBER') if adv_dsc_config['Streaming'].getint(
7373
'ANIMALS_NUMBER') is not None else 1
74+
PASS_SEPARATE = adv_dsc_config['Streaming'].getboolean('PASS_SEPARATE')
7475

7576
REPEAT_VIDEO = adv_dsc_config['Video'].getboolean('REPEAT_VIDEO')
7677
CROP = adv_dsc_config['Streaming'].getboolean('CROP')

0 commit comments

Comments
 (0)