Bug 11801 fixed: Bug with isoview='on' on subplots

Change-Id: I40caba09c4c57e7cbfd388c43ed4a6887c8468e3

diff --git a/scilab/CHANGES_5.4.X b/scilab/CHANGES_5.4.X
index 60eed91..1587cb0 100644 (file)
--- a/scilab/CHANGES_5.4.X
+++ b/scilab/CHANGES_5.4.X
@@ -199,6 +199,8 @@ Bug fixes
 
 * Bug #11711 fixed - xclick and xgetmouse did not work under Mac OS X.
 
+* Bug #11801 fixed - Bug with isoview="on" on subplots.
+
 * Bug #11811 fixed - Fix a typo in the help page of Scinotes.
 
 * Bug #11814 fixed - Fix a typo in one of the titles of CACSD.

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 c8f2535..e0735dd 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
@@ -302,13 +302,15 @@ public class AxesDrawer {
         double w = (1 - margins[0] - margins[1]) * axesBounds[2];
         double h = (1 - margins[2] - margins[3]) * axesBounds[3];
 
-        if (axes.getIsoview()) {
-            double minSize = Math.min(w, h);
-            y += (h - minSize);
-            h = minSize;
-            x += (w - minSize);
-            w = minSize;
-        }
+        // Don't know what's the goal of this code (finally w=h=minSize, so why a square ???)
+        // Comment it: that fixes bug 11801.
+        /*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);
     }