diff --git a/examples/sky-shell/src/se/sics/contiki/collect/CollectServer.java b/examples/sky-shell/src/se/sics/contiki/collect/CollectServer.java index 4ce44b647..435ed1aa5 100644 --- a/examples/sky-shell/src/se/sics/contiki/collect/CollectServer.java +++ b/examples/sky-shell/src/se/sics/contiki/collect/CollectServer.java @@ -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.25 2010/10/10 22:39:09 nifi Exp $ + * $Id: CollectServer.java,v 1.26 2010/10/12 11:38:34 adamdunkels Exp $ * * ----------------------------------------------------------------- * @@ -34,8 +34,8 @@ * * Authors : Joakim Eriksson, Niclas Finne * Created : 3 jul 2008 - * Updated : $Date: 2010/10/10 22:39:09 $ - * $Revision: 1.25 $ + * Updated : $Date: 2010/10/12 11:38:34 $ + * $Revision: 1.26 $ */ package se.sics.contiki.collect; @@ -312,7 +312,7 @@ public class CollectServer implements SerialConnectionListener { return data.getLight2(); } }, - new TimeChartPanel(this, NETWORK, "Neighbors (Over Time)", "Neighbor Count", "Time", "Neighbors") { + new TimeChartPanel(this, NETWORK, "Neighbors", "Neighbor Count", "Time", "Neighbors") { { ValueAxis axis = chart.getXYPlot().getRangeAxis(); ((NumberAxis)axis).setAutoRangeIncludesZero(true); @@ -323,6 +323,17 @@ public class CollectServer implements SerialConnectionListener { return data.getValue(SensorData.NUM_NEIGHBORS); } }, + new TimeChartPanel(this, NETWORK, "Beacon Interval", "Beacon interval", "Time", "Interval (s)") { + { + ValueAxis axis = chart.getXYPlot().getRangeAxis(); + ((NumberAxis)axis).setAutoRangeIncludesZero(true); + axis.setStandardTickUnits(NumberAxis.createIntegerTickUnits()); + setMaxItemCount(defaultMaxItemCount); + } + protected double getSensorDataValue(SensorData data) { + return data.getValue(SensorData.BEACON_INTERVAL); + } + }, new TimeChartPanel(this, NETWORK, "Network Hops (Over Time)", "Network Hops", "Time", "Hops") { { ValueAxis axis = chart.getXYPlot().getRangeAxis();