diff --git a/CV_skeleton_provider/SPimage.py b/CV_skeleton_provider/SPimage.py index 78a87b5..3654b7c 100644 --- a/CV_skeleton_provider/SPimage.py +++ b/CV_skeleton_provider/SPimage.py @@ -7,13 +7,13 @@ # sys.path.append(os.path.dirname(os.path.abspath(os.path.dirname(__file__)))) -from utils_formatter import optionChecker +from CV_skeleton_provider.utils_formatter import optionChecker # from connect_location import detect -from utils_formatter import optionChecker -from utils_preprocessor import preBack -from utils_preprocessor import preGray -from utils_preprocessor import preGamma -from utils_preprocessor import preBlackProportion +from CV_skeleton_provider.utils_formatter import optionChecker +from CV_skeleton_provider.utils_preprocessor import preBack +from CV_skeleton_provider.utils_preprocessor import preGray +from CV_skeleton_provider.utils_preprocessor import preGamma +from CV_skeleton_provider.utils_preprocessor import preBlackProportion def forImage(opt): print('img') diff --git a/CV_skeleton_provider/SPvideo.py b/CV_skeleton_provider/SPvideo.py index 89c8d56..ed64810 100644 --- a/CV_skeleton_provider/SPvideo.py +++ b/CV_skeleton_provider/SPvideo.py @@ -5,11 +5,11 @@ import numpy as np import math -from utils_formatter import optionChecker -from utils_preprocessor import preBack -from utils_preprocessor import preGray -from utils_preprocessor import preGamma -from utils_preprocessor import preBlackProportion +from CV_skeleton_provider.utils_formatter import optionChecker +from CV_skeleton_provider.utils_preprocessor import preBack +from CV_skeleton_provider.utils_preprocessor import preGray +from CV_skeleton_provider.utils_preprocessor import preGamma +from CV_skeleton_provider.utils_preprocessor import preBlackProportion def forVideo(opt): print('video') diff --git a/CV_skeleton_provider/SkeletonProvider.py b/CV_skeleton_provider/SkeletonProvider.py index 0a67f2a..e542ccc 100644 --- a/CV_skeleton_provider/SkeletonProvider.py +++ b/CV_skeleton_provider/SkeletonProvider.py @@ -3,10 +3,10 @@ import time import numpy as np -from SPimage import forImage -from SPvideo import forVideo -from utils_formatter import str2bool -from utils_formatter import fileformat +from CV_skeleton_provider.SPimage import forImage +from CV_skeleton_provider.SPvideo import forVideo +from CV_skeleton_provider.utils_formatter import str2bool +from CV_skeleton_provider.utils_formatter import fileformat if __name__ == '__main__': parser = argparse.ArgumentParser() @@ -38,34 +38,34 @@ def defaultDict(): default_dict = {} - default_dict['--source'] = './example.jpeg' - default_dict['--output'] = './output' - default_dict['--option'] = 'skl' - default_dict['--exclude'] = [] - default_dict['--proto'] = './pose/coco/pose_deploy_linevec.prototxt' - default_dict['--weight'] = './pose/coco/pose_iter_440000.caffemodel' - default_dict['--thres'] = 0.1 - default_dict['--gray'] = False - default_dict['--back'] = False - default_dict['--selectRect'] = False - default_dict['--autolocation'] = False - default_dict['--comp'] = 1 - default_dict['--gamma'] = -1 - default_dict['--b_propo'] = False + default_dict['source'] = './example.jpeg' + default_dict['output'] = './output' + default_dict['option'] = 'skl' + default_dict['exclude'] = [] + default_dict['proto'] = './pose/coco/pose_deploy_linevec.prototxt' + default_dict['weight'] = './pose/coco/pose_iter_440000.caffemodel' + default_dict['thres'] = 0.1 + default_dict['gray'] = False + default_dict['back'] = False + default_dict['selectRect'] = False + default_dict['autolocation'] = False + default_dict['comp'] = 1 + default_dict['gamma'] = -1 + default_dict['b_propo'] = False return default_dict def skprovider(dict_object): arg_list = [] keys = dict_object.keys() for key in keys: - if key == '--exclude': + if key == 'exclude': if len(dict_object[key]) == 0: continue for item in dict_object[key]: - arg_list.append(key) + arg_list.append('--' + key) arg_list.append(str(item)) else: - arg_list.append(key) + arg_list.append('--' + key) arg_list.append(str(dict_object[key])) parser = argparse.ArgumentParser() diff --git a/setup.py b/setup.py index 767ab7e..7ce50a2 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name = 'CV_skeleton_provider', - version = '0.1.11', + version = '0.1.15', description = 'provide skeleton of a person', author = 'LiiNen', author_email = 'kjeonghoon065@gmail.com',