bug 11343 : Use the margins of axes in transformation.

Change-Id: Ie5d0588eb3fbc2129c41facc73030e505a6c907c

diff --git a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/axes/AxesDrawer.java b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/axes/AxesDrawer.java
index 4dc88ae..f6b082d 100644 (file)
--- a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/axes/AxesDrawer.java
+++ b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/axes/AxesDrawer.java
@@ -297,10 +297,18 @@ public class AxesDrawer {
         Double[] margins = axes.getMargins();
 
         // TODO :  zoom box.
-        double x = (axesBounds[0] + axesBounds[2] * margins[0]) * 2 - 1;
-        double y = (1.0 - axesBounds[1] - axesBounds[3] * (1.0 - margins[3])) * 2 - 1;
-        double w = (1 - margins[0] - margins[1]) * axesBounds[2];
-        double h = (1 - margins[2] - margins[3]) * axesBounds[3];
+        double x = axesBounds[0] - 1 + (margins[0] * 2);
+        double y = axesBounds[1] - 1 + (margins[3] * 2);
+        double w = axesBounds[2] - margins[1] - margins[0];
+        double h = axesBounds[3] - margins[2] - margins[3];
+
+        if (axes.getIsoview()) {
+            double minSize = Math.min(w, h);
+            y += (h - minSize);
+            h = minSize;
+            x += (w - minSize);
+            w = minSize;
+        }
 
         return new Rectangle2D.Double(x, y, w, h);
     }
@@ -429,7 +437,7 @@ public class AxesDrawer {
         if (axes.getIsoview()) {
             Double[] axesBounds = axes.getAxesBounds();
             double minScale = Math.min(tmpX * axesBounds[2], tmpY * axesBounds[3]);
-            isoScale = TransformationFactory.getScaleTransformation(minScale / axesBounds[2] , minScale / axesBounds[3] , tmpZ);
+            isoScale = TransformationFactory.getScaleTransformation(minScale / axesBounds[2], minScale / axesBounds[3], tmpZ);
         } else {
             isoScale = TransformationFactory.getScaleTransformation(tmpX, tmpY, tmpZ);
         }