deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[cooja] plugins/Visualizer: Fix: Always highlight selected motes.

Browse source 
Motes were highlighted only by the UDGMVisualizerSkin before.
Now highlighting moved from individual VisualizerSkin to Visualizer.

A selected mote is highlighted with a blue circle
and a semi-transparent gray overlay.
This commit is contained in:
Enrico Joerns 2014-07-11 00:26:00 +02:00
parent 01bd045570
commit 963d2686f3
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tools/cooja/java/org/contikios/cooja/plugins/Visualizer.java
View file

@ -1209,11 +1209,24 @@ public class Visualizer extends VisPlugin implements HasQuickHelp {
2 * MOTE_RADIUS); 2 * MOTE_RADIUS);
} }
if (getSelectedMotes().contains(mote)) {
/* If mote is selected, highlight with red circle
and semitransparent gray overlay */
g.setColor(new Color(51, 102, 255));
g.drawOval(x - MOTE_RADIUS, y - MOTE_RADIUS, 2 * MOTE_RADIUS,
2 * MOTE_RADIUS);
g.drawOval(x - MOTE_RADIUS - 1, y - MOTE_RADIUS - 1, 2 * MOTE_RADIUS + 2,
2 * MOTE_RADIUS + 2);
g.setColor(new Color(128, 128, 128, 128));
g.fillOval(x - MOTE_RADIUS, y - MOTE_RADIUS, 2 * MOTE_RADIUS,
2 * MOTE_RADIUS);
} else {
g.setColor(Color.BLACK); g.setColor(Color.BLACK);
g.drawOval(x - MOTE_RADIUS, y - MOTE_RADIUS, 2 * MOTE_RADIUS, g.drawOval(x - MOTE_RADIUS, y - MOTE_RADIUS, 2 * MOTE_RADIUS,
2 * MOTE_RADIUS); 2 * MOTE_RADIUS);
} }
} }
}
private Polygon arrowPoly = new Polygon(); private Polygon arrowPoly = new Polygon();

3
tools/cooja/java/org/contikios/cooja/plugins/skins/UDGMVisualizerSkin.java
View file

@ -263,9 +263,6 @@ public class UDGMVisualizerSkin implements VisualizerSkin {
@Override @Override
public Color[] getColorOf(Mote mote) { public Color[] getColorOf(Mote mote) {
if (visualizer.getSelectedMotes().contains(mote)) {
return new Color[]{Color.CYAN};
}
return null; return null;
} }