Skip to content

Commit

Permalink
use argparse to select JSON file #9
Browse files Browse the repository at this point in the history
  • Loading branch information
Schellenberg3 committed Apr 22, 2021
1 parent a37a934 commit 65fa2a7
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 5 deletions.
8 changes: 6 additions & 2 deletions scripts/photogrammetry_capture_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 "
Expand All @@ -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)

Expand Down
7 changes: 6 additions & 1 deletion scripts/rviz_pose_array.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 6 additions & 2 deletions scripts/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)

0 comments on commit 65fa2a7

Please sign in to comment.