altosui: Split status and info panels into separate files
authorKeith Packard <keithp@keithp.com>
Sat, 31 Jul 2010 17:34:21 +0000 (10:34 -0700)
committerKeith Packard <keithp@keithp.com>
Sun, 1 Aug 2010 14:31:14 +0000 (10:31 -0400)
This moves some code out of AltosUI.java into separate files

Signed-off-by: Keith Packard <keithp@keithp.com>
ao-tools/altosui/AltosFlightInfoTableModel.java [new file with mode: 0644]
ao-tools/altosui/AltosFlightStatusTableModel.java [new file with mode: 0644]
ao-tools/altosui/AltosUI.java
ao-tools/altosui/Makefile

diff --git a/ao-tools/altosui/AltosFlightInfoTableModel.java b/ao-tools/altosui/AltosFlightInfoTableModel.java
new file mode 100644 (file)
index 0000000..2a22e3e
--- /dev/null
@@ -0,0 +1,81 @@
+/*
+ * Copyright © 2010 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; version 2 of the License.
+ *
+ * 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 altosui;
+
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+import javax.swing.filechooser.FileNameExtensionFilter;
+import javax.swing.table.*;
+import java.io.*;
+import java.util.*;
+import java.text.*;
+import java.util.prefs.*;
+import java.util.concurrent.LinkedBlockingQueue;
+
+public class AltosFlightInfoTableModel extends AbstractTableModel {
+       private String[] columnNames = {"Field", "Value"};
+
+       class InfoLine {
+               String  name;
+               String  value;
+
+               public InfoLine(String n, String v) {
+                       name = n;
+                       value = v;
+               }
+       }
+
+       private ArrayList<InfoLine> rows = new ArrayList<InfoLine>();
+
+       public int getColumnCount() { return columnNames.length; }
+       public String getColumnName(int col) { return columnNames[col]; }
+
+       public int getRowCount() { return 20; }
+
+       int     current_row = 0;
+       int     prev_num_rows = 0;
+
+       public Object getValueAt(int row, int col) {
+               if (row >= rows.size())
+                       return "";
+               if (col == 0)
+                       return rows.get(row).name;
+               else
+                       return rows.get(row).value;
+       }
+
+       public void resetRow() {
+               current_row = 0;
+       }
+       public void addRow(String name, String value) {
+               if (current_row >= rows.size())
+                       rows.add(current_row, new InfoLine(name, value));
+               else
+                       rows.set(current_row, new InfoLine(name, value));
+               current_row++;
+       }
+       public void finish() {
+               if (current_row > prev_num_rows)
+                       fireTableRowsInserted(prev_num_rows, current_row - 1);
+               while (rows.size() > current_row)
+                       rows.remove(rows.size() - 1);
+               prev_num_rows = current_row;
+               fireTableDataChanged();
+       }
+}
diff --git a/ao-tools/altosui/AltosFlightStatusTableModel.java b/ao-tools/altosui/AltosFlightStatusTableModel.java
new file mode 100644 (file)
index 0000000..174dd42
--- /dev/null
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2010 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; version 2 of the License.
+ *
+ * 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 altosui;
+
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+import javax.swing.filechooser.FileNameExtensionFilter;
+import javax.swing.table.*;
+import java.io.*;
+import java.util.*;
+import java.text.*;
+import java.util.prefs.*;
+import java.util.concurrent.LinkedBlockingQueue;
+
+public class AltosFlightStatusTableModel extends AbstractTableModel {
+       private String[] columnNames = {"Height (m)", "State", "RSSI (dBm)", "Speed (m/s)" };
+       private Object[] data = { 0, "idle", 0, 0 };
+
+       public int getColumnCount() { return columnNames.length; }
+       public int getRowCount() { return 2; }
+       public Object getValueAt(int row, int col) {
+               if (row == 0)
+                       return columnNames[col];
+               return data[col];
+       }
+
+       public void setValueAt(Object value, int col) {
+               data[col] = value;
+               fireTableCellUpdated(1, col);
+       }
+
+       public void setValueAt(Object value, int row, int col) {
+               setValueAt(value, col);
+       }
+
+       public void set(AltosState state) {
+               setValueAt(String.format("%1.0f", state.height), 0);
+               setValueAt(state.data.state, 1);
+               setValueAt(state.data.rssi, 2);
+               double speed = state.baro_speed;
+               if (state.ascent)
+                       speed = state.speed;
+               setValueAt(String.format("%1.0f", speed), 3);
+       }
+}
index faa2046980bf96b7460afb1f9c8fe83f00221846..58f39de5efcd22868d8c69b7fbc617d4a6c725ab 100644 (file)
@@ -37,91 +37,11 @@ import altosui.AltosDeviceDialog;
 import altosui.AltosPreferences;
 import altosui.AltosLog;
 import altosui.AltosVoice;
+import altosui.AltosFlightStatusTableModel;
+import altosui.AltosFlightInfoTableModel;
 
 import libaltosJNI.*;
 
-class AltosFlightStatusTableModel extends AbstractTableModel {
-       private String[] columnNames = {"Height (m)", "State", "RSSI (dBm)", "Speed (m/s)" };
-       private Object[] data = { 0, "idle", 0, 0 };
-
-       public int getColumnCount() { return columnNames.length; }
-       public int getRowCount() { return 2; }
-       public Object getValueAt(int row, int col) {
-               if (row == 0)
-                       return columnNames[col];
-               return data[col];
-       }
-
-       public void setValueAt(Object value, int col) {
-               data[col] = value;
-               fireTableCellUpdated(1, col);
-       }
-
-       public void setValueAt(Object value, int row, int col) {
-               setValueAt(value, col);
-       }
-
-       public void set(AltosState state) {
-               setValueAt(String.format("%1.0f", state.height), 0);
-               setValueAt(state.data.state, 1);
-               setValueAt(state.data.rssi, 2);
-               double speed = state.baro_speed;
-               if (state.ascent)
-                       speed = state.speed;
-               setValueAt(String.format("%1.0f", speed), 3);
-       }
-}
-
-class AltosFlightInfoTableModel extends AbstractTableModel {
-       private String[] columnNames = {"Field", "Value"};
-
-       class InfoLine {
-               String  name;
-               String  value;
-
-               public InfoLine(String n, String v) {
-                       name = n;
-                       value = v;
-               }
-       }
-
-       private ArrayList<InfoLine> rows = new ArrayList<InfoLine>();
-
-       public int getColumnCount() { return columnNames.length; }
-       public String getColumnName(int col) { return columnNames[col]; }
-
-       public int getRowCount() { return 20; }
-
-       int     current_row = 0;
-       int     prev_num_rows = 0;
-
-       public Object getValueAt(int row, int col) {
-               if (row >= prev_num_rows)
-                       return "";
-               if (col == 0)
-                       return rows.get(row).name;
-               else
-                       return rows.get(row).value;
-       }
-
-       public void resetRow() {
-               current_row = 0;
-       }
-       public void addRow(String name, String value) {
-               if (current_row >= rows.size())
-                       rows.add(current_row, new InfoLine(name, value));
-               else
-                       rows.set(current_row, new InfoLine(name, value));
-               current_row++;
-       }
-       public void finish() {
-               if (current_row > prev_num_rows)
-                       fireTableRowsInserted(prev_num_rows, current_row - 1);
-               prev_num_rows = current_row;
-               fireTableDataChanged();
-       }
-}
-
 public class AltosUI extends JFrame {
        private int channel = -1;
 
index 790aecdabefcb570065df7516e9af59f4e1440e0..3b88e1c128467f7b8077867baefb176c42fc5a40 100644 (file)
@@ -6,6 +6,8 @@ CLASSFILES=\
        AltosEeprom.class \
        AltosEepromMonitor.class \
        AltosFile.class \
+       AltosFlightInfoTableModel.class \
+       AltosFlightStatusTableModel.class \
        AltosGPS.class \
        AltosGreatCircle.class \
        AltosLog.class \