micropeak: Use JTextArea instead of TextArea

Looks nicer and doesn't appear to have the same weird clipping problem

Signed-off-by: Keith Packard <keithp@keithp.com>

3 files changed, 15 insertions, 13 deletions

diff --git a/micropeak/MicroGraph.java b/micropeak/MicroGraph.java
index 8330a67b..d2e86f9f 100644
--- a/micropeak/MicroGraph.java
+++ b/micropeak/MicroGraph.java
@@ -106,10 +106,12 @@ public class MicroGraph implements AltosUnitsListener {
 		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));
+			}
 		}
 	}
 
@@ -119,17 +121,16 @@ public class MicroGraph implements AltosUnitsListener {
 
 	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) {
-		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();
 	}
 
 	public MicroGraph() {
diff --git a/micropeak/MicroPeak.java b/micropeak/MicroPeak.java
index 290511e7..d4252fa9 100644
--- a/micropeak/MicroPeak.java
+++ b/micropeak/MicroPeak.java
@@ -214,7 +214,8 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
 		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);
diff --git a/micropeak/MicroRaw.java b/micropeak/MicroRaw.java
index 6b006f32..f5bea76f 100644
--- a/micropeak/MicroRaw.java
+++ b/micropeak/MicroRaw.java
@@ -22,7 +22,7 @@ import javax.swing.*;
 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);