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

Timestamp:

2011-10-29T11:39:29+02:00 (13 years ago)

Author:

glebius

Message:

A thin triangle isn't visible upon a satellite imagery when running
LiveGPSPlugin in a moving car. Make the triangle thicker.

File:

• applications/editors/josm/plugins/livegps/src/livegps/LiveGpsLayer.java (modified) (1 diff)

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

@@ -111 +111 @@
 
         Point screen = mv.getPoint(lastPoint.getCoor());
-        g.setColor(Main.pref.getColor(C_LIVEGPS_COLOR_POSITION, Color.RED));
 
         int TriaHeight = Main.pref.getInteger(C_CURSOR_H, 20);
         int TriaWidth = Main.pref.getInteger(C_CURSOR_W, 10);
+
+        /*
+         * Draw a bold triangle.
+         * In case of deep zoom draw also a thin DOP oval.
+         */
+
+        g.setColor(Main.pref.getColor(C_LIVEGPS_COLOR_POSITION_ESTIMATE, Color.CYAN));
+        int w, h;
+        double ppm = 100 / mv.getDist100Pixel();        /* pixels per metre */
+
+        w = (int )Math.round(lastData.getEpx() * ppm);
+        h = (int )Math.round(lastData.getEpy() * ppm);
+
+        if (w > TriaWidth || h > TriaWidth) {
+                int xo, yo;
+
+                yo = screen.y - Math.round(h/2);
+                xo = screen.x - Math.round(w/2);
+
+                g.drawOval(xo, yo, w, h);
+        }
 
         int[] x = new int[4];
         int[] y = new int[4];
         float course = lastData.getCourse();
-
-        x[0] = screen.x + Math.round(TriaHeight * (float )Math.sin(Math.toRadians(course)));
-        y[0] = screen.y - Math.round(TriaHeight * (float )Math.cos(Math.toRadians(course)));
-        x[1] = screen.x + Math.round(TriaWidth * (float )Math.sin(Math.toRadians(course + 120)));
-        y[1] = screen.y - Math.round(TriaWidth * (float )Math.cos(Math.toRadians(course + 120)));
-        x[2] = screen.x;
-        y[2] = screen.y;
-        x[3] = screen.x + Math.round(TriaWidth * (float )Math.sin(Math.toRadians(course + 240)));
-        y[3] = screen.y - Math.round(TriaWidth * (float )Math.cos(Math.toRadians(course + 240)));
-
-        g.drawPolygon(x, y, 4);
-
-        g.setColor(Main.pref.getColor(C_LIVEGPS_COLOR_POSITION_ESTIMATE, Color.CYAN));
-
-        int w, h;
-        double ppm = 100 / mv.getDist100Pixel();        /* pixels per metre */
-
-        w = (int )Math.round(lastData.getEpx() * ppm);
-        h = (int )Math.round(lastData.getEpy() * ppm);
-
-        if (w > TriaWidth || h > TriaWidth) {
-                int xo, yo;
-
-                yo = screen.y - Math.round(h/2);
-                xo = screen.x - Math.round(w/2);
-
-                g.drawOval(xo, yo, w, h);
+        float csin = (float )Math.sin(Math.toRadians(course));
+        float ccos = (float )Math.cos(Math.toRadians(course));
+        float csin120 = (float )Math.sin(Math.toRadians(course + 120));
+        float ccos120 = (float )Math.cos(Math.toRadians(course + 120));
+        float csin240 = (float )Math.sin(Math.toRadians(course + 240));
+        float ccos240 = (float )Math.cos(Math.toRadians(course + 240));
+
+        g.setColor(Main.pref.getColor(C_LIVEGPS_COLOR_POSITION, Color.RED));
+
+        for (int i = 0; i <= 3; i++, TriaHeight--, TriaWidth--) {
+
+                x[0] = screen.x + Math.round(TriaHeight * csin);
+                y[0] = screen.y - Math.round(TriaHeight * ccos);
+                x[1] = screen.x + Math.round(TriaWidth * csin120);
+                y[1] = screen.y - Math.round(TriaWidth * ccos120);
+                x[2] = screen.x;
+                y[2] = screen.y;
+                x[3] = screen.x + Math.round(TriaWidth * csin240);
+                y[3] = screen.y - Math.round(TriaWidth * ccos240);
+
+                g.drawPolygon(x, y, 4);
         }
+
     }