From 271e8adbc9549c7b3b4d0ec14e4edb1a6ab715d1 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 9 May 2013 21:03:38 -0700 Subject: Add altosdroid notebook entry for imperial units Signed-off-by: Keith Packard --- altosdroid/Notebook | 2 ++ 1 file changed, 2 insertions(+) diff --git a/altosdroid/Notebook b/altosdroid/Notebook index 9b383999..b4ae2b7f 100644 --- a/altosdroid/Notebook +++ b/altosdroid/Notebook @@ -26,3 +26,5 @@ Desired AltosDroid feature list *) Re-loading flight data from .telem file to get back to 'find my rocket' mode after shutting down the application. + + *) Imperial Units mode -- cgit v1.2.3 From 17eada6e586731defa9fd75316670c2b2b1601ee Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 9 May 2013 21:04:11 -0700 Subject: altoslib: Add non-persistent 'last logdir' preference This is used to record the last directory for reading or writing log files so that the UI can pop back to the same place next time. Signed-off-by: Keith Packard --- altoslib/AltosPreferences.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/altoslib/AltosPreferences.java b/altoslib/AltosPreferences.java index 392497ef..088ca3d7 100644 --- a/altoslib/AltosPreferences.java +++ b/altoslib/AltosPreferences.java @@ -62,6 +62,9 @@ public class AltosPreferences { /* Log directory */ public static File logdir; + /* Last log directory - use this next time we open or save something */ + public static File last_logdir; + /* Map directory -- hangs of logdir */ public static File mapdir; @@ -198,6 +201,24 @@ public class AltosPreferences { } } + public static File last_logdir() { + synchronized (backend) { + if (last_logdir == null) + last_logdir = logdir; + return last_logdir; + } + } + + public static void set_last_logdir(File file) { + synchronized(backend) { + if (file != null && !file.isDirectory()) + file = file.getParentFile(); + if (file == null) + file = new File("."); + last_logdir = file; + } + } + public static File mapdir() { synchronized (backend) { return mapdir; -- cgit v1.2.3 From 95a3a089f9c97684918937eecd94dcac77c47696 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 9 May 2013 21:04:52 -0700 Subject: Information from configure about android build was misprinted A typo in the script caused it to print either 'yes' or '' Signed-off-by: Keith Packard --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 46467705..32ab33a8 100644 --- a/configure.ac +++ b/configure.ac @@ -148,7 +148,7 @@ fi if test "x$ANDROID_SDK" != "xno"; then HAVE_ANDROID_SDK="yes" else - HAVE_ANDROD_SDK="no" + HAVE_ANDROID_SDK="no" fi AM_CONDITIONAL([ANDROID], [test x$ANDROID_SDK != xno]) -- cgit v1.2.3 From 09d5d6f546ccef2bfd4941e590f047485bb73d76 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 9 May 2013 21:06:23 -0700 Subject: micropeak: Use new 'last logdir' preference for MicroPeak save/load dialogs Signed-off-by: Keith Packard --- micropeak/MicroFileChooser.java | 2 +- micropeak/MicroPeak.java | 1 + micropeak/MicroSave.java | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/micropeak/MicroFileChooser.java b/micropeak/MicroFileChooser.java index 7a3423b4..d52eab2c 100644 --- a/micropeak/MicroFileChooser.java +++ b/micropeak/MicroFileChooser.java @@ -50,6 +50,6 @@ public class MicroFileChooser extends JFileChooser { setDialogTitle("Select MicroPeak Data File"); setFileFilter(new FileNameExtensionFilter("MicroPeak data file", "mpd")); - setCurrentDirectory(AltosUIPreferences.logdir()); + setCurrentDirectory(AltosUIPreferences.last_logdir()); } } diff --git a/micropeak/MicroPeak.java b/micropeak/MicroPeak.java index 57f17dbe..79223176 100644 --- a/micropeak/MicroPeak.java +++ b/micropeak/MicroPeak.java @@ -64,6 +64,7 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene FileInputStream fis = new FileInputStream(filename); try { data = new MicroData((InputStream) fis, filename.getName()); + AltosUIPreferences.set_last_logdir(filename); } catch (InterruptedException ie) { data = null; } finally { diff --git a/micropeak/MicroSave.java b/micropeak/MicroSave.java index 5088b7d7..99f621ce 100644 --- a/micropeak/MicroSave.java +++ b/micropeak/MicroSave.java @@ -83,6 +83,7 @@ public class MicroSave extends JFileChooser { } try { save(file, data); + AltosUIPreferences.set_last_logdir(file.getParentFile()); data.set_name(filename); return true; } catch (FileNotFoundException fe) { @@ -101,7 +102,7 @@ public class MicroSave extends JFileChooser { setDialogTitle("Save MicroPeak Data File"); setFileFilter(new FileNameExtensionFilter("MicroPeak data file", "mpd")); - setCurrentDirectory(AltosUIPreferences.logdir()); + setCurrentDirectory(AltosUIPreferences.last_logdir()); setSelectedFile(MicroFile.make()); } } -- cgit v1.2.3