summaryrefslogtreecommitdiffstats
path: root/scilab/modules/graphics
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-03-16 15:19:56 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-03-16 15:19:56 +0100
commitdd80edde2b9fdba5eea8fef2d73d0bc9d4b97661 (patch)
tree782dd57d6fd73a61b1147aa306dcd0863919c13b /scilab/modules/graphics
parent0040387579b11cf982e2fbd59c05751a28971f47 (diff)
parentfcf094440a0507cc049d1be4444ff9a81b0af748 (diff)
downloadscilab-dd80edde2b9fdba5eea8fef2d73d0bc9d4b97661.zip
scilab-dd80edde2b9fdba5eea8fef2d73d0bc9d4b97661.tar.gz
Merge remote branch 'origin/5.2'
Diffstat (limited to 'scilab/modules/graphics')
-rw-r--r--scilab/modules/graphics/macros/TitleLabel.sci11
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_3289.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_3289.tst2
3 files changed, 2 insertions, 13 deletions
diff --git a/scilab/modules/graphics/macros/TitleLabel.sci b/scilab/modules/graphics/macros/TitleLabel.sci
index 59c9799..7070bf5 100644
--- a/scilab/modules/graphics/macros/TitleLabel.sci
+++ b/scilab/modules/graphics/macros/TitleLabel.sci
@@ -71,13 +71,6 @@ current_figure=gcf();
71cur_draw_mode = current_figure.immediate_drawing; 71cur_draw_mode = current_figure.immediate_drawing;
72current_figure.immediate_drawing = 'off'; 72current_figure.immediate_drawing = 'off';
73 73
74
75// set some defaults here
76// current_figure=gcf(); // already init. before
77// current_figure.color_map=jetcolormap(64); // bad choice -> init must be done somewhere else.
78
79colormap_size = size(current_figure.color_map,1);
80
81/////////////////////////////////// 74///////////////////////////////////
82//Global Property treatment // 75//Global Property treatment //
83//PropertyName and PropertyValue // 76//PropertyName and PropertyValue //
@@ -86,11 +79,7 @@ colormap_size = size(current_figure.color_map,1);
86// P1 is the position of the first PropertyName field. 79// P1 is the position of the first PropertyName field.
87Property = P1; 80Property = P1;
88 81
89current_surface = gce(); // get the newly created fac3d
90
91current_titlelabel=get(monaxe,titlelabel) 82current_titlelabel=get(monaxe,titlelabel)
92monaxe.axes_visible = ["on","on","on"]
93//current_surface.mark_size_unit='point';
94 83
95while ((Property <> 0) & (Property <= nv-1)) 84while ((Property <> 0) & (Property <= nv-1))
96 setTitleLabelProperty(ListArg(Property),ListArg(Property+1),current_titlelabel,current_figure,cur_draw_mode) 85 setTitleLabelProperty(ListArg(Property),ListArg(Property+1),current_titlelabel,current_figure,cur_draw_mode)
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_3289.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_3289.dia.ref
index 7315915..9ee543f 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_3289.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_3289.dia.ref
@@ -23,4 +23,4 @@ if or(c.links<>l([1 3])) then bugmes();quit;end
23if or(c.text<>["1";"3"]) then bugmes();quit;end 23if or(c.text<>["1";"3"]) then bugmes();quit;end
24delete(e.children(2)); 24delete(e.children(2));
25if or(c.links<>l([1])) then bugmes();quit;end 25if or(c.links<>l([1])) then bugmes();quit;end
26if or(c.text<>["1"]) then bugmes();quit;end 26if or(c.text<>["3"]) then bugmes();quit;end
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_3289.tst b/scilab/modules/graphics/tests/nonreg_tests/bug_3289.tst
index 7f5554f..8ee2f79 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_3289.tst
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_3289.tst
@@ -28,4 +28,4 @@ if or(c.text<>["1";"3"]) then pause,end
28 28
29delete(e.children(2)); 29delete(e.children(2));
30if or(c.links<>l([1])) then pause,end 30if or(c.links<>l([1])) then pause,end
31if or(c.text<>["1"]) then pause,end 31if or(c.text<>["3"]) then pause,end