Looks nicer and doesn't appear to have the same weird clipping problem
Signed-off-by: Keith Packard <keithp@keithp.com>
heightSeries.clear();
speedSeries.clear();
accelSeries.clear();
heightSeries.clear();
speedSeries.clear();
accelSeries.clear();
- for (MicroDataPoint point : data.points()) {
- heightSeries.add(point.time, AltosConvert.height.value(point.height));
- speedSeries.add(point.time, AltosConvert.speed.value(point.speed));
- accelSeries.add(point.time, AltosConvert.accel.value(point.accel));
+ if (data != null) {
+ for (MicroDataPoint point : data.points()) {
+ heightSeries.add(point.time, AltosConvert.height.value(point.height));
+ speedSeries.add(point.time, AltosConvert.speed.value(point.speed));
+ accelSeries.add(point.time, AltosConvert.accel.value(point.accel));
+ }
public void setData (MicroData data) {
this.data = data;
public void setData (MicroData data) {
this.data = data;
- chart.setTitle(data.name);
+ if (data != null)
+ setName(data.name);
resetData();
}
public void units_changed(boolean imperial_units) {
resetData();
}
public void units_changed(boolean imperial_units) {
- if (data != null) {
- heightSeries.set_units(AltosConvert.height.show_units());
- speedSeries.set_units(AltosConvert.speed.show_units());
- accelSeries.set_units(AltosConvert.accel.show_units());
- resetData();
- }
+ heightSeries.set_units(AltosConvert.height.show_units());
+ speedSeries.set_units(AltosConvert.speed.show_units());
+ accelSeries.set_units(AltosConvert.accel.show_units());
+ resetData();
raw = new MicroRaw();
pane.add(graph.panel, "Graph");
pane.add(stats, "Statistics");
raw = new MicroRaw();
pane.add(graph.panel, "Graph");
pane.add(stats, "Statistics");
- pane.add(raw, "Raw Data");
+ JScrollPane scroll = new JScrollPane(raw);
+ pane.add(scroll, "Raw Data");
pane.doLayout();
pane.validate();
container.add(pane);
pane.doLayout();
pane.validate();
container.add(pane);
import org.altusmetrum.AltosLib.*;
import org.altusmetrum.altosuilib.*;
import org.altusmetrum.AltosLib.*;
import org.altusmetrum.altosuilib.*;
-public class MicroRaw extends TextArea {
+public class MicroRaw extends JTextArea {
public void setData(MicroData data) {
setRows(data.pressures.length);
public void setData(MicroData data) {
setRows(data.pressures.length);