diff -r 119693c3b7d1 -r eda3e3458cf4 GUI/PlotPanel.cs --- a/GUI/PlotPanel.cs Sat Jul 24 20:15:49 2010 +0000 +++ b/GUI/PlotPanel.cs Tue Jul 27 18:38:11 2010 +0000 @@ -86,12 +86,12 @@ float? minTempNullable = null; float? maxTempNullable = null; foreach (ISensor sensor in temperatures) { - IEnumerable graph = sensor.Plot; - foreach (ISensorEntry entry in graph) { - if (!minTempNullable.HasValue || minTempNullable > entry.Value) - minTempNullable = entry.Value; - if (!maxTempNullable.HasValue || maxTempNullable < entry.Value) - maxTempNullable = entry.Value; + IEnumerable values = sensor.Values; + foreach (SensorValue value in values) { + if (!minTempNullable.HasValue || minTempNullable > value.Value) + minTempNullable = value.Value; + if (!maxTempNullable.HasValue || maxTempNullable < value.Value) + maxTempNullable = value.Value; } } if (!minTempNullable.HasValue) { @@ -125,8 +125,8 @@ float maxTime = 5; if (temperatures.Count > 0) { - IEnumerator enumerator = - temperatures[0].Plot.GetEnumerator(); + IEnumerator enumerator = + temperatures[0].Values.GetEnumerator(); if (enumerator.MoveNext()) { maxTime = (float)(now - enumerator.Current.Time).TotalMinutes; } @@ -193,13 +193,13 @@ float deltaTime = timeGrid[timeGrid.Count - 1]; foreach (ISensor sensor in temperatures) { using (Pen pen = new Pen(colors[sensor])) { - IEnumerable graph = sensor.Plot; + IEnumerable values = sensor.Values; PointF last = new PointF(); bool first = true; - foreach (ISensorEntry entry in graph) { + foreach (SensorValue value in values) { PointF point = new PointF( - x0 + w - w * (float)(now - entry.Time).TotalMinutes / deltaTime, - y0 + h - h * (entry.Value - tempGrid[0]) / deltaTemp); + x0 + w - w * (float)(now - value.Time).TotalMinutes / deltaTime, + y0 + h - h * (value.Value - tempGrid[0]) / deltaTemp); if (!first) g.DrawLine(pen, last, point); last = point;