X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2FMicroGraph.java;h=811b1e7c14984c6511e46611285371f9c6a4538a;hp=0071a160ef988a3cc44dfda02279c7aadef0b915;hb=c8078d352a7f54a4a97d25af080155d3f875536a;hpb=ab9caa22ea905844a99e08b5f6d3b072f094283e diff --git a/micropeak/MicroGraph.java b/micropeak/MicroGraph.java index 0071a160..811b1e7c 100644 --- a/micropeak/MicroGraph.java +++ b/micropeak/MicroGraph.java @@ -22,8 +22,8 @@ import java.util.ArrayList; import java.awt.*; import javax.swing.*; -import org.altusmetrum.altoslib_1.*; -import org.altusmetrum.altosuilib_1.*; +import org.altusmetrum.altoslib_5.*; +import org.altusmetrum.altosuilib_3.*; import org.jfree.ui.*; import org.jfree.chart.*; @@ -40,12 +40,14 @@ public class MicroGraph extends AltosUIGraph { 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); public MicroGraph(AltosUIEnable enable) { super(enable); - addSeries(0, "Height", MicroDataPoint.data_height, AltosConvert.height, height_color); - addSeries(1, "Speed", MicroDataPoint.data_speed, AltosConvert.speed, speed_color); - addSeries(2, "Acceleration", MicroDataPoint.data_accel, AltosConvert.accel, accel_color); + 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