From a8a272919b20bc71911d7b9ff30438903eda57f5 Mon Sep 17 00:00:00 2001 From: "GLEN TURNER (8GT6)" <8gt6@queensu.ca> Date: Mon, 1 Jun 2015 16:47:54 -0400 Subject: [PATCH] added subscription to image topics --- README.md | 6 ++- index.html | 148 +++++++++++++++++++++++++++-------------------------- 2 files changed, 79 insertions(+), 75 deletions(-) diff --git a/README.md b/README.md index 1c95953..f0585e1 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,10 @@ If you are connecting to a remote computer that is running the roscore, you need export ROS_MASTER_URI=http://:11311 export ROS_IP= +Make sure you have the web_video_server installed: + + sudo apt-get install ros-indigo-web-video-server + Then run the bash file in the working directory by running the following in the terminal. bash launch.bash @@ -24,8 +28,6 @@ You can easily customise the "Robot Display" pannel by changing the HTML "index. All ROS related Javascript should go in the "ProjectFiles/js/ros_scripts.js" file. All functions that are used to update the GUI should go in the "ProjectFiles/js/update_guis.js" file - - By using ROSBridge, this GUI will attempt to display relevant information over the web for any device. TODO: diff --git a/index.html b/index.html index aa67242..7175713 100644 --- a/index.html +++ b/index.html @@ -29,13 +29,6 @@ - - @@ -91,6 +84,10 @@ + + + +
@@ -124,91 +121,96 @@
- -
- - - -
- N/A -
- -
+ + + +
+
+ Camera Image +
+
+
+
+ No Camera Image +
+
+ No Camera Image +
+
+
+
- -
+
-
-
+
+
-
-
- - - + +
+ + + - -
- - - - -
- + +
+ + + + +
+ -
- - -
-
- -
-
- ROS Topics -
-
- -
- N/A
-
+ +
- -
-
- ROS Nodes -
-
- -
- N/A -
-
-
-
+ +
+
+ ROS Topics +
+
+ +
+ N/A +
+
+
+ +
+
+ ROS Nodes +
+
+ +
+ N/A +
+
+
+
+
- - + +