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;
// 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() {
}
});
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;
}
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");
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++)
{
+ 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);