X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosFlightSeries.java;h=fc7a9f147f9c2344c905cac192f79ee5654c869d;hb=a61217f0a6d0ef48b6471f632c4600255867e831;hp=dad066d7ba7853ed36c1d91b7d4049ca6ae7952d;hpb=32de85691f2e4ed1430a259e05a514ad820b32d9;p=fw%2Faltos

diff --git a/altoslib/AltosFlightSeries.java b/altoslib/AltosFlightSeries.java
index dad066d7..fc7a9f14 100644
--- a/altoslib/AltosFlightSeries.java
+++ b/altoslib/AltosFlightSeries.java
@@ -12,7 +12,7 @@
  * General Public License for more details.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 import java.util.*;
 
@@ -118,6 +118,12 @@ public class AltosFlightSeries extends AltosDataListener {
 	}
 
 	public void add_series(AltosTimeSeries s) {
+		for (int e = 0; e < series.size(); e++) {
+			if (s.compareTo(series.get(e)) < 0){
+				series.add(e, s);
+				return;
+			}
+		}
 		series.add(s);
 	}
 
@@ -159,6 +165,10 @@ public class AltosFlightSeries extends AltosDataListener {
 
 	public static final String accel_name = "Accel";
 
+	public AltosTimeSeries	vert_accel_series;
+
+	public static final String vert_accel_name = "Vertical Accel";
+
 	public void set_acceleration(double acceleration) {
 		if (acceleration == AltosLib.MISSING)
 			return;
@@ -264,8 +274,25 @@ public class AltosFlightSeries extends AltosDataListener {
 			temp_series.differentiate(alt_speed_series);
 		}
 		if (accel_series != null) {
+
+			if (orient_series != null) {
+				vert_accel_series = add_series(vert_accel_name, AltosConvert.accel);
+
+				for (AltosTimeValue a : accel_series) {
+					double	orient = orient_series.value(a.time);
+					double	a_abs = a.value + AltosConvert.gravity;
+					double	v_a = a_abs * Math.cos(AltosConvert.degrees_to_radians(orient)) - AltosConvert.gravity;
+
+					vert_accel_series.add(a.time, v_a);
+				}
+			}
+
 			AltosTimeSeries temp_series = make_series(speed_name, AltosConvert.speed);
-			accel_series.integrate(temp_series);
+
+			if (vert_accel_series != null)
+				vert_accel_series.integrate(temp_series);
+			else
+				accel_series.integrate(temp_series);
 
 			accel_speed_series = make_series(speed_name, AltosConvert.speed);
 			temp_series.filter(accel_speed_series, 0.1);