Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

1 files changed, 0 insertions, 83 deletions

diff --git a/micropeak/MicroDataPoint.java b/micropeak/MicroDataPoint.java
deleted file mode 100644
index 42079291..00000000
--- a/micropeak/MicroDataPoint.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright © 2012 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package org.altusmetrum.micropeak;
-
-import org.altusmetrum.altosuilib_11.*;
-
-public class MicroDataPoint implements AltosUIDataPoint {
-	public double		time;
-	public double		pressure;
-	public double		height;
-	public double		speed;
-	public double		accel;
-	public MicroStats	stats;
-
-	public static final int data_height = 0;
-	public static final int data_speed = 1;
-	public static final int data_accel = 2;
-	public static final int data_state = 3;
-
-	public double x() {
-		return time;
-	}
-
-	public double y(int index) {
-		switch (index) {
-		case data_height:
-			return height;
-		case data_speed:
-			return speed;
-		case data_accel:
-			return accel;
-		default:
-			return 0;
-		}
-	}
-
-	public int id(int index) {
-		if (index == data_state) {
-			return stats.state(time);
-		}
-		return 0;
-	}
-
-	public String id_name(int index) {
-		if (index == data_state)
-			return stats.state_name(time);
-		return "";
-	}
-
-	public MicroDataPoint (double pressure, double height, double speed, double accel, double time, MicroStats stats) {
-		this.pressure = pressure;
-		this.height = height;
-		this.speed = speed;
-		this.accel = accel;
-		this.time = time;
-		this.stats = stats;
-	}
-
-	public MicroDataPoint(MicroData data, int i) {
-		this(data.pressure(i),
-		     data.height(i),
-		     data.speed(i),
-		     data.acceleration(i),
-		     data.time(i),
-		     data.stats);
-	}
-}
\ No newline at end of file