projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Hacks to plug into the new graph stuff
[fw/altos]
/
altosui
/
AltosGraphUI.java
diff --git
a/altosui/AltosGraphUI.java
b/altosui/AltosGraphUI.java
index 07fe93176c33dd68d71bfec4f47e7ff8a9222c6a..50a1948ececfb4d107c8eb37ef41fc7b570f4f63 100644
(file)
--- a/
altosui/AltosGraphUI.java
+++ b/
altosui/AltosGraphUI.java
@@
-3,7
+3,8
@@
*
* 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
*
* 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 or any later version of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-23,8
+24,8
@@
import java.util.ArrayList;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_
4
.*;
-import org.altusmetrum.altosuilib_
2
.*;
+import org.altusmetrum.altoslib_
11
.*;
+import org.altusmetrum.altosuilib_
11
.*;
import org.jfree.chart.ChartPanel;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.ChartPanel;
import org.jfree.chart.JFreeChart;
@@
-33,7
+34,7
@@
import org.jfree.ui.RefineryUtilities;
public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, AltosUnitsListener
{
JTabbedPane pane;
public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, AltosUnitsListener
{
JTabbedPane pane;
- AltosGraph
graph;
+ AltosGraph
New
graph;
AltosUIEnable enable;
AltosUIMap map;
AltosState state;
AltosUIEnable enable;
AltosUIMap map;
AltosState state;
@@
-55,15
+56,20
@@
public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
}
public void font_size_changed(int font_size) {
}
public void font_size_changed(int font_size) {
- map.font_size_changed(font_size);
- statsTable.font_size_changed(font_size);
+ if (map != null)
+ map.font_size_changed(font_size);
+ if (statsTable != null)
+ statsTable.font_size_changed(font_size);
}
public void units_changed(boolean imperial_units) {
}
public void units_changed(boolean imperial_units) {
- map.units_changed(imperial_units);
+ if (map != null)
+ map.units_changed(imperial_units);
+ if (enable != null)
+ enable.units_changed(imperial_units);
}
}
- AltosGraphUI(AltosStateIterable states, File file) throws InterruptedException, IOException {
+ AltosGraphUI(AltosStateIterable states,
AltosRecordSet record_set,
File file) throws InterruptedException, IOException {
super(file.getName());
state = null;
super(file.getName());
state = null;
@@
-72,9
+78,9
@@
public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
enable = new AltosUIEnable();
stats = new AltosFlightStats(states);
enable = new AltosUIEnable();
stats = new AltosFlightStats(states);
-
graphDataSet = new AltosGraphDataSet(states);
+
//
graphDataSet = new AltosGraphDataSet(states);
- graph = new AltosGraph
(enable, stats, graphDataS
et);
+ graph = new AltosGraph
New(enable, stats, record_s
et);
statsTable = new AltosFlightStatsTable(stats);
statsTable = new AltosFlightStatsTable(stats);
@@
-95,8
+101,6
@@
public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
addWindowListener(new WindowAdapter() {
@Override
public void windowClosing(WindowEvent e) {
addWindowListener(new WindowAdapter() {
@Override
public void windowClosing(WindowEvent e) {
- setVisible(false);
- dispose();
AltosUIPreferences.unregister_font_listener(AltosGraphUI.this);
AltosPreferences.unregister_units_listener(AltosGraphUI.this);
}
AltosUIPreferences.unregister_font_listener(AltosGraphUI.this);
AltosPreferences.unregister_units_listener(AltosGraphUI.this);
}