Changeset 13784 in osm for applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/ImageModifier.java

Timestamp:

2009-02-18T23:31:32+01:00 (16 years ago)

Author:

pieren

Message:

Fix minor bugs, add the fixed size grab scale configurable, fix pbls in transparency.

File:

• applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/ImageModifier.java (modified) (4 diffs)

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/ImageModifier.java

@@ -18 +18 @@
     public static final int cadastreBackground = -1; // white
 
+    public static final int cadastreBackgroundTransp = 1; // original white but transparent 
+
     public BufferedImage bufferedImage;
 
@@ -28 +30 @@
     public ImageModifier(BufferedImage bi) {
         bufferedImage = bi;
-        if (Main.pref.getBoolean("cadastrewms.alterColors")) {
-            changeColors();
-            if (Main.pref.getBoolean("cadastrewms.backgroundTransparent")) {
-                makeTransparent();
-            }
-        }
+        if (Main.pref.getBoolean("cadastrewms.backgroundTransparent"))
+            makeTransparent();
+        else if (Main.pref.getBoolean("cadastrewms.alterColors"))
+            replaceBackground();
+        
+        if (Main.pref.getBoolean("cadastrewms.invertGrey"))
+            invertGrey();
     }
 
     /**
      * Replace the background color by the josm color.background color.
-     * @param bi
-     * @return
      */
-    private void changeColors() {
+    private void replaceBackground() {
         int w = bufferedImage.getWidth();
         int h = bufferedImage.getHeight();
-        int pixel;
-        int josmBackgroundColor = ColorHelper.html2color(Main.pref.get("color.background", "#FFFFFF")).getRGB();
-        boolean invertGrey = (Main.pref.getBoolean("cadastrewms.invertGrey"));
+        int josmBackgroundColor = ColorHelper.html2color(Main.pref.get("color.background", "#000000")).getRGB();
         for (int x = 0; x < w; x++) {
             for (int y = 0; y < h; y++) {
-                pixel = bufferedImage.getRGB(x, y);
+                int pixel = bufferedImage.getRGB(x, y);
                 if (pixel == cadastreBackground) {
                     bufferedImage.setRGB(x, y, josmBackgroundColor);
@@ -56 +55 @@
                     backgroundSampleX = x;
                     backgroundSampleY = y;
-                } else if (invertGrey) {
+                }
+            }
+        }
+    }
+    
+    /**
+     * Invert black/white/grey pixels (to change original black characters to white).
+     */
+    private void invertGrey() {
+        int w = bufferedImage.getWidth();
+        int h = bufferedImage.getHeight();
+        for (int x = 0; x < w; x++) {
+            for (int y = 0; y < h; y++) {
+                int pixel = bufferedImage.getRGB(x, y);
+                if (pixel != cadastreBackground) {
                     bufferedImage.setRGB(x, y, reverseIfGrey(pixel));
                 }
@@ -62 +75 @@
         }
     }
-    
+
     /**
      * Reverse the grey value if the pixel is grey (light grey becomes dark grey)