Added categories for cleaner tab layout

* Added estimated packet loss and next hop change count to node info panel
This commit is contained in:
nifi 2010-09-15 16:15:10 +00:00
parent 58db04ee64
commit bba653f20c
10 changed files with 416 additions and 275 deletions

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: CollectServer.java,v 1.17 2010/09/14 23:04:50 nifi Exp $ * $Id: CollectServer.java,v 1.18 2010/09/15 16:15:10 nifi Exp $
* *
* ----------------------------------------------------------------- * -----------------------------------------------------------------
* *
@ -34,8 +34,8 @@
* *
* Authors : Joakim Eriksson, Niclas Finne * Authors : Joakim Eriksson, Niclas Finne
* Created : 3 jul 2008 * Created : 3 jul 2008
* Updated : $Date: 2010/09/14 23:04:50 $ * Updated : $Date: 2010/09/15 16:15:10 $
* $Revision: 1.17 $ * $Revision: 1.18 $
*/ */
package se.sics.contiki.collect; package se.sics.contiki.collect;
@ -59,6 +59,7 @@ import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Properties; import java.util.Properties;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
@ -100,6 +101,12 @@ public class CollectServer {
public static final String INIT_SCRIPT = "collect-init.script"; public static final String INIT_SCRIPT = "collect-init.script";
public static final String FIRMWARE_FILE = "sky-shell.ihex"; public static final String FIRMWARE_FILE = "sky-shell.ihex";
/* Categories for the tab pane */
private static final String MAIN = "main";
private static final String NETWORK = "Network";
private static final String SENSORS = "Sensors";
private static final String POWER = "Power";
private Properties config = new Properties(); private Properties config = new Properties();
private String configFile; private String configFile;
@ -113,6 +120,7 @@ public class CollectServer {
private JFrame window; private JFrame window;
private JTabbedPane mainPanel; private JTabbedPane mainPanel;
private HashMap<String,JTabbedPane> categoryTable = new HashMap<String,JTabbedPane>();
private JMenuItem serialItem; private JMenuItem serialItem;
private JMenuItem runInitScriptItem; private JMenuItem runInitScriptItem;
@ -165,6 +173,7 @@ public class CollectServer {
}); });
nodeModel = new DefaultListModel(); nodeModel = new DefaultListModel();
nodeModel.addElement("<All>");
nodeList = new JList(nodeModel); nodeList = new JList(nodeModel);
nodeList.setPrototypeCellValue("888.888"); nodeList.setPrototypeCellValue("888.888");
nodeList.addListSelectionListener(new ListSelectionListener() { nodeList.addListSelectionListener(new ListSelectionListener() {
@ -177,9 +186,17 @@ public class CollectServer {
int iMax = nodeList.getMaxSelectionIndex(); int iMax = nodeList.getMaxSelectionIndex();
if ((iMin < 0) || (iMax < 0)) { if ((iMin < 0) || (iMax < 0)) {
selected = null; selected = null;
} else if (nodeList.getSelectedIndex() == 0) {
selected = getNodes();
if (nodeModel.size() > 1) {
nodeList.setSelectionInterval(1, nodeModel.size() - 1);
}
} else { } else {
Node[] tmp = new Node[1 + (iMax - iMin)]; Node[] tmp = new Node[1 + (iMax - iMin)];
int n = 0; int n = 0;
if (iMin < 1) {
iMin = 1;
}
for(int i = iMin; i <= iMax; i++) { for(int i = iMin; i <= iMax; i++) {
if (nodeList.isSelectedIndex(i)) { if (nodeList.isSelectedIndex(i)) {
tmp[n++] = (Node) nodeModel.getElementAt(i); tmp[n++] = (Node) nodeModel.getElementAt(i);
@ -199,16 +216,17 @@ public class CollectServer {
nodeList.setBorder(BorderFactory.createTitledBorder("Nodes")); nodeList.setBorder(BorderFactory.createTitledBorder("Nodes"));
ListCellRenderer renderer = nodeList.getCellRenderer(); ListCellRenderer renderer = nodeList.getCellRenderer();
if (renderer instanceof JLabel) { if (renderer instanceof JLabel) {
((JLabel)renderer).setHorizontalAlignment(JLabel.RIGHT); ((JLabel)renderer).setHorizontalAlignment(JLabel.CENTER);
} }
window.getContentPane().add(new JScrollPane(nodeList), BorderLayout.WEST); window.getContentPane().add(new JScrollPane(nodeList), BorderLayout.WEST);
mainPanel = new JTabbedPane(); mainPanel = new JTabbedPane();
mainPanel.setBackground(nodeList.getBackground()); mainPanel.setBackground(nodeList.getBackground());
mainPanel.setTabLayoutPolicy(JTabbedPane.WRAP_TAB_LAYOUT); mainPanel.setTabLayoutPolicy(JTabbedPane.WRAP_TAB_LAYOUT);
categoryTable.put(MAIN, mainPanel);
serialConsole = new SerialConsole(this); serialConsole = new SerialConsole(this, MAIN);
mapPanel = new MapPanel(this); mapPanel = new MapPanel(this, MAIN);
String image = getConfig("collect.mapimage"); String image = getConfig("collect.mapimage");
if (image != null) { if (image != null) {
mapPanel.setMapBackground(image); mapPanel.setMapBackground(image);
@ -216,7 +234,148 @@ public class CollectServer {
final int defaultMaxItemCount = 250; final int defaultMaxItemCount = 250;
visualizers = new Visualizer[] { visualizers = new Visualizer[] {
mapPanel, mapPanel,
new BarChartPanel(this, "Average Power", "Average Power Consumption", new BarChartPanel(this, SENSORS, "Average Temperature", "Temperature", "Nodes", "Celsius",
new String[] { "Celsius" }) {
{
chart.getCategoryPlot().getRangeAxis().setStandardTickUnits(NumberAxis.createIntegerTickUnits());
}
protected void addSensorData(SensorData data) {
Node node = data.getNode();
String nodeName = node.getName();
SensorDataAggregator aggregator = node.getSensorDataAggregator();
dataset.addValue(aggregator.getAverageTemperature(), categories[0], nodeName);
}
},
new TimeChartPanel(this, SENSORS, "Temperature", "Temperature", "Time", "Celsius") {
{
chart.getXYPlot().getRangeAxis().setStandardTickUnits(NumberAxis.createIntegerTickUnits());
setRangeTick(5);
setRangeMinimumSize(10.0);
setGlobalRange(true);
setMaxItemCount(defaultMaxItemCount);
}
protected double getSensorDataValue(SensorData data) {
return data.getTemperature();
}
},
new TimeChartPanel(this, SENSORS, "Battery Voltage", "Battery Voltage",
"Time", "Volt") {
{
setRangeTick(1);
setRangeMinimumSize(4.0);
setGlobalRange(true);
setMaxItemCount(defaultMaxItemCount);
}
protected double getSensorDataValue(SensorData data) {
return data.getBatteryVoltage();
}
},
new TimeChartPanel(this, SENSORS, "Battery Indicator", "Battery Indicator",
"Time", "Indicator") {
{
chart.getXYPlot().getRangeAxis().setStandardTickUnits(NumberAxis.createIntegerTickUnits());
setRangeTick(5);
setRangeMinimumSize(10.0);
setGlobalRange(true);
setMaxItemCount(defaultMaxItemCount);
}
protected double getSensorDataValue(SensorData data) {
return data.getBatteryIndicator();
}
},
new TimeChartPanel(this, SENSORS, "Relative Humidity", "Humidity", "Time", "%") {
{
setMaxItemCount(defaultMaxItemCount);
chart.getXYPlot().getRangeAxis().setRange(0.0, 100.0);
}
protected double getSensorDataValue(SensorData data) {
return data.getHumidity();
}
},
new TimeChartPanel(this, SENSORS, "Light 1", "Light 1", "Time", "-") {
{
setMaxItemCount(defaultMaxItemCount);
}
protected double getSensorDataValue(SensorData data) {
return data.getLight1();
}
},
new TimeChartPanel(this, SENSORS, "Light 2", "Light 2", "Time", "-") {
{
setMaxItemCount(defaultMaxItemCount);
}
protected double getSensorDataValue(SensorData data) {
return data.getLight2();
}
},
new TimeChartPanel(this, NETWORK, "Network Hops (Over Time)", "Network Hops", "Time", "Hops") {
{
ValueAxis axis = chart.getXYPlot().getRangeAxis();
((NumberAxis)axis).setAutoRangeIncludesZero(true);
axis.setStandardTickUnits(NumberAxis.createIntegerTickUnits());
setMaxItemCount(defaultMaxItemCount);
}
protected double getSensorDataValue(SensorData data) {
return data.getValue(SensorData.HOPS);
}
},
new BarChartPanel(this, NETWORK, "Network Hops (Per Node)", "Network Hops", "Nodes", "Hops",
new String[] { "Last Hop", "Average Hops" }, false) {
{
chart.getCategoryPlot().getRangeAxis().setStandardTickUnits(NumberAxis.createIntegerTickUnits());
}
protected void addSensorData(SensorData data) {
dataset.addValue(data.getValue(SensorData.HOPS), categories[0], data.getNode().getName());
dataset.addValue(data.getNode().getSensorDataAggregator().getAverageValue(SensorData.HOPS), categories[1], data.getNode().getName());
}
},
new TimeChartPanel(this, NETWORK, "Latency", "Latency", "Time", "Seconds") {
{
setMaxItemCount(defaultMaxItemCount);
}
protected double getSensorDataValue(SensorData data) {
return data.getLatency();
}
},
new PacketChartPanel(this, NETWORK, "Received (Over Time)", "Time", "Received Packets"),
new BarChartPanel(this, NETWORK, "Received (Per Node)", "Received Packets Per Node", "Nodes", "Packets",
new String[] { "Packets", "Duplicates" }) {
{
chart.getCategoryPlot().getRangeAxis().setStandardTickUnits(NumberAxis.createIntegerTickUnits());
}
protected void addSensorData(SensorData data) {
Node node = data.getNode();
SensorDataAggregator sda = node.getSensorDataAggregator();
dataset.addValue(sda.getDataCount(), categories[0], node.getName());
dataset.addValue(sda.getDuplicateCount(), categories[1], node.getName());
}
},
new BarChartPanel(this, NETWORK, "Received (5 min)", "Received Packets (last 5 min)", "Nodes", "Packets",
new String[] { "Packets", "Duplicates" }) {
{
chart.getCategoryPlot().getRangeAxis().setStandardTickUnits(NumberAxis.createIntegerTickUnits());
}
protected void addSensorData(SensorData data) {
Node node = data.getNode();
int packetCount = 0;
int duplicateCount = 0;
long earliestData = System.currentTimeMillis() - (5 * 60 * 1000);
for(int index = node.getSensorDataCount() - 1; index >= 0; index--) {
SensorData sd = node.getSensorData(index);
if (sd.getNodeTime() < earliestData) {
break;
}
if (sd.isDuplicate()) {
duplicateCount++;
} else {
packetCount++;
}
}
dataset.addValue(packetCount, categories[0], node.getName());
dataset.addValue(duplicateCount, categories[1], node.getName());
}
},
new BarChartPanel(this, POWER, "Average Power", "Average Power Consumption",
"Nodes", "Power (mW)", "Nodes", "Power (mW)",
new String[] { "LPM", "CPU", "Radio listen", "Radio transmit" }) { new String[] { "LPM", "CPU", "Radio listen", "Radio transmit" }) {
{ {
@ -233,7 +392,7 @@ public class CollectServer {
dataset.addValue(aggregator.getTransmitPower(), categories[3], nodeName); dataset.addValue(aggregator.getTransmitPower(), categories[3], nodeName);
} }
}, },
new BarChartPanel(this, "Radio Duty Cycle", "Average Radio Duty Cycle", new BarChartPanel(this, POWER, "Radio Duty Cycle", "Average Radio Duty Cycle",
"Nodes", "Duty Cycle (%)", "Nodes", "Duty Cycle (%)",
new String[] { "Radio listen", "Radio transmit" }) { new String[] { "Radio listen", "Radio transmit" }) {
{ {
@ -250,7 +409,7 @@ public class CollectServer {
categories[1], nodeName); categories[1], nodeName);
} }
}, },
new BarChartPanel(this, "Instantaneous Power", new BarChartPanel(this, POWER, "Instantaneous Power",
"Instantaneous Power Consumption", "Nodes", "Power (mW)", "Instantaneous Power Consumption", "Nodes", "Power (mW)",
new String[] { "LPM", "CPU", "Radio listen", "Radio transmit" }) { new String[] { "LPM", "CPU", "Radio listen", "Radio transmit" }) {
{ {
@ -266,164 +425,30 @@ public class CollectServer {
dataset.addValue(data.getTransmitPower(), categories[3], nodeName); dataset.addValue(data.getTransmitPower(), categories[3], nodeName);
} }
}, },
new TimeChartPanel(this, "Power History", "Historical Power Consumption", "Time", "mW") { new TimeChartPanel(this, POWER, "Power History", "Historical Power Consumption", "Time", "mW") {
{ {
/* ValueAxis axis = chart.getCategoryPlot().getRangeAxis();*/ // ValueAxis axis = chart.getCategoryPlot().getRangeAxis();
// ((NumberAxis)axis).setAutoRangeIncludesZero(true);
setMaxItemCount(defaultMaxItemCount); setMaxItemCount(defaultMaxItemCount);
/* ((NumberAxis)axis).setAutoRangeIncludesZero(true);*/
} }
protected double getSensorDataValue(SensorData data) { protected double getSensorDataValue(SensorData data) {
return data.getAveragePower(); return data.getAveragePower();
} }
}, },
new BarChartPanel(this, "Average Temperature", "Temperature", "Nodes", "Celsius", new NodeInfoPanel(this, MAIN),
new String[] { "Celsius" }) {
{
chart.getCategoryPlot().getRangeAxis().setStandardTickUnits(NumberAxis.createIntegerTickUnits());
}
protected void addSensorData(SensorData data) {
Node node = data.getNode();
String nodeName = node.getName();
SensorDataAggregator aggregator = node.getSensorDataAggregator();
dataset.addValue(aggregator.getAverageTemperature(), categories[0], nodeName);
}
},
new TimeChartPanel(this, "Temperature", "Temperature", "Time", "Celsius") {
{
chart.getXYPlot().getRangeAxis().setStandardTickUnits(NumberAxis.createIntegerTickUnits());
setRangeTick(5);
setRangeMinimumSize(10.0);
setGlobalRange(true);
setMaxItemCount(defaultMaxItemCount);
}
protected double getSensorDataValue(SensorData data) {
return data.getTemperature();
}
},
new TimeChartPanel(this, "Battery Voltage", "Battery Voltage",
"Time", "Volt") {
{
setRangeTick(1);
setRangeMinimumSize(4.0);
setGlobalRange(true);
setMaxItemCount(defaultMaxItemCount);
}
protected double getSensorDataValue(SensorData data) {
return data.getBatteryVoltage();
}
},
new TimeChartPanel(this, "Battery Indicator", "Battery Indicator",
"Time", "Indicator") {
{
chart.getXYPlot().getRangeAxis().setStandardTickUnits(NumberAxis.createIntegerTickUnits());
setRangeTick(5);
setRangeMinimumSize(10.0);
setGlobalRange(true);
setMaxItemCount(defaultMaxItemCount);
}
protected double getSensorDataValue(SensorData data) {
return data.getBatteryIndicator();
}
},
new TimeChartPanel(this, "Relative Humidity", "Humidity", "Time", "%") {
{
setMaxItemCount(defaultMaxItemCount);
chart.getXYPlot().getRangeAxis().setRange(0.0, 100.0);
}
protected double getSensorDataValue(SensorData data) {
return data.getHumidity();
}
},
new TimeChartPanel(this, "Light 1", "Light 1", "Time", "-") {
{
setMaxItemCount(defaultMaxItemCount);
}
protected double getSensorDataValue(SensorData data) {
return data.getLight1();
}
},
new TimeChartPanel(this, "Light 2", "Light 2", "Time", "-") {
{
setMaxItemCount(defaultMaxItemCount);
}
protected double getSensorDataValue(SensorData data) {
return data.getLight2();
}
},
new TimeChartPanel(this, "Network Hops (Over Time)", "Network Hops", "Time", "Hops") {
{
ValueAxis axis = chart.getXYPlot().getRangeAxis();
((NumberAxis)axis).setAutoRangeIncludesZero(true);
axis.setStandardTickUnits(NumberAxis.createIntegerTickUnits());
setMaxItemCount(defaultMaxItemCount);
}
protected double getSensorDataValue(SensorData data) {
return data.getValue(SensorData.HOPS);
}
},
new BarChartPanel(this, "Network Hops (Per Node)", "Network Hops", "Nodes", "Hops",
new String[] { "Last Hop", "Average Hops" }, false) {
{
chart.getCategoryPlot().getRangeAxis().setStandardTickUnits(NumberAxis.createIntegerTickUnits());
}
protected void addSensorData(SensorData data) {
dataset.addValue(data.getValue(SensorData.HOPS), categories[0], data.getNode().getName());
dataset.addValue(data.getNode().getSensorDataAggregator().getAverageValue(SensorData.HOPS), categories[1], data.getNode().getName());
}
},
new TimeChartPanel(this, "Latency", "Latency", "Time", "Seconds") {
{
setMaxItemCount(defaultMaxItemCount);
}
protected double getSensorDataValue(SensorData data) {
return data.getLatency();
}
},
new PacketChartPanel(this, "Received (Over Time)", "Time", "Received Packets"),
new BarChartPanel(this, "Received (Per Node)", "Received Packets Per Node", "Nodes", "Packets",
new String[] { "Packets", "Duplicates" }) {
{
chart.getCategoryPlot().getRangeAxis().setStandardTickUnits(NumberAxis.createIntegerTickUnits());
}
protected void addSensorData(SensorData data) {
Node node = data.getNode();
SensorDataAggregator sda = node.getSensorDataAggregator();
dataset.addValue(sda.getDataCount(), categories[0], node.getName());
dataset.addValue(sda.getDuplicateCount(), categories[1], node.getName());
}
},
new BarChartPanel(this, "Received (5 min)", "Received Packets (last 5 min)", "Nodes", "Packets",
new String[] { "Packets", "Duplicates" }) {
{
chart.getCategoryPlot().getRangeAxis().setStandardTickUnits(NumberAxis.createIntegerTickUnits());
}
protected void addSensorData(SensorData data) {
Node node = data.getNode();
int dataCount = node.getSensorDataCount();
int packetCount = 0;
int duplicateCount = 0;
long earliestData = getNodeTime() - (5 * 60 * 1000);
for(int index = dataCount - 1; index >= 0; index--) {
SensorData sd = node.getSensorData(index);
if (sd.getNodeTime() < earliestData) {
break;
}
if (sd.isDuplicate()) {
duplicateCount++;
} else {
packetCount++;
}
}
dataset.addValue(packetCount, categories[0], node.getName());
dataset.addValue(duplicateCount, categories[1], node.getName());
}
},
// new SeqnoChartPanel(this, "Received Packets", "Received Packets", "Seqno", "Received Packets"),
new NodeInfoPanel(this),
serialConsole serialConsole
}; };
for (int i = 0, n = visualizers.length; i < n; i++) { for (int i = 0, n = visualizers.length; i < n; i++) {
mainPanel.add(visualizers[i].getTitle(), visualizers[i].getPanel()); String category = visualizers[i].getCategory();
JTabbedPane pane = categoryTable.get(category);
if (pane == null) {
pane = new JTabbedPane();
pane.setBackground(nodeList.getBackground());
pane.setTabLayoutPolicy(JTabbedPane.WRAP_TAB_LAYOUT);
categoryTable.put(category, pane);
mainPanel.add(category, pane);
}
pane.add(visualizers[i].getTitle(), visualizers[i].getPanel());
} }
window.getContentPane().add(mainPanel, BorderLayout.CENTER); window.getContentPane().add(mainPanel, BorderLayout.CENTER);
@ -546,20 +571,6 @@ public class CollectServer {
}); });
toolsMenu.add(baseShapeItem); toolsMenu.add(baseShapeItem);
final JCheckBoxMenuItem scrollItem = new JCheckBoxMenuItem("Scroll Layout");
scrollItem.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
if (scrollItem.getState()) {
mainPanel.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
} else {
mainPanel.setTabLayoutPolicy(JTabbedPane.WRAP_TAB_LAYOUT);
}
}
});
toolsMenu.add(scrollItem);
window.setJMenuBar(menuBar); window.setJMenuBar(menuBar);
window.pack(); window.pack();
@ -797,7 +808,7 @@ public class CollectServer {
SwingUtilities.invokeLater(new Runnable() { SwingUtilities.invokeLater(new Runnable() {
public void run() { public void run() {
boolean added = false; boolean added = false;
for (int i = 0, n = nodeModel.size(); i < n; i++) { for (int i = 1, n = nodeModel.size(); i < n; i++) {
int cmp = newNode.compareTo((Node) nodeModel.get(i)); int cmp = newNode.compareTo((Node) nodeModel.get(i));
if (cmp < 0) { if (cmp < 0) {
nodeModel.insertElementAt(newNode, i); nodeModel.insertElementAt(newNode, i);
@ -973,10 +984,10 @@ public class CollectServer {
private void handleSensorData(final SensorData sensorData) { private void handleSensorData(final SensorData sensorData) {
System.out.println("SENSOR DATA: " + sensorData); System.out.println("SENSOR DATA: " + sensorData);
saveSensorData(sensorData);
if (sensorData.getNode().addSensorData(sensorData)) { if (sensorData.getNode().addSensorData(sensorData)) {
updateNodeTime(sensorData); updateNodeTime(sensorData);
sensorDataList.add(sensorData); sensorDataList.add(sensorData);
saveSensorData(sensorData);
handleLinks(sensorData); handleLinks(sensorData);
if (visualizers != null) { if (visualizers != null) {
SwingUtilities.invokeLater(new Runnable() { SwingUtilities.invokeLater(new Runnable() {
@ -1062,7 +1073,9 @@ public class CollectServer {
Node[] nodes = getNodes(); Node[] nodes = getNodes();
this.selectedNodes = null; this.selectedNodes = null;
nodeList.clearSelection(); nodeList.clearSelection();
nodeModel.removeAllElements(); if (nodeModel.size() > 1) {
nodeModel.removeRange(1, nodeModel.size() - 1);
}
this.nodeTable.clear(); this.nodeTable.clear();
synchronized (this) { synchronized (this) {
this.nodeCache = null; this.nodeCache = null;

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: SensorDataAggregator.java,v 1.6 2010/09/14 14:23:58 adamdunkels Exp $ * $Id: SensorDataAggregator.java,v 1.7 2010/09/15 16:15:10 nifi Exp $
* *
* ----------------------------------------------------------------- * -----------------------------------------------------------------
* *
@ -34,8 +34,8 @@
* *
* Authors : Joakim Eriksson, Niclas Finne * Authors : Joakim Eriksson, Niclas Finne
* Created : 20 aug 2008 * Created : 20 aug 2008
* Updated : $Date: 2010/09/14 14:23:58 $ * Updated : $Date: 2010/09/15 16:15:10 $
* $Revision: 1.6 $ * $Revision: 1.7 $
*/ */
package se.sics.contiki.collect; package se.sics.contiki.collect;
@ -52,6 +52,9 @@ public class SensorDataAggregator implements SensorInfo {
private int seqnoDelta = 0; private int seqnoDelta = 0;
private int dataCount; private int dataCount;
private int duplicates = 0; private int duplicates = 0;
private int lost = 0;
private int nextHopChangeCount = 0;
private String lastNextHop = null;
private long shortestPeriod = Long.MAX_VALUE; private long shortestPeriod = Long.MAX_VALUE;
private long longestPeriod = 0; private long longestPeriod = 0;
@ -88,6 +91,12 @@ public class SensorDataAggregator implements SensorInfo {
int seqn = data.getValue(SEQNO); int seqn = data.getValue(SEQNO);
int s = seqn + seqnoDelta; int s = seqn + seqnoDelta;
String bestNeighbor = data.getBestNeighborID();
if (lastNextHop != null && !lastNextHop.equals(bestNeighbor)) {
nextHopChangeCount++;
}
lastNextHop = bestNeighbor;
if (s <= maxSeqno) { if (s <= maxSeqno) {
// Check for duplicates among the last 5 packets // Check for duplicates among the last 5 packets
for(int n = node.getSensorDataCount() - 1, i = n > 5 ? n - 5 : 0; i < n; i++) { for(int n = node.getSensorDataCount() - 1, i = n > 5 ? n - 5 : 0; i < n; i++) {
@ -142,9 +151,16 @@ public class SensorDataAggregator implements SensorInfo {
} }
} }
// Handle wrapping sequence numbers // Handle wrapping sequence numbers
if (dataCount > 0 && maxSeqno - s > 2) { if (dataCount == 0) {
// First packet from node.
} else if (maxSeqno - s > 2) {
s += maxSeqno - seqnoDelta; s += maxSeqno - seqnoDelta;
seqnoDelta = maxSeqno; seqnoDelta = maxSeqno;
if (seqn > 0) {
lost += seqn - 1;
}
} else if (s > maxSeqno + 1){
lost += s - (maxSeqno + 1);
} }
if (s < minSeqno) minSeqno = s; if (s < minSeqno) minSeqno = s;
if (s > maxSeqno) maxSeqno = s; if (s > maxSeqno) maxSeqno = s;
@ -159,6 +175,9 @@ public class SensorDataAggregator implements SensorInfo {
} }
dataCount = 0; dataCount = 0;
duplicates = 0; duplicates = 0;
lost = 0;
nextHopChangeCount = 0;
lastNextHop = null;
minSeqno = Integer.MAX_VALUE; minSeqno = Integer.MAX_VALUE;
maxSeqno = Integer.MIN_VALUE; maxSeqno = Integer.MIN_VALUE;
seqnoDelta = 0; seqnoDelta = 0;
@ -241,6 +260,14 @@ public class SensorDataAggregator implements SensorInfo {
return node.getSensorDataCount(); return node.getSensorDataCount();
} }
public int getNextHopChangeCount() {
return nextHopChangeCount;
}
public int getEstimatedLostCount() {
return lost;
}
public int getDuplicateCount() { public int getDuplicateCount() {
return duplicates; return duplicates;
} }

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: Visualizer.java,v 1.1 2008/07/09 23:18:06 nifi Exp $ * $Id: Visualizer.java,v 1.2 2010/09/15 16:15:10 nifi Exp $
* *
* ----------------------------------------------------------------- * -----------------------------------------------------------------
* *
@ -34,8 +34,8 @@
* *
* Authors : Joakim Eriksson, Niclas Finne * Authors : Joakim Eriksson, Niclas Finne
* Created : 3 jul 2008 * Created : 3 jul 2008
* Updated : $Date: 2008/07/09 23:18:06 $ * Updated : $Date: 2010/09/15 16:15:10 $
* $Revision: 1.1 $ * $Revision: 1.2 $
*/ */
package se.sics.contiki.collect; package se.sics.contiki.collect;
@ -47,6 +47,7 @@ import java.awt.Component;
*/ */
public interface Visualizer { public interface Visualizer {
public String getCategory();
public String getTitle(); public String getTitle();
public Component getPanel(); public Component getPanel();
public void nodesSelected(Node[] node); public void nodesSelected(Node[] node);

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: BarChartPanel.java,v 1.4 2010/09/15 15:52:28 nifi Exp $ * $Id: BarChartPanel.java,v 1.5 2010/09/15 16:15:10 nifi Exp $
* *
* ----------------------------------------------------------------- * -----------------------------------------------------------------
* *
@ -34,8 +34,8 @@
* *
* Authors : Joakim Eriksson, Niclas Finne * Authors : Joakim Eriksson, Niclas Finne
* Created : 5 jul 2008 * Created : 5 jul 2008
* Updated : $Date: 2010/09/15 15:52:28 $ * Updated : $Date: 2010/09/15 16:15:10 $
* $Revision: 1.4 $ * $Revision: 1.5 $
*/ */
package se.sics.contiki.collect.gui; package se.sics.contiki.collect.gui;
@ -67,6 +67,7 @@ public abstract class BarChartPanel extends JPanel implements Visualizer {
private static final long serialVersionUID = 7664283678708048061L; private static final long serialVersionUID = 7664283678708048061L;
protected final CollectServer server; protected final CollectServer server;
protected final String category;
protected final String title; protected final String title;
protected final String[] categories; protected final String[] categories;
protected final JFreeChart chart; protected final JFreeChart chart;
@ -76,17 +77,18 @@ public abstract class BarChartPanel extends JPanel implements Visualizer {
private boolean isShowingAllNodes = false; private boolean isShowingAllNodes = false;
private int categoryOrder = 0; private int categoryOrder = 0;
protected BarChartPanel(CollectServer server, String title, protected BarChartPanel(CollectServer server, String category, String title,
String chartTitle, String domainAxisLabel, String valueAxisLabel, String chartTitle, String domainAxisLabel, String valueAxisLabel,
String[] categories) { String[] categories) {
this(server, title, chartTitle, domainAxisLabel, valueAxisLabel, categories, true); this(server, category, title, chartTitle, domainAxisLabel, valueAxisLabel, categories, true);
} }
protected BarChartPanel(CollectServer server, String title, protected BarChartPanel(CollectServer server, String category, String title,
String chartTitle, String domainAxisLabel, String valueAxisLabel, String chartTitle, String domainAxisLabel, String valueAxisLabel,
String[] categories, boolean stackedChart) { String[] categories, boolean stackedChart) {
super(new BorderLayout()); super(new BorderLayout());
this.server = server; this.server = server;
this.category = category;
this.title = title; this.title = title;
this.categories = categories; this.categories = categories;
@ -137,6 +139,11 @@ public abstract class BarChartPanel extends JPanel implements Visualizer {
add(chartPanel, BorderLayout.CENTER); add(chartPanel, BorderLayout.CENTER);
} }
@Override
public String getCategory() {
return category;
}
@Override @Override
public String getTitle() { public String getTitle() {
return title; return title;

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: MapPanel.java,v 1.2 2010/09/06 22:32:56 nifi Exp $ * $Id: MapPanel.java,v 1.3 2010/09/15 16:15:10 nifi Exp $
* *
* ----------------------------------------------------------------- * -----------------------------------------------------------------
* *
@ -34,8 +34,8 @@
* *
* Authors : Joakim Eriksson, Niclas Finne * Authors : Joakim Eriksson, Niclas Finne
* Created : 3 jul 2008 * Created : 3 jul 2008
* Updated : $Date: 2010/09/06 22:32:56 $ * Updated : $Date: 2010/09/15 16:15:10 $
* $Revision: 1.2 $ * $Revision: 1.3 $
*/ */
package se.sics.contiki.collect.gui; package se.sics.contiki.collect.gui;
@ -124,13 +124,14 @@ public class MapPanel extends JPanel implements Visualizer, ActionListener, Mous
private String mapName; private String mapName;
private final CollectServer server; private final CollectServer server;
private final String category;
private boolean hideNetwork = false; private boolean hideNetwork = false;
public MapPanel(CollectServer server, String category) {
public MapPanel(CollectServer server) {
super(new BorderLayout()); super(new BorderLayout());
this.server = server; this.server = server;
this.category = category;
setPreferredSize(new Dimension(300, 200)); setPreferredSize(new Dimension(300, 200));
popupMenu = new JPopupMenu(getTitle()); popupMenu = new JPopupMenu(getTitle());
@ -221,6 +222,11 @@ public class MapPanel extends JPanel implements Visualizer, ActionListener, Mous
// Visualizer // Visualizer
// ------------------------------------------------------------------- // -------------------------------------------------------------------
@Override
public String getCategory() {
return category;
}
@Override @Override
public String getTitle() { public String getTitle() {
return "Sensor Map"; return "Sensor Map";

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: NodeInfoPanel.java,v 1.4 2010/09/14 23:04:51 nifi Exp $ * $Id: NodeInfoPanel.java,v 1.5 2010/09/15 16:15:10 nifi Exp $
* *
* ----------------------------------------------------------------- * -----------------------------------------------------------------
* *
@ -34,13 +34,15 @@
* *
* Authors : Joakim Eriksson, Niclas Finne * Authors : Joakim Eriksson, Niclas Finne
* Created : 6 sep 2010 * Created : 6 sep 2010
* Updated : $Date: 2010/09/14 23:04:51 $ * Updated : $Date: 2010/09/15 16:15:10 $
* $Revision: 1.4 $ * $Revision: 1.5 $
*/ */
package se.sics.contiki.collect.gui; package se.sics.contiki.collect.gui;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Component; import java.awt.Component;
import java.awt.Dimension;
import java.awt.event.MouseEvent;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
@ -48,6 +50,7 @@ import javax.swing.JScrollPane;
import javax.swing.JTable; import javax.swing.JTable;
import javax.swing.table.AbstractTableModel; import javax.swing.table.AbstractTableModel;
import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.JTableHeader;
import se.sics.contiki.collect.CollectServer; import se.sics.contiki.collect.CollectServer;
import se.sics.contiki.collect.Node; import se.sics.contiki.collect.Node;
@ -62,77 +65,36 @@ public class NodeInfoPanel extends JPanel implements Visualizer {
private static final long serialVersionUID = -1060893468047793431L; private static final long serialVersionUID = -1060893468047793431L;
private final CollectServer server; private final CollectServer server;
private final String category;
private final JTable nodeTable; private final JTable nodeTable;
private final AbstractTableModel nodeModel; private final NodeModel nodeModel;
private Node[] nodes; private Node[] nodes;
public NodeInfoPanel(CollectServer server) { public NodeInfoPanel(CollectServer server, String category) {
super(new BorderLayout()); super(new BorderLayout());
this.server = server; this.server = server;
this.category = category;
nodeModel = new AbstractTableModel() { nodeModel = new NodeModel();
nodeTable = new JTable(nodeModel) {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1692207305977527004L; public Dimension getPreferredScrollableViewportSize() {
return getPreferredSize();
}
private final String[] COLUMN_NAMES = { protected JTableHeader createDefaultTableHeader() {
"Node", return new JTableHeader(columnModel) {
"Packets Received", private static final long serialVersionUID = 1L;
"Duplicates Received",
"Average Inter-packet time",
"Shortest Inter-packet time",
"Longest Inter-packet time",
};
public Object getValueAt(int row, int col) { public String getToolTipText(MouseEvent e) {
Node node = nodes[row]; int index = columnModel.getColumnIndexAtX(e.getPoint().x);
switch (col) { int realIndex = index < 0 ? index : columnModel.getColumn(index).getModelIndex();
case 0: return realIndex < 0 ? null : nodeModel.getColumnToolTip(realIndex);
return node; }
case 1: };
return node.getSensorDataAggregator().getPacketCount();
case 2:
return node.getSensorDataAggregator().getDuplicateCount();
case 3:
return node.getSensorDataAggregator().getAveragePeriod();
case 4: {
long time = node.getSensorDataAggregator().getShortestPeriod();
return time < Long.MAX_VALUE ? time : 0;
}
case 5:
return node.getSensorDataAggregator().getLongestPeriod();
default:
return null;
}
} }
public Class<?> getColumnClass(int c) {
if (c == 0) {
return Node.class;
}
if (c < 3) {
return Integer.class;
}
if (c < 6) {
return Long.class;
}
return super.getColumnClass(c);
}
public String getColumnName(int col) {
return COLUMN_NAMES[col];
}
public int getColumnCount() {
return COLUMN_NAMES.length;
}
public int getRowCount() {
return nodes == null ? 0 : nodes.length;
}
}; };
nodeTable = new JTable(nodeModel);
nodeTable.setFillsViewportHeight(true); nodeTable.setFillsViewportHeight(true);
nodeTable.setAutoCreateRowSorter(true); nodeTable.setAutoCreateRowSorter(true);
@ -141,7 +103,7 @@ public class NodeInfoPanel extends JPanel implements Visualizer {
renderer.setHorizontalAlignment(JLabel.RIGHT); renderer.setHorizontalAlignment(JLabel.RIGHT);
nodeTable.setDefaultRenderer(Node.class, renderer); nodeTable.setDefaultRenderer(Node.class, renderer);
// Add time renderer // Add renderer for time
renderer = new DefaultTableCellRenderer() { renderer = new DefaultTableCellRenderer() {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -152,6 +114,22 @@ public class NodeInfoPanel extends JPanel implements Visualizer {
}; };
nodeTable.setDefaultRenderer(Long.class, renderer); nodeTable.setDefaultRenderer(Long.class, renderer);
// Add renderer for double
renderer = new DefaultTableCellRenderer() {
private static final long serialVersionUID = 1L;
public void setValue(Object value) {
if (value == null) {
setText(null);
}
double v = (Double) value + 0.0005;
int dec = ((int)(v * 1000)) % 1000;
setText((long)v + "." + (dec > 99 ? "" : "0") + (dec > 9 ? "" : "0") + dec);
}
};
renderer.setHorizontalAlignment(JLabel.RIGHT);
nodeTable.setDefaultRenderer(Double.class, renderer);
add(new JScrollPane(nodeTable), BorderLayout.CENTER); add(new JScrollPane(nodeTable), BorderLayout.CENTER);
} }
@ -160,6 +138,11 @@ public class NodeInfoPanel extends JPanel implements Visualizer {
return this; return this;
} }
@Override
public String getCategory() {
return category;
}
@Override @Override
public String getTitle() { public String getTitle() {
return "Node Info"; return "Node Info";
@ -226,16 +209,92 @@ public class NodeInfoPanel extends JPanel implements Visualizer {
time /= 1000; time /= 1000;
if (time > 24 * 60 * 60) { if (time > 24 * 60 * 60) {
long days = time / (24 * 60 * 60); long days = time / (24 * 60 * 60);
sb.append(days).append(" days, "); sb.append(days).append(days > 1 ? " days, " : " day, ");
time -= days * 24 * 60 * 60; time -= days * 24 * 60 * 60;
} }
if (time > 60 * 60) { if (time > 60 * 60) {
long hours = time / (60 * 60); long hours = time / (60 * 60);
sb.append(hours).append(" hours, "); sb.append(hours).append(hours > 1 ? " hours, " : " hour, ");
time -= hours * 60 * 60; time -= hours * 60 * 60;
} }
sb.append(time / 60).append(" min, ").append(time % 60).append(" sec"); sb.append(time / 60).append(" min, ").append(time % 60).append(" sec");
return sb.toString(); return sb.toString();
} }
private class NodeModel extends AbstractTableModel {
private static final long serialVersionUID = 1692207305977527004L;
private final String[] COLUMN_NAMES = {
"Node", "Node",
"Packets", "Packets Received",
"Duplicates", "Duplicate Packets Received",
"Estimated Lost", "Estimated Lost Packets",
"Average Hops", "Average Hops to Sink",
"Next Hop Changes", "Next Hop Change Count",
"Average Inter-packet time", "Average Inter-packet Time",
"Shortest Inter-packet Time", "Shortest Inter-packet Time",
"Longest Inter-packet Time", "Longest Inter-packet Time"
};
private final Class<?>[] COLUMN_TYPES = {
Node.class,
Integer.class,
Integer.class,
Integer.class,
Double.class,
Integer.class,
Long.class,
Long.class,
Long.class
};
public Object getValueAt(int row, int col) {
Node node = nodes[row];
switch (col) {
case 0:
return node;
case 1:
return node.getSensorDataAggregator().getPacketCount();
case 2:
return node.getSensorDataAggregator().getDuplicateCount();
case 3:
return node.getSensorDataAggregator().getEstimatedLostCount();
case 4:
return node.getSensorDataAggregator().getAverageValue(SensorData.HOPS);
case 5:
return node.getSensorDataAggregator().getNextHopChangeCount();
case 6:
return node.getSensorDataAggregator().getAveragePeriod();
case 7: {
long time = node.getSensorDataAggregator().getShortestPeriod();
return time < Long.MAX_VALUE ? time : 0;
}
case 8:
return node.getSensorDataAggregator().getLongestPeriod();
default:
return null;
}
}
public Class<?> getColumnClass(int c) {
return COLUMN_TYPES[c];
}
public String getColumnName(int col) {
return COLUMN_NAMES[col * 2];
}
public String getColumnToolTip(int col) {
return COLUMN_NAMES[col * 2 + 1];
}
public int getColumnCount() {
return COLUMN_NAMES.length / 2;
}
public int getRowCount() {
return nodes == null ? 0 : nodes.length;
}
}
} }

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: PacketChartPanel.java,v 1.7 2010/09/15 15:20:47 nifi Exp $ * $Id: PacketChartPanel.java,v 1.8 2010/09/15 16:15:10 nifi Exp $
* *
* ----------------------------------------------------------------- * -----------------------------------------------------------------
* *
@ -34,8 +34,8 @@
* *
* Authors : Joakim Eriksson, Niclas Finne * Authors : Joakim Eriksson, Niclas Finne
* Created : 6 sep 2010 * Created : 6 sep 2010
* Updated : $Date: 2010/09/15 15:20:47 $ * Updated : $Date: 2010/09/15 16:15:10 $
* $Revision: 1.7 $ * $Revision: 1.8 $
*/ */
package se.sics.contiki.collect.gui; package se.sics.contiki.collect.gui;
@ -69,6 +69,7 @@ public class PacketChartPanel extends JPanel implements Visualizer {
private static final long serialVersionUID = -607864439709540641L; private static final long serialVersionUID = -607864439709540641L;
protected final CollectServer server; protected final CollectServer server;
protected final String category;
protected final String title; protected final String title;
protected final TimeSeries series; protected final TimeSeries series;
@ -78,10 +79,11 @@ public class PacketChartPanel extends JPanel implements Visualizer {
private Node[] selectedNodes; private Node[] selectedNodes;
private HashMap<Node,Node> selectedMap = new HashMap<Node,Node>(); private HashMap<Node,Node> selectedMap = new HashMap<Node,Node>();
public PacketChartPanel(CollectServer server, String title, public PacketChartPanel(CollectServer server, String category, String title,
String timeAxisLabel, String valueAxisLabel) { String timeAxisLabel, String valueAxisLabel) {
super(new BorderLayout()); super(new BorderLayout());
this.server = server; this.server = server;
this.category = category;
this.title = title; this.title = title;
this.series = new TimeSeries("Received Packets", Minute.class); this.series = new TimeSeries("Received Packets", Minute.class);
TimeSeriesCollection timeSeries = new TimeSeriesCollection(series); TimeSeriesCollection timeSeries = new TimeSeriesCollection(series);
@ -97,6 +99,11 @@ public class PacketChartPanel extends JPanel implements Visualizer {
add(chartPanel, BorderLayout.CENTER); add(chartPanel, BorderLayout.CENTER);
} }
@Override
public String getCategory() {
return category;
}
@Override @Override
public String getTitle() { public String getTitle() {
return title; return title;

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: SeqnoChartPanel.java,v 1.1 2010/08/31 13:05:40 nifi Exp $ * $Id: SeqnoChartPanel.java,v 1.2 2010/09/15 16:15:10 nifi Exp $
* *
* ----------------------------------------------------------------- * -----------------------------------------------------------------
* *
@ -34,8 +34,8 @@
* *
* Authors : Joakim Eriksson, Niclas Finne * Authors : Joakim Eriksson, Niclas Finne
* Created : 3 jul 2008 * Created : 3 jul 2008
* Updated : $Date: 2010/08/31 13:05:40 $ * Updated : $Date: 2010/09/15 16:15:10 $
* $Revision: 1.1 $ * $Revision: 1.2 $
*/ */
package se.sics.contiki.collect.gui; package se.sics.contiki.collect.gui;
@ -66,6 +66,7 @@ public class SeqnoChartPanel extends JPanel implements Visualizer {
private static final long serialVersionUID = 4302047079820959307L; private static final long serialVersionUID = 4302047079820959307L;
protected final CollectServer server; protected final CollectServer server;
protected final String category;
protected final String title; protected final String title;
protected final XYSeriesCollection dataSet; protected final XYSeriesCollection dataSet;
protected final XYSeries series; protected final XYSeries series;
@ -74,10 +75,11 @@ public class SeqnoChartPanel extends JPanel implements Visualizer {
private Node[] selectedNodes; private Node[] selectedNodes;
public SeqnoChartPanel(CollectServer server, String title, public SeqnoChartPanel(CollectServer server, String category, String title,
String chartTitle, String timeAxisLabel, String valueAxisLabel) { String chartTitle, String timeAxisLabel, String valueAxisLabel) {
super(new BorderLayout()); super(new BorderLayout());
this.server = server; this.server = server;
this.category = category;
this.title = title; this.title = title;
this.series = new XYSeries(chartTitle); this.series = new XYSeries(chartTitle);
this.dataSet = new XYSeriesCollection(this.series); this.dataSet = new XYSeriesCollection(this.series);
@ -90,6 +92,11 @@ public class SeqnoChartPanel extends JPanel implements Visualizer {
add(chartPanel, BorderLayout.CENTER); add(chartPanel, BorderLayout.CENTER);
} }
@Override
public String getCategory() {
return category;
}
@Override @Override
public String getTitle() { public String getTitle() {
return title; return title;

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: SerialConsole.java,v 1.1 2008/07/09 23:18:07 nifi Exp $ * $Id: SerialConsole.java,v 1.2 2010/09/15 16:15:10 nifi Exp $
* *
* ----------------------------------------------------------------- * -----------------------------------------------------------------
* *
@ -34,8 +34,8 @@
* *
* Authors : Joakim Eriksson, Niclas Finne * Authors : Joakim Eriksson, Niclas Finne
* Created : 4 jul 2008 * Created : 4 jul 2008
* Updated : $Date: 2008/07/09 23:18:07 $ * Updated : $Date: 2010/09/15 16:15:10 $
* $Revision: 1.1 $ * $Revision: 1.2 $
*/ */
package se.sics.contiki.collect.gui; package se.sics.contiki.collect.gui;
@ -64,6 +64,7 @@ import se.sics.contiki.collect.Visualizer;
public class SerialConsole implements Visualizer { public class SerialConsole implements Visualizer {
private final CollectServer server; private final CollectServer server;
private final String category;
private JPanel panel; private JPanel panel;
private JTextArea logArea; private JTextArea logArea;
private JTextField commandField; private JTextField commandField;
@ -71,8 +72,9 @@ public class SerialConsole implements Visualizer {
private int historyPos = 0; private int historyPos = 0;
private int historyCount = 0; private int historyCount = 0;
public SerialConsole(CollectServer server) { public SerialConsole(CollectServer server, String category) {
this.server = server; this.server = server;
this.category = category;
panel = new JPanel(new BorderLayout()); panel = new JPanel(new BorderLayout());
logArea = new JTextArea(4, 30); logArea = new JTextArea(4, 30);
logArea.setEditable(false); logArea.setEditable(false);
@ -168,6 +170,11 @@ public class SerialConsole implements Visualizer {
return panel; return panel;
} }
@Override
public String getCategory() {
return category;
}
@Override @Override
public String getTitle() { public String getTitle() {
return "Serial Console"; return "Serial Console";

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: TimeChartPanel.java,v 1.6 2010/09/15 15:16:49 nifi Exp $ * $Id: TimeChartPanel.java,v 1.7 2010/09/15 16:15:10 nifi Exp $
* *
* ----------------------------------------------------------------- * -----------------------------------------------------------------
* *
@ -34,8 +34,8 @@
* *
* Authors : Joakim Eriksson, Niclas Finne * Authors : Joakim Eriksson, Niclas Finne
* Created : 3 jul 2008 * Created : 3 jul 2008
* Updated : $Date: 2010/09/15 15:16:49 $ * Updated : $Date: 2010/09/15 16:15:10 $
* $Revision: 1.6 $ * $Revision: 1.7 $
*/ */
package se.sics.contiki.collect.gui; package se.sics.contiki.collect.gui;
@ -64,6 +64,7 @@ public abstract class TimeChartPanel extends JPanel implements Visualizer {
private static final long serialVersionUID = -607864439709540641L; private static final long serialVersionUID = -607864439709540641L;
protected final CollectServer server; protected final CollectServer server;
protected final String category;
protected final String title; protected final String title;
protected final TimeSeriesCollection timeSeries; protected final TimeSeriesCollection timeSeries;
protected final JFreeChart chart; protected final JFreeChart chart;
@ -76,11 +77,12 @@ public abstract class TimeChartPanel extends JPanel implements Visualizer {
private int rangeTick = 0; private int rangeTick = 0;
private boolean hasGlobalRange; private boolean hasGlobalRange;
private int maxItemCount; private int maxItemCount;
public TimeChartPanel(CollectServer server, String title, public TimeChartPanel(CollectServer server, String category, String title,
String chartTitle, String timeAxisLabel, String valueAxisLabel) { String chartTitle, String timeAxisLabel, String valueAxisLabel) {
super(new BorderLayout()); super(new BorderLayout());
this.server = server; this.server = server;
this.category = category;
this.title = title; this.title = title;
this.timeSeries = new TimeSeriesCollection(); this.timeSeries = new TimeSeriesCollection();
this.chart = ChartFactory.createTimeSeriesChart( this.chart = ChartFactory.createTimeSeriesChart(
@ -93,6 +95,11 @@ public abstract class TimeChartPanel extends JPanel implements Visualizer {
add(chartPanel, BorderLayout.CENTER); add(chartPanel, BorderLayout.CENTER);
} }
@Override
public String getCategory() {
return category;
}
@Override @Override
public String getTitle() { public String getTitle() {
return title; return title;