senaduka/old-lab_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed project name from rosbridge_gui_example to rosbridge_gui attempt_1

Browse Source
This commit is contained in:
Glen Turner
2015-07-01 12:44:54 -07:00
parent 6b9cb70fc1
commit 4aef194cb8
8 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.3) cmake_minimum_required(VERSION 2.8.3)
project(rosbridge_gui_example) project(rosbridge_gui)
## Find catkin macros and libraries ## Find catkin macros and libraries
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz) ## 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 ## DEPENDS: system dependencies of this project that dependent projects also need
catkin_package( catkin_package(
# INCLUDE_DIRS include # INCLUDE_DIRS include
# LIBRARIES rosbridge_gui_example # LIBRARIES rosbridge_gui
# CATKIN_DEPENDS roscpp rospy std_msgs # CATKIN_DEPENDS roscpp rospy std_msgs
# DEPENDS system_lib # DEPENDS system_lib
) )
@@ -99,8 +99,8 @@ include_directories(
) )
## Declare a cpp library ## Declare a cpp library
# add_library(rosbridge_gui_example # add_library(rosbridge_gui
# src/${PROJECT_NAME}/rosbridge_gui_example.cpp # src/${PROJECT_NAME}/rosbridge_gui.cpp
# ) # )
## Declare a cpp executable ## Declare a cpp executable
@@ -108,7 +108,7 @@ include_directories(
## Add cmake target dependencies of the executable/library ## Add cmake target dependencies of the executable/library
## as an example, message headers may need to be generated before nodes ## 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 ## Specify libraries to link a library or executable target against
@@ -127,7 +127,7 @@ include_directories(
# ) # )
## Mark executables and/or libraries for installation ## 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} # ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
# LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} # LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
# RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} # RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
@@ -152,7 +152,7 @@ include_directories(
############# #############
## Add gtest based cpp test target and link libraries ## 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) # if(TARGET ${PROJECT_NAME}-test)
# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME}) # target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
# endif() # endif()

BIN
data/test_bag_2015-07-01-12-38-32.bag Normal file
View File

Binary file not shown.

2
launch.bash
View File

@@ -19,7 +19,7 @@ trap "kill_child_processes 1 $$; exit 0" INT
chmod a+x src/bagger.py 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 "python -m SimpleHTTPServer 8000" &
x-terminal-emulator -e "rosrun web_video_server web_video_server" x-terminal-emulator -e "rosrun web_video_server web_video_server"

4
launch/all.launch
View File

@@ -1,5 +1,5 @@
<launch> <launch>
<include file="$(find rosbridge_server)/launch/rosbridge_websocket.launch" /> <include file="$(find rosbridge_server)/launch/rosbridge_websocket.launch" />
<include file="$(find rosbridge_gui_example)/launch/bagger.launch" /> <include file="$(find rosbridge_gui)/launch/bagger.launch" />
<include file="$(find rosbridge_gui_example)/launch/talker.launch" /> <include file="$(find rosbridge_gui)/launch/talker.launch" />
</launch> </launch>

2
launch/bagger.launch
View File

@@ -1,3 +1,3 @@
<launch> <launch>
<node name="bagger" pkg="rosbridge_gui_example" type="bagger.py" /> <node name="bagger" pkg="rosbridge_gui" type="bagger.py" />
</launch> </launch>

2
launch/talker.launch
View File

@@ -1,3 +1,3 @@
<launch> <launch>
<node name="talker" pkg="rosbridge_gui_example" type="talker.py" /> <node name="talker" pkg="rosbridge_gui" type="talker.py" />
</launch> </launch>

8
package.xml
View File

@@ -1,10 +1,10 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<package> <package>
<name>rosbridge_gui_example</name> <name>rosbridge_gui</name>
<version>0.0.0</version> <version>0.0.0</version>
<description>The rosbridge_gui_example package</description> <description>The rosbridge_gui package</description>
<!-- One maintainer tag required, multiple allowed, one person per tag --> <!-- One maintainer tag required, multiple allowed, one person per tag -->
<!-- Example: --> <!-- Example: -->
<!-- <maintainer email="jane.doe@example.com">Jane Doe</maintainer> --> <!-- <maintainer email="jane.doe@example.com">Jane Doe</maintainer> -->
<maintainer email="turner.glen@gmail.com">glen</maintainer> <maintainer email="turner.glen@gmail.com">glen</maintainer>
@@ -47,4 +47,4 @@
<!-- Other tools can request additional information be placed here --> <!-- Other tools can request additional information be placed here -->
</export> </export>
</package> </package>

2
src/bagger.py
View File

@@ -14,7 +14,7 @@ class Bagger(object):
self.pub = rospy.Publisher("bag_notifier", String, queue_size=10) self.pub = rospy.Publisher("bag_notifier", String, queue_size=10)
self.proc = None self.proc = None
rospack = rospkg.RosPack() 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): def callback(self, msg):
if msg.data == "STOP" and self.proc is not None: if msg.data == "STOP" and self.proc is not None: