Thread: [Personalrobots-commit] SF.net SVN: personalrobots:[23728] pkg/trunk/sandbox/web/ navigation_applic

Brought to you by: andrewng, ehberger, gerkey, morgan_quigley, and 2 others

personalrobots-commit

[Personalrobots-commit] SF.net SVN: personalrobots:[23728] pkg/trunk/sandbox/web/ navigation_application

From: <wgh...@us...> - 2009-09-03 00:06:11

Revision: 23728
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23728&view=rev
Author:   wghassan
Date:     2009-09-03 00:06:05 +0000 (Thu, 03 Sep 2009)

Log Message:
-----------
added the app launch file

Modified Paths:
--------------
    pkg/trunk/sandbox/web/navigation_application/manifest.xml
    pkg/trunk/sandbox/web/navigation_application/navigation_application.app

Added Paths:
-----------
    pkg/trunk/sandbox/web/navigation_application/navigation_amcl.launch

Modified: pkg/trunk/sandbox/web/navigation_application/manifest.xml
===================================================================
--- pkg/trunk/sandbox/web/navigation_application/manifest.xml	2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/sandbox/web/navigation_application/manifest.xml	2009-09-03 00:06:05 UTC (rev 23728)
@@ -9,6 +9,7 @@
   <depend package="roslib"/>
   <depend package="rospy"/>
   <depend package="webui"/>
+  <depend package="move_base_stage"/>
 </package>
 
 

Added: pkg/trunk/sandbox/web/navigation_application/navigation_amcl.launch
===================================================================
--- pkg/trunk/sandbox/web/navigation_application/navigation_amcl.launch	                        (rev 0)
+++ pkg/trunk/sandbox/web/navigation_application/navigation_amcl.launch	2009-09-03 00:06:05 UTC (rev 23728)
@@ -0,0 +1,13 @@
+<launch>
+  <master auto="start"/>
+  <param name="/use_sim_time" value="true"/>
+  <include file="$(find move_base_stage)/move_base/move_base.xml"/>
+  <node pkg="map_server" type="map_server" args="$(find willow_maps)/willow-full-0.025.pgm 0.025" />
+  <node pkg="stage" type="stageros" name="stageros" args="$(optenv ROS_STAGE_GRAPHICS -g) $(find 2dnav_stage)/worlds/willow-pr2-2.5cm.world" respawn="false" >
+    <param name="base_watchdog_timeout" value="0.2"/>
+  </node>
+  <include file="$(find move_base_stage)/config/amcl_node.xml"/>
+  <include file="$(find move_base_stage)/move_base/nav_view.xml"/>
+
+  <node pkg="tf" type="change_notifier" respawn="false" />
+</launch>

Modified: pkg/trunk/sandbox/web/navigation_application/navigation_application.app
===================================================================
--- pkg/trunk/sandbox/web/navigation_application/navigation_application.app	2009-09-03 00:04:01 UTC (rev 23727)
+++ pkg/trunk/sandbox/web/navigation_application/navigation_application.app	2009-09-03 00:06:05 UTC (rev 23728)
@@ -1,6 +1,6 @@
 name: Navigation
 package: navigation_application
-launch_file: navigation.launch
+launch_file: navigation_amcl.launch
 description: A navigation web application
 icon: images/screenshot.jpg
 provides:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Personalrobots-commit] SF.net SVN: personalrobots:[23801] pkg/trunk/sandbox/web/ navigation_application

From: <wgh...@us...> - 2009-09-04 00:48:51

Revision: 23801
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23801&view=rev
Author:   wghassan
Date:     2009-09-04 00:48:40 +0000 (Fri, 04 Sep 2009)

Log Message:
-----------
newsub

Modified Paths:
--------------
    pkg/trunk/sandbox/web/navigation_application/navigation_amcl.launch

Added Paths:
-----------
    pkg/trunk/sandbox/web/navigation_application/src/
    pkg/trunk/sandbox/web/navigation_application/src/navigation_application/

Modified: pkg/trunk/sandbox/web/navigation_application/navigation_amcl.launch
===================================================================
--- pkg/trunk/sandbox/web/navigation_application/navigation_amcl.launch	2009-09-04 00:47:08 UTC (rev 23800)
+++ pkg/trunk/sandbox/web/navigation_application/navigation_amcl.launch	2009-09-04 00:48:40 UTC (rev 23801)
@@ -7,7 +7,6 @@
     <param name="base_watchdog_timeout" value="0.2"/>
   </node>
   <include file="$(find move_base_stage)/config/amcl_node.xml"/>
-  <include file="$(find move_base_stage)/move_base/nav_view.xml"/>
 
   <node pkg="tf" type="change_notifier" respawn="false" />
 </launch>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Personalrobots-commit] SF.net SVN: personalrobots:[23804] pkg/trunk/sandbox/web/ navigation_application

From: <rob...@us...> - 2009-09-04 01:11:43

Revision: 23804
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23804&view=rev
Author:   rob_wheeler
Date:     2009-09-04 01:11:27 +0000 (Fri, 04 Sep 2009)

Log Message:
-----------
controls bar

Modified Paths:
--------------
    pkg/trunk/sandbox/web/navigation_application/jslib/map_viewer.js

Added Paths:
-----------
    pkg/trunk/sandbox/web/navigation_application/images/goal_disable.png
    pkg/trunk/sandbox/web/navigation_application/images/goal_enable.png
    pkg/trunk/sandbox/web/navigation_application/images/pan_disable.png
    pkg/trunk/sandbox/web/navigation_application/images/pan_enable.png
    pkg/trunk/sandbox/web/navigation_application/images/pin_disable.png
    pkg/trunk/sandbox/web/navigation_application/images/pin_enable.png
    pkg/trunk/sandbox/web/navigation_application/images/reset_disable.png
    pkg/trunk/sandbox/web/navigation_application/images/reset_enable.png
    pkg/trunk/sandbox/web/navigation_application/images/zoomin_disable.png
    pkg/trunk/sandbox/web/navigation_application/images/zoomin_enable.png
    pkg/trunk/sandbox/web/navigation_application/images/zoomout_disable.png
    pkg/trunk/sandbox/web/navigation_application/images/zoomout_enable.png

Added: pkg/trunk/sandbox/web/navigation_application/images/goal_disable.png
===================================================================
(Binary files differ)


Property changes on: pkg/trunk/sandbox/web/navigation_application/images/goal_disable.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: pkg/trunk/sandbox/web/navigation_application/images/goal_enable.png
===================================================================
(Binary files differ)


Property changes on: pkg/trunk/sandbox/web/navigation_application/images/goal_enable.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: pkg/trunk/sandbox/web/navigation_application/images/pan_disable.png
===================================================================
(Binary files differ)


Property changes on: pkg/trunk/sandbox/web/navigation_application/images/pan_disable.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: pkg/trunk/sandbox/web/navigation_application/images/pan_enable.png
===================================================================
(Binary files differ)


Property changes on: pkg/trunk/sandbox/web/navigation_application/images/pan_enable.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: pkg/trunk/sandbox/web/navigation_application/images/pin_disable.png
===================================================================
(Binary files differ)


Property changes on: pkg/trunk/sandbox/web/navigation_application/images/pin_disable.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: pkg/trunk/sandbox/web/navigation_application/images/pin_enable.png
===================================================================
(Binary files differ)


Property changes on: pkg/trunk/sandbox/web/navigation_application/images/pin_enable.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: pkg/trunk/sandbox/web/navigation_application/images/reset_disable.png
===================================================================
(Binary files differ)


Property changes on: pkg/trunk/sandbox/web/navigation_application/images/reset_disable.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: pkg/trunk/sandbox/web/navigation_application/images/reset_enable.png
===================================================================
(Binary files differ)


Property changes on: pkg/trunk/sandbox/web/navigation_application/images/reset_enable.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: pkg/trunk/sandbox/web/navigation_application/images/zoomin_disable.png
===================================================================
(Binary files differ)


Property changes on: pkg/trunk/sandbox/web/navigation_application/images/zoomin_disable.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: pkg/trunk/sandbox/web/navigation_application/images/zoomin_enable.png
===================================================================
(Binary files differ)


Property changes on: pkg/trunk/sandbox/web/navigation_application/images/zoomin_enable.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: pkg/trunk/sandbox/web/navigation_application/images/zoomout_disable.png
===================================================================
(Binary files differ)


Property changes on: pkg/trunk/sandbox/web/navigation_application/images/zoomout_disable.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: pkg/trunk/sandbox/web/navigation_application/images/zoomout_enable.png
===================================================================
(Binary files differ)


Property changes on: pkg/trunk/sandbox/web/navigation_application/images/zoomout_enable.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: pkg/trunk/sandbox/web/navigation_application/jslib/map_viewer.js
===================================================================
--- pkg/trunk/sandbox/web/navigation_application/jslib/map_viewer.js	2009-09-04 01:06:49 UTC (rev 23803)
+++ pkg/trunk/sandbox/web/navigation_application/jslib/map_viewer.js	2009-09-04 01:11:27 UTC (rev 23804)
@@ -49,6 +49,20 @@
         this.topics = ['/robot_pose_visualization', '/move_base/NavfnROS/plan:simplified'];
     },
 
+    buttons: [
+        {'name': 'zoomin', 'desc': 'Zoom In'},
+        {'name': 'zoomout', 'desc': 'Zoom Out'},
+        {'name': 'reset', 'desc': 'Reset the view'},
+        {'name': 'pan', 'desc': 'Pan'},
+        {'name': 'goal', 'desc': 'Set the robot\'s goal'},
+        {'name': 'pose', 'desc': 'Set the robot\'s initial pose'},
+        {'name': 'pin', 'desc': 'Follow the robot'},
+    ],
+
+    addButton: function(b) {
+        this.buttonbar.insert('<img title="'+b.desc+'" style="margin:1;border:1px solid" src="' + window.location.pathname + '/images/'+b.name+'_disable.png"><br>');
+    },
+
     init: function() {
         // Overlay a canvas the same size as this div
         this.canvas = new Element('canvas', {'id': 'map_canvas', 'width': this.viewer.getWidth(), 'height': this.viewer.getHeight(), 'style': 'z-index:1;position:absolute'});
@@ -59,6 +73,11 @@
         this.panner.left = this.panner.top = 0;
         this.viewer.appendChild(this.panner);
 
+        this.buttonbar = new Element('div', {'style' : 'z-index:10;position:absolute;padding:5'});
+        this.viewer.appendChild(this.buttonbar);
+
+        this.buttons.each(this.addButton.bind(this));
+        
         this.sourceWidth = 2332;
         this.sourceHeight = 1825;
         this.sourceResolution = 0.025;
@@ -290,7 +309,7 @@
             this.drawRobot(ctx, this.robot, 1.0);
         }
         if (this.robot_est) {
-            this.drawRobot(ctx, this.robot_est, 0.75);
+            this.drawRobot(ctx, this.robot_est, 0.5);
         }
 
     },


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Personalrobots-commit] SF.net SVN: personalrobots:[23805] pkg/trunk/sandbox/web/ navigation_application

From: <wgh...@us...> - 2009-09-04 01:13:20

Revision: 23805
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23805&view=rev
Author:   wghassan
Date:     2009-09-04 01:13:14 +0000 (Fri, 04 Sep 2009)

Log Message:
-----------
moved into src

Added Paths:
-----------
    pkg/trunk/sandbox/web/navigation_application/src/navigation_application/cgibin/
    pkg/trunk/sandbox/web/navigation_application/src/navigation_application/images/
    pkg/trunk/sandbox/web/navigation_application/src/navigation_application/jslib/
    pkg/trunk/sandbox/web/navigation_application/src/navigation_application/templates/

Removed Paths:
-------------
    pkg/trunk/sandbox/web/navigation_application/cgibin/
    pkg/trunk/sandbox/web/navigation_application/images/
    pkg/trunk/sandbox/web/navigation_application/jslib/
    pkg/trunk/sandbox/web/navigation_application/templates/


Property changes on: pkg/trunk/sandbox/web/navigation_application/src/navigation_application/cgibin
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: pkg/trunk/sandbox/web/navigation_application/src/navigation_application/images
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: pkg/trunk/sandbox/web/navigation_application/src/navigation_application/jslib
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: pkg/trunk/sandbox/web/navigation_application/src/navigation_application/templates
___________________________________________________________________
Added: svn:mergeinfo
   + 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.