giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added method to select a log listener message near a given time, similar to timeline and radio logger methods

This commit is contained in:
fros4943 2009-12-14 13:25:04 +00:00
parent cc252e5c16
commit 32936c3df8
3 changed files with 105 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
tools/cooja/java/se/sics/cooja/plugins/LogListener.java
View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: LogListener.java,v 1.20 2009/09/17 13:20:48 fros4943 Exp $
* $Id: LogListener.java,v 1.21 2009/12/14 13:25:04 fros4943 Exp $
*/
package se.sics.cooja.plugins;
@ -80,7 +80,6 @@ import se.sics.cooja.VisPlugin;
import se.sics.cooja.SimEventCentral.LogOutputEvent;
import se.sics.cooja.SimEventCentral.LogOutputListener;
import se.sics.cooja.dialogs.TableColumnAdjuster;
import se.sics.cooja.interfaces.MoteID;
/**
* A simple mote log listener.
@ -196,6 +195,10 @@ public class LogListener extends VisPlugin {
popupMenu.add(new JMenuItem(clearAction));
popupMenu.addSeparator();
popupMenu.add(new JMenuItem(saveAction));
popupMenu.addSeparator();
popupMenu.add(new JMenuItem(radioLoggerAction));
popupMenu.add(new JMenuItem(timeLineAction));
logTable.setComponentPopupMenu(popupMenu);
/* Fetch log output history */
@ -268,7 +271,7 @@ public class LogListener extends VisPlugin {
filterTextField = new JTextField("");
filterTextFieldBackground = filterTextField.getBackground();
filterPanel.add(Box.createHorizontalStrut(2));
filterPanel.add(new JLabel("Filter on string: "));
filterPanel.add(new JLabel("Filter: "));
filterPanel.add(filterTextField);
filterTextField.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@ -349,6 +352,26 @@ public class LogListener extends VisPlugin {
}
}
public void trySelectTime(final long time) {
java.awt.EventQueue.invokeLater(new Runnable() {
public void run() {
for (int i=0; i < logs.size(); i++) {
if (logs.get(i).ev.getTime() < time) {
continue;
}
int view = logTable.convertRowIndexToView(i);
if (view < 0) {
continue;
}
logTable.scrollRectToVisible(logTable.getCellRect(view, 0, true));
logTable.setRowSelectionInterval(view, view);
return;
}
}
});
}
private static class LogData {
public final LogOutputEvent ev;
public final String strID; /* cached value */
@ -405,6 +428,45 @@ public class LogListener extends VisPlugin {
}
};
private Action timeLineAction = new AbstractAction("to Timeline") {
public void actionPerformed(ActionEvent e) {
TimeLine plugin = (TimeLine) simulation.getGUI().getStartedPlugin(TimeLine.class.getName());
if (plugin == null) {
logger.fatal("No Timeline plugin");
return;
}
int view = logTable.getSelectedRow();
if (view < 0) {
return;
}
int model = logTable.convertRowIndexToModel(view);
/* Select simulation time */
plugin.trySelectTime(logs.get(model).ev.getTime());
}
};
private Action radioLoggerAction = new AbstractAction("to Radio Logger") {
public void actionPerformed(ActionEvent e) {
RadioLogger plugin = (RadioLogger) simulation.getGUI().getStartedPlugin(RadioLogger.class.getName());
if (plugin == null) {
logger.fatal("No Radio Logger plugin");
return;
}
int view = logTable.getSelectedRow();
if (view < 0) {
return;
}
int model = logTable.convertRowIndexToModel(view);
/* Select simulation time */
plugin.trySelectTime(logs.get(model).ev.getTime());
}
};
private Action clearAction = new AbstractAction("Clear") {
public void actionPerformed(ActionEvent e) {
int size = logs.size();
@ -423,11 +485,11 @@ public class LogListener extends VisPlugin {
StringBuilder sb = new StringBuilder();
for (int i: selectedRows) {
sb.append(logTable.getValueAt(i, 0));
sb.append(logTable.getValueAt(i, COLUMN_TIME));
sb.append("\t");
sb.append(logTable.getValueAt(i, 1));
sb.append(logTable.getValueAt(i, COLUMN_FROM));
sb.append("\t");
sb.append(logTable.getValueAt(i, 2));
sb.append(logTable.getValueAt(i, COLUMN_DATA));
sb.append("\n");
}

22
tools/cooja/java/se/sics/cooja/plugins/RadioLogger.java
View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: RadioLogger.java,v 1.25 2009/11/25 15:32:34 fros4943 Exp $
* $Id: RadioLogger.java,v 1.26 2009/12/14 13:25:04 fros4943 Exp $
*/
package se.sics.cooja.plugins;
@ -253,6 +253,7 @@ public class RadioLogger extends VisPlugin {
popupMenu.add(new JMenuItem(saveAction));
popupMenu.addSeparator();
popupMenu.add(new JMenuItem(timeLineAction));
popupMenu.add(new JMenuItem(logListenerAction));
dataTable.setComponentPopupMenu(popupMenu);
add(new JScrollPane(dataTable));
@ -547,7 +548,24 @@ public class RadioLogger extends VisPlugin {
plugin.trySelectTime(time);
}
};
private Action logListenerAction = new AbstractAction("to Log Listener") {
public void actionPerformed(ActionEvent e) {
LogListener plugin = (LogListener) simulation.getGUI().getStartedPlugin(LogListener.class.getName());
if (plugin == null) {
logger.fatal("No Log Listener plugin");
return;
}
int selectedRow = dataTable.getSelectedRow();
if (selectedRow < 0) return;
long time = connections.get(selectedRow).startTime;
/* Select simulation time */
plugin.trySelectTime(time);
}
};
private Properties aliases = null;
private Action aliasAction = new AbstractAction("Assign alias") {
public void actionPerformed(ActionEvent e) {

18
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
* SUCH DAMAGE.
*
* $Id: TimeLine.java,v 1.20 2009/12/11 10:41:10 fros4943 Exp $
* $Id: TimeLine.java,v 1.21 2009/12/14 13:25:04 fros4943 Exp $
*/
package se.sics.cooja.plugins;
@ -652,6 +652,21 @@ public class TimeLine extends VisPlugin {
plugin.trySelectTime(popupLocation.x*currentPixelDivisor);
}
};
private Action logListenerAction = new AbstractAction("to Log Listener") {
public void actionPerformed(ActionEvent e) {
LogListener plugin = (LogListener) simulation.getGUI().getStartedPlugin(LogListener.class.getName());
if (plugin == null) {
logger.fatal("No Log Listener plugin");
return;
}
if (popupLocation == null) {
return;
}
/* Select simulation time */
plugin.trySelectTime(popupLocation.x*currentPixelDivisor);
}
};
private void numberMotesWasUpdated() {
/* Plugin title */
@ -1050,6 +1065,7 @@ public class TimeLine extends VisPlugin {
popupMenu.addSeparator();
popupMenu.add(new JMenuItem(radioLoggerAction));
popupMenu.add(new JMenuItem(logListenerAction));
addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent e) {