Commit dda929ee authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Checkpoint various UI changes suggested by Tim and Kirk.

parent 06b4974f
...@@ -1876,6 +1876,8 @@ public class RoboTrack extends JApplet { ...@@ -1876,6 +1876,8 @@ public class RoboTrack extends JApplet {
robbie.type = tokens.nextToken().trim(); robbie.type = tokens.nextToken().trim();
robbie.allocated = robbie.allocated =
tokens.nextToken().trim().compareTo("1") == 0; tokens.nextToken().trim().compareTo("1") == 0;
// Skip dead
tokens.nextToken();
robbie.mobile = robbie.mobile =
tokens.nextToken().trim().compareTo("1") == 0; tokens.nextToken().trim().compareTo("1") == 0;
robbie.size = (int) robbie.size = (int)
......
...@@ -30,7 +30,7 @@ ScrollablePicture.class: $(SRCDIR)/ScrollablePicture.java ...@@ -30,7 +30,7 @@ ScrollablePicture.class: $(SRCDIR)/ScrollablePicture.java
$(TESTBED_SRCDIR)/www/robotrack/NodeSelect.jar: NodeSelect.class $(TESTBED_SRCDIR)/www/robotrack/NodeSelect.jar: NodeSelect.class
echo '$(filter-out NodeSelect.class, $(shell echo *.class))' echo '$(filter-out NodeSelect.class, $(shell echo *.class))'
$(JAR) cvf $@ $^ $(patsubst %,'%',$(filter-out NodeSelect.class, $(shell echo *.class))) $(JAR) cvf $@ $^ $(patsubst %,'%',$(filter-out NodeSelect.class, $(shell echo *.class))) -C $(SRCDIR)/ up.gif -C $(SRCDIR)/ down.gif
install: install:
......
This diff is collapsed.
...@@ -84,8 +84,14 @@ while ($row = mysql_fetch_array($query_result)) { ...@@ -84,8 +84,14 @@ while ($row = mysql_fetch_array($query_result)) {
$size = 0.07; $size = 0.07;
$radius = 0.04; $radius = 0.04;
} }
$alloc = (isset($pid) ? 1 : 0); $alloc = 0;
$dead = 0;
if (isset($pid)) {
$alloc = 1;
if ($pid == $NODEDEAD_PID && $eid == $NODEDEAD_EID) {
$dead = 1;
}
}
if (!isset($vname)) if (!isset($vname))
$vname = $pname; $vname = $pname;
if (!isset($loc_z)) if (!isset($loc_z))
...@@ -97,7 +103,7 @@ while ($row = mysql_fetch_array($query_result)) { ...@@ -97,7 +103,7 @@ while ($row = mysql_fetch_array($query_result)) {
if (!isset($selector)) { if (!isset($selector)) {
echo "$vname, "; echo "$vname, ";
} }
echo "$type, $alloc, $mobile, $size, $radius, "; echo "$type, $alloc, $dead, $mobile, $size, $radius, ";
echo "$loc_x, $loc_y, $loc_z, $or"; echo "$loc_x, $loc_y, $loc_z, $or";
echo "\n"; echo "\n";
} }
......
Supports Markdown
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