Version 13, August 2011

[GpsPrune.git] / tim / prune / function / charts / Charter.java

diff --git a/tim/prune/function/charts/Charter.java b/tim/prune/function/charts/Charter.java
index 01bf16c48d27a6f6b5b22bfc1ed4a080dcd9c55e..502c91439dc1434085e42cce1165352708e10ab5 100644 (file)
--- a/tim/prune/function/charts/Charter.java
+++ b/tim/prune/function/charts/Charter.java
@@ -25,10 +25,10 @@ import javax.swing.JTextField;
 import javax.swing.SwingConstants;
 
 import tim.prune.App;
-import tim.prune.Config;
 import tim.prune.ExternalTools;
 import tim.prune.GenericFunction;
 import tim.prune.I18nManager;
+import tim.prune.config.Config;
 import tim.prune.data.Altitude;
 import tim.prune.data.DataPoint;
 import tim.prune.data.Distance;
@@ -189,14 +189,6 @@ public class Charter extends GenericFunction
                // button panel on bottom
                JPanel buttonPanel = new JPanel();
                buttonPanel.setLayout(new FlowLayout(FlowLayout.RIGHT));
-               // Cancel button
-               JButton cancelButton = new JButton(I18nManager.getText("button.cancel"));
-               cancelButton.addActionListener(new ActionListener() {
-                       public void actionPerformed(ActionEvent e) {
-                               _dialog.setVisible(false);
-                       }
-               });
-               buttonPanel.add(cancelButton);
                // ok button
                JButton okButton = new JButton(I18nManager.getText("button.ok"));
                okButton.addActionListener(new ActionListener() {
@@ -206,6 +198,14 @@ public class Charter extends GenericFunction
                        }
                });
                buttonPanel.add(okButton);
+               // Cancel button
+               JButton cancelButton = new JButton(I18nManager.getText("button.cancel"));
+               cancelButton.addActionListener(new ActionListener() {
+                       public void actionPerformed(ActionEvent e) {
+                               _dialog.setVisible(false);
+                       }
+               });
+               buttonPanel.add(cancelButton);
                dialogPanel.add(buttonPanel, BorderLayout.SOUTH);
                return dialogPanel;
        }
@@ -380,7 +380,7 @@ public class Charter extends GenericFunction
                FileWriter tempFileWriter = null;
                try {
                        tempFileWriter = new FileWriter(tempFile);
-                       tempFileWriter.write("# Temporary data file for Prune charts\n\n");
+                       tempFileWriter.write("# Temporary data file for GpsPrune charts\n\n");
                        for (int i=0; i<inTrack.getNumPoints(); i++) {
                                if (xValues.hasData(i) && yValues.hasData(i)) {
                                        tempFileWriter.write("" + xValues.getData(i) + ", " + yValues.getData(i) + "\n");
@@ -526,6 +526,7 @@ public class Charter extends GenericFunction
                ChartSeries values = new ChartSeries(inTrack.getNumPoints());
                DataPoint prevPoint = null, currPoint = null, nextPoint = null;
                DataPoint[] points = getDataPoints(inTrack, false);
+               final boolean useMetric = Config.getConfigBoolean(Config.KEY_METRIC_UNITS);
                // Loop over collected points
                for (int i=1; i<(points.length-1); i++)
                {
@@ -541,7 +542,7 @@ public class Charter extends GenericFunction
                                        + DataPoint.calculateRadiansBetween(currPoint, nextPoint);
                                double time = nextPoint.getTimestamp().getSecondsSince(prevPoint.getTimestamp()) / 60.0 / 60.0;
                                // Convert to distance and pass to chartseries
-                               if (Config.getConfigBoolean(Config.KEY_METRIC_UNITS)) {
+                               if (useMetric) {
                                        values.setData(i, Distance.convertRadiansToDistance(rads, Units.KILOMETRES) / time);
                                } else {
                                        values.setData(i, Distance.convertRadiansToDistance(rads, Units.MILES) / time);