* Bug #11489 fixed - 'SliderStep' property was ignored for uicontrols.

[scilab.git] / scilab / modules / gui / src / java / org / scilab / modules / gui / bridge / slider / SwingScilabSlider.java

diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/slider/SwingScilabSlider.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/slider/SwingScilabSlider.java
index 2d40842..08ace49 100644 (file)
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/slider/SwingScilabSlider.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/slider/SwingScilabSlider.java
@@ -21,6 +21,7 @@ import java.awt.event.AdjustmentEvent;
 import java.awt.event.AdjustmentListener;
 
 import javax.swing.JScrollBar;
+import javax.swing.SwingUtilities;
 
 import org.scilab.modules.graphic_objects.graphicController.GraphicController;
 import org.scilab.modules.gui.SwingViewWidget;
@@ -48,7 +49,7 @@ public class SwingScilabSlider extends JScrollBar implements SwingViewObject, Si
     private static final int MIN_KNOB_SIZE = 40;
 
     private static final int MINIMUM_VALUE = 0;
-    private static final int MAXIMUM_VALUE = 1000;
+    private static final int MAXIMUM_VALUE = 10000;
 
     private String uid;
 
@@ -207,7 +208,7 @@ public class SwingScilabSlider extends JScrollBar implements SwingViewObject, Si
      * @param value the minimum value
      */
     public void setMinimumValue(double value) {
-        updateModel();
+        updateModel(); /* Update the model according to the knob position */
     }
 
     /**
@@ -215,7 +216,7 @@ public class SwingScilabSlider extends JScrollBar implements SwingViewObject, Si
      * @param value the maximum value
      */
     public void setMaximumValue(double value) {
-        updateModel();
+        updateModel(); /* Update the model according to the knob position */
     }
 
     /**
@@ -234,9 +235,11 @@ public class SwingScilabSlider extends JScrollBar implements SwingViewObject, Si
         /* Remove the listener to avoid the callback to be executed */
         removeAdjustmentListener(adjustmentListener);
 
-        setBlockIncrement((int) (space * (MAXIMUM_VALUE - MINIMUM_VALUE)));
+        double userMin = (Double) GraphicController.getController().getProperty(uid, __GO_UI_MIN__);
+        double userMax = (Double) GraphicController.getController().getProperty(uid, __GO_UI_MAX__);
+        setBlockIncrement((int) (space * (MAXIMUM_VALUE - MINIMUM_VALUE) / (userMax - userMin)));
         int oldMax = getMaximum() - getVisibleAmount();
-        setVisibleAmount(Math.max((int) (space * (MAXIMUM_VALUE - MINIMUM_VALUE)), MIN_KNOB_SIZE));
+        setVisibleAmount(Math.max((int) ((MAXIMUM_VALUE - MINIMUM_VALUE) / space), MIN_KNOB_SIZE));
         setMaximum(oldMax + getVisibleAmount());
 
         /* Put back the listener */
@@ -251,7 +254,9 @@ public class SwingScilabSlider extends JScrollBar implements SwingViewObject, Si
         /* Remove the listener to avoid the callback to be executed */
         removeAdjustmentListener(adjustmentListener);
 
-        setUnitIncrement((int) (space * (MAXIMUM_VALUE - MINIMUM_VALUE)));
+        double userMin = (Double) GraphicController.getController().getProperty(uid, __GO_UI_MIN__);
+        double userMax = (Double) GraphicController.getController().getProperty(uid, __GO_UI_MAX__);
+        setUnitIncrement((int) (space * (MAXIMUM_VALUE - MINIMUM_VALUE) / (userMax - userMin)));
 
         /* Put back the listener */
         addAdjustmentListener(adjustmentListener);
@@ -301,15 +306,17 @@ public class SwingScilabSlider extends JScrollBar implements SwingViewObject, Si
      * @param value the new value
      */
     public void setUserValue(double value) {
-        /* Remove the listener to avoid the callback to be executed */
-        removeAdjustmentListener(adjustmentListener);
+        if (!SwingUtilities.isEventDispatchThread()) { /* Avoid double-update when Model is updated from the callback */
+            /* Remove the listener to avoid the callback to be executed */
+            removeAdjustmentListener(adjustmentListener);
 
-        double userMin = (Double) GraphicController.getController().getProperty(uid, __GO_UI_MIN__);
-        double userMax = (Double) GraphicController.getController().getProperty(uid, __GO_UI_MAX__);
-        super.setValue(MINIMUM_VALUE + (int) ((value - userMin) * (MAXIMUM_VALUE - MINIMUM_VALUE) / (userMax - userMin)));
+            double userMin = (Double) GraphicController.getController().getProperty(uid, __GO_UI_MIN__);
+            double userMax = (Double) GraphicController.getController().getProperty(uid, __GO_UI_MAX__);
+            super.setValue(MINIMUM_VALUE + (int) ((value - userMin) * (MAXIMUM_VALUE - MINIMUM_VALUE) / (userMax - userMin)));
 
-        /* Put back the listener */
-        addAdjustmentListener(adjustmentListener);
+            /* Put back the listener */
+            addAdjustmentListener(adjustmentListener);
+        }
     }
 
     /**