altos: Fix GPS test frameworks to handle shared ao_gps_new variable

[fw/altos] / altosui / AltosGraphDataPoint.java

diff --git a/altosui/AltosGraphDataPoint.java b/altosui/AltosGraphDataPoint.java
index 537efc4408afd2ab8b06afbc2276b2ef0b4e107d..d8191f5d35199ab378188c5e071885031db2d47e 100644 (file)
--- 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 {
 
@@ -49,16 +49,16 @@ public class AltosGraphDataPoint implements AltosUIDataPoint {
        }
 
        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;
@@ -97,10 +97,10 @@ 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;
        }