summaryrefslogtreecommitdiffstats
path: root/scilab/modules/spreadsheet
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-12 11:10:06 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-12 11:10:06 +0100
commit10963c0a56109ddafb6f2f4a8dbdc925b00ac69c (patch)
tree9f8eefbac0a88917328855a3cf4c046f4e7ca719 /scilab/modules/spreadsheet
parentbc7b15143690a57f6ee6d6ec9401227e77b18db4 (diff)
parentc8b337d77b6d3f040afc6a76b9c607a838ae62dd (diff)
downloadscilab-10963c0a56109ddafb6f2f4a8dbdc925b00ac69c.zip
scilab-10963c0a56109ddafb6f2f4a8dbdc925b00ac69c.tar.gz
Merge remote branch 'origin/master' into textrendering
Conflicts: scilab/CHANGES_5.3.X scilab/configure scilab/configure.ac
Diffstat (limited to 'scilab/modules/spreadsheet')
-rw-r--r--scilab/modules/spreadsheet/Makefile.in1
-rw-r--r--scilab/modules/spreadsheet/help/en_US/excel2sci.xml37
-rw-r--r--scilab/modules/spreadsheet/macros/excel2sci.sci19
-rw-r--r--scilab/modules/spreadsheet/macros/sci2excel.sci23
-rw-r--r--scilab/modules/spreadsheet/tests/unit_tests/sci2excel.dia.ref15
-rw-r--r--scilab/modules/spreadsheet/tests/unit_tests/sci2excel.tst18
6 files changed, 1 insertions, 112 deletions
diff --git a/scilab/modules/spreadsheet/Makefile.in b/scilab/modules/spreadsheet/Makefile.in
index 521a8da..967b26f 100644
--- a/scilab/modules/spreadsheet/Makefile.in
+++ b/scilab/modules/spreadsheet/Makefile.in
@@ -242,6 +242,7 @@ LD = @LD@
242LDFLAGS = @LDFLAGS@ 242LDFLAGS = @LDFLAGS@
243LIBICONV = @LIBICONV@ 243LIBICONV = @LIBICONV@
244LIBINTL = @LIBINTL@ 244LIBINTL = @LIBINTL@
245LIBM = @LIBM@
245LIBOBJS = @LIBOBJS@ 246LIBOBJS = @LIBOBJS@
246LIBS = @LIBS@ 247LIBS = @LIBS@
247LIBTOOL = @LIBTOOL@ 248LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/spreadsheet/help/en_US/excel2sci.xml b/scilab/modules/spreadsheet/help/en_US/excel2sci.xml
deleted file mode 100644
index 3e2b134..0000000
--- a/scilab/modules/spreadsheet/help/en_US/excel2sci.xml
+++ /dev/null
@@ -1,37 +0,0 @@
1<?xml version="1.0" encoding="ISO-8859-1"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) ????-2008 - INRIA
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry version="5.0-subset Scilab" xml:id="excel2sci" xml:lang="en"
14 xmlns="http://docbook.org/ns/docbook"
15 xmlns:xlink="http://www.w3.org/1999/xlink"
16 xmlns:svg="http://www.w3.org/2000/svg"
17 xmlns:ns4="http://www.w3.org/1999/xhtml"
18 xmlns:mml="http://www.w3.org/1998/Math/MathML"
19 xmlns:db="http://docbook.org/ns/docbook">
20
21 <refnamediv>
22 <refname>excel2sci</refname>
23 <refpurpose>obsolete see read_csv</refpurpose>
24 </refnamediv>
25
26 <refsection>
27 <title>See Also</title>
28 <simplelist type="inline">
29 <member>
30 <link linkend="read_csv">read_csv</link>
31 </member>
32 <member>
33 <link linkend="write_csv">write_csv</link>
34 </member>
35 </simplelist>
36 </refsection>
37</refentry>
diff --git a/scilab/modules/spreadsheet/macros/excel2sci.sci b/scilab/modules/spreadsheet/macros/excel2sci.sci
deleted file mode 100644
index f5ddcde..0000000
--- a/scilab/modules/spreadsheet/macros/excel2sci.sci
+++ /dev/null
@@ -1,19 +0,0 @@
1
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2008 - INRIA
4//
5// This file must be used under the terms of the CeCILL.
6// This source file is licensed as described in the file COPYING, which
7// you should have received as part of this distribution. The terms
8// are also available at
9// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10
11function mat = excel2sci(fname, sep)
12 warnobsolete("read_csv", "5.3");
13
14 if argn(2)<2 then
15 sep=',';
16 end
17
18 mat = read_csv(fname, sep);
19endfunction
diff --git a/scilab/modules/spreadsheet/macros/sci2excel.sci b/scilab/modules/spreadsheet/macros/sci2excel.sci
deleted file mode 100644
index ad8038e..0000000
--- a/scilab/modules/spreadsheet/macros/sci2excel.sci
+++ /dev/null
@@ -1,23 +0,0 @@
1
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2008 - INRIA
4//
5// This file must be used under the terms of the CeCILL.
6// This source file is licensed as described in the file COPYING, which
7// you should have received as part of this distribution. The terms
8// are also available at
9// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10
11function sci2excel(var, fname, sep, dec)
12 warnobsolete("write_csv", "5.3");
13
14 if exists('sep','local') == 0 then
15 sep = ascii(9);
16 end
17
18 if exists('dec','local') == 0 then
19 dec = ',';
20 end
21
22 write_csv(var, fname, sep, dec);
23endfunction
diff --git a/scilab/modules/spreadsheet/tests/unit_tests/sci2excel.dia.ref b/scilab/modules/spreadsheet/tests/unit_tests/sci2excel.dia.ref
deleted file mode 100644
index 4d4eba2..0000000
--- a/scilab/modules/spreadsheet/tests/unit_tests/sci2excel.dia.ref
+++ /dev/null
@@ -1,15 +0,0 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2008 - DIGITEO - Allan CORNET
4//
5// This file is distributed under the same license as the Scilab package.
6// =============================================================================
7warning('off');
8ref1 = [ 0 1 2 3 4 5 6 7 8 9 ;
9 10 11 12 13 14 15 16 17 18 19 ;
10 20 21 22 23 24 25 26 27 28 29 ;
11 30 31 32 33 34 35 36 37 38 39 ;
12 40 41 42 43 44 45 46 47 48 49 ];
13sci2excel(ref1,TMPDIR+filesep()+'test.csv');
14res = excel2sci(TMPDIR+filesep()+'test.csv');
15if and(evstr(res)<>ref1) then bugmes();quit;end
diff --git a/scilab/modules/spreadsheet/tests/unit_tests/sci2excel.tst b/scilab/modules/spreadsheet/tests/unit_tests/sci2excel.tst
deleted file mode 100644
index 2a48203..0000000
--- a/scilab/modules/spreadsheet/tests/unit_tests/sci2excel.tst
+++ /dev/null
@@ -1,18 +0,0 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2008 - DIGITEO - Allan CORNET
4//
5// This file is distributed under the same license as the Scilab package.
6// =============================================================================
7
8warning('off');
9ref1 = [ 0 1 2 3 4 5 6 7 8 9 ;
10 10 11 12 13 14 15 16 17 18 19 ;
11 20 21 22 23 24 25 26 27 28 29 ;
12 30 31 32 33 34 35 36 37 38 39 ;
13 40 41 42 43 44 45 46 47 48 49 ];
14
15sci2excel(ref1,TMPDIR+filesep()+'test.csv');
16res = excel2sci(TMPDIR+filesep()+'test.csv');
17
18if and(evstr(res)<>ref1) then pause,end \ No newline at end of file