X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=micropeak%2FMicroGraph.java;h=d2e86f9fe50f151e8f1ac32f98ea1a6cda760038;hb=9e4c5b0a6ed3594cff6ab71398c172daa7c67177;hp=c55806348463f8a72b7c52b35abab9307911f6e4;hpb=982b272920fcb444fd399941cabe613d8ac7104b;p=fw%2Faltos

diff --git a/micropeak/MicroGraph.java b/micropeak/MicroGraph.java
index c5580634..d2e86f9f 100644
--- a/micropeak/MicroGraph.java
+++ b/micropeak/MicroGraph.java
@@ -106,11 +106,12 @@ public class MicroGraph implements AltosUnitsListener {
 		heightSeries.clear();
 		speedSeries.clear();
 		accelSeries.clear();
-		for (int i = 0; i < data.pressures.length; i++) {
-			double x = data.time(i);
-			heightSeries.add(x, AltosConvert.height.value(data.height(i)));
-			speedSeries.add(x, AltosConvert.speed.value(data.speed(i)));
-			accelSeries.add(x, AltosConvert.accel.value(data.acceleration(i)));
+		if (data != null) {
+			for (MicroDataPoint point : data.points()) {
+				heightSeries.add(point.time, AltosConvert.height.value(point.height));
+				speedSeries.add(point.time, AltosConvert.speed.value(point.speed));
+				accelSeries.add(point.time, AltosConvert.accel.value(point.accel));
+			}
 		}
 	}
 
@@ -120,17 +121,16 @@ public class MicroGraph implements AltosUnitsListener {
 
 	public void setData (MicroData data) {
 		this.data = data;
-		chart.setTitle(data.name);
+		if (data != null)
+			setName(data.name);
 		resetData();
 	}
 
 	public void units_changed(boolean imperial_units) {
-		if (data != null) {
-			heightSeries.set_units(AltosConvert.height.show_units());
-			speedSeries.set_units(AltosConvert.speed.show_units());
-			accelSeries.set_units(AltosConvert.accel.show_units());
-			resetData();
-		}
+		heightSeries.set_units(AltosConvert.height.show_units());
+		speedSeries.set_units(AltosConvert.speed.show_units());
+		accelSeries.set_units(AltosConvert.accel.show_units());
+		resetData();
 	}
 
 	public MicroGraph() {