summaryrefslogtreecommitdiffstats
path: root/scilab/modules/graphics
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-03-08 09:28:07 +0100
committerAllan CORNET <allan.cornet@scilab.org>2010-03-08 09:28:07 +0100
commit8b7ac05e63459066060daee277f1a41d5b8905d3 (patch)
tree4279ccbffa71e2a0697c866471a0f02e12148c58 /scilab/modules/graphics
parent4c6a4300d0c9a42b71fb8572e6a656ee3bcb3bdf (diff)
downloadscilab-8b7ac05e63459066060daee277f1a41d5b8905d3.zip
scilab-8b7ac05e63459066060daee277f1a41d5b8905d3.tar.gz
MSDOS replaced by getos() == 'Windows'
Diffstat (limited to 'scilab/modules/graphics')
-rw-r--r--scilab/modules/graphics/macros/colordef.sci2
-rw-r--r--scilab/modules/graphics/macros/ged.sci6
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_612.tst2
-rw-r--r--scilab/modules/graphics/tests/unit_tests/xlfont.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/unit_tests/xlfont.tst2
5 files changed, 7 insertions, 7 deletions
diff --git a/scilab/modules/graphics/macros/colordef.sci b/scilab/modules/graphics/macros/colordef.sci
index b427b98..31330de 100644
--- a/scilab/modules/graphics/macros/colordef.sci
+++ b/scilab/modules/graphics/macros/colordef.sci
@@ -56,7 +56,7 @@ function colordef(varargin)
56 a.font_color=a.foreground; 56 a.font_color=a.foreground;
57 a.mark_foreground=a.foreground; 57 a.mark_foreground=a.foreground;
58 case 'black' 58 case 'black'
59 if MSDOS then c=0.2, else c=0.35,end 59 if getos() == 'Windows' then c=0.2, else c=0.35,end
60 f.color_map=[jetcolormap(64);[1 1 1]*c]; 60 f.color_map=[jetcolormap(64);[1 1 1]*c];
61 f.background=65;f.foreground=-2; 61 f.background=65;f.foreground=-2;
62 a.background=-1;a.foreground=-2; 62 a.background=-1;a.foreground=-2;
diff --git a/scilab/modules/graphics/macros/ged.sci b/scilab/modules/graphics/macros/ged.sci
index ea405f3..1c2c8b3 100644
--- a/scilab/modules/graphics/macros/ged.sci
+++ b/scilab/modules/graphics/macros/ged.sci
@@ -87,7 +87,7 @@ function ged(k,win)
87 TCL_EvalStr('set '+bluname+" "+string(f.color_map(i,3))); 87 TCL_EvalStr('set '+bluname+" "+string(f.color_map(i,3)));
88 end 88 end
89 89
90 TCL_SetVar("msdos",string(MSDOS)) // to know the OS 90 TCL_SetVar("msdos",string(getos() == 'Windows')) // to know the OS
91 // get the number of the window associated with ged 91 // get the number of the window associated with ged
92 TCL_SetVar("sciGedIsAlive",string(ged_cur_fig_handle.figure_id)) ; 92 TCL_SetVar("sciGedIsAlive",string(ged_cur_fig_handle.figure_id)) ;
93 TCL_SetVar("SCIHOME", SCIHOME) // to know the home directory to put temporary files 93 TCL_SetVar("SCIHOME", SCIHOME) // to know the home directory to put temporary files
@@ -109,7 +109,7 @@ function ged(k,win)
109 TCL_EvalStr('set '+bluname+" "+string(f.color_map(i,3))); 109 TCL_EvalStr('set '+bluname+" "+string(f.color_map(i,3)));
110 end 110 end
111 111
112 TCL_SetVar("msdos",string(MSDOS)) // to know the OS 112 TCL_SetVar("msdos",string(getos() == 'Windows')) // to know the OS
113 // get the number of the window associated with ged 113 // get the number of the window associated with ged
114 TCL_SetVar("sciGedIsAlive",string(ged_cur_fig_handle.figure_id)) ; 114 TCL_SetVar("sciGedIsAlive",string(ged_cur_fig_handle.figure_id)) ;
115 TCL_SetVar("SCIHOME", SCIHOME) // to know the home directory to put temporary files 115 TCL_SetVar("SCIHOME", SCIHOME) // to know the home directory to put temporary files
@@ -1547,7 +1547,7 @@ for i=1:size(f.color_map,1)
1547 TCL_EvalStr('set '+bluname+" "+string(f.color_map(i,3))); 1547 TCL_EvalStr('set '+bluname+" "+string(f.color_map(i,3)));
1548end 1548end
1549 1549
1550TCL_SetVar("msdos",string(MSDOS)) // to know the OS 1550TCL_SetVar("msdos",string(getos() == 'Windows')) // to know the OS
1551// get the number of the window associated with ged 1551// get the number of the window associated with ged
1552TCL_SetVar("sciGedIsAlive",string(ged_cur_fig_handle.figure_id)) ; 1552TCL_SetVar("sciGedIsAlive",string(ged_cur_fig_handle.figure_id)) ;
1553TCL_SetVar("SCIHOME", SCIHOME) // to know the home directory to put temporary files 1553TCL_SetVar("SCIHOME", SCIHOME) // to know the home directory to put temporary files
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_612.tst b/scilab/modules/graphics/tests/nonreg_tests/bug_612.tst
index 0896631..0c4f69c 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_612.tst
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_612.tst
@@ -22,7 +22,7 @@
22xset("wresize",0); 22xset("wresize",0);
23xset('wdim',2^16+3,5000); 23xset('wdim',2^16+3,5000);
24 24
25if ~MSDOS then 25if getos() <> 'Windows' then
26 resultLinux = xget("wdim"); 26 resultLinux = xget("wdim");
27 resultWindows = [ 65535. 5000.]; 27 resultWindows = [ 65535. 5000.];
28 if or(resultLinux <> resultWindows) then pause,end 28 if or(resultLinux <> resultWindows) then pause,end
diff --git a/scilab/modules/graphics/tests/unit_tests/xlfont.dia.ref b/scilab/modules/graphics/tests/unit_tests/xlfont.dia.ref
index 2d0726e..db0f5ac 100644
--- a/scilab/modules/graphics/tests/unit_tests/xlfont.dia.ref
+++ b/scilab/modules/graphics/tests/unit_tests/xlfont.dia.ref
@@ -23,7 +23,7 @@ xlfont('reset');
23afterresetfonts = xlfont(); 23afterresetfonts = xlfont();
24if ~and(initialfonts == afterresetfonts) then bugmes();quit;end 24if ~and(initialfonts == afterresetfonts) then bugmes();quit;end
25cd(TMPDIR); 25cd(TMPDIR);
26if MSDOS then 26if getos() == 'Windows' then
27 unix_w(jre_path()+"\bin\java.exe -cp "+SCI+"\modules\localization\tests\unit_tests CreateDir"); 27 unix_w(jre_path()+"\bin\java.exe -cp "+SCI+"\modules\localization\tests\unit_tests CreateDir");
28else 28else
29 unix_w(jre_path()+"/bin/java -classpath "+SCI+"/modules/localization/tests/unit_tests CreateDir"); 29 unix_w(jre_path()+"/bin/java -classpath "+SCI+"/modules/localization/tests/unit_tests CreateDir");
diff --git a/scilab/modules/graphics/tests/unit_tests/xlfont.tst b/scilab/modules/graphics/tests/unit_tests/xlfont.tst
index 835c3e9..950d0b5 100644
--- a/scilab/modules/graphics/tests/unit_tests/xlfont.tst
+++ b/scilab/modules/graphics/tests/unit_tests/xlfont.tst
@@ -34,7 +34,7 @@ if ~and(initialfonts == afterresetfonts) then pause,end
34 34
35cd(TMPDIR); 35cd(TMPDIR);
36 36
37if MSDOS then 37if getos() == 'Windows' then
38 unix_w(jre_path()+"\bin\java.exe -cp "+SCI+"\modules\localization\tests\unit_tests CreateDir"); 38 unix_w(jre_path()+"\bin\java.exe -cp "+SCI+"\modules\localization\tests\unit_tests CreateDir");
39else 39else
40 unix_w(jre_path()+"/bin/java -classpath "+SCI+"/modules/localization/tests/unit_tests CreateDir"); 40 unix_w(jre_path()+"/bin/java -classpath "+SCI+"/modules/localization/tests/unit_tests CreateDir");