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

Merge pull request #24 from boeglin/cooja_radiologger_no

Browse source 
Add a "Packet Number" column to the RadioLogger plugin
This commit is contained in:
Adam Dunkels 2012-11-13 03:51:18 -08:00
parent 8eeae7689e 8f9931a215
commit 23f9cdd90d
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tools/cooja/java/se/sics/cooja/plugins/RadioLogger.java
View file

@ -107,15 +107,17 @@ public class RadioLogger extends VisPlugin {
private static Logger logger = Logger.getLogger(RadioLogger.class); private static Logger logger = Logger.getLogger(RadioLogger.class);
private static final long serialVersionUID = -6927091711697081353L; private static final long serialVersionUID = -6927091711697081353L;
private final static int COLUMN_TIME = 0; private final static int COLUMN_NO = 0;
private final static int COLUMN_FROM = 1; private final static int COLUMN_TIME = 1;
private final static int COLUMN_TO = 2; private final static int COLUMN_FROM = 2;
private final static int COLUMN_DATA = 3; private final static int COLUMN_TO = 3;
private final static int COLUMN_DATA = 4;
private JSplitPane splitPane; private JSplitPane splitPane;
private JTextPane verboseBox = null; private JTextPane verboseBox = null;
private final static String[] COLUMN_NAMES = { private final static String[] COLUMN_NAMES = {
"No.",
"Time", "Time",
"From", "From",
"To", "To",
@ -185,7 +187,9 @@ public class RadioLogger extends VisPlugin {
public Object getValueAt(int row, int col) { public Object getValueAt(int row, int col) {
RadioConnectionLog conn = connections.get(row); RadioConnectionLog conn = connections.get(row);
if (col == COLUMN_TIME) { if (col == COLUMN_NO) {
return Long.toString(row + 1);
} else if (col == COLUMN_TIME) {
return Long.toString(conn.startTime / Simulation.MILLISECOND); return Long.toString(conn.startTime / Simulation.MILLISECOND);
} else if (col == COLUMN_FROM) { } else if (col == COLUMN_FROM) {
return "" + conn.connection.getSource().getMote().getID(); return "" + conn.connection.getSource().getMote().getID();
@ -775,6 +779,7 @@ public class RadioLogger extends VisPlugin {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for (int i: selectedRows) { for (int i: selectedRows) {
sb.append(i + 1).append('\t');
sb.append(dataTable.getValueAt(i, COLUMN_TIME)).append('\t'); sb.append(dataTable.getValueAt(i, COLUMN_TIME)).append('\t');
sb.append(dataTable.getValueAt(i, COLUMN_FROM)).append('\t'); sb.append(dataTable.getValueAt(i, COLUMN_FROM)).append('\t');
sb.append(getDestString(connections.get(i))).append('\t'); sb.append(getDestString(connections.get(i))).append('\t');
@ -794,6 +799,7 @@ public class RadioLogger extends VisPlugin {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for(int i=0; i < connections.size(); i++) { for(int i=0; i < connections.size(); i++) {
sb.append("" + (i + 1) + '\t');
sb.append("" + dataTable.getValueAt(i, COLUMN_TIME) + '\t'); sb.append("" + dataTable.getValueAt(i, COLUMN_TIME) + '\t');
sb.append("" + dataTable.getValueAt(i, COLUMN_FROM) + '\t'); sb.append("" + dataTable.getValueAt(i, COLUMN_FROM) + '\t');
sb.append("" + getDestString(connections.get(i)) + '\t'); sb.append("" + getDestString(connections.get(i)) + '\t');
@ -838,6 +844,7 @@ public class RadioLogger extends VisPlugin {
try { try {
PrintWriter outStream = new PrintWriter(new FileWriter(saveFile)); PrintWriter outStream = new PrintWriter(new FileWriter(saveFile));
for(int i=0; i < connections.size(); i++) { for(int i=0; i < connections.size(); i++) {
outStream.print("" + (i + 1) + '\t');
outStream.print("" + dataTable.getValueAt(i, COLUMN_TIME) + '\t'); outStream.print("" + dataTable.getValueAt(i, COLUMN_TIME) + '\t');
outStream.print("" + dataTable.getValueAt(i, COLUMN_FROM) + '\t'); outStream.print("" + dataTable.getValueAt(i, COLUMN_FROM) + '\t');
outStream.print("" + getDestString(connections.get(i)) + '\t'); outStream.print("" + getDestString(connections.get(i)) + '\t');