X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosGraphDataPoint.java;h=537efc4408afd2ab8b06afbc2276b2ef0b4e107d;hb=de8d9c5630ae46378c50faf97f7d2e97fe139e30;hp=8e6d6923327feb670f339a9bd0f8af3b19cfc4fd;hpb=2efd3ad80d4fefa8ccc1b80a2e657dbf9ba0c60f;p=fw%2Faltos

diff --git a/altosui/AltosGraphDataPoint.java b/altosui/AltosGraphDataPoint.java
index 8e6d6923..537efc44 100644
--- a/altosui/AltosGraphDataPoint.java
+++ b/altosui/AltosGraphDataPoint.java
@@ -39,11 +39,13 @@ public class AltosGraphDataPoint implements AltosUIDataPoint {
 	public static final int data_temperature = 12;
 	public static final int data_range = 13;
 	public static final int data_distance = 14;
+	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 {
@@ -62,16 +64,16 @@ public class AltosGraphDataPoint implements AltosUIDataPoint {
 			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;
@@ -94,6 +96,9 @@ public class AltosGraphDataPoint implements AltosUIDataPoint {
 			if (state.from_pad != null)
 				y = state.from_pad.distance;
 			break;
+		case data_pressure:
+			y = state.pressure;
+			break;
 		}
 		if (y == AltosRecord.MISSING)
 			throw new AltosUIDataMissing(index);
@@ -102,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;
@@ -112,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 "";
 	}