Convert to aescape_lab_ui
This commit is contained in:
@@ -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()
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<launch>
|
||||
<include file="$(find rosbridge_server)/launch/rosbridge_websocket.launch" />
|
||||
<include file="$(find rosbridge_gui)/launch/bagger.launch" />
|
||||
<include file="$(find rosbridge_gui)/launch/talker.launch" />
|
||||
<include file="$(find aescape_lab_ui)/launch/bagger.launch" />
|
||||
<include file="$(find aescape_lab_ui)/launch/talker.launch" />
|
||||
</launch>
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
<launch>
|
||||
<node name="bagger" pkg="rosbridge_gui" type="bagger.py" />
|
||||
<node name="bagger" pkg="aescape_lab_ui" type="bagger.py" />
|
||||
</launch>
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
<launch>
|
||||
<node name="talker" pkg="rosbridge_gui" type="talker.py" />
|
||||
<node name="talker" pkg="aescape_lab_ui" type="talker.py" />
|
||||
</launch>
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
<?xml version="1.0"?>
|
||||
<package>
|
||||
<name>rosbridge_gui</name>
|
||||
<name>aescape_lab_ui</name>
|
||||
<version>0.0.0</version>
|
||||
<description>The rosbridge_gui package</description>
|
||||
<description>The aescape_lab_ui package</description>
|
||||
|
||||
<!-- One maintainer tag required, multiple allowed, one person per tag -->
|
||||
<!-- Example: -->
|
||||
<!-- <maintainer email="jane.doe@example.com">Jane Doe</maintainer> -->
|
||||
<maintainer email="turner.glen@gmail.com">glen</maintainer>
|
||||
<maintainer email="david@aescape.co">David</maintainer>
|
||||
|
||||
|
||||
<!-- One license tag required, multiple allowed, one license per tag -->
|
||||
|
||||
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user