Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[23824] pkg/trunk/sandbox/web
|
From: <wgh...@us...> - 2009-09-04 07:47:45
|
Revision: 23824
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23824&view=rev
Author: wghassan
Date: 2009-09-04 07:47:36 +0000 (Fri, 04 Sep 2009)
Log Message:
-----------
fixes for the app bar
Modified Paths:
--------------
pkg/trunk/sandbox/web/map_tiler/src/map_tiler/handler.py
pkg/trunk/sandbox/web/navigation_application/src/navigation_application/jslib/map_viewer.js
pkg/trunk/sandbox/web/navigation_application/src/navigation_application/templates/index.cs
pkg/trunk/sandbox/web/rosweb2/src/rosweb.py
pkg/trunk/sandbox/web/sample_application/src/sample_application/cgibin/sample_application_index.py
pkg/trunk/sandbox/web/sample_application/src/sample_application/templates/index.cs
pkg/trunk/sandbox/web/webui/src/webui/mod/webui/jslib/ros.js
pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/header.cs
pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/nodes.cs
pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/powerboard.cs
pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/status.cs
pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/topic.cs
pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/topics.cs
Added Paths:
-----------
pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/status_header.cs
Modified: pkg/trunk/sandbox/web/map_tiler/src/map_tiler/handler.py
===================================================================
--- pkg/trunk/sandbox/web/map_tiler/src/map_tiler/handler.py 2009-09-04 07:45:26 UTC (rev 23823)
+++ pkg/trunk/sandbox/web/map_tiler/src/map_tiler/handler.py 2009-09-04 07:47:36 UTC (rev 23824)
@@ -14,6 +14,7 @@
from numpy import float64
from simplify import Simplifier
+import rosweb
_map_cache = {}
_scale_cache = {}
Modified: pkg/trunk/sandbox/web/navigation_application/src/navigation_application/jslib/map_viewer.js
===================================================================
--- pkg/trunk/sandbox/web/navigation_application/src/navigation_application/jslib/map_viewer.js 2009-09-04 07:45:26 UTC (rev 23823)
+++ pkg/trunk/sandbox/web/navigation_application/src/navigation_application/jslib/map_viewer.js 2009-09-04 07:47:36 UTC (rev 23824)
@@ -45,8 +45,8 @@
var MapViewer = Class.create({
initialize: function(domobj) {
this.viewer = domobj;
- //this.topics = ['/robot_pose_visualization', '/move_base/NavfnROS/plan:simplified', '/base_pose_ground_truth'];
- this.topics = ['/robot_pose_visualization', '/move_base/NavfnROS/plan:simplified'];
+ this.topics = ['/robot_pose_visualization', '/move_base/NavfnROS/plan:simplified', '/base_pose_ground_truth'];
+ //this.topics = ['/robot_pose_visualization', '/move_base/NavfnROS/plan:simplified'];
},
buttons: [
Modified: pkg/trunk/sandbox/web/navigation_application/src/navigation_application/templates/index.cs
===================================================================
--- pkg/trunk/sandbox/web/navigation_application/src/navigation_application/templates/index.cs 2009-09-04 07:45:26 UTC (rev 23823)
+++ pkg/trunk/sandbox/web/navigation_application/src/navigation_application/templates/index.cs 2009-09-04 07:47:36 UTC (rev 23824)
@@ -11,8 +11,7 @@
<table align=right>
<td>
-<input class=app_button type=button value="" objtype="LaunchButtonWidget2" topic="/app_update" taskid="<?cs var:CGI.cur.app.taskid ?>">
-<div class=app_status objtype=TextWidget topic="/app_update" key=status selector="taskid" selectorValue="<?cs var:CGI.cur.app.taskid?>"> </div>
+<div class=app_button objtype="LaunchButtonWidget2" taskid="navigation_application/navigation_application.app">
</td>
</table>
Modified: pkg/trunk/sandbox/web/rosweb2/src/rosweb.py
===================================================================
--- pkg/trunk/sandbox/web/rosweb2/src/rosweb.py 2009-09-04 07:45:26 UTC (rev 23823)
+++ pkg/trunk/sandbox/web/rosweb2/src/rosweb.py 2009-09-04 07:47:36 UTC (rev 23824)
@@ -235,7 +235,7 @@
self.messages.append((self.factory.counter, newmsg))
self.factory.counter = self.factory.counter + 1
- self.newmsg = self.messages[-20:]
+ self.messages = self.messages[-20:]
Modified: pkg/trunk/sandbox/web/sample_application/src/sample_application/cgibin/sample_application_index.py
===================================================================
--- pkg/trunk/sandbox/web/sample_application/src/sample_application/cgibin/sample_application_index.py 2009-09-04 07:45:26 UTC (rev 23823)
+++ pkg/trunk/sandbox/web/sample_application/src/sample_application/cgibin/sample_application_index.py 2009-09-04 07:47:36 UTC (rev 23824)
@@ -11,12 +11,14 @@
from webui import MBPage
+import db_webui
+
class MyPage(MBPage.MBPage):
def setup(self, hdf):
pass
def display(self, hdf):
- pass
+ db_webui.grabTopics(hdf, ['/chatter:more'])
def run(context):
Modified: pkg/trunk/sandbox/web/sample_application/src/sample_application/templates/index.cs
===================================================================
--- pkg/trunk/sandbox/web/sample_application/src/sample_application/templates/index.cs 2009-09-04 07:45:26 UTC (rev 23823)
+++ pkg/trunk/sandbox/web/sample_application/src/sample_application/templates/index.cs 2009-09-04 07:47:36 UTC (rev 23824)
@@ -9,7 +9,7 @@
<table align=right>
<td>
-<div class=app_button objtype="LaunchButtonWidget2" taskid="<?cs var:CGI.cur.app.taskid ?>">
+<div class=app_button objtype="LaunchButtonWidget2" taskid="sample_application/sample_app.app">
</td>
</table>
@@ -22,5 +22,6 @@
<div id=ErrorDiv></div>
+<?cs include:"rosfooter.cs"?>
</body>
</html>
Modified: pkg/trunk/sandbox/web/webui/src/webui/mod/webui/jslib/ros.js
===================================================================
--- pkg/trunk/sandbox/web/webui/src/webui/mod/webui/jslib/ros.js 2009-09-04 07:45:26 UTC (rev 23823)
+++ pkg/trunk/sandbox/web/webui/src/webui/mod/webui/jslib/ros.js 2009-09-04 07:47:36 UTC (rev 23824)
@@ -392,8 +392,10 @@
new_message: function($super, msg) {
if(msg[this.key] != null) {
var d = document.createElement("div");
- d.innerHTML = msg[this.key] + "<br>";
+ d.appendChild(document.createTextNode(msg[this.key]));
+ d.innerHTML = msg[this.key];
this.textdiv.appendChild(d);
+
}
}
});
Modified: pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/header.cs
===================================================================
--- pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/header.cs 2009-09-04 07:45:26 UTC (rev 23823)
+++ pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/header.cs 2009-09-04 07:47:36 UTC (rev 23824)
@@ -20,13 +20,9 @@
</tr>
</table>
-<table class=head_buttons width=100%>
+<table class=head_buttons width=80%>
<tr>
<td class=head_buttons width=1% onclick="javascript:location.href='<?cs var:CGI.ScriptName?>/webui/apps.py'">Apps</a></td>
-<!--<td class=head_buttons width=1% onclick="javascript:location.href='<?cs var:CGI.ScriptName?>/webui/move.py'">Move</td> -->
-<td class=head_buttons width=1% onclick="javascript:location.href='<?cs var:CGI.ScriptName?>/webui/topics.py'">Topics</a></td>
-<td class=head_buttons width=1% onclick="javascript:location.href='<?cs var:CGI.ScriptName?>/webui/nodes.py'">Nodes</td>
-<td class=head_buttons width=1% onclick="javascript:location.href='<?cs var:CGI.ScriptName?>/webui/powerboard.py'">Power</td>
<td class=head_buttons width=1% onclick="javascript:location.href='<?cs var:CGI.ScriptName?>/webui/status.py'">Status</a></td>
<td class=head_buttons width=1% onclick="javascript:location.href='<?cs var:CGI.ScriptName?>/webui/admin.py'">Admin</a></td>
Modified: pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/nodes.cs
===================================================================
--- pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/nodes.cs 2009-09-04 07:45:26 UTC (rev 23823)
+++ pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/nodes.cs 2009-09-04 07:47:36 UTC (rev 23824)
@@ -6,6 +6,7 @@
<body onload="ros_handleOnLoad('/ros')">
<?cs include:"header.cs" ?>
<br>
+<?cs include:"status_header.cs" ?>
<h3>Nodes:</h3>
<ul objtype="ListWidget" topic="/topics" key="nodes">
Modified: pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/powerboard.cs
===================================================================
--- pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/powerboard.cs 2009-09-04 07:45:26 UTC (rev 23823)
+++ pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/powerboard.cs 2009-09-04 07:47:36 UTC (rev 23824)
@@ -11,6 +11,7 @@
<body onload="ros_handleOnLoad('/ros')">
<?cs include:"header.cs" ?>
<br>
+<?cs include:"status_header.cs" ?>
<br>
Modified: pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/status.cs
===================================================================
--- pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/status.cs 2009-09-04 07:45:26 UTC (rev 23823)
+++ pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/status.cs 2009-09-04 07:47:36 UTC (rev 23824)
@@ -6,7 +6,7 @@
<body onload="ros_handleOnLoad('/ros')">
<?cs include:"header.cs" ?>
<br>
-<br>
+<?cs include:"status_header.cs" ?>
<table style="border: 1px solid black; width: 150px; float: right">
<tr>
Added: pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/status_header.cs
===================================================================
--- pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/status_header.cs (rev 0)
+++ pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/status_header.cs 2009-09-04 07:47:36 UTC (rev 23824)
@@ -0,0 +1,8 @@
+<table class=head_buttons width=30%>
+<tr>
+<td class=head_buttons width=1% onclick="javascript:location.href='<?cs var:CGI.ScriptName?>/webui/topics.py'">Topics</a></td>
+<td class=head_buttons width=1% onclick="javascript:location.href='<?cs var:CGI.ScriptName?>/webui/nodes.py'">Nodes</td>
+<td class=head_buttons width=1% onclick="javascript:location.href='<?cs var:CGI.ScriptName?>/webui/powerboard.py'">Power</td>
+
+</tr>
+</table>
Modified: pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/topic.cs
===================================================================
--- pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/topic.cs 2009-09-04 07:45:26 UTC (rev 23823)
+++ pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/topic.cs 2009-09-04 07:47:36 UTC (rev 23824)
@@ -6,6 +6,9 @@
<body onload="ros_handleOnLoad('/ros')">
<?cs include:"header.cs" ?>
+<br>
+<?cs include:"status_header.cs" ?>
+
<h3>Topic: <?cs var:CGI.cur.topic?></h3>
<div style="font-size: 10pt; " objtype=MessageWidget topic="<?cs var:CGI.cur.topic ?>"></div><br>
Modified: pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/topics.cs
===================================================================
--- pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/topics.cs 2009-09-04 07:45:26 UTC (rev 23823)
+++ pkg/trunk/sandbox/web/webui/src/webui/mod/webui/templates/topics.cs 2009-09-04 07:47:36 UTC (rev 23824)
@@ -6,6 +6,7 @@
<body onload="ros_handleOnLoad('/ros')">
<?cs include:"header.cs" ?>
<br>
+<?cs include:"status_header.cs" ?>
<h3>Published topics:</h3>
<ul objtype="ListWidget" topic="/topics" key="pubtopics">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
