From 55dfcbd0feeccbc56ea4eba28e4e5c8155a690ce Mon Sep 17 00:00:00 2001
From: Holt59 <capelle.mikael@gmail.com>
Date: Sat, 3 Mar 2018 23:25:48 +0100
Subject: [PATCH] Improve markers rendering.

---
 res/marker_mask.bin                           | Bin 0 -> 35144 bytes
 .../drawing/components/BasicDrawing.java      |  15 +--
 .../drawing/overlays/MarkerUtils.java         | 126 +++++++-----------
 3 files changed, 53 insertions(+), 88 deletions(-)
 create mode 100644 res/marker_mask.bin

diff --git a/res/marker_mask.bin b/res/marker_mask.bin
new file mode 100644
index 0000000000000000000000000000000000000000..0e894637db55d8bc71cb5c8d2948f757630766a9
GIT binary patch
literal 35144
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

literal 0
HcmV?d00001

diff --git a/src/main/org/insa/graphics/drawing/components/BasicDrawing.java b/src/main/org/insa/graphics/drawing/components/BasicDrawing.java
index 9ceb0ac..ac79f0e 100644
--- a/src/main/org/insa/graphics/drawing/components/BasicDrawing.java
+++ b/src/main/org/insa/graphics/drawing/components/BasicDrawing.java
@@ -91,19 +91,20 @@ public class BasicDrawing extends JPanel implements Drawing {
 
     private class BasicMarkerOverlay extends BasicOverlay implements MarkerOverlay {
 
-        // Default marker width
-        private static final int DEFAULT_MARKER_WIDTH = 20;
-
         // Point of the marker.
         private Point point;
 
         // Color of the marker.
         private final Color color;
 
+        // Image to draw
+        private final BufferedImage image;
+
         public BasicMarkerOverlay(Point point, Color color) {
             super();
             this.point = point;
             this.color = color;
+            this.image = MarkerUtils.getMarkerForColor(color);
         }
 
         @Override
@@ -128,12 +129,8 @@ public class BasicDrawing extends JPanel implements Drawing {
             int px = BasicDrawing.this.projx(getPoint().getLongitude());
             int py = BasicDrawing.this.projy(getPoint().getLatitude());
 
-            BufferedImage img = MarkerUtils.getMarkerForColor(color);
-            Graphics2D gr = img.createGraphics();
-            double scale = DEFAULT_MARKER_WIDTH / (double) img.getHeight();
-            gr.scale(scale, scale);
-
-            graphics.drawImage(img, px - img.getWidth() / 2, py - img.getHeight(), BasicDrawing.this);
+            graphics.drawImage(this.image, px - this.image.getWidth() / 2, py - this.image.getHeight(),
+                    BasicDrawing.this);
         }
 
     };
diff --git a/src/main/org/insa/graphics/drawing/overlays/MarkerUtils.java b/src/main/org/insa/graphics/drawing/overlays/MarkerUtils.java
index a9916bd..42e8a88 100644
--- a/src/main/org/insa/graphics/drawing/overlays/MarkerUtils.java
+++ b/src/main/org/insa/graphics/drawing/overlays/MarkerUtils.java
@@ -1,19 +1,15 @@
 package org.insa.graphics.drawing.overlays;
 
 import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.Image;
 import java.awt.image.BufferedImage;
+import java.io.DataInputStream;
+import java.io.FileInputStream;
 
 public class MarkerUtils {
 
-    /**
-     * Return a color mapping with the given color as the main color.
-     * 
-     * @param color
-     * @return
-     */
-    protected static Color[] getColorMapping(Color color) {
-        return new Color[] { new Color(0, 0, 0, 0), color, Color.BLACK };
-    }
+    private static final String MARKER_MASK_FILE = "res/marker_mask.bin";
 
     /**
      * Create a Bitmap representing a marker of the given color.
@@ -23,83 +19,55 @@ public class MarkerUtils {
      */
     public static BufferedImage getMarkerForColor(Color color) {
         // create image
-        BufferedImage image = new BufferedImage(MARKER_MASK[0].length, MARKER_MASK.length,
-                BufferedImage.TYPE_4BYTE_ABGR);
+        int[][] mask = readMarkerMask();
+        BufferedImage image = new BufferedImage(mask[0].length, mask.length, BufferedImage.TYPE_4BYTE_ABGR);
 
-        Color[] map = getColorMapping(color);
+        // Color[] map = getColorMapping(color);
+        int rgb = color.getRGB() & 0x00ffffff;
         for (int i = 0; i < image.getHeight(); ++i) {
             for (int j = 0; j < image.getWidth(); ++j) {
-                image.setRGB(j, i, map[MARKER_MASK[i][j]].getRGB());
+                // image.setRGB(j, i, map[MARKER_MASK[i][j]].getRGB());
+                image.setRGB(j, i, rgb | (mask[i][j] << 24));
             }
         }
 
+        BufferedImage scaleImage = new BufferedImage(28, 48, BufferedImage.TYPE_4BYTE_ABGR);
+        Graphics2D graphics = scaleImage.createGraphics();
+        graphics.drawImage(image.getScaledInstance(28, 48, Image.SCALE_SMOOTH), 0, 0, null);
+        graphics.dispose();
+
         // Create Bitmap and return it.
-        return image;
+        return scaleImage;
+    }
+
+    // Mask cache
+    private static int[][] MASK_CACHE = null;
+
+    /**
+     * @return Retrieve the mask from the mask file or from the cache.
+     */
+    private static int[][] readMarkerMask() {
+        if (MASK_CACHE == null) {
+            try {
+                DataInputStream dis = new DataInputStream(new FileInputStream(MARKER_MASK_FILE));
+
+                int nrows = dis.readInt();
+                int ncols = dis.readInt();
+
+                MASK_CACHE = new int[nrows][ncols];
+                for (int i = 0; i < nrows; ++i) {
+                    for (int j = 0; j < ncols; ++j) {
+                        MASK_CACHE[i][j] = dis.readUnsignedByte();
+                    }
+                }
+                dis.close();
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+                MASK_CACHE = null;
+            }
+        }
+        return MASK_CACHE;
     }
 
-    // Mask
-    private static byte[][] MARKER_MASK = new byte[][] {
-        // @formatter:off
-		{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0},
-		{0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0},
-		{0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0},
-		{0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0},
-		{0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0},
-		{0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0},
-		{0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0},
-		{0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0},
-		{0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0},
-		{0,1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,0},
-		{1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1},
-		{1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1},
-		{1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1},
-		{1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1},
-		{1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1},
-		{1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1},
-		{1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1},
-		{0,1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,0},
-		{0,1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,0},
-		{0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0},
-		{0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0},
-		{0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0},
-		{0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0},
-		{0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0},
-		{0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0},
-		{0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0},
-		{0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0},
-		{0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-		{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}
-	};	
 }