X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosGraph.java;h=f14956762bd8752a165752eb2ff42ca9f447e09e;hb=5fb246fb50e262aa81ef7eb430be9782cfcf8848;hp=fa1a5b7202ecbebf2cfaad3d44632ad3988d9c08;hpb=8e5f3b922100f9de54b9650df14749e81b1a6562;p=fw%2Faltos

diff --git a/altosui/AltosGraph.java b/altosui/AltosGraph.java
index fa1a5b72..f1495676 100644
--- a/altosui/AltosGraph.java
+++ b/altosui/AltosGraph.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altoslib_3.*;
 import org.altusmetrum.altosuilib_1.*;
 
 import org.jfree.ui.*;
@@ -150,29 +150,6 @@ class AltosGyroUnits extends AltosUnits {
 	}
 }
 
-class AltosOrientUnits 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 "°";
-	}
-
-	public String say_units(boolean imperial_units) {
-		return "degrees";
-	}
-
-	public int show_fraction(int width, boolean imperial_units) {
-		return 1;
-	}
-}
-
 class AltosMagUnits extends AltosUnits {
 
 	public double value(double p, boolean imperial_units) {
@@ -231,7 +208,7 @@ public class AltosGraph extends AltosUIGraph {
 	static AltosNsat nsat_units = new AltosNsat();
 	static AltosDbm dbm_units = new AltosDbm();
 	static AltosGyroUnits gyro_units = new AltosGyroUnits();
-	static AltosOrientUnits orient_units = new AltosOrientUnits();
+	static AltosOrient orient_units = new AltosOrient();
 	static AltosMagUnits mag_units = new AltosMagUnits();
 
 	AltosUIAxis	height_axis, speed_axis, accel_axis, voltage_axis, temperature_axis, nsat_axis, dbm_axis;
@@ -412,7 +389,16 @@ 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);
+		}
 
 		setDataSet(dataSet);
 	}
-}
\ No newline at end of file
+}