Changeset 25788 in osm for applications/editors/josm/plugins/livegps/src

Timestamp:

2011-04-04T19:47:00+02:00 (14 years ago)

Author:

glebius

Message:

The default refreshtime of 5 seconds doesn't look like sane one, if
we are trying to emulate a navigator in JOSM. That will draw cursor
cornering right after the vehicle already passed a turn.

Decrease default refreshtime to 500 milliseconds. Deprecate the old
config key livegps.refreshinterval, and introduce a new key measured
in milliseconds.

Keep compatibility with old key.

File:

• applications/editors/josm/plugins/livegps/src/livegps/LiveGpsSuppressor.java (modified) (2 diffs)

applications/editors/josm/plugins/livegps/src/livegps/LiveGpsSuppressor.java

@@ -19 +19 @@
 
     /**
-     * Default sleep time is 5 seconds.
+     * Default sleep time is 0.5 seconds.
      */
-    private static final int DEFAULT_SLEEP_TIME = 5;
-
-    /**
-     * The currently used sleepTime.
-     */
-    private int sleepTime = DEFAULT_SLEEP_TIME;
+    private static final int DEFAULT_SLEEP_TIME = 500;
+    private static final String oldConfigKey = "livegps.refreshinterval";     /* in seconds */
+    private static final String ConfigKey = "livegps.refresh_interval_msec";  /* in msec */
+    private int sleepTime;
 
     /**
@@ -62 +60 @@
 
     /**
-     * Retrieve the sleepTime from the configuration.
-     * If no such configuration key exists, it will be initialized here.
+     * Retrieve the sleepTime from the configuration. Be compatible with old
+     * version that stored value in seconds. If no such configuration key exists,
+     * it will be initialized here.
      */
     private void initSleepTime() {
-        // fetch it from the user setting, or use the default value.
-        int sleepSeconds = 0;
-        sleepSeconds = Main.pref.getInteger("livegps.refreshinterval",
-                DEFAULT_SLEEP_TIME);
+        if ((this.sleepTime = Main.pref.getInteger(ConfigKey, 0)) == 0) {
+                if ((this.sleepTime = Main.pref.getInteger(oldConfigKey, 0)) != 0) {
+                        this.sleepTime *= 1000;
+                        Main.pref.put(oldConfigKey, null);
+                } else
+                        this.sleepTime = DEFAULT_SLEEP_TIME;
+        }
+
         // creates the setting, if none present.
-        Main.pref.putInteger("livegps.refreshinterval", sleepSeconds);
-
-        // convert seconds into milliseconds internally.
-        this.sleepTime = sleepSeconds * 1000;
+        Main.pref.putInteger(ConfigKey, this.sleepTime);
     }