Permalink
Browse files

spaces for python, removed roslaunch, added node status

  • Loading branch information...
evanw committed Apr 10, 2012
1 parent 99e8307 commit 737a4794e17a065b847fd1790ded9a5ea8713d63
Showing with 179 additions and 161 deletions.
  1. +1 −1 README.md
  2. +6 −1 html/script.js
  3. +4 −1 msg/Node.msg
  4. +168 −158 nodes/ride.py
View
@@ -1,6 +1,6 @@
# ride
-An IDE for [ROS](http://ros.org/) that runs in the web browser and edits the graph of nodes while it's running. This is an independent study project in progress and is not yet ready to use. To run ride, run the following commands in a new terminal and visit http://localhost:8000/.
+An IDE for [ROS](http://ros.org/) that runs in the web browser and edits the graph of nodes while it's running. This is an independent study project in progress and is not yet ready to use. To run ride, run the following commands in a new terminal and visit [http://localhost:8000/](http://localhost:8000/).
rosmake ride
roslaunch ride ride.launch
View
@@ -50,7 +50,7 @@ var ride = {
data.map(function(info) {
var node = ride.graph.node(info.name);
node.readOnlyFlag = !info.owned;
- node.detailText = info.running ? '' : 'Not running';
+ node.detailText = ['Starting...', '', 'Stopped'][info.status];
info.subscribed.map(function(topic) {
if (!node.input(topic)) {
var input = new GraphBox.Connection(topic);
@@ -200,6 +200,11 @@ var inputWithFocus = null;
$('input').focus(function() { inputWithFocus = this; });
$('input').blur(function() { inputWithFocus = null; });
+// Deselect input when the graph is clicked
+$(ride.graph.element).click(function() {
+ $('input').blur();
+});
+
$(document).keydown(function(e) {
// Delete the selection when backspace or delete is pressed
if (!inputWithFocus && (e.which == 8 || e.which == 46)) {
View
@@ -3,4 +3,7 @@ string[] published
string[] subscribed
string[] services
bool owned
-bool running
+int32 status
+int32 STATUS_STARTING = 0
+int32 STATUS_RUNNING = 1
+int32 STATUS_STOPPED = 2
Oops, something went wrong.

0 comments on commit 737a479

Please sign in to comment.