Commit 829f1820 authored by Leigh Stoller's avatar Leigh Stoller

Fix a few nits for Jay.

parent f433ddca
......@@ -468,8 +468,9 @@ public class RoboTrack extends JApplet {
static class MyTableModel extends AbstractTableModel {
private String[] columnNames = {"Pname", "Vname",
"X", "Y", "O",
"DX", "DY", "DO",
"X (meters)", "Y (meters)",
"O (degrees)",
"Dest-X", "Dest-Y", "Dest-O",
"Battery %", "Voltage"
};
......
......@@ -61,25 +61,26 @@ if (isset($fake)) {
return;
}
$last_stamp = 0;
$base_query_string =
"select loc.*,r.pid,r.eid,r.vname, ".
" n.battery_voltage,n.battery_percentage, ".
" n.destination_x,n.destination_y, ".
" n.destination_orientation ".
" from location_info as loc ".
"left join reserved as r on r.node_id=loc.node_id ".
"left join nodes as n on n.node_id=loc.node_id ".
"where loc.building='$building' and ".
" loc.floor='$floor' ";
$last_stamp = 0;
# Loop forever.
while (1) {
if ($last_stamp)
$query_string = $base_query_string . "and stamp>$last_stamp";
$stamp_clause = " and stamp>$last_stamp ";
else
$query_string = $base_query_string;
$stamp_clause = "";
$query_string =
"select loc.*,r.pid,r.eid,r.vname, ".
" n.battery_voltage,n.battery_percentage, ".
" n.destination_x,n.destination_y, ".
" n.destination_orientation ".
" from location_info as loc ".
"left join reserved as r on r.node_id=loc.node_id ".
"left join nodes as n on n.node_id=loc.node_id ".
"where loc.building='$building' and ".
" loc.floor='$floor' $stamp_clause ".
"order by n.type,n.node_id";
$query_result = DBQueryFatal($query_string);
......
......@@ -51,8 +51,11 @@ echo "<table cellspacing=5 cellpadding=5 border=0 class=\"stealth\">
<td class=stealth>This applet allows you to view the robots
as they move around. The table at the bottom
shows the current position (x, y, orientation),
the destination position (dx, dy, dorientation),
the destination position,
and the battery level (percentage and voltage).
The shaded areas (blue border) are <em>exclusion</em>
zones where robots
are not allowed to go.
</td>
</tr>
</table><hr>\n";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment