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

Fixed to sort nodes by id. Added charts for packets received last 5 minutes and last/average hops to sink

Browse source
This commit is contained in:
nifi 2010-09-14 10:38:12 +00:00
parent a226286351
commit aff3fcad87
4 changed files with 87 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: NodeInfoPanel.java,v 1.2 2010/09/08 12:40:18 nifi Exp $
* $Id: NodeInfoPanel.java,v 1.3 2010/09/14 10:38:12 nifi Exp $
*
* -----------------------------------------------------------------
*
@ -34,8 +34,8 @@
*
* Authors : Joakim Eriksson, Niclas Finne
* Created : 6 sep 2010
* Updated : $Date: 2010/09/08 12:40:18 $
* $Revision: 1.2 $
* Updated : $Date: 2010/09/14 10:38:12 $
* $Revision: 1.3 $
*/
package se.sics.contiki.collect.gui;
@ -123,7 +123,7 @@ public class NodeInfoPanel extends JPanel implements Visualizer {
for(Node node : selectedNodes) {
SensorDataAggregator sda = node.getSensorDataAggregator();
long longest = sda.getLongestPeriod();
sb.append(node.getName() + '\n'
sb.append("Node " + node.getName() + '\n'
+ " Packets Received: \t" + sda.getPacketCount() + '\n'
+ " Duplicates: \t" + sda.getDuplicateCount() + '\n');
if (longest > 0) {

8
examples/sky-shell/src/se/sics/contiki/collect/gui/TimeChartPanel.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: TimeChartPanel.java,v 1.4 2010/08/31 13:05:40 nifi Exp $
* $Id: TimeChartPanel.java,v 1.5 2010/09/14 10:38:12 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.4 $
* Updated : $Date: 2010/09/14 10:38:12 $
* $Revision: 1.5 $
*/
package se.sics.contiki.collect.gui;
@ -169,7 +169,7 @@ public abstract class TimeChartPanel extends JPanel implements Visualizer {
timeSeries.removeAllSeries();
if (this.selectedNodes != null) {
for(Node node: this.selectedNodes) {
TimeSeries series = new TimeSeries(node.getName(), Second.class);
TimeSeries series = new TimeSeries("Node " + node.getName(), Second.class);
// Reduce the number of items by grouping them and use the average for each group
int groupSize = getGroupSize(node);
if (groupSize > 1) {