diff --git a/scripts/photogrammetry_capture_runner.py b/scripts/photogrammetry_capture_runner.py index 9b0df69..3a8c302 100755 --- a/scripts/photogrammetry_capture_runner.py +++ b/scripts/photogrammetry_capture_runner.py @@ -7,6 +7,7 @@ from utils import get_path_from_json import numpy as np import geometry_msgs.msg +import argparse import rospy import time import json @@ -20,6 +21,10 @@ if __name__ == '__main__': + parser = argparse.ArgumentParser(description="Input JSON file name") + parser.add_argument('-json_name', '--json-name', type=str, default='detected_object.json') + args = parser.parse_args() + json_name = args.json_name try: print "----------------------------------------------------------" print " Photogrammetry Image Capture Tool " @@ -41,8 +46,7 @@ ## PLANNING ## # Example detected object definition - - fname = os.path.join(current, "detected_object.json") + fname = os.path.join(current, json_name) with open(fname, "r") as read_file: detected_object = json.load(read_file) diff --git a/scripts/rviz_pose_array.py b/scripts/rviz_pose_array.py index ac31797..7eee73f 100755 --- a/scripts/rviz_pose_array.py +++ b/scripts/rviz_pose_array.py @@ -14,6 +14,7 @@ from path_plans import OrthogonalCapture from transformations import Transformations from utils import get_path_from_json +import argparse import json import os import rospy @@ -118,7 +119,11 @@ def node_cameraPoseArray(inputArray): ##################################################### ## MAIN CODE ## -def main(): +def main(): + parser = argparse.ArgumentParser(description="Input JSON file name") + parser.add_argument('-json_name', '--json-name', type=str, default='detected_object.json') + args = parser.parse_args() + json_name = args.json_name # Example detected object definition # TODO: Eliniate theis hacky logic and put a proper way to load a desired json file if False: # For manually defining the position in the code diff --git a/scripts/utils.py b/scripts/utils.py index 83af606..a2200ff 100644 --- a/scripts/utils.py +++ b/scripts/utils.py @@ -2,6 +2,7 @@ from path_plans import SteppedRings from path_plans import OrthogonalCapture import numpy as np +import argparse import json import sys import os @@ -66,10 +67,13 @@ def get_path_from_json(structure): if __name__ == '__main__': - json_name = sys.argv[1] + parser = argparse.ArgumentParser(description="Input JSON file name") + parser.add_argument('-json_name', '--json-name', type=str, default='detected_object.json') + args = parser.parse_args() + json_name = args.json_name fname = os.path.join(current, json_name) + print str(json_name) with open(fname, "r") as read_file: json_structure = json.load(read_file) - print str(sys.argv[1]) # get_path_from_json(json_structure) \ No newline at end of file