* Bug #7828 fixed - Slight improvements in nicholschart.

Change-Id: Iefa81d7fe6aead1d90aa3f62f1490d6f40526321

diff --git a/scilab/CHANGES_5.5.X b/scilab/CHANGES_5.5.X
index c3646b3..913be8b 100644 (file)
--- a/scilab/CHANGES_5.5.X
+++ b/scilab/CHANGES_5.5.X
@@ -77,6 +77,8 @@ Bug fixes
 
 * Bug #7684 fixed - Introduction demo splitted in subsections.
 
+* Bug #7828 fixed - Slight improvements in nicholschart.
+
 * Bug #7927 fixed - Output "flag" in qmr function was not well documented.
 
 * Bug #8667 fixed - Handling of %nan in functions min,max,median is not correctly documented.

diff --git a/scilab/modules/cacsd/help/en_US/plot_display/nicholschart.xml b/scilab/modules/cacsd/help/en_US/plot_display/nicholschart.xml
index 2a7df97..8801dd6 100644 (file)
--- a/scilab/modules/cacsd/help/en_US/plot_display/nicholschart.xml
+++ b/scilab/modules/cacsd/help/en_US/plot_display/nicholschart.xml
@@ -17,7 +17,7 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Calling Sequence</title>
-        <synopsis>nicholschart([ modules [,args [,colors]]])</synopsis>
+        <synopsis>nicholschart([modules] [,args] [,colors])</synopsis>
         <synopsis/>
     </refsynopsisdiv>
     <refsection>

diff --git a/scilab/modules/cacsd/macros/nicholschart.sci b/scilab/modules/cacsd/macros/nicholschart.sci
index c239eed..69c972a 100644 (file)
--- a/scilab/modules/cacsd/macros/nicholschart.sci
+++ b/scilab/modules/cacsd/macros/nicholschart.sci
@@ -35,8 +35,8 @@ function nicholschart(modules,args,colors)
   mod_min=ax.data_bounds(1,2)
   mod_max=ax.data_bounds(2,2)
 
-  defaultArgs = [1 5 10 20 30 50 90 120 150 180]
-  defaultModules=[mod_min:20:-40 -12 -6  -3   -1 0 0.25 0.5  1  2.3 4  6  12];
+  defaultArgs = [1 2 5 10 20 30 50 70 90 120 140 160 180];
+  defaultModules=[mod_min:20:-35 -30 -25 -20 -15 -12 -9 -6  -3 -2 -1 -0.5 -0.25 -0.1 0 0.1 0.25 0.5  1  2.3 4  6  12];
 
 
   if exists("modules","local")==0 then

diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_7828.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_7828.dia.ref
new file mode 100644 (file)
index 0000000..84a2f4b
--- /dev/null
+++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_7828.dia.ref
@@ -0,0 +1,17 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- Non-regression test for bug 7828 -->
+//
+// <-- TEST WITH GRAPHIC -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=7828
+//
+// <-- Short Description -->
+// slight improvements in nicholschart.
+assert_checktrue(execstr("nicholschart()","errcatch")==0);

diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_7828.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_7828.tst
new file mode 100644 (file)
index 0000000..3ed0c4e
--- /dev/null
+++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_7828.tst
@@ -0,0 +1,18 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- Non-regression test for bug 7828 -->
+//
+// <-- TEST WITH GRAPHIC -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=7828
+//
+// <-- Short Description -->
+// slight improvements in nicholschart.
+
+assert_checktrue(execstr("nicholschart()","errcatch")==0);