Changeset 14387 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-10-30T22:51:22+01:00 (5 years ago)

Author:

simon04

Message:

fix #15832 - Add labels for background imagery sliders

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trc;
 
 import java.awt.BorderLayout;
@@ -15 +16 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Dictionary;
 import java.util.HashMap;
+import java.util.Hashtable;
 import java.util.List;
 import java.util.function.Supplier;
@@ -248 +251 @@
 
             slider.addChangeListener(e -> onStateChanged());
+
+            //final NumberFormat format = DecimalFormat.getInstance();
+            //setLabels(format.format(minValue), format.format((minValue + maxValue) / 2), format.format(maxValue));
+        }
+
+        protected void setLabels(String labelMinimum, String labelMiddle, String labelMaximum) {
+            final Dictionary<Integer, JLabel> labels = new Hashtable<>();
+            labels.put(slider.getMinimum(), new JLabel(labelMinimum));
+            labels.put((slider.getMaximum() + slider.getMinimum()) / 2, new JLabel(labelMiddle));
+            labels.put(slider.getMaximum(), new JLabel(labelMaximum));
+            slider.setLabelTable(labels);
+            slider.setPaintLabels(true);
         }
 
@@ -334 +349 @@
     class OpacitySlider extends AbstractFilterSlider<Layer> {
         /**
-         * Creaate a new {@link OpacitySlider}.
+         * Create a new {@link OpacitySlider}.
          */
         OpacitySlider() {
             super(0, 1, Layer.class);
+            setLabels("0%", "50%", "100%");
             slider.setToolTipText(tr("Adjust opacity of the layer."));
         }
@@ -410 +426 @@
         GammaFilterSlider() {
             super(-1, 1, ImageryLayer.class);
+            setLabels("0", "1", "∞");
             slider.setToolTipText(tr("Adjust gamma value of the layer."));
         }
@@ -469 +486 @@
         SharpnessSlider() {
             super(0, MAX_SHARPNESS_FACTOR, ImageryLayer.class);
+            setLabels(trc("image sharpness", "blurred"), trc("image sharpness", "normal"), trc("image sharpness", "sharp"));
             slider.setToolTipText(tr("Adjust sharpness/blur value of the layer."));
         }
@@ -506 +524 @@
         ColorfulnessSlider() {
             super(0, MAX_COLORFUL_FACTOR, ImageryLayer.class);
+            setLabels(trc("image colorfulness", "less"), trc("image colorfulness", "normal"), trc("image colorfulness", "more"));
             slider.setToolTipText(tr("Adjust colorfulness of the layer."));
         }