Axes and figure should have same colormap index.

Change-Id: I936deab9353ec57670300d3bbb0eb328fbfb19d4

diff --git a/scilab/modules/gui/sci_gateway/c/sci_figure.c b/scilab/modules/gui/sci_gateway/c/sci_figure.c
index dc69542..fb531e9 100644 (file)
--- a/scilab/modules/gui/sci_gateway/c/sci_figure.c
+++ b/scilab/modules/gui/sci_gateway/c/sci_figure.c
@@ -291,7 +291,7 @@ int sci_figure(char * fname, unsigned long fname_len)
         }
         iFig = createFigure(bDockable, iMenubarType, iToolbarType, bDefaultAxes, bVisible);
         setGraphicObjectProperty(iFig, __GO_ID__, &iNewId, jni_int, 1);
-        setDefaultProperties(iFig, bDefaultAxes);
+        iAxes = setDefaultProperties(iFig, bDefaultAxes);
     }
 
     //set(iFig, iPos, iPos + 1)

diff --git a/scilab/modules/gui/tests/unit_tests/figure.dia.ref b/scilab/modules/gui/tests/unit_tests/figure.dia.ref
index 507bc5f..fa600d9 100644 (file)
--- a/scilab/modules/gui/tests/unit_tests/figure.dia.ref
+++ b/scilab/modules/gui/tests/unit_tests/figure.dia.ref
@@ -19,7 +19,7 @@ delete(f);
 f = figure("backgroundcolor", [0 1 0]);
 a = gca();
 assert_checkequal(f.background, 3);
-assert_checkequal(a.background, 33);
+assert_checkequal(a.background, f.background);
 assert_checkequal(a.filled, "off");
 assert_checkequal(size(f.color_map), [33, 3]);
 assert_checkequal(f.color_map(3,:), [0, 1, 0]);
@@ -28,7 +28,7 @@ delete(f);
 f = figure("backgroundcolor", [0.5 0.2 0.6]);
 a = gca();
 assert_checkequal(f.background, 34);
-assert_checkequal(a.background, 33);
+assert_checkequal(a.background, f.background);
 assert_checkequal(a.filled, "off");
 assert_checkequal(size(f.color_map), [34, 3]);
 assert_checkequal(f.color_map(34,:), [0.5 0.2 0.6]);

diff --git a/scilab/modules/gui/tests/unit_tests/figure.tst b/scilab/modules/gui/tests/unit_tests/figure.tst
index 07b7b21..2853a19 100644 (file)
--- a/scilab/modules/gui/tests/unit_tests/figure.tst
+++ b/scilab/modules/gui/tests/unit_tests/figure.tst
@@ -23,7 +23,7 @@ delete(f);
 f = figure("backgroundcolor", [0 1 0]);
 a = gca();
 assert_checkequal(f.background, 3);
-assert_checkequal(a.background, 33);
+assert_checkequal(a.background, f.background);
 assert_checkequal(a.filled, "off");
 assert_checkequal(size(f.color_map), [33, 3]);
 assert_checkequal(f.color_map(3,:), [0, 1, 0]);
@@ -33,7 +33,7 @@ delete(f);
 f = figure("backgroundcolor", [0.5 0.2 0.6]);
 a = gca();
 assert_checkequal(f.background, 34);
-assert_checkequal(a.background, 33);
+assert_checkequal(a.background, f.background);
 assert_checkequal(a.filled, "off");
 assert_checkequal(size(f.color_map), [34, 3]);
 assert_checkequal(f.color_map(34,:), [0.5 0.2 0.6]);