Changeset 1283 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2009-01-17T22:35:18+01:00 (15 years ago)

Author:

stoecker

Message:

fix #1978. Patch by xeen

File:

• trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -87 +87 @@
     private Color computeCacheColorUsed;
     private boolean computeCacheColored;
+    private int computeCacheColorTracksTune;
 
     public GpxLayer(GpxData d) {
@@ -389 +390 @@
         int delta = Main.pref.getInteger("draw.rawgps.min-arrow-distance", 0);
         // don't draw arrows nearer to each other than this
-
+        int colorTracksTune = Main.pref.getInteger("draw.rawgps.colorTracksTune", 45); // allows to tweak line coloring for different speed levels.
         /****************************************************************
          ********** STEP 2a - CHECK CACHE VALIDITY **********************
@@ -395 +396 @@
         if (computeCacheInSync && ((computeCacheMaxLineLengthUsed != maxLineLength) ||
                                    (!neutralColor.equals(computeCacheColorUsed)) ||
-                                   (computeCacheColored != colored))) {
+                                   (computeCacheColored != colored) ||
+                                   (computeCacheColorTracksTune != colorTracksTune))) {
 //          System.out.println("(re-)computing gpx line styles, reason: CCIS=" + computeCacheInSync + " CCMLLU=" + (computeCacheMaxLineLengthUsed != maxLineLength) + " CCCU=" +  (!neutralColor.equals(computeCacheColorUsed)) + " CCC=" + (computeCacheColored != colored));
             computeCacheMaxLineLengthUsed = maxLineLength;
@@ -401 +403 @@
             computeCacheColorUsed = neutralColor;
             computeCacheColored = colored;
+            computeCacheColorTracksTune = colorTracksTune;
         }
 
@@ -421 +424 @@
                             double dtime = trkPnt.time - oldWp.time;
                             double vel = dist/dtime;
+                            double velColor = vel/colorTracksTune*255;
 
                             if (!colored) {
                                 trkPnt.speedLineColor = neutralColor;
-                            } else if (dtime <= 0 || vel < 0 || vel > 36) { // attn: bad case first
+                            } else if (dtime <= 0 || vel < 0 || velColor > 255) { // attn: bad case first
                                 trkPnt.speedLineColor = colors[255];
                             } else {
-                                trkPnt.speedLineColor = colors[(int) (7*vel)];
+                                trkPnt.speedLineColor = colors[(int) (velColor)];
                             }
                             if (maxLineLength == -1 || dist <= maxLineLength) {