From: Keith Packard <keithp@keithp.com>
Date: Sun, 28 May 2017 06:34:18 +0000 (-0700)
Subject: altosuilib: Remove 'cal_data' param from AltosGraphNew constructor
X-Git-Tag: 1.8~75
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=9e17d3be199d14473d8a7f9b899c290518b879a6

altosuilib: Remove 'cal_data' param from AltosGraphNew constructor

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index 71aa0e6f..9b47211d 100644
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -99,7 +99,7 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 
 		stats = new AltosFlightStats(flight_series);
 
-		graph = new AltosGraphNew(enable, stats, flight_series, cal_data);
+		graph = new AltosGraphNew(enable, stats, flight_series);
 
 		statsTable = new AltosFlightStatsTable(stats);
 
diff --git a/altosuilib/AltosGraphNew.java b/altosuilib/AltosGraphNew.java
index a9393f94..c0afd652 100644
--- a/altosuilib/AltosGraphNew.java
+++ b/altosuilib/AltosGraphNew.java
@@ -82,7 +82,8 @@ public class AltosGraphNew extends AltosUIGraphNew {
 
 	AltosUIFlightSeries flight_series;
 
-	AltosUITimeSeries[] setup(AltosFlightStats stats, AltosUIFlightSeries flight_series, AltosCalData cal_data) {
+	AltosUITimeSeries[] setup(AltosFlightStats stats, AltosUIFlightSeries flight_series) {
+		AltosCalData	cal_data = flight_series.cal_data;
 
 		AltosUIAxis	height_axis, speed_axis, accel_axis, voltage_axis, temperature_axis, nsat_axis, dbm_axis;
 		AltosUIAxis	distance_axis, pressure_axis, thrust_axis;
@@ -159,6 +160,11 @@ public class AltosGraphNew extends AltosUIGraphNew {
 					    true,
 					    height_axis);
 
+		flight_series.register_axis(AltosUIFlightSeries.altitude_name,
+					    height_color,
+					    false,
+					    height_axis);
+
 		flight_series.register_axis(AltosUIFlightSeries.kalman_height_name,
 					    kalman_height_color,
 					    false,
@@ -305,9 +311,16 @@ public class AltosGraphNew extends AltosUIGraphNew {
 		return flight_series.series(cal_data);
 	}
 
-	public AltosGraphNew(AltosUIEnable enable, AltosFlightStats stats, AltosUIFlightSeries flight_series, AltosCalData cal_data) {
+	public void set_data(AltosFlightStats stats, AltosUIFlightSeries flight_series) {
+		set_series(setup(stats, flight_series));
+	}
+
+	public AltosGraphNew(AltosUIEnable enable) {
 		super(enable, "Flight");
+	}
 
-		set_series(setup(stats, flight_series, cal_data));
+	public AltosGraphNew(AltosUIEnable enable, AltosFlightStats stats, AltosUIFlightSeries flight_series) {
+		this(enable);
+		set_series(setup(stats, flight_series));
 	}
 }