summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ao-tools/altosui/Altos.java2
-rw-r--r--ao-tools/altosui/AltosAscent.java8
-rw-r--r--ao-tools/altosui/AltosDescent.java8
-rw-r--r--ao-tools/altosui/AltosFlightInfoTableModel.java77
-rw-r--r--ao-tools/altosui/AltosFlightUI.java50
-rw-r--r--ao-tools/altosui/AltosInfoTable.java70
-rw-r--r--ao-tools/altosui/AltosLanded.java2
-rw-r--r--ao-tools/altosui/AltosPad.java4
-rw-r--r--ao-tools/altosui/AltosSiteMap.java3
-rw-r--r--ao-tools/altosui/AltosSiteMapCache.java2
-rw-r--r--ao-tools/altosui/AltosSiteMapTile.java1
11 files changed, 98 insertions, 129 deletions
diff --git a/ao-tools/altosui/Altos.java b/ao-tools/altosui/Altos.java
index 197e98db..8ee94e04 100644
--- a/ao-tools/altosui/Altos.java
+++ b/ao-tools/altosui/Altos.java
@@ -73,6 +73,8 @@ public class Altos {
static final Font value_font = new Font("Monospaced", Font.PLAIN, 22);
static final Font status_font = new Font("SansSerif", Font.BOLD, 24);
+ static final int text_width = 16;
+
static void initialize_map()
{
string_to_state.put("startup", ao_flight_startup);
diff --git a/ao-tools/altosui/AltosAscent.java b/ao-tools/altosui/AltosAscent.java
index 2ceaa183..64bdcf30 100644
--- a/ao-tools/altosui/AltosAscent.java
+++ b/ao-tools/altosui/AltosAscent.java
@@ -65,7 +65,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
layout.setConstraints(label, c);
add(label);
- value = new JTextField(17);
+ value = new JTextField(Altos.text_width);
value.setFont(Altos.value_font);
value.setHorizontalAlignment(SwingConstants.RIGHT);
c.gridx = 2; c.gridy = y;
@@ -102,7 +102,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
layout.setConstraints(label, c);
add(label);
- value = new JTextField(17);
+ value = new JTextField(Altos.text_width);
value.setFont(Altos.value_font);
value.setHorizontalAlignment(SwingConstants.RIGHT);
c.gridx = 2; c.gridy = y;
@@ -151,7 +151,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
layout.setConstraints(label, c);
add(label);
- value = new JTextField(17);
+ value = new JTextField(Altos.text_width);
value.setFont(Altos.value_font);
value.setHorizontalAlignment(SwingConstants.RIGHT);
c.gridx = 2; c.gridy = y;
@@ -161,7 +161,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
layout.setConstraints(value, c);
add(value);
- max_value = new JTextField(17);
+ max_value = new JTextField(Altos.text_width);
max_value.setFont(Altos.value_font);
max_value.setHorizontalAlignment(SwingConstants.RIGHT);
c.gridx = 3; c.gridy = y;
diff --git a/ao-tools/altosui/AltosDescent.java b/ao-tools/altosui/AltosDescent.java
index abe64fdc..16ccd458 100644
--- a/ao-tools/altosui/AltosDescent.java
+++ b/ao-tools/altosui/AltosDescent.java
@@ -66,7 +66,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
layout.setConstraints(label, c);
add(label);
- value = new JTextField(17);
+ value = new JTextField(Altos.text_width);
value.setFont(Altos.value_font);
value.setHorizontalAlignment(SwingConstants.RIGHT);
c.gridx = 4; c.gridy = y;
@@ -112,7 +112,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
c.weightx = 0;
add(label, c);
- value = new JTextField(17);
+ value = new JTextField(Altos.text_width);
value.setFont(Altos.value_font);
value.setHorizontalAlignment(SwingConstants.RIGHT);
c.gridx = x + 2; c.gridy = y;
@@ -159,7 +159,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
layout.setConstraints(label, c);
add(label);
- value1 = new JTextField(17);
+ value1 = new JTextField(Altos.text_width);
value1.setFont(Altos.value_font);
value1.setHorizontalAlignment(SwingConstants.RIGHT);
c.gridx = x + 2; c.gridy = y;
@@ -169,7 +169,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
layout.setConstraints(value1, c);
add(value1);
- value2 = new JTextField(17);
+ value2 = new JTextField(Altos.text_width);
value2.setFont(Altos.value_font);
value2.setHorizontalAlignment(SwingConstants.RIGHT);
c.gridx = x + 4; c.gridy = y;
diff --git a/ao-tools/altosui/AltosFlightInfoTableModel.java b/ao-tools/altosui/AltosFlightInfoTableModel.java
index 3355ff52..e23eff68 100644
--- a/ao-tools/altosui/AltosFlightInfoTableModel.java
+++ b/ao-tools/altosui/AltosFlightInfoTableModel.java
@@ -29,53 +29,56 @@ import java.util.prefs.*;
import java.util.concurrent.LinkedBlockingQueue;
public class AltosFlightInfoTableModel extends AbstractTableModel {
- private String[] columnNames = {"Field", "Value"};
+ final static private String[] columnNames = {"Field", "Value"};
- class InfoLine {
- String name;
- String value;
+ int rows;
+ int cols;
+ private String[][] data;
- 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 17; }
-
- int current_row = 0;
- int prev_num_rows = 0;
+ public int getColumnCount() { return cols; }
+ public int getRowCount() { return rows; }
+ public String getColumnName(int col) { return columnNames[col & 1]; }
public Object getValueAt(int row, int col) {
- if (row >= rows.size())
+ if (row >= rows || col >= cols)
return "";
- if (col == 0)
- return rows.get(row).name;
- else
- return rows.get(row).value;
+ return data[row][col];
}
- public void resetRow() {
- current_row = 0;
+ int[] current_row;
+
+ public void reset() {
+ for (int i = 0; i < cols / 2; i++)
+ current_row[i] = 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 clear() {
+ reset();
+ for (int c = 0; c < cols; c++)
+ for (int r = 0; r < rows; r++)
+ data[r][c] = "";
+ fireTableDataChanged();
+ }
+
+ public void addRow(int col, String name, String value) {
+ if (current_row[col] < rows) {
+ data[current_row[col]][col * 2] = name;
+ data[current_row[col]][col * 2 + 1] = value;
+ }
+ current_row[col]++;
}
+
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;
+ for (int c = 0; c < cols / 2; c++)
+ while (current_row[c] < rows)
+ addRow(c, "", "");
fireTableDataChanged();
}
+
+ public AltosFlightInfoTableModel (int in_rows, int in_cols) {
+ rows = in_rows;
+ cols = in_cols * 2;
+ data = new String[rows][cols];
+ current_row = new int[in_cols];
+ }
}
diff --git a/ao-tools/altosui/AltosFlightUI.java b/ao-tools/altosui/AltosFlightUI.java
index c85fc977..a3a28782 100644
--- a/ao-tools/altosui/AltosFlightUI.java
+++ b/ao-tools/altosui/AltosFlightUI.java
@@ -42,10 +42,9 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
AltosAscent ascent;
AltosDescent descent;
AltosLanded landed;
- AltosSiteMap sitemap;
+ AltosSiteMap sitemap;
private AltosFlightStatus flightStatus;
- private JScrollPane flightInfoPane;
private AltosInfoTable flightInfo;
static final int tab_pad = 1;
@@ -67,14 +66,6 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
return tab_landed;
}
- public int width() {
- return flightInfo.width();
- }
-
- public int height() {
- return flightStatus.height() + flightInfo.height();
- }
-
void stop_display() {
if (thread != null && thread.isAlive()) {
thread.interrupt();
@@ -149,6 +140,7 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
setTitle(String.format("AltOS %s", reader.name));
+ /* Stick channel selector at top of table for telemetry monitoring */
if (serial >= 0) {
// Channel menu
channels = new AltosChannelMenu(AltosPreferences.channel(serial));
@@ -165,6 +157,7 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
bag.add (channels, c);
}
+ /* Flight status is always visible */
flightStatus = new AltosFlightStatus();
c.gridx = 0;
c.gridy = 1;
@@ -172,6 +165,9 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
c.weightx = 1;
bag.add(flightStatus, c);
+ /* The rest of the window uses a tabbed pane to
+ * show one of the alternate data views
+ */
pane = new JTabbedPane();
pad = new AltosPad();
@@ -187,12 +183,12 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
pane.add("Landed", landed);
flightInfo = new AltosInfoTable();
- flightInfoPane = new JScrollPane(flightInfo.box());
- pane.add("Table", flightInfoPane);
+ pane.add("Table", new JScrollPane(flightInfo));
- sitemap = new AltosSiteMap();
- pane.add("Site Map", sitemap);
+ sitemap = new AltosSiteMap();
+ pane.add("Site Map", sitemap);
+ /* Make the tabbed pane use the rest of the window space */
c.gridx = 0;
c.gridy = 2;
c.fill = GridBagConstraints.BOTH;
@@ -200,22 +196,20 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
c.weighty = 1;
bag.add(pane, c);
- this.setSize(this.getPreferredSize());
- this.validate();
-
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
addWindowListener(new WindowAdapter() {
- @Override
- public void windowClosing(WindowEvent e) {
- disconnect();
- setVisible(false);
- dispose();
- if (exit_on_close)
- System.exit(0);
- }
- });
-
- this.setVisible(true);
+ @Override
+ public void windowClosing(WindowEvent e) {
+ disconnect();
+ setVisible(false);
+ dispose();
+ if (exit_on_close)
+ System.exit(0);
+ }
+ });
+
+ pack();
+ setVisible(true);
thread = new AltosDisplayThread(this, voice, this, reader);
diff --git a/ao-tools/altosui/AltosInfoTable.java b/ao-tools/altosui/AltosInfoTable.java
index 9f2bef5b..723f8301 100644
--- a/ao-tools/altosui/AltosInfoTable.java
+++ b/ao-tools/altosui/AltosInfoTable.java
@@ -28,11 +28,8 @@ import java.text.*;
import java.util.prefs.*;
import java.util.concurrent.LinkedBlockingQueue;
-public class AltosInfoTable {
- private Box box;
- private JTable table[];
- private AltosFlightInfoTableModel model[];
- private Box ibox[];
+public class AltosInfoTable extends JTable {
+ private AltosFlightInfoTableModel model;
private Font infoLabelFont = new Font("SansSerif", Font.PLAIN, 14);
private Font infoValueFont = new Font("Monospaced", Font.PLAIN, 14);
@@ -40,58 +37,35 @@ public class AltosInfoTable {
static final int info_columns = 3;
static final int info_rows = 17;
- public AltosInfoTable() {
- box = Box.createHorizontalBox();
- model = new AltosFlightInfoTableModel[info_columns];
- table = new JTable[info_columns];
- ibox = new Box[info_columns];
- for (int i = 0; i < info_columns; i++) {
- model[i] = new AltosFlightInfoTableModel();
- table[i] = new JTable(model[i]);
- ibox[i] = box.createVerticalBox();
-
- table[i].setFont(infoValueFont);
- table[i].setRowHeight(rowHeight());
- table[i].setShowGrid(true);
- ibox[i].add(table[i].getTableHeader());
- ibox[i].add(table[i]);
- box.add(ibox[i]);
- }
- }
-
- public int rowHeight() {
- FontMetrics infoValueMetrics = table[0].getFontMetrics(infoValueFont);
- return (infoValueMetrics.getHeight() + infoValueMetrics.getLeading()) * 20 / 10;
- }
-
- public int columnWidth() {
- FontMetrics infoValueMetrics = table[0].getFontMetrics(infoValueFont);
- return infoValueMetrics.charWidth('0') * 20 * 2;
+ int desired_row_height() {
+ FontMetrics infoValueMetrics = getFontMetrics(infoValueFont);
+ return (infoValueMetrics.getHeight() + infoValueMetrics.getLeading()) * 18 / 10;
}
- public int height() {
- return rowHeight() * info_rows;
- }
-
- public int width() {
- return columnWidth() * info_columns;
+ public AltosInfoTable() {
+ super(new AltosFlightInfoTableModel(info_rows, info_columns));
+ model = (AltosFlightInfoTableModel) getModel();
+ setFont(infoValueFont);
+ setAutoResizeMode(AUTO_RESIZE_ALL_COLUMNS);
+ setShowGrid(true);
+ setRowHeight(desired_row_height());
+ doLayout();
}
- public Box box() {
- return box;
+ public Dimension getPreferredScrollableViewportSize() {
+ return getPreferredSize();
}
void info_reset() {
- for (int i = 0; i < info_columns; i++)
- model[i].resetRow();
+ model.reset();
}
void info_add_row(int col, String name, String value) {
- model[col].addRow(name, value);
+ model.addRow(col, name, value);
}
void info_add_row(int col, String name, String format, Object... parameters) {
- model[col].addRow(name, String.format(format, parameters));
+ info_add_row (col, name, String.format(format, parameters));
}
void info_add_deg(int col, String name, double v, int pos, int neg) {
@@ -103,17 +77,15 @@ public class AltosInfoTable {
double deg = Math.floor(v);
double min = (v - deg) * 60;
- model[col].addRow(name, String.format("%3.0f°%08.5f'", deg, min));
+ info_add_row(col, name, String.format("%3.0f°%08.5f'", deg, min));
}
void info_finish() {
- for (int i = 0; i < info_columns; i++)
- model[i].finish();
+ model.finish();
}
public void clear() {
- info_reset();
- info_finish();
+ model.clear();
}
public void show(AltosState state, int crc_errors) {
diff --git a/ao-tools/altosui/AltosLanded.java b/ao-tools/altosui/AltosLanded.java
index 059dbb6d..d34efe6d 100644
--- a/ao-tools/altosui/AltosLanded.java
+++ b/ao-tools/altosui/AltosLanded.java
@@ -61,7 +61,7 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay {
layout.setConstraints(label, c);
add(label);
- value = new JTextField(17);
+ value = new JTextField(Altos.text_width);
value.setFont(value_font);
value.setHorizontalAlignment(SwingConstants.RIGHT);
c.gridx = 1; c.gridy = y;
diff --git a/ao-tools/altosui/AltosPad.java b/ao-tools/altosui/AltosPad.java
index 480e4d79..66954347 100644
--- a/ao-tools/altosui/AltosPad.java
+++ b/ao-tools/altosui/AltosPad.java
@@ -65,7 +65,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
layout.setConstraints(label, c);
add(label);
- value = new JTextField(17);
+ value = new JTextField(Altos.text_width);
value.setFont(Altos.value_font);
value.setHorizontalAlignment(SwingConstants.RIGHT);
c.gridx = 2; c.gridy = y;
@@ -101,7 +101,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
layout.setConstraints(label, c);
add(label);
- value = new JTextField(17);
+ value = new JTextField(Altos.text_width);
value.setFont(Altos.value_font);
value.setHorizontalAlignment(SwingConstants.RIGHT);
c.gridx = 2; c.gridy = y;
diff --git a/ao-tools/altosui/AltosSiteMap.java b/ao-tools/altosui/AltosSiteMap.java
index 5f5e30f0..50177d4e 100644
--- a/ao-tools/altosui/AltosSiteMap.java
+++ b/ao-tools/altosui/AltosSiteMap.java
@@ -211,7 +211,7 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
boolean initialised = false;
public void show(AltosState state, int crc_errors) {
// if insufficient gps data, nothing to update
- if (!state.gps_ready) {
+ if (state.gps == null || !state.gps.locked) {
if (state.pad_lat == 0 && state.pad_lon == 0)
return;
if (state.ngps < 3)
@@ -266,4 +266,3 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
setPreferredSize(new Dimension(500,200));
}
}
-
diff --git a/ao-tools/altosui/AltosSiteMapCache.java b/ao-tools/altosui/AltosSiteMapCache.java
index e9dbf8e6..2e62cc45 100644
--- a/ao-tools/altosui/AltosSiteMapCache.java
+++ b/ao-tools/altosui/AltosSiteMapCache.java
@@ -33,6 +33,7 @@ import java.net.URLConnection;
public class AltosSiteMapCache extends JLabel {
public static boolean fetchMap(File file, String url) {
URL u;
+
try {
u = new URL(url);
} catch (java.net.MalformedURLException e) {
@@ -100,4 +101,3 @@ public class AltosSiteMapCache extends JLabel {
}
}
}
-
diff --git a/ao-tools/altosui/AltosSiteMapTile.java b/ao-tools/altosui/AltosSiteMapTile.java
index 8aee86c1..9d6f855d 100644
--- a/ao-tools/altosui/AltosSiteMapTile.java
+++ b/ao-tools/altosui/AltosSiteMapTile.java
@@ -131,4 +131,3 @@ public class AltosSiteMapTile extends JLayeredPane {
add(draw, new Integer(1));
}
}
-
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-26 22:19:30 +0000