From 4fb1e3a72431b33ffa6bad5ab064c9b6f4d2c84d Mon Sep 17 00:00:00 2001 From: kondoh Date: Wed, 2 Sep 2015 14:16:06 +0900 Subject: [PATCH 1/2] Runtime Manager Computing tab, add feat_proj dialog and adjust_xy msg --- .../util/packages/runtime_manager/CMakeLists.txt | 1 + .../runtime_manager/scripts/computing.yaml | 16 ++++++++++++++++ .../scripts/runtime_manager_dialog.py | 1 + 3 files changed, 18 insertions(+) diff --git a/ros/src/util/packages/runtime_manager/CMakeLists.txt b/ros/src/util/packages/runtime_manager/CMakeLists.txt index 7af1aceb09f..f23ba9f769f 100644 --- a/ros/src/util/packages/runtime_manager/CMakeLists.txt +++ b/ros/src/util/packages/runtime_manager/CMakeLists.txt @@ -30,6 +30,7 @@ add_message_files( traffic_light.msg ConfigCarFusion.msg ConfigPedestrianFusion.msg + adjust_xy.msg ) generate_messages( diff --git a/ros/src/util/packages/runtime_manager/scripts/computing.yaml b/ros/src/util/packages/runtime_manager/scripts/computing.yaml index c4470e05e0e..ea78f78ee83 100644 --- a/ros/src/util/packages/runtime_manager/scripts/computing.yaml +++ b/ros/src/util/packages/runtime_manager/scripts/computing.yaml @@ -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 @@ -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 diff --git a/ros/src/util/packages/runtime_manager/scripts/runtime_manager_dialog.py b/ros/src/util/packages/runtime_manager/scripts/runtime_manager_dialog.py index 54233eb614b..1f8ebf1d86e 100755 --- a/ros/src/util/packages/runtime_manager/scripts/runtime_manager_dialog.py +++ b/ros/src/util/packages/runtime_manager/scripts/runtime_manager_dialog.py @@ -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): From ba496f597b5794da5d23b682684efe00550d1263 Mon Sep 17 00:00:00 2001 From: kondoh Date: Wed, 2 Sep 2015 14:19:10 +0900 Subject: [PATCH 2/2] Runtime Manager Computing tab, add feat_proj dialog and adjst_xy msg --- ros/src/util/packages/runtime_manager/msg/adjust_xy.msg | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 ros/src/util/packages/runtime_manager/msg/adjust_xy.msg diff --git a/ros/src/util/packages/runtime_manager/msg/adjust_xy.msg b/ros/src/util/packages/runtime_manager/msg/adjust_xy.msg new file mode 100644 index 00000000000..f90c91d0c05 --- /dev/null +++ b/ros/src/util/packages/runtime_manager/msg/adjust_xy.msg @@ -0,0 +1,3 @@ +Header header +int32 x +int32 y