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

Added chart with received packets per minute and skeleton for node statistics panel

Browse source
This commit is contained in:
nifi 2010-09-06 22:42:29 +00:00
parent 46f258f66c
commit 77014a8d90
3 changed files with 346 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
examples/sky-shell/src/se/sics/contiki/collect/CollectServer.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: CollectServer.java,v 1.10 2010/08/31 13:05:40 nifi Exp $
* $Id: CollectServer.java,v 1.11 2010/09/06 22:42:29 nifi Exp $
*
* -----------------------------------------------------------------
*
@ -34,8 +34,8 @@
*
* Authors : Joakim Eriksson, Niclas Finne
* Created : 3 jul 2008
* Updated : $Date: 2010/08/31 13:05:40 $
* $Revision: 1.10 $
* Updated : $Date: 2010/09/06 22:42:29 $
* $Revision: 1.11 $
*/
package se.sics.contiki.collect;
@ -80,9 +80,10 @@ import org.jfree.chart.axis.NumberAxis;
import org.jfree.chart.axis.ValueAxis;
import se.sics.contiki.collect.gui.BarChartPanel;
import se.sics.contiki.collect.gui.MapPanel;
import se.sics.contiki.collect.gui.NodeInfoPanel;
import se.sics.contiki.collect.gui.PacketChartPanel;
import se.sics.contiki.collect.gui.SerialConsole;
import se.sics.contiki.collect.gui.TimeChartPanel;
import se.sics.contiki.collect.gui.SeqnoChartPanel;
/**
*
@ -351,7 +352,9 @@ public class CollectServer {
return data.getLatency();
}
},
new SeqnoChartPanel(this, "Received Packets", "Received Packets", "Seqno", "Received Packets"),
new PacketChartPanel(this, "Received Packets", "Time", "Received Packets"),
// new SeqnoChartPanel(this, "Received Packets", "Received Packets", "Seqno", "Received Packets"),
new NodeInfoPanel(),
serialConsole
};
for (int i = 0, n = visualizers.length; i < n; i++) {

128
examples/sky-shell/src/se/sics/contiki/collect/gui/NodeInfoPanel.java Normal file
View file

@ -0,0 +1,128 @@
/*
* Copyright (c) 2010, Swedish Institute of Computer Science.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: NodeInfoPanel.java,v 1.1 2010/09/06 22:42:29 nifi Exp $
*
* -----------------------------------------------------------------
*
* NodeInfoPanel
*
* Authors : Joakim Eriksson, Niclas Finne
* Created : 6 sep 2010
* Updated : $Date: 2010/09/06 22:42:29 $
* $Revision: 1.1 $
*/
package se.sics.contiki.collect.gui;
import java.awt.BorderLayout;
import java.awt.Component;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import se.sics.contiki.collect.Node;
import se.sics.contiki.collect.SensorData;
import se.sics.contiki.collect.SensorDataAggregator;
import se.sics.contiki.collect.Visualizer;
/**
*
*/
public class NodeInfoPanel extends JPanel implements Visualizer {
private static final long serialVersionUID = -1060893468047793431L;
private JTextArea infoArea;
private Node[] selectedNodes;
public NodeInfoPanel() {
super(new BorderLayout());
infoArea = new JTextArea(4, 30);
infoArea.setEditable(false);
add(new JScrollPane(infoArea), BorderLayout.CENTER);
}
@Override
public Component getPanel() {
return this;
}
@Override
public String getTitle() {
return "Node Info";
}
@Override
public void nodeAdded(Node node) {
// Ignore
}
@Override
public void nodeDataReceived(SensorData sensorData) {
// Ignore
}
@Override
public void clearNodeData() {
// Ignore
}
@Override
public void nodesSelected(Node[] nodes) {
this.selectedNodes = nodes;
if (isVisible()) {
updateInfoArea();
}
}
private void updateInfoArea() {
StringBuilder sb = new StringBuilder();
if (selectedNodes != null) {
for(Node node : selectedNodes) {
SensorDataAggregator sda = node.getSensorDataAggregator();
sb.append(node.getName()).append('\n');
sb.append(" Packets Received: \t" + sda.getPacketCount() + '\n'
+ " Duplicates: \t" + sda.getDuplicateCount() + '\n'
+ " Unique Sensor Values:\t" + sda.getDataCount()
+ "\n--------------------------------------------------------\n");
}
}
infoArea.setText(sb.toString());
}
public void setVisible(boolean visible) {
if (visible) {
updateInfoArea();
} else {
infoArea.setText("");
}
super.setVisible(visible);
}
}

210
examples/sky-shell/src/se/sics/contiki/collect/gui/PacketChartPanel.java Normal file
View file

@ -0,0 +1,210 @@
/*
* Copyright (c) 2010, Swedish Institute of Computer Science.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: PacketChartPanel.java,v 1.1 2010/09/06 22:42:29 nifi Exp $
*
* -----------------------------------------------------------------
*
* PacketChartPanel
*
* Authors : Joakim Eriksson, Niclas Finne
* Created : 6 sep 2010
* Updated : $Date: 2010/09/06 22:42:29 $
* $Revision: 1.1 $
*/
package se.sics.contiki.collect.gui;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Dimension;
import java.util.Date;
import java.util.HashMap;
import javax.swing.JPanel;
import org.jfree.chart.ChartFactory;
import org.jfree.chart.ChartPanel;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
import org.jfree.data.time.Minute;
import org.jfree.data.time.TimeSeries;
import org.jfree.data.time.TimeSeriesCollection;
import se.sics.contiki.collect.CollectServer;
import se.sics.contiki.collect.Node;
import se.sics.contiki.collect.SensorData;
import se.sics.contiki.collect.Visualizer;
/**
*
*/
public class PacketChartPanel extends JPanel implements Visualizer {
private static final long serialVersionUID = -607864439709540641L;
protected final CollectServer server;
protected final String title;
protected final TimeSeries series;
protected final JFreeChart chart;
protected final ChartPanel chartPanel;
private Node[] selectedNodes;
private HashMap<Node,Node> selectedMap = new HashMap<Node,Node>();
public PacketChartPanel(CollectServer server, String title,
String timeAxisLabel, String valueAxisLabel) {
super(new BorderLayout());
this.server = server;
this.title = title;
this.series = new TimeSeries("Received Packets", Minute.class);
TimeSeriesCollection timeSeries = new TimeSeriesCollection(series);
this.chart = ChartFactory.createTimeSeriesChart(
"Received Packets", timeAxisLabel, valueAxisLabel, timeSeries,
false, true, false
);
this.chartPanel = new ChartPanel(chart);
this.chartPanel.setPreferredSize(new Dimension(500, 270));
setBaseShapeVisible(false);
add(chartPanel, BorderLayout.CENTER);
}
@Override
public String getTitle() {
return title;
}
@Override
public Component getPanel() {
return this;
}
@Override
public void nodeAdded(Node node) {
// Ignore
}
@Override
public void nodesSelected(Node[] nodes) {
if (this.selectedNodes != nodes) {
this.selectedNodes = nodes;
this.selectedMap.clear();
if (nodes != null) {
for(Node node : nodes) {
this.selectedMap.put(node, node);
}
}
if (isVisible()) {
updateCharts();
}
}
}
@Override
public void nodeDataReceived(SensorData data) {
if (isVisible() && selectedMap.get(data.getNode()) != null) {
updateCharts();
}
}
@Override
public void clearNodeData() {
if (isVisible()) {
updateCharts();
}
}
private void updateCharts() {
int duplicates = 0;
int total = 0;
series.clear();
if (this.selectedNodes != null && server.getSensorDataCount() > 0) {
long minute = server.getSensorData(0).getSystemTime() / 60000;
long lastMinute = minute;
int count = 0;
for(int i = 0; i < server.getSensorDataCount(); i++) {
SensorData sd = server.getSensorData(i);
if (selectedMap.get(sd.getNode()) != null) {
if (sd.isDuplicate()) {
duplicates++;
} else {
long min = sd.getSystemTime() / 60000;
if (min != minute) {
for(; lastMinute < minute - 1; lastMinute++) {
series.add(new Minute(new Date(lastMinute * 60000L)), 0);
}
series.add(new Minute(new Date(minute * 60000L)), count);
count = 0;
lastMinute = minute + 1;
minute = min;
}
count++;
}
total++;
}
}
if (count > 0) {
series.addOrUpdate(new Minute(new Date(minute * 60000L)), count);
}
}
int nodes = selectedMap.size();
if (nodes > 0) {
chart.setTitle("Received " + total + " packets from " + nodes + " node"
+ (nodes > 1 ? "s" : "")
+ (duplicates > 0 ? (" (" + duplicates + " duplicates)") : ""));
} else {
chart.setTitle("Received Packets");
}
}
public boolean getBaseShapeVisible() {
return ((XYLineAndShapeRenderer)this.chart.getXYPlot().getRenderer()).getBaseShapesVisible();
}
public void setBaseShapeVisible(boolean visible) {
((XYLineAndShapeRenderer)this.chart.getXYPlot().getRenderer()).setBaseShapesVisible(visible);
}
public double getRangeMinimumSize() {
return chart.getXYPlot().getRangeAxis().getAutoRangeMinimumSize();
}
public void setRangeMinimumSize(double size) {
chart.getXYPlot().getRangeAxis().setAutoRangeMinimumSize(size);
}
public void setVisible(boolean visible) {
if (visible) {
updateCharts();
} else {
series.clear();
}
super.setVisible(visible);
}
}