|
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.
|