X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosGraphDataPoint.java;h=85a19b00c4c61241a8236756b7f12d479548329d;hb=d203a2da2641bec21a4257c8a7b03d9a1eba53a5;hp=7454f447948e897b2a468af31820f0ee42df8593;hpb=10f3d0084ff1c0b3dbf28c5d44727b514caeee20;p=fw%2Faltos

diff --git a/altosui/AltosGraphDataPoint.java b/altosui/AltosGraphDataPoint.java
index 7454f447..85a19b00 100644
--- a/altosui/AltosGraphDataPoint.java
+++ b/altosui/AltosGraphDataPoint.java
@@ -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;
 		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,7 +97,7 @@ 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)
@@ -106,7 +107,7 @@ public class AltosGraphDataPoint implements AltosUIDataPoint {
 
 	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 "";
 	}