From 4aef194cb8fcca3e923d7b94aed960d6049ae807 Mon Sep 17 00:00:00 2001 From: Glen Turner <8gt6@queensu.ca> Date: Wed, 1 Jul 2015 12:44:54 -0700 Subject: [PATCH] Changed project name from rosbridge_gui_example to rosbridge_gui attempt_1 --- CMakeLists.txt | 14 +++++++------- data/test_bag_2015-07-01-12-38-32.bag | Bin 0 -> 84222 bytes launch.bash | 2 +- launch/all.launch | 4 ++-- launch/bagger.launch | 2 +- launch/talker.launch | 2 +- package.xml | 8 ++++---- src/bagger.py | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 data/test_bag_2015-07-01-12-38-32.bag diff --git a/CMakeLists.txt b/CMakeLists.txt index 986ff95..a59c9bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.8.3) -project(rosbridge_gui_example) +project(rosbridge_gui) ## Find catkin macros and libraries ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz) @@ -82,7 +82,7 @@ find_package(catkin REQUIRED COMPONENTS ## DEPENDS: system dependencies of this project that dependent projects also need catkin_package( # INCLUDE_DIRS include -# LIBRARIES rosbridge_gui_example +# LIBRARIES rosbridge_gui # CATKIN_DEPENDS roscpp rospy std_msgs # DEPENDS system_lib ) @@ -99,8 +99,8 @@ include_directories( ) ## Declare a cpp library -# add_library(rosbridge_gui_example -# src/${PROJECT_NAME}/rosbridge_gui_example.cpp +# add_library(rosbridge_gui +# src/${PROJECT_NAME}/rosbridge_gui.cpp # ) ## Declare a cpp executable @@ -108,7 +108,7 @@ include_directories( ## Add cmake target dependencies of the executable/library ## as an example, message headers may need to be generated before nodes -# add_dependencies(rosbridge_gui_example_node rosbridge_gui_example_generate_messages_cpp) +# add_dependencies(rosbridge_gui_node rosbridge_gui_generate_messages_cpp) ## Specify libraries to link a library or executable target against @@ -127,7 +127,7 @@ include_directories( # ) ## Mark executables and/or libraries for installation -# install(TARGETS rosbridge_gui_example rosbridge_gui_example_node +# install(TARGETS rosbridge_gui rosbridge_gui_node # ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} # LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} # RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} @@ -152,7 +152,7 @@ include_directories( ############# ## Add gtest based cpp test target and link libraries -# catkin_add_gtest(${PROJECT_NAME}-test test/test_rosbridge_gui_example.cpp) +# catkin_add_gtest(${PROJECT_NAME}-test test/test_rosbridge_gui.cpp) # if(TARGET ${PROJECT_NAME}-test) # target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME}) # endif() diff --git a/data/test_bag_2015-07-01-12-38-32.bag b/data/test_bag_2015-07-01-12-38-32.bag new file mode 100644 index 0000000000000000000000000000000000000000..4ca6e05b6d9d1af819057e869b3fa0905ce99fd3 GIT binary patch literal 84222 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 BJoNwo literal 0 HcmV?d00001 diff --git a/launch.bash b/launch.bash index 3f66973..8958e3d 100644 --- a/launch.bash +++ b/launch.bash @@ -19,7 +19,7 @@ trap "kill_child_processes 1 $$; exit 0" INT chmod a+x src/bagger.py -x-terminal-emulator -e "roslaunch rosbridge_gui_example all.launch" & +x-terminal-emulator -e "roslaunch rosbridge_gui all.launch" & x-terminal-emulator -e "python -m SimpleHTTPServer 8000" & x-terminal-emulator -e "rosrun web_video_server web_video_server" diff --git a/launch/all.launch b/launch/all.launch index 879051b..759dad6 100644 --- a/launch/all.launch +++ b/launch/all.launch @@ -1,5 +1,5 @@ - - + + diff --git a/launch/bagger.launch b/launch/bagger.launch index 371dd4a..45f048c 100644 --- a/launch/bagger.launch +++ b/launch/bagger.launch @@ -1,3 +1,3 @@ - + diff --git a/launch/talker.launch b/launch/talker.launch index d1c7241..51399f1 100644 --- a/launch/talker.launch +++ b/launch/talker.launch @@ -1,3 +1,3 @@ - + diff --git a/package.xml b/package.xml index 2f1e587..ff79b60 100644 --- a/package.xml +++ b/package.xml @@ -1,10 +1,10 @@ - rosbridge_gui_example + rosbridge_gui 0.0.0 - The rosbridge_gui_example package + The rosbridge_gui package - + glen @@ -47,4 +47,4 @@ - \ No newline at end of file + diff --git a/src/bagger.py b/src/bagger.py index 3b48c8e..74977f7 100755 --- a/src/bagger.py +++ b/src/bagger.py @@ -14,7 +14,7 @@ class Bagger(object): self.pub = rospy.Publisher("bag_notifier", String, queue_size=10) self.proc = None rospack = rospkg.RosPack() - self.data_path = os.path.join(rospack.get_path("rosbridge_gui_example"), "data") + self.data_path = os.path.join(rospack.get_path("rosbridge_gui"), "data") def callback(self, msg): if msg.data == "STOP" and self.proc is not None: