Skip to content

Commit

Permalink
Merge pull request #10 from CPFL/add_feat_proj_dialog
Browse files Browse the repository at this point in the history
Runtime Manager Computing tab, add feat_proj dialog and adjust_xy msg
  • Loading branch information
kondoh2 committed Sep 2, 2015
2 parents 24e6dcc + ba496f5 commit 1f95756
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 0 deletions.
1 change: 1 addition & 0 deletions ros/src/util/packages/runtime_manager/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ add_message_files(
traffic_light.msg
ConfigCarFusion.msg
ConfigPedestrianFusion.msg
adjust_xy.msg
)

generate_messages(
Expand Down
3 changes: 3 additions & 0 deletions ros/src/util/packages/runtime_manager/msg/adjust_xy.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Header header
int32 x
int32 y
16 changes: 16 additions & 0 deletions ros/src/util/packages/runtime_manager/scripts/computing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ subs :
subs :
- name : feat_proj
cmd : rosrun road_wizard feat_proj
param: feat_proj
- name : region_tlr
cmd : roslaunch road_wizard traffic_light_recognition.launch

Expand Down Expand Up @@ -762,6 +763,21 @@ params :
dash : ''
delim : ':='

- name : feat_proj
topic: /config/adjust_xy
msg : adjust_xy
vars :
- name : x
label: x
min : -100
max : 100
v : 0
- name : y
label: y
min : -100
max : 100
v : 0

- name : traffic_light
vars :
- name : file
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
from runtime_manager.msg import indicator_cmd
from runtime_manager.msg import lamp_cmd
from runtime_manager.msg import traffic_light
from runtime_manager.msg import adjust_xy

class MyFrame(rtmgr.MyFrame):
def __init__(self, *args, **kwds):
Expand Down

0 comments on commit 1f95756

Please sign in to comment.