diff --git a/CMakeLists.txt b/CMakeLists.txt index a59c9bb..7d72a0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.8.3) -project(rosbridge_gui) +project(aescape_lab_ui) ## 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 +# LIBRARIES aescape_lab_ui # CATKIN_DEPENDS roscpp rospy std_msgs # DEPENDS system_lib ) @@ -99,8 +99,8 @@ include_directories( ) ## Declare a cpp library -# add_library(rosbridge_gui -# src/${PROJECT_NAME}/rosbridge_gui.cpp +# add_library(aescape_lab_ui +# src/${PROJECT_NAME}/aescape_lab_ui.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_node rosbridge_gui_generate_messages_cpp) +# add_dependencies(aescape_lab_ui_node aescape_lab_ui_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 rosbridge_gui_node +# install(TARGETS aescape_lab_ui aescape_lab_ui_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.cpp) +# catkin_add_gtest(${PROJECT_NAME}-test test/test_aescape_lab_ui.cpp) # if(TARGET ${PROJECT_NAME}-test) # target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME}) # endif() diff --git a/README.md b/README.md index 14d65d4..7d146e3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -# ROSBRIDGE GUI +# AESCAPE LAB UI + + The purpose of this project is an example of how to write a web page that can be accessed by any device on the same network as the host computer by accessing the IP of that host computer. diff --git a/launch.bash b/launch.bash index 8958e3d..3690fc4 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 all.launch" & +x-terminal-emulator -e "roslaunch aescape_lab_ui 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 759dad6..f6263df 100644 --- a/launch/all.launch +++ b/launch/all.launch @@ -1,5 +1,5 @@ - - + + diff --git a/launch/bagger.launch b/launch/bagger.launch index 45f048c..5bd1b5a 100644 --- a/launch/bagger.launch +++ b/launch/bagger.launch @@ -1,3 +1,3 @@ - + diff --git a/launch/talker.launch b/launch/talker.launch index 51399f1..d024e24 100644 --- a/launch/talker.launch +++ b/launch/talker.launch @@ -1,3 +1,3 @@ - + diff --git a/package.xml b/package.xml index ff79b60..85706c8 100644 --- a/package.xml +++ b/package.xml @@ -1,13 +1,13 @@ - rosbridge_gui + aescape_lab_ui 0.0.0 - The rosbridge_gui package + The aescape_lab_ui package - glen + David diff --git a/src/bagger.py b/src/bagger.py index 74977f7..f957cb6 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"), "data") + self.data_path = os.path.join(rospack.get_path("aescape_lab_ui"), "data") def callback(self, msg): if msg.data == "STOP" and self.proc is not None: