X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosGraph.java;h=ba3875c6d521ec5e2690783a537a37be4278d1e1;hp=42334e319cc435d5d85090c3bb2c169fb6fd4b4c;hb=f80075be4ebb9c5fe00c24b8c7638fad23267424;hpb=9877f6b880a0e89fbfbf1a39ded94bdc1891f3d9

diff --git a/altosui/AltosGraph.java b/altosui/AltosGraph.java
index 42334e31..ba3875c6 100644
--- a/altosui/AltosGraph.java
+++ b/altosui/AltosGraph.java
@@ -22,8 +22,8 @@ import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
@@ -189,6 +189,9 @@ public class AltosGraph extends AltosUIGraph {
 	static final private Color gps_nsat_color = new Color (194, 31, 194);
 	static final private Color gps_nsat_solution_color = new Color (194, 31, 194);
 	static final private Color gps_nsat_view_color = new Color (150, 31, 150);
+	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 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);
@@ -214,6 +217,7 @@ public class AltosGraph extends AltosUIGraph {
 	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;
 
 	public AltosGraph(AltosUIEnable enable, AltosFlightStats stats, AltosGraphDataSet dataSet) {
 		super(enable);
@@ -232,6 +236,7 @@ public class AltosGraph extends AltosUIGraph {
 		gyro_axis = newAxis("Rotation Rate", gyro_units, gyro_z_color, 0);
 		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);
 
 		addMarker("State", AltosGraphDataPoint.data_state, state_color);
 		addSeries("Height",
@@ -288,7 +293,25 @@ public class AltosGraph extends AltosUIGraph {
 				  nsat_units,
 				  gps_nsat_view_color,
 				  false,
-			  nsat_axis);
+				  nsat_axis);
+			addSeries("GPS Course",
+				  AltosGraphDataPoint.data_gps_course,
+				  orient_units,
+				  gps_course_color,
+				  false,
+				  course_axis);
+			addSeries("GPS Ground Speed",
+				  AltosGraphDataPoint.data_gps_ground_speed,
+				  AltosConvert.speed,
+				  gps_ground_speed_color,
+				  false,
+				  speed_axis);
+			addSeries("GPS Climb Rate",
+				  AltosGraphDataPoint.data_gps_climb_rate,
+				  AltosConvert.speed,
+				  gps_climb_rate_color,
+				  false,
+				  speed_axis);
 		}
 		if (stats.has_rssi)
 			addSeries("Received Signal Strength",
@@ -389,7 +412,18 @@ public class AltosGraph extends AltosUIGraph {
 				  orient_color,
 				  false,
 				  orient_axis);
+		if (stats.num_ignitor > 0) {
+			for (int i = 0; i < stats.num_ignitor; i++)
+				addSeries(AltosIgnitor.ignitor_name(i),
+					  AltosGraphDataPoint.data_ignitor_0 + i,
+					  voltage_units,
+					  main_voltage_color,
+					  false,
+					  voltage_axis);
+			for (int i = 0; i < stats.num_ignitor; i++)
+				addMarker(AltosIgnitor.ignitor_name(i), AltosGraphDataPoint.data_ignitor_fired_0 + i, state_color);
+		}
 
 		setDataSet(dataSet);
 	}
-}
\ No newline at end of file
+}