X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2FMicroGraph.java;h=50508a61b42cbcb0f46bf9fc45b685caba6c6e30;hp=9192cad93d35a3a82075bce0d7a1b7f29e9ad15d;hb=0169e56ad030c0096b1068d00f06957990dfb31f;hpb=f7a56152808c7838c1886884bb77de2705ab076c

diff --git a/micropeak/MicroGraph.java b/micropeak/MicroGraph.java
index 9192cad9..50508a61 100644
--- a/micropeak/MicroGraph.java
+++ b/micropeak/MicroGraph.java
@@ -22,7 +22,8 @@ import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
@@ -34,77 +35,19 @@ import org.jfree.chart.labels.*;
 import org.jfree.data.xy.*;
 import org.jfree.data.*;
 
-public class MicroGraph {
+public class MicroGraph extends AltosUIGraph {
 
-	XYPlot		plot;
-	JFreeChart	chart;
-	ChartPanel	panel;
-	NumberAxis	xAxis;
-	XYSeries	heightSeries;
-	XYSeries	speedSeries;
-	XYSeries	accelSeries;
+	static final private Color height_color = new Color(194,31,31);
+	static final private Color speed_color = new Color(31,194,31);
+	static final private Color accel_color = new Color(31,31,194);
+	static final private Color state_color = new Color(3,3,3);
 
-	MicroData	data;
+	public MicroGraph(AltosUIEnable enable) {
+		super(enable);
 
-	public JPanel panel() {
-		return panel;
-	}
-
-	private void addSeries(XYSeries series, int index, String label, String units) {
-		XYSeriesCollection	dataset = new XYSeriesCollection(series);
-		NumberAxis		axis = new NumberAxis(String.format("%s (%s)", label, units));
-		XYItemRenderer		renderer = new XYLineAndShapeRenderer(true, false);
-
-		renderer.setPlot(plot);
-		renderer.setBaseToolTipGenerator(new StandardXYToolTipGenerator(String.format("{1}s: {2}%s ({0})", units),
-										new java.text.DecimalFormat("0.00"),
-										new java.text.DecimalFormat("0.00")));
-		plot.setRangeAxis(index, axis);
-		plot.setDataset(index, dataset);
-		plot.setRenderer(index, renderer);
-		plot.mapDatasetToRangeAxis(index, index);
-	}
-	
-	public void setData (MicroData data) {
-		heightSeries.clear();
-		speedSeries.clear();
-		accelSeries.clear();
-		for (int i = 0; i < data.pressures.length; i++) {
-			double x = data.time(i);
-			heightSeries.add(x, data.height(i));
-			speedSeries.add(x, data.speed(i));
-			accelSeries.add(x, data.acceleration(i));
-		}
-	}
-
-	public MicroGraph(MicroData data) {
-
-		this.data = data;
-
-		heightSeries = new XYSeries("Height");
-		speedSeries = new XYSeries("Speed");
-		accelSeries = new XYSeries("Acceleration");
-
-		xAxis = new NumberAxis("Time (s)");
-		
-		xAxis.setAutoRangeIncludesZero(true);
-
-		plot = new XYPlot();
-		plot.setDomainAxis(xAxis);
-		plot.setOrientation(PlotOrientation.VERTICAL);
-		plot.setDomainPannable(true);
-		plot.setRangePannable(true);
-
-		addSeries(heightSeries, 0, "Height", "m");
-		addSeries(speedSeries, 1, "Speed", "m/s");
-		addSeries(accelSeries, 2, "Acceleration", "m/s²");
-
-		chart = new JFreeChart("Flight", JFreeChart.DEFAULT_TITLE_FONT,
-				       plot, true);
-
-		ChartUtilities.applyCurrentTheme(chart);
-		panel = new ChartPanel(chart);
-		panel.setMouseWheelEnabled(true);
-		panel.setPreferredSize(new java.awt.Dimension(800, 500));
+		addSeries("Height", MicroDataPoint.data_height, AltosConvert.height, height_color);
+		addSeries("Speed", MicroDataPoint.data_speed, AltosConvert.speed, speed_color);
+		addSeries("Acceleration", MicroDataPoint.data_accel, AltosConvert.accel, accel_color);
+		addMarker("State", MicroDataPoint.data_state, state_color);
 	}
 }
\ No newline at end of file