summaryrefslogtreecommitdiff
path: root/altosui
diff options
context:
space:
mode:
Diffstat (limited to 'altosui')
-rw-r--r--altosui/AltosCompanionInfo.java7
-rw-r--r--altosui/AltosFlightInfoTableModel.java75
-rw-r--r--altosui/AltosIdleMonitorUI.java4
-rw-r--r--altosui/AltosInfoTable.java236
-rw-r--r--altosui/Makefile.am2
5 files changed, 7 insertions, 317 deletions
diff --git a/altosui/AltosCompanionInfo.java b/altosui/AltosCompanionInfo.java
index 42413a57..f8d033a8 100644
--- a/altosui/AltosCompanionInfo.java
+++ b/altosui/AltosCompanionInfo.java
@@ -20,8 +20,9 @@ package altosui;
import java.awt.*;
import javax.swing.*;
import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
-public class AltosCompanionInfo extends JTable {
+public class AltosCompanionInfo extends JTable implements AltosFlightDisplay {
private AltosFlightInfoTableModel model;
static final int info_columns = 2;
@@ -50,7 +51,7 @@ public class AltosCompanionInfo extends JTable {
return getPreferredSize();
}
- void info_reset() {
+ public void reset() {
model.reset();
}
@@ -88,7 +89,7 @@ public class AltosCompanionInfo extends JTable {
return;
if (state.companion != null)
companion = state.companion;
- info_reset();
+ reset();
info_add_row(0, "Companion board", "%s", board_name());
if (companion != null) {
info_add_row(0, "Last Data", "%5d", companion.tick);
diff --git a/altosui/AltosFlightInfoTableModel.java b/altosui/AltosFlightInfoTableModel.java
deleted file mode 100644
index 249f6497..00000000
--- a/altosui/AltosFlightInfoTableModel.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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 javax.swing.table.*;
-
-public class AltosFlightInfoTableModel extends AbstractTableModel {
- final static private String[] columnNames = {"Field", "Value"};
-
- int rows;
- int cols;
- private String[][] data;
-
- 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 || col >= cols)
- return "";
- return data[row][col];
- }
-
- int[] current_row;
-
- public void reset() {
- for (int i = 0; i < cols / 2; i++)
- current_row[i] = 0;
- }
-
- 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() {
- 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/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java
index 62b50568..b5652df3 100644
--- a/altosui/AltosIdleMonitorUI.java
+++ b/altosui/AltosIdleMonitorUI.java
@@ -234,7 +234,9 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
try {
disconnect();
} catch (Exception ex) {
- System.out.println(Arrays.toString(ex.getStackTrace()));
+ System.out.printf("Exception %s\n", ex.toString());
+ for (StackTraceElement e : ex.getStackTrace())
+ System.out.printf("%s\n", e.toString());
}
setVisible(false);
dispose();
diff --git a/altosui/AltosInfoTable.java b/altosui/AltosInfoTable.java
deleted file mode 100644
index 125fa94c..00000000
--- a/altosui/AltosInfoTable.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * 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 javax.swing.*;
-import javax.swing.table.*;
-import org.altusmetrum.altoslib_4.*;
-
-public class AltosInfoTable extends JTable {
- private AltosFlightInfoTableModel model;
-
- static final int info_columns = 3;
- static final int info_rows = 17;
-
- int desired_row_height() {
- FontMetrics infoValueMetrics = getFontMetrics(Altos.table_value_font);
- return (infoValueMetrics.getHeight() + infoValueMetrics.getLeading()) * 18 / 10;
- }
-
- int text_width(String t) {
- FontMetrics infoValueMetrics = getFontMetrics(Altos.table_value_font);
-
- return infoValueMetrics.stringWidth(t);
- }
-
- void set_layout() {
- setRowHeight(desired_row_height());
- for (int i = 0; i < info_columns * 2; i++)
- {
- TableColumn column = getColumnModel().getColumn(i);
-
- if ((i & 1) == 0)
- column.setPreferredWidth(text_width(" Satellites Visible"));
- else
- column.setPreferredWidth(text_width("W 179°59.99999' "));
- }
- }
-
- public AltosInfoTable() {
- super(new AltosFlightInfoTableModel(info_rows, info_columns));
- model = (AltosFlightInfoTableModel) getModel();
- setFont(Altos.table_value_font);
- setAutoResizeMode(AUTO_RESIZE_ALL_COLUMNS);
- setShowGrid(true);
- set_layout();
- doLayout();
- }
-
- public void set_font() {
- setFont(Altos.table_value_font);
- set_layout();
- doLayout();
- }
-
- public Dimension getPreferredScrollableViewportSize() {
- return getPreferredSize();
- }
-
- void info_reset() {
- model.reset();
- }
-
- void info_add_row(int col, String name, String value) {
- model.addRow(col, name, value);
- }
-
- void info_add_row(int col, String name, String format, Object... parameters) {
- info_add_row (col, name, String.format(format, parameters));
- }
-
- void info_add_deg(int col, String name, double v, int pos, int neg) {
- int c = pos;
- if (v < 0) {
- c = neg;
- v = -v;
- }
- double deg = Math.floor(v);
- double min = (v - deg) * 60;
-
- info_add_row(col, name, String.format("%c %3.0f°%08.5f'", c, deg, min));
- }
-
- void info_finish() {
- model.finish();
- }
-
- public void clear() {
- model.clear();
- }
-
- public void show(AltosState state, AltosListenerState listener_state) {
- info_reset();
- if (state != null) {
- if (state.device_type != AltosLib.MISSING)
- info_add_row(0, "Device", "%s", AltosLib.product_name(state.device_type));
- if (state.altitude() != AltosLib.MISSING)
- info_add_row(0, "Altitude", "%6.0f m", state.altitude());
- if (state.ground_altitude() != AltosLib.MISSING)
- info_add_row(0, "Pad altitude", "%6.0f m", state.ground_altitude());
- if (state.height() != AltosLib.MISSING)
- info_add_row(0, "Height", "%6.0f m", state.height());
- if (state.max_height() != AltosLib.MISSING)
- info_add_row(0, "Max height", "%6.0f m", state.max_height());
- if (state.acceleration() != AltosLib.MISSING)
- info_add_row(0, "Acceleration", "%8.1f m/s²", state.acceleration());
- if (state.max_acceleration() != AltosLib.MISSING)
- info_add_row(0, "Max acceleration", "%8.1f m/s²", state.max_acceleration());
- if (state.speed() != AltosLib.MISSING)
- info_add_row(0, "Speed", "%8.1f m/s", state.speed());
- if (state.max_speed() != AltosLib.MISSING)
- info_add_row(0, "Max Speed", "%8.1f m/s", state.max_speed());
- if (state.orient() != AltosLib.MISSING)
- info_add_row(0, "Tilt", "%4.0f °", state.orient());
- if (state.max_orient() != AltosLib.MISSING)
- info_add_row(0, "Max Tilt", "%4.0f °", state.max_orient());
- if (state.temperature != AltosLib.MISSING)
- info_add_row(0, "Temperature", "%9.2f °C", state.temperature);
- if (state.battery_voltage != AltosLib.MISSING)
- info_add_row(0, "Battery", "%9.2f V", state.battery_voltage);
- if (state.apogee_voltage != AltosLib.MISSING)
- info_add_row(0, "Drogue", "%9.2f V", state.apogee_voltage);
- if (state.main_voltage != AltosLib.MISSING)
- info_add_row(0, "Main", "%9.2f V", state.main_voltage);
- }
- if (listener_state != null) {
- info_add_row(0, "CRC Errors", "%6d", listener_state.crc_errors);
-
- if (listener_state.battery != AltosLib.MISSING)
- info_add_row(0, "Receiver Battery", "%9.2f", listener_state.battery);
- }
-
- if (state != null) {
- if (state.gps == null || !state.gps.connected) {
- info_add_row(1, "GPS", "not available");
- } else {
- if (state.gps_ready)
- info_add_row(1, "GPS state", "%s", "ready");
- else
- info_add_row(1, "GPS state", "wait (%d)",
- state.gps_waiting);
- if (state.gps.locked)
- info_add_row(1, "GPS", " locked");
- else if (state.gps.connected)
- info_add_row(1, "GPS", " unlocked");
- else
- info_add_row(1, "GPS", " missing");
- info_add_row(1, "Satellites", "%6d", state.gps.nsat);
- if (state.gps.lat != AltosLib.MISSING)
- info_add_deg(1, "Latitude", state.gps.lat, 'N', 'S');
- if (state.gps.lon != AltosLib.MISSING)
- info_add_deg(1, "Longitude", state.gps.lon, 'E', 'W');
- if (state.gps.alt != AltosLib.MISSING)
- info_add_row(1, "GPS altitude", "%8.1f", state.gps.alt);
- if (state.gps_height != AltosLib.MISSING)
- info_add_row(1, "GPS height", "%8.1f", state.gps_height);
-
- /* The SkyTraq GPS doesn't report these values */
- /*
- if (false) {
- info_add_row(1, "GPS ground speed", "%8.1f m/s %3d°",
- state.gps.ground_speed,
- state.gps.course);
- info_add_row(1, "GPS climb rate", "%8.1f m/s",
- state.gps.climb_rate);
- info_add_row(1, "GPS error", "%6d m(h)%3d m(v)",
- state.gps.h_error, state.gps.v_error);
- }
- */
-
- info_add_row(1, "GPS hdop", "%8.1f", state.gps.hdop);
-
- if (state.npad > 0) {
- if (state.from_pad != null) {
- info_add_row(1, "Distance from pad", "%6d m",
- (int) (state.from_pad.distance + 0.5));
- info_add_row(1, "Direction from pad", "%6d°",
- (int) (state.from_pad.bearing + 0.5));
- info_add_row(1, "Elevation from pad", "%6d°",
- (int) (state.elevation + 0.5));
- info_add_row(1, "Range from pad", "%6d m",
- (int) (state.range + 0.5));
- } else {
- info_add_row(1, "Distance from pad", "unknown");
- info_add_row(1, "Direction from pad", "unknown");
- info_add_row(1, "Elevation from pad", "unknown");
- info_add_row(1, "Range from pad", "unknown");
- }
- info_add_deg(1, "Pad latitude", state.pad_lat, 'N', 'S');
- info_add_deg(1, "Pad longitude", state.pad_lon, 'E', 'W');
- info_add_row(1, "Pad GPS alt", "%6.0f m", state.pad_alt);
- }
- if (state.gps.year != AltosLib.MISSING)
- info_add_row(1, "GPS date", "%04d-%02d-%02d",
- state.gps.year,
- state.gps.month,
- state.gps.day);
- if (state.gps.hour != AltosLib.MISSING)
- info_add_row(1, "GPS time", " %02d:%02d:%02d",
- state.gps.hour,
- state.gps.minute,
- state.gps.second);
- //int nsat_vis = 0;
- int c;
-
- if (state.gps.cc_gps_sat == null)
- info_add_row(2, "Satellites Visible", "%4d", 0);
- else {
- info_add_row(2, "Satellites Visible", "%4d", state.gps.cc_gps_sat.length);
- for (c = 0; c < state.gps.cc_gps_sat.length; c++) {
- info_add_row(2, "Satellite id,C/N0",
- "%4d, %4d",
- state.gps.cc_gps_sat[c].svid,
- state.gps.cc_gps_sat[c].c_n0);
- }
- }
- }
- }
- info_finish();
- }
-}
diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 686b5967..add46825 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -21,7 +21,6 @@ altosui_JAVA = \
AltosConfigTD.java \
AltosConfigTDUI.java \
AltosDescent.java \
- AltosFlightInfoTableModel.java \
AltosFlightStatsTable.java \
AltosFlightStatus.java \
AltosFlightStatusUpdate.java \
@@ -32,7 +31,6 @@ altosui_JAVA = \
AltosIgnitor.java \
AltosLaunch.java \
AltosLaunchUI.java \
- AltosInfoTable.java \
AltosLanded.java \
AltosPad.java \
AltosUIPreferencesBackend.java \
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-17 23:53:22 +0000