X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosGraph.java;h=522eea1ef65ed1d463a9d84a303e213ef65f1c96;hp=5e5a35cf3a7a8c0e9973208694fb5dc1eacc8291;hb=61cbad00b68d9f4f2fed7b76132433e263966952;hpb=bf684a4c290573a3aa627fd8ddf6f6ebbe5fa057

diff --git a/altosuilib/AltosGraph.java b/altosuilib/AltosGraph.java
index 5e5a35cf..522eea1e 100644
--- a/altosuilib/AltosGraph.java
+++ b/altosuilib/AltosGraph.java
@@ -15,14 +15,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_2;
+package org.altusmetrum.altosuilib_3;
 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altoslib_5.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
@@ -172,6 +172,29 @@ class AltosMagUnits extends AltosUnits {
 	}
 }
 
+class AltosDopUnits extends AltosUnits {
+
+	public double value(double p, boolean imperial_units) {
+		return p;
+	}
+
+	public double inverse(double p, boolean imperial_units) {
+		return p;
+	}
+
+	public String show_units(boolean imperial_units) {
+		return null;
+	}
+
+	public String say_units(boolean imperial_units) {
+		return null;
+	}
+
+	public int show_fraction(int width, boolean imperial_units) {
+		return 1;
+	}
+}
+
 public class AltosGraph extends AltosUIGraph {
 
 	static final private Color height_color = new Color(194,31,31);
@@ -191,6 +214,9 @@ public class AltosGraph extends AltosUIGraph {
 	static final private Color gps_course_color = new Color (100, 31, 112);
 	static final private Color gps_ground_speed_color = new Color (31, 112, 100);
 	static final private Color gps_climb_rate_color = new Color (31, 31, 112);
+	static final private Color gps_pdop_color = new Color(50, 194, 0);
+	static final private Color gps_hdop_color = new Color(50, 0, 194);
+	static final private Color gps_vdop_color = new Color(194, 0, 50);
 	static final private Color temperature_color = new Color (31, 194, 194);
 	static final private Color dbm_color = new Color(31, 100, 100);
 	static final private Color state_color = new Color(0,0,0);
@@ -212,11 +238,12 @@ public class AltosGraph extends AltosUIGraph {
 	static AltosGyroUnits gyro_units = new AltosGyroUnits();
 	static AltosOrient orient_units = new AltosOrient();
 	static AltosMagUnits mag_units = new AltosMagUnits();
+	static AltosDopUnits dop_units = new AltosDopUnits();
 
 	AltosUIAxis	height_axis, speed_axis, accel_axis, voltage_axis, temperature_axis, nsat_axis, dbm_axis;
 	AltosUIAxis	distance_axis, pressure_axis;
 	AltosUIAxis	gyro_axis, orient_axis, mag_axis;
-	AltosUIAxis	course_axis;
+	AltosUIAxis	course_axis, dop_axis;
 
 	public AltosGraph(AltosUIEnable enable, AltosFlightStats stats, AltosGraphDataSet dataSet) {
 		super(enable);
@@ -236,33 +263,42 @@ public class AltosGraph extends AltosUIGraph {
 		orient_axis = newAxis("Tilt Angle", orient_units, orient_color, 0);
 		mag_axis = newAxis("Magnetic Field", mag_units, mag_x_color, 0);
 		course_axis = newAxis("Course", orient_units, gps_course_color, 0);
+		dop_axis = newAxis("Dilution of Precision", dop_units, gps_pdop_color, 0);
 
 		addMarker("State", AltosGraphDataPoint.data_state, state_color);
-		addSeries("Height",
-			  AltosGraphDataPoint.data_height,
-			  AltosConvert.height,
-			  height_color,
-			  true,
-			  height_axis);
-		addSeries("Pressure",
-			  AltosGraphDataPoint.data_pressure,
-			  pressure_units,
-			  pressure_color,
-			  false,
-			  pressure_axis);
-		addSeries("Speed",
-			  AltosGraphDataPoint.data_speed,
-			  AltosConvert.speed,
-			  speed_color,
-			  true,
-			  speed_axis);
-		addSeries("Acceleration",
-			  AltosGraphDataPoint.data_accel,
-			  AltosConvert.accel,
-			  accel_color,
-			  true,
-			  accel_axis);
+
+		if (stats.has_flight_data) {
+			addSeries("Height",
+				  AltosGraphDataPoint.data_height,
+				  AltosConvert.height,
+				  height_color,
+				  true,
+				  height_axis);
+			addSeries("Pressure",
+				  AltosGraphDataPoint.data_pressure,
+				  pressure_units,
+				  pressure_color,
+				  false,
+				  pressure_axis);
+			addSeries("Speed",
+				  AltosGraphDataPoint.data_speed,
+				  AltosConvert.speed,
+				  speed_color,
+				  true,
+				  speed_axis);
+			addSeries("Acceleration",
+				  AltosGraphDataPoint.data_accel,
+				  AltosConvert.accel,
+				  accel_color,
+				  true,
+				  accel_axis);
+		}
 		if (stats.has_gps) {
+			boolean	enable_gps = false;
+
+			if (!stats.has_flight_data)
+				enable_gps = true;
+
 			addSeries("Range",
 				  AltosGraphDataPoint.data_range,
 				  AltosConvert.distance,
@@ -273,12 +309,18 @@ public class AltosGraph extends AltosUIGraph {
 				  AltosGraphDataPoint.data_distance,
 				  AltosConvert.distance,
 				  distance_color,
-				  false,
+				  enable_gps,
 				  distance_axis);
 			addSeries("GPS Height",
 				  AltosGraphDataPoint.data_gps_height,
 				  AltosConvert.height,
 				  gps_height_color,
+				  enable_gps,
+				  height_axis);
+			addSeries("GPS Altitude",
+				  AltosGraphDataPoint.data_gps_altitude,
+				  AltosConvert.height,
+				  gps_height_color,
 				  false,
 				  height_axis);
 			addSeries("GPS Satellites in Solution",
@@ -303,14 +345,32 @@ public class AltosGraph extends AltosUIGraph {
 				  AltosGraphDataPoint.data_gps_ground_speed,
 				  AltosConvert.speed,
 				  gps_ground_speed_color,
-				  false,
+				  enable_gps,
 				  speed_axis);
 			addSeries("GPS Climb Rate",
 				  AltosGraphDataPoint.data_gps_climb_rate,
 				  AltosConvert.speed,
 				  gps_climb_rate_color,
-				  false,
+				  enable_gps,
 				  speed_axis);
+			addSeries("GPS Position DOP",
+				  AltosGraphDataPoint.data_gps_pdop,
+				  dop_units,
+				  gps_pdop_color,
+				  false,
+				  dop_axis);
+			addSeries("GPS Horizontal DOP",
+				  AltosGraphDataPoint.data_gps_hdop,
+				  dop_units,
+				  gps_hdop_color,
+				  false,
+				  dop_axis);
+			addSeries("GPS Vertical DOP",
+				  AltosGraphDataPoint.data_gps_vdop,
+				  dop_units,
+				  gps_vdop_color,
+				  false,
+				  dop_axis);
 		}
 		if (stats.has_rssi)
 			addSeries("Received Signal Strength",
@@ -319,19 +379,22 @@ public class AltosGraph extends AltosUIGraph {
 				  dbm_color,
 				  false,
 				  dbm_axis);
-		if (stats.has_other_adc) {
-			addSeries("Temperature",
-				  AltosGraphDataPoint.data_temperature,
-				  AltosConvert.temperature,
-				  temperature_color,
-				  false,
-				  temperature_axis);
+
+		if (stats.has_battery)
 			addSeries("Battery Voltage",
 				  AltosGraphDataPoint.data_battery_voltage,
 				  voltage_units,
 				  battery_voltage_color,
 				  false,
 				  voltage_axis);
+
+		if (stats.has_flight_adc) {
+			addSeries("Temperature",
+				  AltosGraphDataPoint.data_temperature,
+				  AltosConvert.temperature,
+				  temperature_color,
+				  false,
+				  temperature_axis);
 			addSeries("Drogue Voltage",
 				  AltosGraphDataPoint.data_drogue_voltage,
 				  voltage_units,