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

clear menu option + time focus on double-click

Browse source
This commit is contained in:
fros4943 2010-08-17 15:04:56 +00:00
parent 5a46c64e57
commit afbd65a68f
1 changed files with 74 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
tools/cooja/java/se/sics/cooja/plugins/TimeLine.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: TimeLine.java,v 1.27 2010/08/13 10:23:20 fros4943 Exp $ * $Id: TimeLine.java,v 1.28 2010/08/17 15:04:56 fros4943 Exp $
*/ */
package se.sics.cooja.plugins; package se.sics.cooja.plugins;
@ -549,6 +549,27 @@ public class TimeLine extends VisPlugin {
} }
}; };
private Action clearAction = new AbstractAction("Clear logs") {
private static final long serialVersionUID = -4592530582786872403L;
private void clearLogs() {
for (MoteEvents me : allMoteEvents) {
me.clear();
}
repaint();
}
public void actionPerformed(ActionEvent e) {
if (simulation.isRunning()) {
simulation.invokeSimulationThread(new Runnable() {
public void run() {
clearLogs();
}
});
} else {
clearLogs();
}
}
};
private class MoteStatistics { private class MoteStatistics {
Mote mote; Mote mote;
long onTimeRedLED = 0, onTimeGreenLED = 0, onTimeBlueLED = 0; long onTimeRedLED = 0, onTimeGreenLED = 0, onTimeBlueLED = 0;
@ -1269,6 +1290,7 @@ public class TimeLine extends VisPlugin {
popupMenu.add(new JMenuItem(saveDataAction)); popupMenu.add(new JMenuItem(saveDataAction));
popupMenu.add(new JMenuItem(statisticsAction)); popupMenu.add(new JMenuItem(statisticsAction));
popupMenu.add(new JMenuItem(clearAction));
popupMenu.addSeparator(); popupMenu.addSeparator();
@ -1293,11 +1315,35 @@ public class TimeLine extends VisPlugin {
popupMenu.add(advancedMenu); popupMenu.add(advancedMenu);
addMouseListener(new MouseAdapter() { addMouseListener(new MouseAdapter() {
long lastClick = -1;
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
if (e.isPopupTrigger()) { if (e.isPopupTrigger()) {
popupLocation = new Point(e.getX(), e.getY()); popupLocation = new Point(e.getX(), e.getY());
popupMenu.show(Timeline.this, e.getX(), e.getY()); popupMenu.show(Timeline.this, e.getX(), e.getY());
} }
/* Focus on double-click */
if (System.currentTimeMillis() - lastClick < 250) {
popupLocation = e.getPoint();
logListenerAction.actionPerformed(null);
radioLoggerAction.actionPerformed(null);
long time = (long) ((double)popupLocation.x*currentPixelDivisor);
Plugin[] plugins = simulation.getGUI().getStartedPlugins();
for (Plugin p: plugins) {
if (!(p instanceof TimeLine)) {
continue;
}
if (p == TimeLine.this) {
continue;
}
/* Select simulation time */
TimeLine plugin = (TimeLine) p;
plugin.trySelectTime(time);
}
}
lastClick = System.currentTimeMillis();
} }
public void mousePressed(MouseEvent e) { public void mousePressed(MouseEvent e) {
if (e.isPopupTrigger()) { if (e.isPopupTrigger()) {
@ -2083,6 +2129,31 @@ public class TimeLine extends VisPlugin {
} }
} }
protected void clear() {
this.radioRXTXEvents.clear();
this.radioChannelEvents.clear();
this.radioHWEvents.clear();
this.ledEvents.clear();
this.logEvents.clear();
this.watchpointEvents.clear();
if (mote.getSimulation().getSimulationTime() > 0) {
/* Create no history events */
lastRadioRXTXEvent = new NoHistoryEvent(0);
lastRadioChannelEvent = new NoHistoryEvent(0);
lastRadioHWEvent = new NoHistoryEvent(0);
lastLEDEvent = new NoHistoryEvent(0);
lastLogEvent = new NoHistoryEvent(0);
lastWatchpointEvent = new NoHistoryEvent(0);
radioRXTXEvents.add(lastRadioRXTXEvent);
radioChannelEvents.add(lastRadioChannelEvent);
radioHWEvents.add(lastRadioHWEvent);
ledEvents.add(lastLEDEvent);
logEvents.add(lastLogEvent);
watchpointEvents.add(lastWatchpointEvent);
}
}
public void addRadioRXTX(RadioRXTXEvent ev) { public void addRadioRXTX(RadioRXTXEvent ev) {
/* Link with previous events */ /* Link with previous events */
if (lastRadioRXTXEvent != null) { if (lastRadioRXTXEvent != null) {