X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosGraphDataPoint.java;h=d8191f5d35199ab378188c5e071885031db2d47e;hp=7454f447948e897b2a468af31820f0ee42df8593;hb=88fa5fa6acbdd66d1338ca73cbbac219d62b5136;hpb=4ff54bb96f6c00c0c2c7dd32f81403bac331621a

diff --git a/altosui/AltosGraphDataPoint.java b/altosui/AltosGraphDataPoint.java
index 7454f447..d8191f5d 100644
--- a/altosui/AltosGraphDataPoint.java
+++ b/altosui/AltosGraphDataPoint.java
@@ -18,7 +18,7 @@
 package altosui;
 
 import org.altusmetrum.altosuilib_1.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
 
 public class AltosGraphDataPoint implements AltosUIDataPoint {
 
@@ -42,37 +42,38 @@ public class AltosGraphDataPoint implements AltosUIDataPoint {
 	public static final int data_pressure = 15;
 
 	public double x() throws AltosUIDataMissing {
-		if (state.data.time < -2)
+		double	time = state.time_since_boost();
+		if (time < -2)
 			throw new AltosUIDataMissing(-1);
-		return state.data.time;
+		return time;
 	}
 
 	public double y(int index) throws AltosUIDataMissing {
-		double y = AltosRecord.MISSING;
+		double y = AltosLib.MISSING;
 		switch (index) {
 		case data_height:
-			y = state.height;
+			y = state.height();
 			break;
 		case data_speed:
 			y = state.speed();
 			break;
 		case data_accel:
-			y = state.acceleration;
+			y = state.acceleration();
 			break;
 		case data_temp:
 			y = state.temperature;
 			break;
 		case data_battery_voltage:
-			y = state.battery;
+			y = state.battery_voltage;
 			break;
 		case data_drogue_voltage:
-			y = state.drogue_sense;
+			y = state.apogee_voltage;
 			break;
 		case data_main_voltage:
-			y = state.main_sense;
+			y = state.main_voltage;
 			break;
 		case data_rssi:
-			y = state.data.rssi;
+			y = state.rssi;
 			break;
 		case data_gps_height:
 			y = state.gps_height;
@@ -96,17 +97,17 @@ public class AltosGraphDataPoint implements AltosUIDataPoint {
 				y = state.from_pad.distance;
 			break;
 		case data_pressure:
-			y = state.pressure;
+			y = state.pressure();
 			break;
 		}
-		if (y == AltosRecord.MISSING)
+		if (y == AltosLib.MISSING)
 			throw new AltosUIDataMissing(index);
 		return y;
 	}
 
 	public int id(int index) {
 		if (index == data_state) {
-			int s = state.data.state;
+			int s = state.state;
 			if (s < Altos.ao_flight_boost || s > Altos.ao_flight_landed)
 				return -1;
 			return s;
@@ -116,7 +117,7 @@ public class AltosGraphDataPoint implements AltosUIDataPoint {
 
 	public String id_name(int index) {
 		if (index == data_state)
-			return state.data.state();
+			return state.state_name();
 		return "";
 	}