Changeset 31506 in osm

Timestamp:

2015-08-17T21:55:09+02:00 (9 years ago)

Author:

niplecrumple

Message:

Fixed problem with sliders of integer type

Location:

applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters

Files:

• actions/ShowLayerFiltersDialog.java (modified) (2 diffs)
• gui/FilterPanel.java (modified) (4 diffs)

applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/actions/ShowLayerFiltersDialog.java

@@ -28 +28 @@
  *
  */
-public final class ShowLayerFiltersDialog extends AbstractAction implements LayerAction {
+public final class ShowLayerFiltersDialog extends AbstractAction implements
+                LayerAction {
 
         private List<FiltersDialog> dialogs = new ArrayList<FiltersDialog>();
@@ -61 +62 @@
                                 if (temp.getLayer().equals(layer)) {
                                         try {
-
                                                 temp.createAndShowGUI();
-
                                         } catch (MalformedURLException e1) {
                                                 e1.printStackTrace();
                                         }
-
                                         break;
                                 }

applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/gui/FilterPanel.java

@@ -248 +248 @@
                         int initValue = json.getInt("default");
 
+                        Main.debug("Slider is integer\n");
+                        Main.debug("minValue: " + String.valueOf(minValue) +
+                                        "maxValue: " + String.valueOf(maxValue));
                         try {
                                 slider = new JSlider(JSlider.HORIZONTAL, minValue, maxValue,
@@ -265 +268 @@
                 } else if (valueType.equals("float")) {
 
+                        Main.debug("Slider is float\n");
                         // every value is supplied by 10 to be integer for slider
                         double minValueDouble = array.getJsonNumber(0).doubleValue();
@@ -295 +299 @@
                                 slider.setName(json.getString("name"));
                                 slider.setToolTipText(String.valueOf((double) slider.getValue() / 100));
-                                slider.setBackground(this.getBackground());
-                                slider.setBorder(sliderBorder);
-                                slider.setPaintTicks(true);
-                                slider.setPaintLabels(true);
-                                this.add(slider);
+
 
                         } catch (IllegalArgumentException e) {
@@ -311 +311 @@
                 }
 
+                slider.setBackground(this.getBackground());
+                slider.setBorder(sliderBorder);
+                slider.setPaintTicks(true);
+                slider.setPaintLabels(true);
+                this.add(slider);
+
                 return slider;
         }