X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2FMicroDataPoint.java;h=61faf794e1edb10a51339726f3716a7a46230563;hp=3fd1e641cdb1f13bf8880108f21edc0d5d9ae2a9;hb=0169e56ad030c0096b1068d00f06957990dfb31f;hpb=93d640de65a1ecedfef89c96521c21632f96f372

diff --git a/micropeak/MicroDataPoint.java b/micropeak/MicroDataPoint.java
index 3fd1e641..61faf794 100644
--- a/micropeak/MicroDataPoint.java
+++ b/micropeak/MicroDataPoint.java
@@ -17,23 +17,66 @@
 
 package org.altusmetrum.micropeak;
 
-public class MicroDataPoint {
-	public double	time;
-	public double	height;
-	public double	speed;
-	public double	accel;
+import org.altusmetrum.altosuilib_1.*;
 
-	public MicroDataPoint (double height, double speed, double accel, double time) {
+public class MicroDataPoint implements AltosUIDataPoint {
+	public double		time;
+	public double		pressure;
+	public double		height;
+	public double		speed;
+	public double		accel;
+	public MicroStats	stats;
+
+	public static final int data_height = 0;
+	public static final int data_speed = 1;
+	public static final int data_accel = 2;
+	public static final int data_state = 3;
+
+	public double x() {
+		return time;
+	}
+
+	public double y(int index) {
+		switch (index) {
+		case data_height:
+			return height;
+		case data_speed:
+			return speed;
+		case data_accel:
+			return accel;
+		default:
+			return 0;
+		}
+	}
+
+	public int id(int index) {
+		if (index == data_state) {
+			return stats.state(time);
+		}
+		return 0;
+	}
+
+	public String id_name(int index) {
+		if (index == data_state)
+			return stats.state_name(time);
+		return "";
+	}
+
+	public MicroDataPoint (double pressure, double height, double speed, double accel, double time, MicroStats stats) {
+		this.pressure = pressure;
 		this.height = height;
 		this.speed = speed;
 		this.accel = accel;
 		this.time = time;
+		this.stats = stats;
 	}
 
 	public MicroDataPoint(MicroData data, int i) {
-		this(data.height(i),
+		this(data.pressure(i),
+		     data.height(i),
 		     data.speed(i),
 		     data.acceleration(i),
-		     data.time(i));
+		     data.time(i),
+		     data.stats);
 	}
 }
\ No newline at end of file