Changeset 11785 in josm

Timestamp:

2017-03-28T23:17:28+02:00 (8 years ago)

Author:

bastiK

Message:

Imagery: remove fade setting (superseded by layer opacity), see #7427

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• layer/AbstractTileSourceLayer.java (modified) (1 diff)
• layer/ImageryLayer.java (modified) (3 diffs)
• preferences/display/ColorPreference.java (modified) (1 diff)
• preferences/imagery/CommonSettingsPanel.java (modified) (4 diffs)

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

@@ -1110 +1110 @@
                 imgXend, imgYend,
                 this);
-        if (PROP_FADE_AMOUNT.get() != 0) {
-            // dimm by painting opaque rect...
-            g.setColor(getFadeColorWithAlpha());
-            ((Graphics2D) g).fill(target);
-        }
     }
 

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.layer;
 
-import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trc;
 
-import java.awt.Color;
 import java.awt.Component;
 import java.awt.GridBagLayout;
@@ -31 +29 @@
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.OffsetBookmark;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.gui.MenuScroller;
@@ -44 +41 @@
 public abstract class ImageryLayer extends Layer {
 
-    public static final ColorProperty PROP_FADE_COLOR = new ColorProperty(marktr("Imagery fade"), Color.white);
-    public static final IntegerProperty PROP_FADE_AMOUNT = new IntegerProperty("imagery.fade_amount", 0);
     public static final IntegerProperty PROP_SHARPEN_LEVEL = new IntegerProperty("imagery.sharpen_level", 0);
 
     private final List<ImageProcessor> imageProcessors = new ArrayList<>();
-
-    public static Color getFadeColor() {
-        return PROP_FADE_COLOR.get();
-    }
-
-    public static Color getFadeColorWithAlpha() {
-        Color c = PROP_FADE_COLOR.get();
-        return new Color(c.getRed(), c.getGreen(), c.getBlue(), PROP_FADE_AMOUNT.get()*255/100);
-    }
 
     protected final ImageryInfo info;

trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java

@@ -263 +263 @@
         GpxDrawHelper.getGenericColor();
         OsmDataLayer.getOutsideColor();
-        ImageryLayer.getFadeColor();
         MapScaler.getColor();
         MapStatus.getColors();

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CommonSettingsPanel.java

@@ -36 +36 @@
 
     // Common Settings
-    private final JButton btnFadeColor;
-    private final JSlider fadeAmount = new JSlider(0, 100);
     private final JosmComboBox<String> sharpen;
-    private final JosmTextField tilecacheDir = new JosmTextField();
+    private final JosmTextField tilecacheDir = new JosmTextField(11);
     private final JSpinner maxElementsOnDisk;
     private final JSlider tilesZoom = new JSlider(-2, 2, 0);
@@ -52 +50 @@
         this.maxElementsOnDisk = new JSpinner(new SpinnerNumberModel(
                 AbstractCachedTileSourceLayer.MAX_DISK_CACHE_SIZE.get().intValue(), 0, Integer.MAX_VALUE, 1));
-
-        this.btnFadeColor = new JButton();
-        this.btnFadeColor.addActionListener(e -> {
-            JColorChooser chooser = new JColorChooser(btnFadeColor.getBackground());
-            int answer = JOptionPane.showConfirmDialog(
-                    this, chooser,
-                    tr("Choose a color for {0}", tr("imagery fade")),
-                    JOptionPane.OK_CANCEL_OPTION,
-                    JOptionPane.PLAIN_MESSAGE);
-            if (answer == JOptionPane.OK_OPTION) {
-                Color colFadeColor = chooser.getColor();
-                btnFadeColor.setBackground(colFadeColor);
-                btnFadeColor.setText(ColorHelper.color2html(colFadeColor));
-            }
-        });
-
-        add(new JLabel(tr("Fade Color: ")), GBC.std());
-        add(GBC.glue(5, 0), GBC.std().fill(GBC.HORIZONTAL));
-        add(this.btnFadeColor, GBC.eol().fill(GBC.HORIZONTAL));
-
-        add(new JLabel(tr("Fade amount: ")), GBC.std());
-        add(GBC.glue(5, 0), GBC.std().fill(GBC.HORIZONTAL));
-        add(this.fadeAmount, GBC.eol().fill(GBC.HORIZONTAL));
 
         this.sharpen = new JosmComboBox<>(new String[] {
@@ -105 +80 @@
      */
     public void loadSettings() {
-        Color colFadeColor = ImageryLayer.PROP_FADE_COLOR.get();
-        this.btnFadeColor.setBackground(colFadeColor);
-        this.btnFadeColor.setText(ColorHelper.color2html(colFadeColor));
-        this.fadeAmount.setValue(ImageryLayer.PROP_FADE_AMOUNT.get());
         this.sharpen.setSelectedIndex(Utils.clamp(ImageryLayer.PROP_SHARPEN_LEVEL.get(), 0, 2));
         this.tilecacheDir.setText(CachedTileLoaderFactory.PROP_TILECACHE_DIR.get());
@@ -120 +91 @@
      */
     public boolean saveSettings() {
-        ImageryLayer.PROP_FADE_AMOUNT.put(this.fadeAmount.getValue());
-        ImageryLayer.PROP_FADE_COLOR.put(this.btnFadeColor.getBackground());
         ImageryLayer.PROP_SHARPEN_LEVEL.put(sharpen.getSelectedIndex());