Changeset 29828 in osm for applications

Timestamp:

2013-08-06T16:15:48+02:00 (11 years ago)

Author:

pieren

Message:

Add new preference setting to simplify colors in 2 bits for raster images

Location:

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr

Files:

• CadastrePreferenceSetting.java (modified) (4 diffs)
• RasterImageModifier.java (modified) (2 diffs)
• WMSLayer.java (modified) (1 diff)

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

@@ -42 +42 @@
 
     private JCheckBox enableTableauAssemblage = new JCheckBox(tr("Use \"Tableau d''assemblage\""));
+    
+    private JCheckBox simplify2BitsColors = new JCheckBox(tr("Replace grey shades by white color only"));
 
     private JCheckBox autoFirstLayer = new JCheckBox(tr("Select first WMS layer in list."));
@@ -125 +127 @@
         reversGrey.setSelected(Main.pref.getBoolean("cadastrewms.invertGrey", false));
         reversGrey.setToolTipText(tr("Invert the original black and white colors (and all intermediate greys). Useful for texts on dark backgrounds."));
-        cadastrewms.add(reversGrey, GBC.eop().insets(00, 0, 0, 0));
+        cadastrewms.add(reversGrey, GBC.eop().insets(0, 0, 0, 0));
 
         // option to enable transparency
@@ -290 +292 @@
         enableTableauAssemblage.setToolTipText(tr("Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."));
         cadastrewms.add(enableTableauAssemblage, GBC.eop().insets(0, 0, 0, 0));
+        // option to use 2 bits colors only
+        simplify2BitsColors.setSelected(Main.pref.getBoolean("cadastrewms.raster2bitsColors", false));
+        simplify2BitsColors.setToolTipText(tr("Replace greyscale by white color (smaller files and memory usage)."));
+        cadastrewms.add(simplify2BitsColors, GBC.eop().insets(0, 0, 0, 0));
         // the crosspiece display
         JLabel jLabelCrosspieces = new JLabel(tr("Display crosspieces:"));
@@ -404 +410 @@
         Main.pref.put("cadastrewms.noImageCropping", disableImageCropping.isSelected());
         Main.pref.put("cadastrewms.useTA", enableTableauAssemblage.isSelected());
+        Main.pref.put("cadastrewms.raster2bitsColors", simplify2BitsColors.isSelected());
         if (crosspiece1.isSelected()) Main.pref.put("cadastrewms.crosspieces", "0");
         else if (crosspiece2.isSelected()) Main.pref.put("cadastrewms.crosspieces", "1");

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

@@ -66 +66 @@
             int height = bufferedImage.getHeight();
             BufferedImage bi = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
+            // converting grey scale colors to black/white is configurable (use less resources but is less readable)
+            boolean simplifyColors = Main.pref.getBoolean("cadastrewms.raster2bitsColors", false);
             for (int y = 0; y < height; y++) {
                 for (int x = 0; x < width; x++) {
@@ -75 +77 @@
                     Color maskedColor;
                     if (rgb == cadastreBackground) {
-                        maskedColor = new Color(r, g, b, 0x00); // transparent
+                        maskedColor = simplifyColors ? new Color(0xff, 0xff, 0xff, 0x00) : 
+                            new Color(r, g, b, 0x00); // transparent
                     } else {
-                        maskedColor = new Color(r, g, b, 0xFF); // opaque
+                        maskedColor = simplifyColors ? new Color(0, 0, 0, 0xFF) : 
+                            new Color(r, g, b, 0xFF); // opaque
                     }
-                    //maskedColor = new Color(r, g, b, alpha);
                     bi.setRGB(x, y, maskedColor.getRGB());
                 }

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

@@ -248 +248 @@
         if (isRaster) {
             str += "\n"+tr("Is not vectorized.");
-            str += "\n"+tr("Raster size: {0}", communeBBox);
+            str += "\n"+tr("Bounding box: {0}", communeBBox);
+            if(images.size()>0)
+                str += "\n"+tr("Image size (px): {0}/{1}", images.get(0).image.getWidth(), images.get(0).image.getHeight());
         } else
             str += "\n"+tr("Is vectorized.");