Bug 12166 fixed: There was a bad label with drawaxis

Change-Id: I43faa33bee47fc1094bfe3025323839deb92fb3a

diff --git a/scilab/CHANGES_5.4.X b/scilab/CHANGES_5.4.X
index 43f11e4..41ec27a 100644 (file)
--- a/scilab/CHANGES_5.4.X
+++ b/scilab/CHANGES_5.4.X
@@ -197,6 +197,8 @@ Bug fixes
 
 * Bug #12119 fixed - bar and barh had wrong x/y bounds.
 
+* Bug #12166 fixed - There was a bad label with drawaxis.
+
 * Bug #12179 fixed - Fix an incompatibility with MPI version of HDF5.
 
 * Bug #11965 fixed - Export to SVG converted texts in shapes.

diff --git a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/AxisDrawer.java b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/AxisDrawer.java
index b593fe6..066d10e 100644 (file)
--- a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/AxisDrawer.java
+++ b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/AxisDrawer.java
@@ -161,14 +161,14 @@ public class AxisDrawer {
      */
     private Vector3d computeTicksDirection(Axis.TicksDirection direction) {
         switch (direction) {
-            case TOP:
-                return new Vector3d(0, +1, 0);
-            case BOTTOM:
-                return new Vector3d(0, -1, 0);
-            case LEFT:
-                return new Vector3d(-1, 0, 0);
-            default:
-                return new Vector3d(+1, 0, 0);
+        case TOP:
+            return new Vector3d(0, +1, 0);
+        case BOTTOM:
+            return new Vector3d(0, -1, 0);
+        case LEFT:
+            return new Vector3d(-1, 0, 0);
+        default:
+            return new Vector3d(+1, 0, 0);
         }
     }
 
@@ -347,7 +347,7 @@ public class AxisDrawer {
             // 0 <= value <= 1
             // Should find right index through given labels.
             String[] ticksLabel = axis.getTicksLabels();
-            int index = (int) (value * (ticksLabel.length - 1));
+            int index = (int) Math.round(value * (ticksLabel.length - 1));
             if ((index < 0) || (index > ticksLabel.length)) {
                 return null;
             } else {