Merge remote-tracking branch 'origin/5.5' 71/16771/1
Vincent COUVERT [Fri, 3 Jul 2015 08:31:39 +0000 (10:31 +0200)]
Change-Id: I2b0118b704748131e154ceb15e37145f585e04bc

100 files changed:
scilab/CHANGES_5.5.X
scilab/bin/scilab
scilab/m4/macosx.m4
scilab/modules/action_binding/locales/action_binding.pot
scilab/modules/api_scilab/locales/api_scilab.pot
scilab/modules/arnoldi/locales/arnoldi.pot
scilab/modules/atoms/locales/atoms.pot
scilab/modules/boolean/locales/boolean.pot
scilab/modules/cacsd/locales/cacsd.pot
scilab/modules/commons/locales/commons.pot
scilab/modules/compatibility_functions/locales/compatibility_functions.pot
scilab/modules/completion/locales/completion.pot
scilab/modules/console/locales/console.pot
scilab/modules/console/src/java/org/scilab/modules/console/utils/ScilabSpecialTextUtilities.java
scilab/modules/core/locales/core.pot
scilab/modules/data_structures/locales/data_structures.pot
scilab/modules/demo_tools/locales/demo_tools.pot
scilab/modules/development_tools/locales/development_tools.pot
scilab/modules/differential_equations/locales/differential_equations.pot
scilab/modules/dynamic_link/locales/dynamic_link.pot
scilab/modules/elementary_functions/locales/elementary_functions.pot
scilab/modules/external_objects/locales/external_objects.pot
scilab/modules/external_objects_java/help/pt_BR/addchapter.sce
scilab/modules/external_objects_java/help/ru_RU/addchapter.sce
scilab/modules/external_objects_java/locales/external_objects_java.pot
scilab/modules/fftw/locales/fftw.pot
scilab/modules/fileio/locales/fileio.pot
scilab/modules/functions/locales/functions.pot
scilab/modules/genetic_algorithms/locales/genetic_algorithms.pot
scilab/modules/graph/locales/graph.pot
scilab/modules/graphic_export/locales/graphic_export.pot
scilab/modules/graphic_objects/locales/graphic_objects.pot
scilab/modules/graphics/help/en_US/axes_operations/zoom_auto.xml [new file with mode: 0644]
scilab/modules/graphics/locales/graphics.pot
scilab/modules/graphics/macros/zoom_auto.sci [new file with mode: 0644]
scilab/modules/graphics/tests/nonreg_tests/bug_13807.dia.ref [new file with mode: 0644]
scilab/modules/graphics/tests/nonreg_tests/bug_13807.tst [new file with mode: 0644]
scilab/modules/graphics/tests/nonreg_tests/bug_13834.dia.ref [new file with mode: 0644]
scilab/modules/graphics/tests/nonreg_tests/bug_13834.tst [new file with mode: 0644]
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/etc/graphics_menubar.xml
scilab/modules/gui/etc/graphics_toolbar.xml
scilab/modules/gui/locales/gui.pot
scilab/modules/hdf5/locales/hdf5.pot
scilab/modules/helptools/locales/helptools.pot
scilab/modules/history_browser/locales/history_browser.pot
scilab/modules/history_manager/locales/history_manager.pot
scilab/modules/integer/locales/integer.pot
scilab/modules/interpolation/locales/interpolation.pot
scilab/modules/io/locales/io.pot
scilab/modules/jvm/locales/jvm.pot
scilab/modules/linear_algebra/locales/linear_algebra.pot
scilab/modules/localization/locales/localization.pot
scilab/modules/m2sci/locales/m2sci.pot
scilab/modules/matio/locales/matio.pot
scilab/modules/mexlib/locales/mexlib.pot
scilab/modules/modules_manager/locales/modules_manager.pot
scilab/modules/mpi/locales/mpi.pot
scilab/modules/optimization/locales/optimization.pot
scilab/modules/output_stream/locales/output_stream.pot
scilab/modules/overloading/locales/overloading.pot
scilab/modules/overloading/macros/%r_n_r.sci
scilab/modules/overloading/macros/%r_o_r.sci
scilab/modules/overloading/tests/nonreg_tests/bug_13924.dia.ref [new file with mode: 0644]
scilab/modules/overloading/tests/nonreg_tests/bug_13924.tst [new file with mode: 0644]
scilab/modules/parallel/locales/parallel.pot
scilab/modules/parameters/locales/parameters.pot
scilab/modules/polynomials/locales/polynomials.pot
scilab/modules/preferences/locales/preferences.pot
scilab/modules/randlib/locales/randlib.pot
scilab/modules/renderer/locales/renderer.pot
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/DrawerVisitor.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/axes/AxesDrawer.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/text/TextManager.java
scilab/modules/scicos/locales/scicos.pot
scilab/modules/scicos_blocks/locales/scicos_blocks.pot
scilab/modules/scicos_blocks/macros/NonLinear/EXPBLK_f.sci
scilab/modules/scicos_blocks/macros/NonLinear/POWBLK_f.sci
scilab/modules/scinotes/etc/XConfiguration-scinotes.xml
scilab/modules/scinotes/locales/scinotes.pot
scilab/modules/signal_processing/locales/signal_processing.pot
scilab/modules/simulated_annealing/locales/simulated_annealing.pot
scilab/modules/sound/locales/sound.pot
scilab/modules/sparse/locales/sparse.pot
scilab/modules/special_functions/locales/special_functions.pot
scilab/modules/spreadsheet/locales/spreadsheet.pot
scilab/modules/startup/locales/startup.pot
scilab/modules/statistics/locales/statistics.pot
scilab/modules/string/locales/string.pot
scilab/modules/symbolic/locales/symbolic.pot
scilab/modules/tclsci/locales/tclsci.pot
scilab/modules/time/locales/time.pot
scilab/modules/types/locales/types.pot
scilab/modules/ui_data/locales/ui_data.pot
scilab/modules/umfpack/locales/umfpack.pot
scilab/modules/windows_tools/locales/windows_tools.pot
scilab/modules/xcos/demos/ModelicaBlocks/Rotational_system.zcos
scilab/modules/xcos/locales/xcos.pot
scilab/modules/xml/locales/xml.pot

index 8a07333..93dedf0 100644 (file)
@@ -4,14 +4,24 @@
 Scilab Bug Fixes
 ================
 
+* Bug #8990 fixed - zoom_auto feature was missing on the plot toolbar.
+
+* Bug #13807 fixed - Invalid margins were computed when figure was not visible.
+
 * Bug #13829 fixed - mean and sum functions returned wrong results for hypermatrices.
 
+* Bug #13834 fixed - Drawing a high number of strings in a figure generated a Java exceptions.
+
 * Bug #13854 fixed - On some operating systems, SciNotes did not initialize a new document at startup.
 
 * Bug #13866 fixed - There were some issues with FFTW3 library.
 
 * Bug #13881 fixed - datatipRemoveAll did not work.
 
+* Bug #13924 fixed - rationals r1==r2 and r1~=r2 might sometimes be wrong.
+
+* Bug #13925 fixed - SciNotes used the wrong paired bracket highlight style.
+
 
 
                      Changes between version 5.5.1 and 5.5.2
index 48ae1f4..8fba34d 100755 (executable)
@@ -713,7 +713,6 @@ set_macox_specific_path()
 
     PATH_TO_SPECIFIC_10_10=$SCIBINARYBASE/lib/thirdparty/10.10/
     PATH_TO_SPECIFIC_10_6=$SCIBINARYBASE/lib/thirdparty/10.6/
-    PATH_TO_SPECIFIC_10_5=$SCIBINARYBASE/lib/thirdparty/10.5/
 
     case $macosxMajorVersion in
         10)
@@ -724,17 +723,10 @@ set_macox_specific_path()
                     DYLD_LIBRARY_PATH=$PATH_TO_SPECIFIC_10_10${DYLD_LIBRARY_PATH+:$DYLD_LIBRARY_PATH}
                     ;;
                 6)
-                    # the iconv lib fails under 10.7, just declare it for 10.5 & 10.6
+                    # the iconv lib fails under 10.7, just declare it for 10.6
                     LD_LIBRARY_PATH=$PATH_TO_SPECIFIC_10_6${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
                     DYLD_LIBRARY_PATH=$PATH_TO_SPECIFIC_10_6${DYLD_LIBRARY_PATH+:$DYLD_LIBRARY_PATH}
                     ;;
-                 5)
-                    # the iconv lib fails under 10.7, just declare it for 10.5 & 10.6
-                    LD_LIBRARY_PATH=$PATH_TO_SPECIFIC_10_6${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
-                    DYLD_LIBRARY_PATH=$PATH_TO_SPECIFIC_10_6${DYLD_LIBRARY_PATH+:$DYLD_LIBRARY_PATH}
-                    LD_LIBRARY_PATH=$PATH_TO_SPECIFIC_10_5${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
-                    DYLD_LIBRARY_PATH=$PATH_TO_SPECIFIC_10_5${DYLD_LIBRARY_PATH+:$DYLD_LIBRARY_PATH}
-                    ;;
             esac
             ;;
     esac
@@ -762,19 +754,6 @@ check_macosx_version()
                         osascript $BINPATH/checkmacosx.applescript $macosxVersion "10.6.5 (Snow Leopard) or newer system" || exit 128
                     fi
                     ;;
-                 5)
-                     if test $macosxBuildVersion -le 7; then
-                         # Version <= 10.5.8
-                         osascript $BINPATH/checkmacosx.applescript $macosxVersion "10.5.8 (Leopard) or newer system" || exit 128
-                     fi
-                     # Check if the default java is not 1.5 (magic)
-                     VERSION=$(/usr/libexec/java_home -v 1.5|grep 1.5.0)
-                     if test "$VERSION"; then
-                         open /Applications/Utilities/Java\ Preferences.app/ &
-                         osascript $BINPATH/checkmacosx.applescript $macosxVersion "Java 6 or newer. Please disable any version of Java 1.5 in the Java Preferences menu. An other workaround is to rename /System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Libraries/libjava.jnilib to libjava.jnilib_" || exit 128
-                     fi
-
-                     ;;
                 *)
                     osascript $BINPATH/checkmacosx.applescript $macosxVersion "10.6.5 (Snow Leopard) or newer system" || exit 128
                     ;;
index ada4b8f..fbec1cf 100644 (file)
@@ -20,11 +20,8 @@ AC_DEFUN([AC_GET_MACOSX_VERSION],[
          10.6*)
               AC_MSG_RESULT([Mac OS X 10.6 - Snow Leopard.])
          ;;
-         *10.5*)
-              AC_MSG_RESULT([Mac OS X 10.5 - Leopard.])
-         ;;
          *)
-              AC_MSG_ERROR([MacOSX 10.5 to 10.10 are needed. Found $macosx_version])
+              AC_MSG_ERROR([MacOSX 10.6 to 10.10 are needed. Found $macosx_version])
          ;;
-        esac
+    esac
 ])
index f07d2d1..316ccef 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/cpp/sci_notify.cpp, line: 46
 # File: sci_gateway/cpp/sci_notify.cpp, line: 54
index 5a9b03c..7cda640 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: src/cpp/api_boolean.cpp, line: 35
 # File: src/cpp/api_boolean_sparse.cpp, line: 33
index 9e4eacc..7fd40a0 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_dnaupd.c, line: 98
 # File: sci_gateway/c/sci_dnaupd.c, line: 116
@@ -489,7 +489,6 @@ msgstr ""
 
 #
 # File: macros/eigs.sci, line: 84
-# File: macros/eigs.sci, line: 156
 #, c-format
 msgid ""
 "%s: Wrong type for input argument: If A is a matrix, use opts with tol, "
@@ -497,6 +496,14 @@ msgid ""
 msgstr ""
 
 #
+# File: macros/eigs.sci, line: 156
+#, c-format
+msgid ""
+"%s: Wrong type for input argument: If A is a function, use opts with tol, "
+"maxiter, ncv, resid, cholB, issym"
+msgstr ""
+
+#
 # File: macros/eigs.sci, line: 274
 #, c-format
 msgid "%s: Wrong type for input argument #%d: A string expected.\n"
index cd1d87c..5bf3f8d 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: macros/atomsAutoload.sci, line: 47
 # File: macros/atomsLoad.sci, line: 38
index 74ae6cc..bd6ca1a 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_and.c, line: 40
 # File: sci_gateway/c/sci_and.c, line: 58
index 74cd404..5fdce73 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_contr.c, line: 72
 # File: sci_gateway/c/sci_contr.c, line: 78
index 590a868..355eeed 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: src/java/org/scilab/modules/commons/xml/ScilabXMLUtilities.java, line: 59
 msgid "Could not save file: "
index 8fc42a1..ef80525 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: macros/%b_cumprod.sci, line: 31
 # File: macros/%b_cumsum.sci, line: 31
index 159c3e7..ea06689 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_completion.c, line: 43
 # File: sci_gateway/c/sci_completion.c, line: 83
index 117d189..0d8f9cf 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_clc.c, line: 41
 # File: sci_gateway/c/sci_lines.c, line: 206
index 8373955..50c3a95 100644 (file)
@@ -67,6 +67,13 @@ public final class ScilabSpecialTextUtilities {
         if (icon == null) {
             // Shortcut when we are sure text is
             // neither Latex nor MathML
+            try {
+                //we set a void icon to erase an eventual latex or html one
+                setIcon(component, icon);
+            } catch (InvocationTargetException e) {
+                e.printStackTrace();
+            }
+
             return false;
         }
 
index f58c4d2..b6591a0 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: examples/capi/call_scifunction/sci_call_scifunc.c, line: 37
 # File: examples/capi/call_scifunction/sci_call_scifunc.c, line: 55
index 8bb91fd..1bf8ae2 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_mlist.c, line: 35
 # File: sci_gateway/c/sci_tlist.c, line: 35
index c87671e..5816184 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: macros/add_demo.sci, line: 38
 #, c-format
index b1181a4..eaba4b1 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: macros/assert/assert_checkalmostequal.sci, line: 16
 # File: macros/assert/assert_checkfilesequal.sci, line: 15
@@ -425,13 +425,13 @@ msgid "%s is not an installed module or toolbox"
 msgstr ""
 
 #
-# File: macros/test_run.sci, line: 1087
+# File: macros/test_run.sci, line: 1093
 #, c-format
 msgid "The ref file (%s) doesn't exist"
 msgstr ""
 
 #
-# File: macros/test_run.sci, line: 1233
+# File: macros/test_run.sci, line: 1239
 #, c-format
 msgid ""
 "The file '%s' is not following the XUnit XML format. Root tag expected "
index e83f4fb..9525816 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: demos/bike/bike.dem.gateway.sce, line: 10
 msgid "Unstable trajectory"
index 4ea2a87..4794ff7 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_addinter.c, line: 46
 # File: sci_gateway/c/sci_addinter.c, line: 58
index 115dda1..151aa34 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_base2dec.c, line: 41
 # File: sci_gateway/c/sci_base2dec.c, line: 54
index 5ae352d..94dfc65 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: includes/ScilabAbstractEnvironmentException.hxx, line: 108
 msgid "Exception thrown in file"
index 4b7a769..ea2fb9a 100644 (file)
@@ -7,4 +7,4 @@
 // are also available at
 // http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
 
-add_help_chapter("Java from Scilab",SCI+"/modules/external_objects_java/help/ru_RU",%T);
+add_help_chapter("Java from Scilab",SCI+"/modules/external_objects_java/help/pt_BR",%T);
index 2b0b9c8..bfe5c77 100644 (file)
@@ -7,4 +7,4 @@
 // are also available at
 // http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
 
-add_help_chapter("Java from Scilab",SCI+"/modules/external_objects_java/help/ja_JP",%T);
+add_help_chapter("Java из Scilab",SCI+"/modules/external_objects_java/help/ru_RU",%T);
index c0ff239..3d94971 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/cpp/sci_jconvMatrixMethod.cpp, line: 35
 #, c-format
index 7e0fe9c..e581e2b 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/gw_fftw.c, line: 49
 #, c-format
index 1310280..6af12f4 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_basename.c, line: 45
 # File: sci_gateway/c/sci_basename.c, line: 58
index 958a782..6aeef96 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_exec.c, line: 52
 # File: sci_gateway/c/sci_exec.c, line: 60
index dc8b70a..d31f894 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: demos/GAIsing2ddemo.sce, line: 63
 # File: demos/GAdemo.sce, line: 86
index 20e4471..6a78dd8 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: src/java/org/scilab/modules/graph/utils/ScilabGraphMessages.java, line: 22
 msgid "Copy"
index 0829738..661435b 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/gw_graphic_export.c, line: 84
 # File: src/nographic_export/nographic_export.c, line: 26
index 011ce04..c4b54a1 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: src/java/org/scilab/modules/graphic_objects/datatip/Datatip.java, line: 359
 #, c-format
diff --git a/scilab/modules/graphics/help/en_US/axes_operations/zoom_auto.xml b/scilab/modules/graphics/help/en_US/axes_operations/zoom_auto.xml
new file mode 100644 (file)
index 0000000..f9cf916
--- /dev/null
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ *
+ * This help file was generated from zoom_auto.sci using help_from_sci().
+ *
+ -->
+
+<refentry version="5.0-subset Scilab" xml:id="zoom_auto" xml:lang="en"
+          xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg"
+          xmlns:ns3="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:scilab="http://www.scilab.org"
+          xmlns:db="http://docbook.org/ns/docbook">
+    
+    <refnamediv>
+        <refname>zoom_auto</refname>
+        <refpurpose>Zoom automatically to the visible values of all axes of the figure</refpurpose>
+    </refnamediv>
+    
+    
+    <refsynopsisdiv>
+        <title>Calling Sequence</title>
+        <synopsis>
+            zoom_auto()
+            zoom_auto(h)
+            
+        </synopsis>
+    </refsynopsisdiv>
+    
+    <refsection>
+        <title>Parameters</title>
+        <variablelist>
+            <varlistentry>
+                <term>h:</term>
+                <listitem>
+                    <para> A Figure or Axes handle to zoom automatically</para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    
+    <refsection>
+        <title>Description</title>
+        <para>
+            This function update the zoom_box of all axes of the figure when there is
+            some zoom applied to it or update the data bounds otherwise. After the call
+            the user will be able to view all visible data even if mis-configured
+            something.
+        </para>
+        <para>
+        </para>
+    </refsection>
+    
+    <refsection>
+        <title>Examples</title>
+        <programlisting role="example"><![CDATA[
+plot3d();
+a=gca();
+// hide some data to the user
+a.data_bounds = [-1 -1 -0.5 ; 1 1 0.5]
+sleep(1000)
+// let the user view the whole dataset
+zoom_auto()
+
+   ]]></programlisting>
+    </refsection>
+    
+    <refsection>
+        <title>See also</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="zoom_rect">zoom_rect</link>
+            </member>
+            <member>
+                <link linkend="unzoom">unzoom</link>
+            </member>
+            <member>
+                <link linkend="axes_properties">axes_properties</link>
+            </member>
+        </simplelist>
+    </refsection>
+    
+    <refsection>
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.5.3</revnumber>
+                <revremark>
+                    Function <function>zoom_auto</function> introduced.
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
+</refentry>
index 96867ca..53e9a14 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/gw_graphics.c, line: 134
 # File: src/nographics/nographics.c, line: 83
@@ -3149,6 +3149,7 @@ msgstr ""
 # File: macros/fac3d.sci, line: 41
 # File: macros/fac3d1.sci, line: 43
 # File: macros/getcolor.sci, line: 38
+# File: macros/zoom_auto.sci, line: 36
 #, c-format
 msgid "%s: Wrong number of input arguments: %d to %d expected.\n"
 msgstr ""
@@ -3717,14 +3718,14 @@ msgid "Left click on a curve to create a datatip, right opens contextual menu"
 msgstr ""
 
 #
-# File: macros/datatips/datatipRemoveAll.sci, line: 16
+# File: macros/datatips/datatipRemoveAll.sci, line: 17
 #, c-format
 msgid ""
 "%s: Wrong type for input argument #%d: an array of graphic handle expected.\n"
 msgstr ""
 
 #
-# File: macros/datatips/datatipRemoveAll.sci, line: 28
+# File: macros/datatips/datatipRemoveAll.sci, line: 29
 #, c-format
 msgid ""
 "%s: Wrong value for input argument #%d: the handles must have the same "
@@ -3732,7 +3733,7 @@ msgid ""
 msgstr ""
 
 #
-# File: macros/datatips/datatipRemoveAll.sci, line: 33
+# File: macros/datatips/datatipRemoveAll.sci, line: 34
 #, c-format
 msgid ""
 "%s: Wrong type for input argument #%d: handle on axes or axes children "
@@ -4502,3 +4503,15 @@ msgstr ""
 #, c-format
 msgid "%s: Wrong value given for %s."
 msgstr ""
+
+#
+# File: macros/zoom_auto.sci, line: 43
+#, c-format
+msgid "%s: Wrong type for argument %d: a handle expected.\n"
+msgstr ""
+
+#
+# File: macros/zoom_auto.sci, line: 46
+#, c-format
+msgid "%s: Wrong size for input argument #%d: a handle expected.\n"
+msgstr ""
diff --git a/scilab/modules/graphics/macros/zoom_auto.sci b/scilab/modules/graphics/macros/zoom_auto.sci
new file mode 100644 (file)
index 0000000..432e27f
--- /dev/null
@@ -0,0 +1,211 @@
+function zoom_auto(h)
+    // Zoom automatically to the visible values of all axes of the figure
+    //
+    // Calling Sequence
+    //   zoom_auto()
+    //   zoom_auto(h)
+    //
+    // Parameters
+    // h: A Figure or Axes handle to zoom automatically
+    //
+    // Description
+    // This function update the zoom_box of all axes of the figure when there is
+    // some zoom applied to it or update the data bounds otherwise. After the call
+    // the user will be able to view all visible data even if mis-configured
+    // something.
+    //
+    // Examples
+    // plot3d();
+    // a=gca();
+    // // hide some data to the user
+    // a.data_bounds = [-1 -1 -0.5 ; 1 1 0.5]
+    // sleep(1000)
+    // // let the user view the whole dataset
+    // zoom_auto()
+    //
+    // See also
+    //  zoom_rect
+    //  unzoom
+    //  axes_properties
+    //
+    // Authors
+    //  Clement DAVID - Scilab Enterprises
+
+    rhs=argn(2);
+    if rhs>1 then
+        error(msprintf(gettext("%s: Wrong number of input arguments: %d to %d expected.\n"), "zoom_auto", 0, 1));
+    end
+
+    if (rhs == 0) then
+        h=gcf();
+    end
+    if typeof(h)<>"handle" then
+        error(sprintf(gettext("%s: Wrong type for argument %d: a handle expected.\n"), "zoom_auto", 1));
+    end
+    if size(h, "*")<>1 then
+        error(sprintf(gettext("%s: Wrong size for input argument #%d: a handle expected.\n"), "zoom_auto" , 1));
+    end
+
+    visit(h, [0 0 0 ; 0 0 0])
+endfunction
+
+function [bounds]=visit(e, bounds)
+    if isempty(e) then
+        pause,
+    end
+    execstr("bounds=visit"+e.Type+"(e, bounds);");
+endfunction
+
+function [bounds]=visitFigure(e, bounds)
+    for i=1:length(e.children)
+        a=e.children(i);
+        bounds = visit(a, bounds);
+
+        if (a.zoom_state == "off") then
+            a.data_bounds=bounds;
+        else
+            // the weird definition of zoom_box enforce us to perfom a projection
+            M=[1 0 0 0 0 0 ;..
+            0 0 1 0 0 0 ;..
+            0 1 0 0 0 0 ;..
+            0 0 0 1 0 0 ;..
+            0 0 0 0 1 0 ;..
+            0 0 0 0 0 1 ];
+            a.zoom_box= M * bounds(:);
+        end
+    end
+endfunction
+
+function [bounds]=visitAxes(e, bounds)
+    children = e.children;
+    for i=1:length(children)
+        bounds = visit(children(i), bounds);
+    end
+endfunction
+
+function [bounds]=visitCompound(e, bounds)
+    children = e.children;
+    for i=1:length(children)
+        bounds = visit(children(i), bounds);
+    end
+endfunction
+
+function [bounds]=visitAxis(e, bounds)
+    bounds(1,1)=min([a1.xtics_coord , bounds(1,1)]);
+    bounds(2,1)=max([a1.xtics_coord , bounds(2,1)]);
+    bounds(1,2)=min([a1.ytics_coord , bounds(1,2)]);
+    bounds(2,2)=max([a1.ytics_coord , bounds(2,2)]);
+endfunction
+
+function [bounds]=visitPolyline(e, bounds)
+    data = e.data;
+
+    bounds(1,1)=min([data(:,1) ; bounds(1,1)]);
+    bounds(2,1)=max([data(:,1) ; bounds(2,1)]);
+    bounds(1,2)=min([data(:,2) ; bounds(1,2)]);
+    bounds(2,2)=max([data(:,2) ; bounds(2,2)]);
+    if (size(data,"c") > 2) then
+        bounds(1,3)=min([data(:,3) ; bounds(1,3)]);
+        bounds(2,3)=max([data(:,3) ; bounds(2,3)]);
+    end
+endfunction
+
+function [bounds]=visitArc(e, bounds)
+    data = e.data;
+
+    bounds(1,1)=min([data(1) ; bounds(1,1)]);
+    bounds(2,1)=max([data(1)+data(3) ; bounds(2,1)]);
+    bounds(1,2)=min([data(2)-data(4) ; bounds(1,2)]);
+    bounds(2,2)=max([data(2) ; bounds(2,2)]);
+endfunction
+
+function [bounds]=visitRectangle(e, bounds)
+    data = e.data;
+
+    bounds(1,1)=min([data(1) ; bounds(1,1)]);
+    bounds(2,1)=max([data(1)+data(3) ; bounds(2,1)]);
+    bounds(1,2)=min([data(2)-data(4) ; bounds(1,2)]);
+    bounds(2,2)=max([data(2) ; bounds(2,2)]);
+endfunction
+
+function [bounds]=visitSurface(e, bounds)
+    data = e.data;
+
+    bounds(1,1)=min([min(data.x) ; bounds(1,1)]);
+    bounds(2,1)=max([max(data.x) ; bounds(2,1)]);
+    bounds(1,2)=min([min(data.y) ; bounds(1,2)]);
+    bounds(2,2)=max([max(data.y) ; bounds(2,2)]);
+    bounds(1,3)=min([min(data.z) ; bounds(1,3)]);
+    bounds(2,3)=max([max(data.z) ; bounds(2,3)]);
+endfunction
+
+function [bounds]=visitFac3d(e, bounds)
+    [bounds]=visitSurface(e, bounds)
+endfunction
+
+function [bounds]=visitPlot3d(e, bounds)
+    [bounds]=visitSurface(e, bounds)
+endfunction
+
+function [bounds]=visitFec(e, bounds)
+    data = e.data;
+
+    // TODO: Fec zoom behavior is not clear to me, should be reviewed carefully
+    bounds(1,1)=min([data(:,2) ; bounds(1,1)]);
+    bounds(2,1)=max([data(:,2) ; bounds(2,1)]);
+    bounds(1,2)=min([data(:,1) ; bounds(1,2)]);
+    bounds(2,2)=max([data(:,1) ; bounds(2,2)]);
+endfunction
+
+function [bounds]=visitGrayplot(e, bounds)
+    [bounds]=visitSurface(e, bounds)
+endfunction
+
+function [bounds]=visitMatplot(e, bounds)
+    data = e.rect;
+
+    bounds(1,1)=min([data(1) ; bounds(1,1)]);
+    bounds(2,1)=max([data(3) ; bounds(2,1)]);
+    bounds(1,2)=min([data(2) ; bounds(1,2)]);
+    bounds(2,2)=max([data(4) ; bounds(2,2)]);
+endfunction
+
+function [bounds]=visitSegs(e, bounds)
+    data = e.data;
+
+    bounds(1,1)=min([data(:,1) ; bounds(1,1)]);
+    bounds(2,1)=max([data(:,1) ; bounds(2,1)]);
+    bounds(1,2)=min([data(:,2) ; bounds(1,2)]);
+    bounds(2,2)=max([data(:,2) ; bounds(2,2)]);
+    if (size(data,"c") > 2) then
+        bounds(1,3)=min([data(:,3) ; bounds(1,3)]);
+        bounds(2,3)=max([data(:,3) ; bounds(2,3)]);
+    end
+endfunction
+
+function [bounds]=visitChamp(e, bounds)
+    data = e.data;
+
+    bounds(1,1)=min([data.x ; bounds(1,1)]);
+    bounds(2,1)=max([data.x ; bounds(2,1)]);
+    bounds(1,2)=min([data.y ; bounds(1,2)]);
+    bounds(2,2)=max([data.y ; bounds(2,2)]);
+endfunction
+
+function [bounds]=visitText(e, bounds)
+    data = e.data;
+
+    bounds(1,1)=min([data(1) ; bounds(1,1)]);
+    bounds(1,2)=min([data(2) ; bounds(1,2)]);
+    if (size(data,"c") > 2) then
+        bounds(1,3)=min([data(3) ; bounds(1,3)]);
+    end
+endfunction
+
+function [bounds]=visitLegend(e, bounds)
+    // TODO: implement something ; it might not be possible at all
+endfunction
+
+function [bounds]=visitLight(e, bounds)
+    // nothing to do, a light is always visible
+endfunction
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_13807.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_13807.dia.ref
new file mode 100644 (file)
index 0000000..1526812
--- /dev/null
@@ -0,0 +1,49 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2015 - Scilab Enterprises - Vincent COUVERT
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- TEST WITH GRAPHIC -->
+// <-- Non-regression test for bug 13807 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/13807
+//
+// <-- Short Description -->
+// Invalid margins when the visibility of figure was to off
+fig = figure("figure_name", "TEST MARGINS", ...
+"dockable", "off", ...
+"axes_size", [950,550], ...
+"infobar_visible", "off", ...
+"toolbar", "none", ...
+"menubar_visible", "on", ...
+"menubar", "none", ...
+"default_axes", "off", ...
+"layout", "border", ...
+"visible", "off");
+f = uicontrol(fig, "style", "frame", ...
+"layout", "gridbag");
+f1 = uicontrol(f, "style", "frame", ...
+"layout", "gridbag", ...
+"constraints", createConstraints("gridbag", [1 1 1 1], [1 1], "both", "left"));
+a1 = newaxes(f1);
+//a1.auto_margins="off";
+a1.filled = "off";
+a1.tag = "axe";
+f2 = uicontrol(f, "style", "frame", ...
+"layout", "gridbag", ...
+"constraints", createConstraints("gridbag", [1 2 1 1], [1 1], "horizontal", "left"));
+uicontrol(f2, "style", "text", ...
+"string", "test", ...
+"layout", "gridbag", ...
+"constraints", createConstraints("gridbag", [1 1 1 1], [1 1], "none", "left"));
+sca(a1);
+plot2d(1:10, 1:10);
+a1.tight_limits = "on";
+a1.x_label.text = "Time (s)";
+a1.x_label.font_size = 2;
+a1.x_location = "top";
+legend("text", -1);
+fig.visible="on";
+// Check that the margins ont the top are visually correct.
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_13807.tst b/scilab/modules/graphics/tests/nonreg_tests/bug_13807.tst
new file mode 100644 (file)
index 0000000..c0fd853
--- /dev/null
@@ -0,0 +1,58 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2015 - Scilab Enterprises - Vincent COUVERT
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- TEST WITH GRAPHIC -->
+
+// <-- Non-regression test for bug 13807 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/13807
+//
+// <-- Short Description -->
+// Invalid margins when the visibility of figure was to off
+
+fig = figure("figure_name", "TEST MARGINS", ...
+"dockable", "off", ...
+"axes_size", [950,550], ...
+"infobar_visible", "off", ...
+"toolbar", "none", ...
+"menubar_visible", "on", ...
+"menubar", "none", ...
+"default_axes", "off", ...
+"layout", "border", ...
+"visible", "off");
+
+f = uicontrol(fig, "style", "frame", ...
+"layout", "gridbag");
+
+f1 = uicontrol(f, "style", "frame", ...
+"layout", "gridbag", ...
+"constraints", createConstraints("gridbag", [1 1 1 1], [1 1], "both", "left"));
+a1 = newaxes(f1);
+//a1.auto_margins="off";
+a1.filled = "off";
+a1.tag = "axe";
+
+f2 = uicontrol(f, "style", "frame", ...
+"layout", "gridbag", ...
+"constraints", createConstraints("gridbag", [1 2 1 1], [1 1], "horizontal", "left"));
+uicontrol(f2, "style", "text", ...
+"string", "test", ...
+"layout", "gridbag", ...
+"constraints", createConstraints("gridbag", [1 1 1 1], [1 1], "none", "left"));
+
+sca(a1);
+plot2d(1:10, 1:10);
+a1.tight_limits = "on";
+a1.x_label.text = "Time (s)";
+a1.x_label.font_size = 2;
+a1.x_location = "top";
+legend("text", -1);
+fig.visible="on";
+
+// Check that the margins ont the top are visually correct.
+
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_13834.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_13834.dia.ref
new file mode 100644 (file)
index 0000000..8987386
--- /dev/null
@@ -0,0 +1,20 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2015 - Scilab Enterprises - Calixte DENIZET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- TEST WITH GRAPHIC -->
+// <-- Non-regression test for bug 13834 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/13834
+//
+// <-- Short Description -->
+// NPE when too many strings are drawn
+// Just check that there is no NPE printed in the terminal
+f=scf();
+f.children(1).data_bounds = [0 0; 500 500];
+x=linspace(1,400,1000);
+y=linspace(1,400,1000);
+xstring(x, y, string(x));
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_13834.tst b/scilab/modules/graphics/tests/nonreg_tests/bug_13834.tst
new file mode 100644 (file)
index 0000000..3d769fc
--- /dev/null
@@ -0,0 +1,24 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2015 - Scilab Enterprises - Calixte DENIZET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- TEST WITH GRAPHIC -->
+
+// <-- Non-regression test for bug 13834 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/13834
+//
+// <-- Short Description -->
+// NPE when too many strings are drawn
+
+// Just check that there is no NPE printed in the terminal
+
+f=scf();
+f.children(1).data_bounds = [0 0; 500 500];
+x=linspace(1,400,1000);
+y=linspace(1,400,1000);
+xstring(x, y, string(x));
\ No newline at end of file
index 92946a0..ea3a31d 100755 (executable)
@@ -324,6 +324,7 @@ images/icons/16x16/actions/list-remove.png \
 images/icons/16x16/actions/longe.png \
 images/icons/16x16/actions/long.png \
 images/icons/16x16/actions/media-playback-start.png \
+images/icons/16x16/actions/media-playback-stop.png \
 images/icons/16x16/actions/plot.png \
 images/icons/16x16/actions/save-and-execute.png \
 images/icons/16x16/actions/scilab_search.png \
index 840179d..7d92145 100644 (file)
@@ -986,6 +986,7 @@ images/icons/16x16/actions/list-remove.png \
 images/icons/16x16/actions/longe.png \
 images/icons/16x16/actions/long.png \
 images/icons/16x16/actions/media-playback-start.png \
+images/icons/16x16/actions/media-playback-stop.png \
 images/icons/16x16/actions/plot.png \
 images/icons/16x16/actions/save-and-execute.png \
 images/icons/16x16/actions/scilab_search.png \
index 71cff58..4c52969 100644 (file)
@@ -77,6 +77,9 @@
         <submenu label="&amp;Original View" icon="zoom-original">
             <callback instruction='unzoom(get_figure_handle([SCILAB_FIGURE_ID]))' type="0"/>
         </submenu>
+        <submenu label="Fit zoom to data" icon="zoom-fit-drawing">
+            <callback instruction='zoom_auto(get_figure_handle([SCILAB_FIGURE_ID]))' type="0"/>
+        </submenu>
         <separator/>
         <submenu label="2D/3D &amp;Rotation" icon="transform-rotate">
             <callback instruction="set(get_figure_handle([SCILAB_FIGURE_ID]), 'info_message', 'Right click and drag to rotate.')" type="-2"/>
index 7057be3..e2e72f6 100644 (file)
     <button icon="zoom-original" tooltiptext="Original View">
         <callback instruction="unzoom(get_figure_handle([SCILAB_FIGURE_ID]))" type="-2"/>
     </button>
+    <!-- Fit to the data -->
+    <button icon="zoom-fit-drawing" tooltiptext="Fit zoom to data">
+        <callback instruction="zoom_auto(get_figure_handle([SCILAB_FIGURE_ID]))" type="-2"/>
+    </button>
     <separator/>
     <!-- Datatips -->
     <button icon="datatips" tooltiptext="Toggle datatip mode" toggle="true">
index fbf686f..3eadb26 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/gw_gui.c, line: 89
 #, c-format
@@ -1185,8 +1185,8 @@ msgstr ""
 
 #
 # File: scilab_fake_localization_file.c, line: 1
-# File: scilab_fake_localization_file.c, line: 36
-# File: scilab_fake_localization_file.c, line: 44
+# File: scilab_fake_localization_file.c, line: 37
+# File: scilab_fake_localization_file.c, line: 45
 msgid "&File"
 msgstr ""
 
@@ -1217,13 +1217,13 @@ msgstr ""
 
 #
 # File: scilab_fake_localization_file.c, line: 7
-# File: scilab_fake_localization_file.c, line: 51
+# File: scilab_fake_localization_file.c, line: 52
 msgid "P&age setup..."
 msgstr ""
 
 #
 # File: scilab_fake_localization_file.c, line: 8
-# File: scilab_fake_localization_file.c, line: 52
+# File: scilab_fake_localization_file.c, line: 53
 msgid "&Print..."
 msgstr ""
 
@@ -1234,13 +1234,13 @@ msgstr ""
 
 #
 # File: scilab_fake_localization_file.c, line: 10
-# File: scilab_fake_localization_file.c, line: 38
+# File: scilab_fake_localization_file.c, line: 39
 msgid "&Tools"
 msgstr ""
 
 #
 # File: scilab_fake_localization_file.c, line: 11
-# File: scilab_fake_localization_file.c, line: 60
+# File: scilab_fake_localization_file.c, line: 61
 msgid "Show/Hide &Toolbar"
 msgstr ""
 
@@ -1256,396 +1256,402 @@ msgstr ""
 
 #
 # File: scilab_fake_localization_file.c, line: 14
-msgid "2D/3D &Rotation"
+# File: scilab_fake_localization_file.c, line: 95
+msgid "Fit zoom to data"
 msgstr ""
 
 #
 # File: scilab_fake_localization_file.c, line: 15
-# File: scilab_fake_localization_file.c, line: 54
-msgid "&Edit"
+msgid "2D/3D &Rotation"
 msgstr ""
 
 #
 # File: scilab_fake_localization_file.c, line: 16
-msgid "&Select as current figure"
+# File: scilab_fake_localization_file.c, line: 55
+msgid "&Edit"
 msgstr ""
 
 #
 # File: scilab_fake_localization_file.c, line: 17
-msgid "&Clear figure"
+msgid "&Select as current figure"
 msgstr ""
 
 #
 # File: scilab_fake_localization_file.c, line: 18
-msgid "&Figure properties"
+msgid "&Clear figure"
 msgstr ""
 
 #
 # File: scilab_fake_localization_file.c, line: 19
-msgid "&Axes properties"
+msgid "&Figure properties"
 msgstr ""
 
 #
 # File: scilab_fake_localization_file.c, line: 20
-msgid "&Start entity picker"
+msgid "&Axes properties"
 msgstr ""
 
 #
 # File: scilab_fake_localization_file.c, line: 21
-msgid "S&top entity picker"
+msgid "&Start entity picker"
 msgstr ""
 
 #
 # File: scilab_fake_localization_file.c, line: 22
-msgid "&Start datatip manager"
+msgid "S&top entity picker"
 msgstr ""
 
 #
 # File: scilab_fake_localization_file.c, line: 23
-msgid "Stop datatip manager"
+msgid "&Start datatip manager"
 msgstr ""
 
 #
 # File: scilab_fake_localization_file.c, line: 24
-msgid "Start curve data modification"
+msgid "Stop datatip manager"
 msgstr ""
 
 #
 # File: scilab_fake_localization_file.c, line: 25
-msgid "Stop curve data modification"
+msgid "Start curve data modification"
 msgstr ""
 
 #
 # File: scilab_fake_localization_file.c, line: 26
+msgid "Stop curve data modification"
+msgstr ""
+
+#
+# File: scilab_fake_localization_file.c, line: 27
 # File: src/java/org/scilab/modules/gui/plotbrowser/MessagesPlotBrowser.java, line: 25
 msgid "Plot Browser"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 27
+# File: scilab_fake_localization_file.c, line: 28
 msgid "Scilab Graphic Editor - GED"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 28
+# File: scilab_fake_localization_file.c, line: 29
 msgid "&Quick Editor"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 29
+# File: scilab_fake_localization_file.c, line: 30
 msgid "&MVC"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 30
+# File: scilab_fake_localization_file.c, line: 31
 msgid "&Log View (Trace all View notifications)"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 31
+# File: scilab_fake_localization_file.c, line: 32
 msgid "&All Objects View (All objects with properties)"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 32
+# File: scilab_fake_localization_file.c, line: 33
 msgid "&Ged-like View (Future ged)"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 33
-# File: scilab_fake_localization_file.c, line: 42
-# File: scilab_fake_localization_file.c, line: 76
+# File: scilab_fake_localization_file.c, line: 34
+# File: scilab_fake_localization_file.c, line: 43
+# File: scilab_fake_localization_file.c, line: 77
 msgid "&?"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 34
+# File: scilab_fake_localization_file.c, line: 35
 msgid "&Scilab Help"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 35
-# File: scilab_fake_localization_file.c, line: 43
-# File: scilab_fake_localization_file.c, line: 90
+# File: scilab_fake_localization_file.c, line: 36
+# File: scilab_fake_localization_file.c, line: 44
+# File: scilab_fake_localization_file.c, line: 91
 msgid "&About Scilab..."
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 37
+# File: scilab_fake_localization_file.c, line: 38
 msgid "&Close"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 39
+# File: scilab_fake_localization_file.c, line: 40
 msgid "&Incremental Search"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 40
+# File: scilab_fake_localization_file.c, line: 41
 msgid "In&crease font size"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 41
+# File: scilab_fake_localization_file.c, line: 42
 msgid "&Decrease font size"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 45
+# File: scilab_fake_localization_file.c, line: 46
 msgid "&Execute..."
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 46
+# File: scilab_fake_localization_file.c, line: 47
 msgid "&Open a file..."
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 47
+# File: scilab_fake_localization_file.c, line: 48
 msgid "&Load environment..."
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 48
+# File: scilab_fake_localization_file.c, line: 49
 msgid "&Save environment..."
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 49
+# File: scilab_fake_localization_file.c, line: 50
 msgid "&Change current directory..."
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 50
+# File: scilab_fake_localization_file.c, line: 51
 msgid "&Display current directory"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 53
+# File: scilab_fake_localization_file.c, line: 54
 msgid "&Quit"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 55
+# File: scilab_fake_localization_file.c, line: 56
 msgid "C&ut"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 56
+# File: scilab_fake_localization_file.c, line: 57
 msgid "&Copy"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 57
+# File: scilab_fake_localization_file.c, line: 58
 msgid "&Paste"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 58
+# File: scilab_fake_localization_file.c, line: 59
 msgid "&Empty clipboard"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 59
+# File: scilab_fake_localization_file.c, line: 60
 msgid "&Select all"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 61
+# File: scilab_fake_localization_file.c, line: 62
 msgid "Clear &History"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 62
+# File: scilab_fake_localization_file.c, line: 63
 msgid "Clear C&onsole"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 63
+# File: scilab_fake_localization_file.c, line: 64
 msgid "P&references"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 64
+# File: scilab_fake_localization_file.c, line: 65
 msgid "&Control"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 65
+# File: scilab_fake_localization_file.c, line: 66
 msgid "&Resume"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 66
+# File: scilab_fake_localization_file.c, line: 67
 msgid "&Abort"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 67
+# File: scilab_fake_localization_file.c, line: 68
 msgid "&Interrupt"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 68
+# File: scilab_fake_localization_file.c, line: 69
 msgid "&Applications"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 69
+# File: scilab_fake_localization_file.c, line: 70
 msgid "&SciNotes"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 70
+# File: scilab_fake_localization_file.c, line: 71
 msgid "&Xcos"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 71
+# File: scilab_fake_localization_file.c, line: 72
 msgid "&Matlab to Scilab translator"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 72
+# File: scilab_fake_localization_file.c, line: 73
 msgid "M&odule manager - ATOMS"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 73
+# File: scilab_fake_localization_file.c, line: 74
 msgid "&Variable Browser"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 74
+# File: scilab_fake_localization_file.c, line: 75
 msgid "&Command History"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 75
+# File: scilab_fake_localization_file.c, line: 76
 msgid "&File Browser"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 77
+# File: scilab_fake_localization_file.c, line: 78
 msgid "Scilab &Help"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 78
+# File: scilab_fake_localization_file.c, line: 79
 msgid "Scilab &Demonstrations"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 79
+# File: scilab_fake_localization_file.c, line: 80
 msgid "&Links"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 80
+# File: scilab_fake_localization_file.c, line: 81
 msgid "Scilab &Web Site"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 81
+# File: scilab_fake_localization_file.c, line: 82
 msgid "Scilab &Online Help"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 82
+# File: scilab_fake_localization_file.c, line: 83
 msgid "Scilab &Wiki"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 83
+# File: scilab_fake_localization_file.c, line: 84
 msgid "Scilab &ATOMS Web Site"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 84
+# File: scilab_fake_localization_file.c, line: 85
 msgid "&File Exchange"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 85
+# File: scilab_fake_localization_file.c, line: 86
 msgid "&Mailing Lists"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 86
+# File: scilab_fake_localization_file.c, line: 87
 msgid "Mailing Lists &Archives"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 87
+# File: scilab_fake_localization_file.c, line: 88
 msgid "&Forge"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 88
+# File: scilab_fake_localization_file.c, line: 89
 msgid "&Bugs And Requests"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 89
+# File: scilab_fake_localization_file.c, line: 90
 msgid "&Scilab Enterprises"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 91
+# File: scilab_fake_localization_file.c, line: 92
 msgid "Rotate"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 92
+# File: scilab_fake_localization_file.c, line: 93
 msgid "Zoom Area"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 93
+# File: scilab_fake_localization_file.c, line: 94
 msgid "Original View"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 94
+# File: scilab_fake_localization_file.c, line: 96
 msgid "Toggle datatip mode"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 95
+# File: scilab_fake_localization_file.c, line: 97
 msgid "Open the graphics editor"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 96
+# File: scilab_fake_localization_file.c, line: 98
 msgid "Toggle curve data modification"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 97
-# File: scilab_fake_localization_file.c, line: 109
+# File: scilab_fake_localization_file.c, line: 99
+# File: scilab_fake_localization_file.c, line: 111
 # File: src/java/org/scilab/modules/gui/helpbrowser/ScilabHelpBrowser.java, line: 91
 msgid "Help Browser"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 98
+# File: scilab_fake_localization_file.c, line: 100
 msgid "Launch SciNotes"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 99
+# File: scilab_fake_localization_file.c, line: 101
 msgid "Open a file"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 100
+# File: scilab_fake_localization_file.c, line: 102
 # File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 92
 # File: src/java/org/scilab/modules/gui/editor/Editor.java, line: 298
 msgid "Cut"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 101
+# File: scilab_fake_localization_file.c, line: 103
 # File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 99
 # File: src/java/org/scilab/modules/gui/bridge/helpbrowser/SwingScilabHelpBrowserViewer.java, line: 593
 # File: src/java/org/scilab/modules/gui/editor/Editor.java, line: 296
@@ -1653,243 +1659,243 @@ msgid "Copy"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 102
+# File: scilab_fake_localization_file.c, line: 104
 # File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 106
 # File: src/java/org/scilab/modules/gui/editor/Editor.java, line: 300
 msgid "Paste"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 103
+# File: scilab_fake_localization_file.c, line: 105
 # File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 79
 # File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 120
 msgid "Clear Console"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 104
+# File: scilab_fake_localization_file.c, line: 106
 msgid "Print..."
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 105
+# File: scilab_fake_localization_file.c, line: 107
 msgid "Module manager - ATOMS"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 106
+# File: scilab_fake_localization_file.c, line: 108
 msgid "Xcos"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 107
+# File: scilab_fake_localization_file.c, line: 109
 msgid "Scilab Preferences"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 108
+# File: scilab_fake_localization_file.c, line: 110
 msgid "Scilab Demonstrations"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 192
+# File: scilab_fake_localization_file.c, line: 194
 # File: etc/graphics_menubar.xml, line: 15
 msgid "Select a file to load"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 195
+# File: scilab_fake_localization_file.c, line: 197
 # File: etc/graphics_menubar.xml, line: 18
 msgid "Figure loaded.\n"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 203
+# File: scilab_fake_localization_file.c, line: 205
 # File: etc/graphics_menubar.xml, line: 26
 msgid "Select a file to write"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 209
+# File: scilab_fake_localization_file.c, line: 211
 # File: etc/graphics_menubar.xml, line: 32
 msgid "Figure saved.\n"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 694
+# File: scilab_fake_localization_file.c, line: 703
 # File: src/java/org/scilab/modules/gui/ged/MessagesGED.java, line: 100
 msgid "Colors"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 745
+# File: scilab_fake_localization_file.c, line: 754
 msgid "Desktop color"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 753
-# File: scilab_fake_localization_file.c, line: 767
+# File: scilab_fake_localization_file.c, line: 762
+# File: scilab_fake_localization_file.c, line: 776
 msgid "Use system color"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 803
+# File: scilab_fake_localization_file.c, line: 812
 msgid "Text "
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 817
+# File: scilab_fake_localization_file.c, line: 826
 msgid "Background "
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 831
+# File: scilab_fake_localization_file.c, line: 840
 msgid "Cursor "
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 855
+# File: scilab_fake_localization_file.c, line: 864
 msgid "Syntax highlighting colors"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 887
+# File: scilab_fake_localization_file.c, line: 896
 msgid "Keyword color "
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 911
+# File: scilab_fake_localization_file.c, line: 920
 msgid "&lt;html&gt;&lt;b&gt;Bold&lt;/b&gt;&lt;html&gt;"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 925
+# File: scilab_fake_localization_file.c, line: 934
 msgid "&lt;html&gt;&lt;i&gt;Italic&lt;/i&gt;&lt;html&gt;"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 939
+# File: scilab_fake_localization_file.c, line: 948
 msgid "&lt;html&gt;&lt;u&gt;Underline&lt;/u&gt;&lt;html&gt;"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 953
+# File: scilab_fake_localization_file.c, line: 962
 msgid "&lt;html&gt;&lt;s&gt;Strike-through&lt;/s&gt;&lt;html&gt;"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 1003
+# File: scilab_fake_localization_file.c, line: 1012
 msgid "Fonts"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 1055
+# File: scilab_fake_localization_file.c, line: 1064
 msgid "Desktop font"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 1063
+# File: scilab_fake_localization_file.c, line: 1072
 msgid "Use system font"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 1095
+# File: scilab_fake_localization_file.c, line: 1104
 msgid "Desktop text font: "
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 1126
+# File: scilab_fake_localization_file.c, line: 1135
 msgid "Custom font"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 1154
+# File: scilab_fake_localization_file.c, line: 1163
 msgid "Fonts to use:"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 1160
+# File: scilab_fake_localization_file.c, line: 1169
 msgid "Desktop text font"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 1172
+# File: scilab_fake_localization_file.c, line: 1181
 msgid "Custom:"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 1231
+# File: scilab_fake_localization_file.c, line: 1240
 msgid "LaTeX preview"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 1235
+# File: scilab_fake_localization_file.c, line: 1244
 msgid "LaTeX font size:"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 1440
+# File: scilab_fake_localization_file.c, line: 1449
 msgid "Web"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 1458
+# File: scilab_fake_localization_file.c, line: 1467
 msgid "Web browser and mailer"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 1460
+# File: scilab_fake_localization_file.c, line: 1469
 msgid "Use default web browser"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 1466
+# File: scilab_fake_localization_file.c, line: 1475
 msgid "Command for web browser: "
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 1481
-# File: scilab_fake_localization_file.c, line: 1512
+# File: scilab_fake_localization_file.c, line: 1490
+# File: scilab_fake_localization_file.c, line: 1521
 msgid "(Don't forget to quote path containing white spaces)"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 1491
+# File: scilab_fake_localization_file.c, line: 1500
 msgid "Use default mailer"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 1497
+# File: scilab_fake_localization_file.c, line: 1506
 msgid "Command for mailer: "
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 1525
+# File: scilab_fake_localization_file.c, line: 1534
 msgid "Proxy settings"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 1527
+# File: scilab_fake_localization_file.c, line: 1536
 msgid "Enable proxy"
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 1533
+# File: scilab_fake_localization_file.c, line: 1542
 msgid "Host: "
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 1547
+# File: scilab_fake_localization_file.c, line: 1556
 msgid "Port: "
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 1561
+# File: scilab_fake_localization_file.c, line: 1570
 msgid "User: "
 msgstr ""
 
 #
-# File: scilab_fake_localization_file.c, line: 1575
+# File: scilab_fake_localization_file.c, line: 1584
 msgid "Password: "
 msgstr ""
 
@@ -4012,17 +4018,17 @@ msgid "Could not open: "
 msgstr ""
 
 #
-# File: src/java/org/scilab/modules/gui/utils/WindowsConfigurationManager.java, line: 70
+# File: src/java/org/scilab/modules/gui/utils/WindowsConfigurationManager.java, line: 71
 msgid "Restoration error"
 msgstr ""
 
 #
-# File: src/java/org/scilab/modules/gui/utils/WindowsConfigurationManager.java, line: 71
+# File: src/java/org/scilab/modules/gui/utils/WindowsConfigurationManager.java, line: 72
 msgid "The configuration file has been corrupted and reset to the default one."
 msgstr ""
 
 #
-# File: src/java/org/scilab/modules/gui/utils/WindowsConfigurationManager.java, line: 72
+# File: src/java/org/scilab/modules/gui/utils/WindowsConfigurationManager.java, line: 73
 msgid "The configuration file has been corrupted. Scilab needs to restart."
 msgstr ""
 
index ebe0736..6f129df 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/cpp/sci_export_to_hdf5.cpp, line: 103
 #, c-format
@@ -788,24 +788,24 @@ msgid "Bitfield is too big"
 msgstr ""
 
 #
-# File: src/cpp/H5DataFactory.cpp, line: 216
-# File: src/cpp/H5DataFactory.cpp, line: 219
+# File: src/cpp/H5DataFactory.cpp, line: 224
+# File: src/cpp/H5DataFactory.cpp, line: 227
 msgid "Cannot get data from an unknown data type."
 msgstr ""
 
 #
-# File: src/cpp/H5DataFactory.cpp, line: 289
+# File: src/cpp/H5DataFactory.cpp, line: 297
 msgid "Memory to allocate is too big"
 msgstr ""
 
 #
-# File: src/cpp/H5DataFactory.cpp, line: 314
-# File: src/cpp/H5DataFactory.cpp, line: 326
+# File: src/cpp/H5DataFactory.cpp, line: 322
+# File: src/cpp/H5DataFactory.cpp, line: 334
 msgid "Cannot allocate memory to get the data"
 msgstr ""
 
 #
-# File: src/cpp/H5DataFactory.cpp, line: 358
+# File: src/cpp/H5DataFactory.cpp, line: 366
 msgid "Cannot retrieve the data from the attribute"
 msgstr ""
 
index 0f04a77..4f89a47 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/gw_helptools.c, line: 39
 #, c-format
index 3612641..5872ab2 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/gw_history_browser.c, line: 37
 # File: src/nohistory_browser/nohistory_browser.c, line: 25
index 2a6e1fe..a0f69b3 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_addhistory.c, line: 83
 #, c-format
index e4f78f4..83ce43c 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_iconvert.c, line: 37
 # File: sci_gateway/c/sci_iconvert.c, line: 51
index 8992c15..d19180c 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_bsplin3val.c, line: 62
 # File: sci_gateway/c/sci_cshep2d.c, line: 50
index d892e59..d0bbef5 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_file.c, line: 61
 # File: sci_gateway/c/sci_file.c, line: 69
index b9bb2a8..bdf1d0b 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/gw_jvm.c, line: 47
 msgid "JVM interface disabled in -nogui or -nwni modes.\n"
index fa27fab..81dd8cf 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_backslash.c, line: 66
 # File: sci_gateway/c/sci_backslash.c, line: 87
index a539a24..1ab4d88 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_addlocalizationdomain.c, line: 51
 # File: sci_gateway/c/sci_addlocalizationdomain.c, line: 72
index 4fefb3c..3bf9345 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: macros/buildmacros.sce, line: 18
 #, c-format
index cdc3725..823a0a7 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_matfile_close.c, line: 63
 # File: sci_gateway/c/sci_matfile_listvar.c, line: 63
index 87ffead..a3e394d 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: includes/mex.h, line: 87
 msgid "mexPutFull failed\n"
index df6302d..ff811bc 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: macros/tbx_build_blocks.sci, line: 21
 # File: macros/tbx_build_pal_loader.sci, line: 13
index c9bbf1a..e4a099e 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_mpi_bcast.c, line: 42
 # File: sci_gateway/c/sci_mpi_bcast.c, line: 56
index 30911e5..65e356d 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_qld.c, line: 86
 # File: sci_gateway/c/sci_qld.c, line: 112
index 1232669..9888f32 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_mprintf.c, line: 66
 # File: sci_gateway/c/sci_msprintf.c, line: 156
index 4215c8e..27cd570 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: macros/%0_i_st.sci, line: 19
 #, c-format
@@ -178,8 +178,8 @@ msgstr ""
 #
 # File: macros/%hm_cumprod.sci, line: 40
 # File: macros/%hm_cumsum.sci, line: 40
-# File: macros/%hm_prod.sci, line: 40
-# File: macros/%hm_sum.sci, line: 40
+# File: macros/%hm_prod.sci, line: 41
+# File: macros/%hm_sum.sci, line: 41
 # File: macros/%p_cumprod.sci, line: 28
 # File: macros/%p_cumsum.sci, line: 27
 # File: macros/%p_prod.sci, line: 28
@@ -203,8 +203,8 @@ msgstr ""
 #
 # File: macros/%hm_cumprod.sci, line: 47
 # File: macros/%hm_cumsum.sci, line: 47
-# File: macros/%hm_prod.sci, line: 47
-# File: macros/%hm_sum.sci, line: 47
+# File: macros/%hm_prod.sci, line: 48
+# File: macros/%hm_sum.sci, line: 48
 # File: macros/%p_cumprod.sci, line: 35
 # File: macros/%p_cumsum.sci, line: 34
 # File: macros/%p_prod.sci, line: 35
@@ -228,8 +228,8 @@ msgstr ""
 #
 # File: macros/%hm_cumprod.sci, line: 50
 # File: macros/%hm_cumsum.sci, line: 50
-# File: macros/%hm_prod.sci, line: 50
-# File: macros/%hm_sum.sci, line: 50
+# File: macros/%hm_prod.sci, line: 51
+# File: macros/%hm_sum.sci, line: 51
 # File: macros/%p_cumprod.sci, line: 38
 # File: macros/%p_cumsum.sci, line: 37
 # File: macros/%p_prod.sci, line: 38
@@ -255,10 +255,10 @@ msgstr ""
 # File: macros/%hm_cumprod.sci, line: 72
 # File: macros/%hm_cumsum.sci, line: 54
 # File: macros/%hm_cumsum.sci, line: 72
-# File: macros/%hm_prod.sci, line: 54
-# File: macros/%hm_prod.sci, line: 72
-# File: macros/%hm_sum.sci, line: 54
-# File: macros/%hm_sum.sci, line: 72
+# File: macros/%hm_prod.sci, line: 55
+# File: macros/%hm_prod.sci, line: 73
+# File: macros/%hm_sum.sci, line: 55
+# File: macros/%hm_sum.sci, line: 73
 # File: macros/%p_cumprod.sci, line: 42
 # File: macros/%p_cumsum.sci, line: 41
 # File: macros/%p_prod.sci, line: 42
@@ -286,8 +286,8 @@ msgstr ""
 #
 # File: macros/%hm_cumprod.sci, line: 57
 # File: macros/%hm_cumsum.sci, line: 57
-# File: macros/%hm_prod.sci, line: 57
-# File: macros/%hm_sum.sci, line: 57
+# File: macros/%hm_prod.sci, line: 58
+# File: macros/%hm_sum.sci, line: 58
 # File: macros/%p_cumprod.sci, line: 45
 # File: macros/%p_cumsum.sci, line: 44
 # File: macros/%p_prod.sci, line: 45
@@ -311,8 +311,8 @@ msgstr ""
 #
 # File: macros/%hm_cumprod.sci, line: 63
 # File: macros/%hm_cumsum.sci, line: 63
-# File: macros/%hm_prod.sci, line: 63
-# File: macros/%hm_sum.sci, line: 63
+# File: macros/%hm_prod.sci, line: 64
+# File: macros/%hm_sum.sci, line: 64
 # File: macros/%p_cumprod.sci, line: 52
 # File: macros/%p_cumsum.sci, line: 52
 # File: macros/%p_prod.sci, line: 52
@@ -336,8 +336,8 @@ msgstr ""
 #
 # File: macros/%hm_cumprod.sci, line: 68
 # File: macros/%hm_cumsum.sci, line: 68
-# File: macros/%hm_prod.sci, line: 68
-# File: macros/%hm_sum.sci, line: 68
+# File: macros/%hm_prod.sci, line: 69
+# File: macros/%hm_sum.sci, line: 69
 # File: macros/%spb_cumprod.sci, line: 59
 # File: macros/%spb_cumsum.sci, line: 59
 # File: macros/%spb_prod.sci, line: 59
@@ -349,8 +349,8 @@ msgstr ""
 #
 # File: macros/%hm_cumprod.sci, line: 76
 # File: macros/%hm_cumsum.sci, line: 76
-# File: macros/%hm_prod.sci, line: 76
-# File: macros/%hm_sum.sci, line: 76
+# File: macros/%hm_prod.sci, line: 77
+# File: macros/%hm_sum.sci, line: 77
 # File: macros/%spb_cumprod.sci, line: 67
 # File: macros/%spb_cumsum.sci, line: 67
 # File: macros/%spb_prod.sci, line: 67
index 8bfc8a3..2ea7c19 100644 (file)
@@ -1,5 +1,6 @@
 // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 // Copyright (C) INRIA
+// Copyright (C) 2015 - Samuel GOUGEON
 //
 // This file must be used under the terms of the CeCILL.
 // This source file is licensed as described in the file COPYING, which
@@ -7,12 +8,6 @@
 // are also available at
 // http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
 
-function r=%r_n_r(l1,l2)
-    //%r_n_r(l1,l2) <=> l1<>l2 for rational matrices
-    //!
-
-    r=l1("dt")<>l2("dt")
-    if ~r then
-        r=l1("num")<>l2("num")|(l1("den")<>l2("den")&l1("num")<>0)
-    end
+function r = %r_n_r(l1, l2)
+    r = ~%r_o_r(l1, l2)
 endfunction
index 1729566..1ce5a2d 100644 (file)
@@ -1,5 +1,6 @@
 // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 // Copyright (C) INRIA
+// Copyright (C) 2015 - Samuel GOUGEON
 //
 // This file must be used under the terms of the CeCILL.
 // This source file is licensed as described in the file COPYING, which
@@ -7,15 +8,9 @@
 // are also available at
 // http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
 
-function r=%r_o_r(l1,l2)
-    // l1==l2 with l1 and l2 rationals
-    //!
-    //r=l1('dt')==l2('dt')&l1('num')==l2('num')&(l1('den')==l2('den')|l1('num')==0)
-    r = and((l1.num == l2.num))&and((l1.den==l2.den))&(l1.dt==l2.dt);
-    
-//    if varn([l1("num"),l1("den")])~=varn([l2("num"),l2("den")]) then
-//        r=%f;
-//    else
-//        r=(l1("dt")==l2("dt"))&(numer(l1-l2)==0)
-//    end
+function r = %r_o_r(l1, l2)
+    r = ((l1.num == l2.num  & l1.den==l2.den)   | ..
+    (l1.num == -l2.num & l1.den==-l2.den)       | ..
+    (l1.num==0 & l2.num==0)) .. // when simp_mode(%f)
+    & (l1.dt==l2.dt)
 endfunction
diff --git a/scilab/modules/overloading/tests/nonreg_tests/bug_13924.dia.ref b/scilab/modules/overloading/tests/nonreg_tests/bug_13924.dia.ref
new file mode 100644 (file)
index 0000000..0fcdb40
--- /dev/null
@@ -0,0 +1,49 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2015 - Scilab Enterprises - Clement DAVID
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- Non-regression test for bug 13924 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=13924
+//
+// <-- Short Description -->
+// rationals: r1==r2 and r1~=r2 may be wrong and operate unconsistenly.
+a = %z/(1-%z);
+b = -%z / -(1-%z);
+assert_checkequal(a,b)
+ ans  =
+  T  
+assert_checkequal(size([a b]==[a a], "*"), 2)
+ ans  =
+  T  
+assert_checkequal(size([a b]~=[a a], "*"), 2)
+ ans  =
+  T  
+// Disable simplification mode
+simp_mode(%f)
+a = %z/(1-%z);
+b = -%z / -(1-%z);
+c = 0 / (1-%z);
+d = 0 / (2+%z);
+assert_checkequal(a,b)
+ ans  =
+  T  
+assert_checkequal(c,d)
+ ans  =
+  T  
+assert_checkequal(size([a b c d]==[a a c c], "*"), 4)
+ ans  =
+  T  
+assert_checkequal(size([a b c d]~=[a a c c], "*"), 4)
+ ans  =
+  T  
diff --git a/scilab/modules/overloading/tests/nonreg_tests/bug_13924.tst b/scilab/modules/overloading/tests/nonreg_tests/bug_13924.tst
new file mode 100644 (file)
index 0000000..03fd64f
--- /dev/null
@@ -0,0 +1,35 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2015 - Scilab Enterprises - Clement DAVID
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- Non-regression test for bug 13924 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=13924
+//
+// <-- Short Description -->
+// rationals: r1==r2 and r1~=r2 may be wrong and operate unconsistenly.
+
+a = %z/(1-%z);
+b = -%z / -(1-%z);
+assert_checkequal(a,b)
+
+assert_checkequal(size([a b]==[a a], "*"), 2)
+assert_checkequal(size([a b]~=[a a], "*"), 2)
+
+// Disable simplification mode
+simp_mode(%f)
+
+a = %z/(1-%z);
+b = -%z / -(1-%z);
+c = 0 / (1-%z);
+d = 0 / (2+%z);
+
+assert_checkequal(a,b)
+assert_checkequal(c,d)
+
+assert_checkequal(size([a b c d]==[a a c c], "*"), 4)
+assert_checkequal(size([a b c d]~=[a a c c], "*"), 4)
index 3a654af..9cfdde1 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/cpp/sci_parallel_run.cpp, line: 547
 #, c-format
index b7f66b0..d86cd0c 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: src/c/parameters.c, line: 144
 # File: src/c/parameters.c, line: 571
index b7e3ffd..2fe6a17 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: demos/polynomials.dem.gateway.sce, line: 10
 msgid "Polynomials"
index 001eee4..e7719fc 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/gw_preferences.c, line: 38
 #, c-format
index 2ea22bd..26cce3d 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_grand.c, line: 156
 # File: sci_gateway/c/sci_grand.c, line: 511
index 328378e..2cfd24b 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: src/java/org/scilab/modules/renderer/JoGLView/interaction/RubberBox.java, line: 276
 msgid "Click to set first bounds"
index 5f46830..034d229 100755 (executable)
@@ -1169,7 +1169,7 @@ public class DrawerVisitor implements Visitor, Drawer, GraphicView {
         GraphicObject object = GraphicController.getController().getObjectFromId(id);
         int objectType = (Integer) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
         int objectStyle = (objectType == GraphicObjectProperties.__GO_UICONTROL__ ? (Integer) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_STYLE__) : -1);
-        if ((object != null) && isFigureChild(id) || (objectType == GraphicObjectProperties.__GO_UICONTROL__ && objectStyle == GraphicObjectProperties.__GO_UI_FRAME__)
+        if ((object != null) && (isFigureChild(id) || isFigureParent(id)) || (objectType == GraphicObjectProperties.__GO_UICONTROL__ && objectStyle == GraphicObjectProperties.__GO_UI_FRAME__)
                 && objectType != GraphicObjectProperties.__GO_UIMENU__ && objectType != GraphicObjectProperties.__GO_UI_FRAME_BORDER__) {
 
             if (GraphicObjectProperties.__GO_VALID__ == property) {
@@ -1216,11 +1216,12 @@ public class DrawerVisitor implements Visitor, Drawer, GraphicView {
                 if (property == GraphicObjectProperties.__GO_SIZE__
                         || property == GraphicObjectProperties.__GO_AXES_SIZE__
                         || property == GraphicObjectProperties.__GO_CHILDREN__
-                        || property == GraphicObjectProperties.__GO_POSITION__) {
-                    Figure fig = (Figure) object;
-                    for (Integer gid : fig.getChildren()) {
+                        || property == GraphicObjectProperties.__GO_POSITION__
+                        || property == GraphicObjectProperties.__GO_VISIBLE__) {
+                    for (Integer gid : figure.getChildren()) {
                         GraphicObject go = GraphicController.getController().getObjectFromId(gid);
                         if (go instanceof Axes) {
+                            axesDrawer.computeMargins((Axes) go);
                             axesDrawer.computeRulers((Axes) go);
                         }
                     }
@@ -1321,6 +1322,28 @@ public class DrawerVisitor implements Visitor, Drawer, GraphicView {
     }
 
     /**
+     * Check if the given id correspond to a parent of the current {@see Figure}.
+     * @param id the given id.
+     * @return true if the given id correspond to a parent of the current {@see Figure}.
+     */
+    private boolean isFigureParent(Integer id) {
+        GraphicObject object = GraphicController.getController().getObjectFromId(id);
+        if (object != null) {
+            Object parentObject = GraphicController.getController().getProperty(figure.getIdentifier(), GraphicObjectProperties.__GO_PARENT__);
+            Integer parentUID = parentObject == null ? 0 : (Integer) parentObject;
+            while (parentUID.intValue() != 0) {
+                if (parentUID.intValue() == id.intValue()) {
+                    return true;
+                }
+                parentObject = GraphicController.getController().getProperty(parentUID, GraphicObjectProperties.__GO_PARENT__);
+                parentUID = parentObject == null ? 0 : (Integer) parentObject;
+            }
+        }
+
+        return false;
+    }
+
+    /**
      * Check if the given id correspond to a child of the current {@see Figure}.
      * @param id the given id.
      * @return true if the given id correspond to a child of the current {@see Figure}.
index 76fa620..2e5a61f 100644 (file)
@@ -193,123 +193,125 @@ public class AxesDrawer {
 
             Dimension[] marginLabels = labelManager.getLabelsSize(colorMap, axes, this);
             Integer[] size = {visitor.getCanvas().getWidth(), visitor.getCanvas().getHeight()};
-            // [x_left, y_up, w, h]
-            Double[] axesBounds = axes.getAxesBounds();
-            // [l, r, t, b]
-            Double[] margins = axes.getMargins();
-            // m is a copy of margins
-            Double[] mt = new Double[] { 0., 0., 0., 0. };
-            Double[] ml = new Double[] { 0., 0., 0., 0. };
-            Double[] ma = new Double[] { 0., 0., 0., 0. };
-            Double[] m = new Double[] { 0., 0., 0., 0. };
-            AxisProperty.AxisLocation xloc = axes.getXAxis().getAxisLocation();
-            AxisProperty.AxisLocation yloc = axes.getYAxis().getAxisLocation();
-            final double DEFAULT_MARGIN = 0.125;
-
-            // We compute the adapted margins for axes titles.
-            if (marginLabels[0].height != 0 || marginLabels[2].height != 0 || marginLabels[1].width != 0) {
-                if (marginLabels[2].height != 0) {
-                    final double th = (marginLabels[2].height + 2 + TitlePositioner.TITLEOFFSET) / (size[1] * axesBounds[3]);
-                    mt[2] = th;
-                }
+            if (size[0] != 0 && size[1] != 0) {
+                // [x_left, y_up, w, h]
+                Double[] axesBounds = axes.getAxesBounds();
+                // [l, r, t, b]
+                Double[] margins = axes.getMargins();
+                // m is a copy of margins
+                Double[] mt = new Double[] { 0., 0., 0., 0. };
+                Double[] ml = new Double[] { 0., 0., 0., 0. };
+                Double[] ma = new Double[] { 0., 0., 0., 0. };
+                Double[] m = new Double[] { 0., 0., 0., 0. };
+                AxisProperty.AxisLocation xloc = axes.getXAxis().getAxisLocation();
+                AxisProperty.AxisLocation yloc = axes.getYAxis().getAxisLocation();
+                final double DEFAULT_MARGIN = 0.125;
+
+                // We compute the adapted margins for axes titles.
+                if (marginLabels[0].height != 0 || marginLabels[2].height != 0 || marginLabels[1].width != 0) {
+                    if (marginLabels[2].height != 0) {
+                        final double th = (marginLabels[2].height + 2 + TitlePositioner.TITLEOFFSET) / (size[1] * axesBounds[3]);
+                        mt[2] = th;
+                    }
 
-                if (marginLabels[0].height != 0 && (xloc == AxisProperty.AxisLocation.BOTTOM || xloc == AxisProperty.AxisLocation.TOP)) {
-                    final double xh = (marginLabels[0].height + 2) / (size[1] * axesBounds[3]);
-                    if (xloc == AxisProperty.AxisLocation.BOTTOM) {
-                        mt[3] = xh;
-                    } else {
-                        mt[2] += xh;
+                    if (marginLabels[0].height != 0 && (xloc == AxisProperty.AxisLocation.BOTTOM || xloc == AxisProperty.AxisLocation.TOP)) {
+                        final double xh = (marginLabels[0].height + 2) / (size[1] * axesBounds[3]);
+                        if (xloc == AxisProperty.AxisLocation.BOTTOM) {
+                            mt[3] = xh;
+                        } else {
+                            mt[2] += xh;
+                        }
                     }
-                }
 
-                if (marginLabels[1].width != 0 && (yloc == AxisProperty.AxisLocation.LEFT || yloc == AxisProperty.AxisLocation.RIGHT)) {
-                    final double yh = (marginLabels[1].width + 2) / (size[0] * axesBounds[2]);
-                    if (yloc == AxisProperty.AxisLocation.LEFT) {
-                        mt[0] = yh;
-                    } else {
-                        mt[1] = yh;
+                    if (marginLabels[1].width != 0 && (yloc == AxisProperty.AxisLocation.LEFT || yloc == AxisProperty.AxisLocation.RIGHT)) {
+                        final double yh = (marginLabels[1].width + 2) / (size[0] * axesBounds[2]);
+                        if (yloc == AxisProperty.AxisLocation.LEFT) {
+                            mt[0] = yh;
+                        } else {
+                            mt[1] = yh;
+                        }
                     }
                 }
-            }
 
-            //computeRulers(axes);
-            final double xratio = rulerDrawer.getRulerDrawer(axes, 0).getDistanceRatio();
-            final double yratio = rulerDrawer.getRulerDrawer(axes, 1).getDistanceRatio();
+                //computeRulers(axes);
+                final double xratio = rulerDrawer.getRulerDrawer(axes, 0).getDistanceRatio();
+                final double yratio = rulerDrawer.getRulerDrawer(axes, 1).getDistanceRatio();
 
-            if (xloc == AxisProperty.AxisLocation.BOTTOM) {
-                ma[3] = (1 - margins[2] - margins[3]) * xratio / 2.;
-            } else if (xloc == AxisProperty.AxisLocation.TOP) {
-                ma[2] = (1 - margins[2] - margins[3]) * xratio / 2.;
-            }
+                if (xloc == AxisProperty.AxisLocation.BOTTOM) {
+                    ma[3] = (1 - margins[2] - margins[3]) * xratio / 2.;
+                } else if (xloc == AxisProperty.AxisLocation.TOP) {
+                    ma[2] = (1 - margins[2] - margins[3]) * xratio / 2.;
+                }
 
-            if (yloc == AxisProperty.AxisLocation.LEFT) {
-                ma[0] = (1 - margins[0] - margins[1]) * yratio / 2.;
-            } else if (yloc == AxisProperty.AxisLocation.RIGHT) {
-                ma[1] = (1 - margins[0] - margins[1]) * yratio / 2.;
-            }
+                if (yloc == AxisProperty.AxisLocation.LEFT) {
+                    ma[0] = (1 - margins[0] - margins[1]) * yratio / 2.;
+                } else if (yloc == AxisProperty.AxisLocation.RIGHT) {
+                    ma[1] = (1 - margins[0] - margins[1]) * yratio / 2.;
+                }
 
-            // Get the legend if any (only one ???)
-            if (axes.getChildren() != null) {
-                for (Integer i : axes.getChildren()) {
-                    GraphicObject child = GraphicController.getController().getObjectFromId(i);
-                    if (child instanceof Legend) {
-                        Legend legend = (Legend) child;
-                        Dimension legDims = visitor.getLegendDrawer().computeDimensions(axes, legend);
-                        if (legDims != null) {
-                            LegendLocation legLoc = legend.getLegendLocationAsEnum();
-                            double C;
-                            /*
-                             * Legends dimension are linearly dependent of margins... so we need to solve an equation
-                             * to find a good value for margins.
-                             * For example:
-                             *  legend.w = texture.w + 3/8 * line.w + line.w
-                             *  where line.w = LINE_WIDTH * ab[2] * (1 - m[0] - m[1]) * size[0];
-                             *  the minimal value for m[1] is the solution of the equation (where unknown is m[1]):
-                             *   legend.w = ab[2] * m[1] * size[0].
-                             */
-                            switch (legLoc) {
-                                case OUT_UPPER_RIGHT:
-                                case OUT_LOWER_RIGHT:
-                                    // 1/8 of LINE_WIDTH is xOffset
-                                    // see legendDims[0] = ... in LegendDrawer::draw
-                                    // we add 2*xoffset to have a little space around the box
-                                    C = legend.getLineWidth() + LegendDrawer.LINE_WIDTH * (3. / 8. + 2. / 8.);
-                                    m[0] = Math.max(ma[0] + mt[0], DEFAULT_MARGIN);
-                                    m[1] = Math.max(((legDims.width + 2) / (axesBounds[2] * size[0]) + C * (1 - m[0])) / (1 + C) + ma[1] + mt[1], DEFAULT_MARGIN);
-                                    break;
-                                case OUT_UPPER_LEFT:
-                                case OUT_LOWER_LEFT:
-                                    C = legend.getLineWidth() + LegendDrawer.LINE_WIDTH * (3. / 8. + 2. / 8.);
-                                    m[1] = Math.max(ma[1] + mt[1], DEFAULT_MARGIN);
-                                    m[0] = Math.max(((legDims.width + 2) / (axesBounds[2] * size[0]) + C * (1 - m[1])) / (1 + C) + ma[0] + mt[0], DEFAULT_MARGIN);
-                                    break;
-                                case UPPER_CAPTION:
-                                    C = LegendDrawer.Y_OFFSET * (3. + 2.);
-                                    m[3] = Math.max(ma[3] + mt[3], DEFAULT_MARGIN);
-                                    m[2] = Math.max(Math.max(((legDims.height + 2) / (axesBounds[3] * size[1]) + C * (1 - m[3])) / (1 + C), mt[2]) + ma[2], DEFAULT_MARGIN);
-                                    break;
-                                case LOWER_CAPTION:
-                                    C = LegendDrawer.Y_OFFSET * (3. + 2.);
-                                    m[2] = Math.max(ma[2] + mt[2], DEFAULT_MARGIN);
-                                    m[3] = Math.max(Math.max(((legDims.height + 2) / (axesBounds[3] * size[1]) + C * (1 - m[2])) / (1 + C), mt[3]) + ma[3], DEFAULT_MARGIN);
-                                    break;
-                                default:
+                // Get the legend if any (only one ???)
+                if (axes.getChildren() != null) {
+                    for (Integer i : axes.getChildren()) {
+                        GraphicObject child = GraphicController.getController().getObjectFromId(i);
+                        if (child instanceof Legend) {
+                            Legend legend = (Legend) child;
+                            Dimension legDims = visitor.getLegendDrawer().computeDimensions(axes, legend);
+                            if (legDims != null) {
+                                LegendLocation legLoc = legend.getLegendLocationAsEnum();
+                                double C;
+                                /*
+                                 * Legends dimension are linearly dependent of margins... so we need to solve an equation
+                                 * to find a good value for margins.
+                                 * For example:
+                                 *  legend.w = texture.w + 3/8 * line.w + line.w
+                                 *  where line.w = LINE_WIDTH * ab[2] * (1 - m[0] - m[1]) * size[0];
+                                 *  the minimal value for m[1] is the solution of the equation (where unknown is m[1]):
+                                 *   legend.w = ab[2] * m[1] * size[0].
+                                 */
+                                switch (legLoc) {
+                                    case OUT_UPPER_RIGHT:
+                                    case OUT_LOWER_RIGHT:
+                                        // 1/8 of LINE_WIDTH is xOffset
+                                        // see legendDims[0] = ... in LegendDrawer::draw
+                                        // we add 2*xoffset to have a little space around the box
+                                        C = legend.getLineWidth() + LegendDrawer.LINE_WIDTH * (3. / 8. + 2. / 8.);
+                                        m[0] = Math.max(ma[0] + mt[0], DEFAULT_MARGIN);
+                                        m[1] = Math.max(((legDims.width + 2) / (axesBounds[2] * size[0]) + C * (1 - m[0])) / (1 + C) + ma[1] + mt[1], DEFAULT_MARGIN);
+                                        break;
+                                    case OUT_UPPER_LEFT:
+                                    case OUT_LOWER_LEFT:
+                                        C = legend.getLineWidth() + LegendDrawer.LINE_WIDTH * (3. / 8. + 2. / 8.);
+                                        m[1] = Math.max(ma[1] + mt[1], DEFAULT_MARGIN);
+                                        m[0] = Math.max(((legDims.width + 2) / (axesBounds[2] * size[0]) + C * (1 - m[1])) / (1 + C) + ma[0] + mt[0], DEFAULT_MARGIN);
+                                        break;
+                                    case UPPER_CAPTION:
+                                        C = LegendDrawer.Y_OFFSET * (3. + 2.);
+                                        m[3] = Math.max(ma[3] + mt[3], DEFAULT_MARGIN);
+                                        m[2] = Math.max(Math.max(((legDims.height + 2) / (axesBounds[3] * size[1]) + C * (1 - m[3])) / (1 + C), mt[2]) + ma[2], DEFAULT_MARGIN);
+                                        break;
+                                    case LOWER_CAPTION:
+                                        C = LegendDrawer.Y_OFFSET * (3. + 2.);
+                                        m[2] = Math.max(ma[2] + mt[2], DEFAULT_MARGIN);
+                                        m[3] = Math.max(Math.max(((legDims.height + 2) / (axesBounds[3] * size[1]) + C * (1 - m[2])) / (1 + C), mt[3]) + ma[3], DEFAULT_MARGIN);
+                                        break;
+                                    default:
+                                }
                             }
+                            break;
                         }
-                        break;
                     }
                 }
-            }
 
-            for (int i = 0; i < m.length; i++) {
-                if (m[i] == 0) {
-                    m[i] = Math.max(ma[i] + mt[i], DEFAULT_MARGIN);
+                for (int i = 0; i < m.length; i++) {
+                    if (m[i] == 0) {
+                        m[i] = Math.max(ma[i] + mt[i], DEFAULT_MARGIN);
+                    }
                 }
-            }
 
-            if (!m[0].equals(margins[0]) || !m[1].equals(margins[1]) || !m[2].equals(margins[2]) || !m[3].equals(margins[3])) {
-                axes.setMargins(m);
-                //computeRulers(axes);
+                if (!m[0].equals(margins[0]) || !m[1].equals(margins[1]) || !m[2].equals(margins[2]) || !m[3].equals(margins[3])) {
+                    axes.setMargins(m);
+                    //computeRulers(axes);
+                }
             }
         }
     }
index c0208c0..7e61e1b 100644 (file)
@@ -89,47 +89,49 @@ public class TextManager {
 
         Integer parentAxesId = text.getParentAxes();
         Axes parentAxes = (Axes) GraphicController.getController().getObjectFromId(parentAxesId);
-        double[][] factors = parentAxes.getScaleTranslateFactors();
-        Double[] pos = text.getPosition();
-        pos[0] = pos[0] * factors[0][0] + factors[1][0];
-        pos[1] = pos[1] * factors[0][1] + factors[1][1];
-        pos[2] = pos[2] * factors[0][2] + factors[1][2];
+        if (parentAxes != null) {
+            double[][] factors = parentAxes.getScaleTranslateFactors();
+            Double[] pos = text.getPosition();
+            pos[0] = pos[0] * factors[0][0] + factors[1][0];
+            pos[1] = pos[1] * factors[0][1] + factors[1][1];
+            pos[2] = pos[2] * factors[0][2] + factors[1][2];
 
-        Vector3d textPosition = new Vector3d(pos);
+            Vector3d textPosition = new Vector3d(pos);
 
-        /* Compute the text box vectors and the text box to texture dimension ratios */
-        Vector3d[] textBoxVectors =  computeTextBoxVectors(projection, text, texture.getDataProvider().getTextureSize(), parentAxes);
-        double[] ratios = computeRatios(projection, text, textBoxVectors, texture.getDataProvider().getTextureSize(), spriteDims);
+            /* Compute the text box vectors and the text box to texture dimension ratios */
+            Vector3d[] textBoxVectors =  computeTextBoxVectors(projection, text, texture.getDataProvider().getTextureSize(), parentAxes);
+            double[] ratios = computeRatios(projection, text, textBoxVectors, texture.getDataProvider().getTextureSize(), spriteDims);
 
-        /* If text box mode is equal to filled, the texture must be updated */
-        if (text.getTextBoxMode() == 2 && ratios[0] != 1.0) {
-            texture = updateSprite(colorMap, text, ratios[0], ratios[1]);
-        }
+            /* If text box mode is equal to filled, the texture must be updated */
+            if (text.getTextBoxMode() == 2 && ratios[0] != 1.0) {
+                texture = updateSprite(colorMap, text, ratios[0], ratios[1]);
+            }
 
-        /* Compute the text texture's actual position, which depends on the object's text box mode property */
-        Vector3d[] cornerPositions = computeTextPosition(projection, text, textBoxVectors, texture.getDataProvider().getTextureSize());
+            /* Compute the text texture's actual position, which depends on the object's text box mode property */
+            Vector3d[] cornerPositions = computeTextPosition(projection, text, textBoxVectors, texture.getDataProvider().getTextureSize());
 
-        /* Draw in window coordinates */
-        drawingTools.getTransformationManager().useWindowCoordinate();
+            /* Draw in window coordinates */
+            drawingTools.getTransformationManager().useWindowCoordinate();
 
-        /* The Text object's rotation direction convention is opposite to the standard one, its angle is expressed in radians. */
-        drawingTools.draw(texture, AnchorPosition.LOWER_LEFT, cornerPositions[0], -180.0 * text.getFontAngle() / Math.PI);
+            /* The Text object's rotation direction convention is opposite to the standard one, its angle is expressed in radians. */
+            drawingTools.draw(texture, AnchorPosition.LOWER_LEFT, cornerPositions[0], -180.0 * text.getFontAngle() / Math.PI);
 
-        drawingTools.getTransformationManager().useSceneCoordinate();
+            drawingTools.getTransformationManager().useSceneCoordinate();
 
-        /* Compute the corners of the text's bounding box in window coordinates */
-        Vector3d[] projCorners;
-        if (text.getTextBoxMode() == 2) {
-            projCorners = computeProjTextBoxCorners(cornerPositions[1], text.getFontAngle(), textBoxVectors);
-        } else {
-            projCorners = computeProjCorners(cornerPositions[0], text.getFontAngle(), texture.getDataProvider().getTextureSize());
-        }
+            /* Compute the corners of the text's bounding box in window coordinates */
+            Vector3d[] projCorners;
+            if (text.getTextBoxMode() == 2) {
+                projCorners = computeProjTextBoxCorners(cornerPositions[1], text.getFontAngle(), textBoxVectors);
+            } else {
+                projCorners = computeProjCorners(cornerPositions[0], text.getFontAngle(), texture.getDataProvider().getTextureSize());
+            }
 
-        Vector3d[] corners = computeCorners(projection, projCorners, parentAxes);
-        Double[] coordinates = cornersToCoordinateArray(corners);
+            Vector3d[] corners = computeCorners(projection, projCorners, parentAxes);
+            Double[] coordinates = cornersToCoordinateArray(corners);
 
-        /* Set the computed coordinates */
-        text.setCorners(coordinates);
+            /* Set the computed coordinates */
+            text.setCorners(coordinates);
+        }
     }
 
     /**
index 06e44d3..75dba84 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_buildouttb.c, line: 95
 #, c-format
@@ -650,7 +650,7 @@ msgstr ""
 
 #
 # File: src/c/scicos.c, line: 562
-# File: src/c/scicos.c, line: 3978
+# File: src/c/scicos.c, line: 3979
 msgid "Undefined Function type\n"
 msgstr ""
 
@@ -687,19 +687,19 @@ msgid ""
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 1825
+# File: src/c/scicos.c, line: 1826
 #, c-format
 msgid "****SUNDIALS.Cvode from: %f to %f hot= %d  \n"
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 1891
+# File: src/c/scicos.c, line: 1892
 #, c-format
 msgid "****SUNDIALS.Cvode reached: %f\n"
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 1900
+# File: src/c/scicos.c, line: 1901
 #, c-format
 msgid ""
 "****SUNDIALS.Cvode: too much work at time=%g (stiff region, change RTOL and "
@@ -707,60 +707,60 @@ msgid ""
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 1943
-# File: src/c/scicos.c, line: 3319
+# File: src/c/scicos.c, line: 1944
+# File: src/c/scicos.c, line: 3320
 #, c-format
 msgid "root found at t=: %f\n"
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 2065
-# File: src/c/scicos.c, line: 3485
+# File: src/c/scicos.c, line: 2066
+# File: src/c/scicos.c, line: 3486
 #, c-format
 msgid "Event: %d activated at t=%f\n"
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 2070
+# File: src/c/scicos.c, line: 2071
 #, c-format
 msgid "mode of block %d=%d, "
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 2073
+# File: src/c/scicos.c, line: 2074
 msgid "**mod**\n"
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 2079
-# File: src/c/scicos.c, line: 3491
+# File: src/c/scicos.c, line: 2080
+# File: src/c/scicos.c, line: 3492
 msgid "End of activation\n"
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 3120
+# File: src/c/scicos.c, line: 3121
 msgid "**** SUNDIALS.IDA successfully initialized *****\n"
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 3124
+# File: src/c/scicos.c, line: 3125
 msgid "**** SUNDIALS.IDA failed to initialize ->try again *****\n"
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 3207
+# File: src/c/scicos.c, line: 3208
 #, c-format
 msgid "****daskr from: %f to %f hot= %d  \n"
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 3260
+# File: src/c/scicos.c, line: 3261
 #, c-format
 msgid "****SUNDIALS.Ida reached: %f\n"
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 3269
+# File: src/c/scicos.c, line: 3270
 #, c-format
 msgid ""
 "**** SUNDIALS.Ida: too much work at time=%g (stiff region, change RTOL and "
@@ -768,42 +768,42 @@ msgid ""
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 3592
+# File: src/c/scicos.c, line: 3593
 #, c-format
 msgid "block %d is called "
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 3593
+# File: src/c/scicos.c, line: 3594
 #, c-format
 msgid "with flag %d "
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 3594
+# File: src/c/scicos.c, line: 3595
 #, c-format
 msgid "at time %f \n"
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 3600
+# File: src/c/scicos.c, line: 3601
 msgid "Entering the block \n"
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 4016
+# File: src/c/scicos.c, line: 4017
 #, c-format
 msgid "Leaving block %d \n"
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 4070
+# File: src/c/scicos.c, line: 4071
 msgid "Error in the Debug block \n"
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 4100
-# File: src/c/scicos.c, line: 4172
+# File: src/c/scicos.c, line: 4101
+# File: src/c/scicos.c, line: 4173
 #, c-format
 msgid ""
 "\n"
@@ -811,8 +811,8 @@ msgid ""
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 4135
-# File: src/c/scicos.c, line: 4197
+# File: src/c/scicos.c, line: 4136
+# File: src/c/scicos.c, line: 4198
 #, c-format
 msgid ""
 "\n"
@@ -820,8 +820,8 @@ msgid ""
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 4306
-# File: src/c/scicos.c, line: 4385
+# File: src/c/scicos.c, line: 4307
+# File: src/c/scicos.c, line: 4386
 #, c-format
 msgid ""
 "\n"
@@ -829,7 +829,7 @@ msgid ""
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 4351
+# File: src/c/scicos.c, line: 4352
 #, c-format
 msgid ""
 "\n"
@@ -837,14 +837,14 @@ msgid ""
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 4392
+# File: src/c/scicos.c, line: 4393
 msgid ""
 "\n"
 "Error: Problem in the evaluation of a root function"
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 4437
+# File: src/c/scicos.c, line: 4438
 #, c-format
 msgid ""
 "\n"
@@ -852,21 +852,21 @@ msgid ""
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 4447
+# File: src/c/scicos.c, line: 4448
 msgid ""
 "\n"
 "Error: The preconditioner evaluation function failed."
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 4458
+# File: src/c/scicos.c, line: 4459
 msgid ""
 "\n"
 "Error: Failed to factor the preconditioner."
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 4481
+# File: src/c/scicos.c, line: 4482
 #, c-format
 msgid ""
 "\n"
@@ -874,7 +874,7 @@ msgid ""
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 4520
+# File: src/c/scicos.c, line: 4521
 #, c-format
 msgid ""
 "\n"
@@ -882,35 +882,35 @@ msgid ""
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 4521
+# File: src/c/scicos.c, line: 4522
 msgid ""
 "\n"
 "         (already programmed) event. There may be an error in"
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 4522
+# File: src/c/scicos.c, line: 4523
 msgid ""
 "\n"
 "         your model. Please check your model\n"
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 6495
+# File: src/c/scicos.c, line: 6496
 msgid ""
 "\n"
 " error in Jacobian"
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 6596
-# File: src/c/scicos.c, line: 6722
+# File: src/c/scicos.c, line: 6597
+# File: src/c/scicos.c, line: 6723
 #, c-format
 msgid "Error: Cannot find file '%s'.\n"
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 6906
+# File: src/c/scicos.c, line: 6907
 #, c-format
 msgid ""
 "\n"
@@ -918,7 +918,7 @@ msgid ""
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 7042
+# File: src/c/scicos.c, line: 7043
 #, c-format
 msgid ""
 "\n"
@@ -926,7 +926,7 @@ msgid ""
 msgstr ""
 
 #
-# File: src/c/scicos.c, line: 7043
+# File: src/c/scicos.c, line: 7044
 msgid ""
 "\n"
 " The residual function returns NAN/Inf. \n"
index b2b980d..b180642 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: src/c/convert.c, line: 1214
 # File: src/c/convert.c, line: 1239
index 0c4dd55..35810d0 100644 (file)
@@ -33,7 +33,7 @@ function [x,y,typ]=EXPBLK_f(job,arg1,arg2)
             exprs=exprs(2),
         end
         while %t do
-            [ok,a,exprs]=scicos_getvalue("Set a^u  block parameters",..
+            [ok,a,exprs]=scicos_getvalue("a^u: raise the value a to the power of the input",..
             "a (>0)",list("vec",1),exprs)
             if ~ok then
                 break,
index 02d8e0d..f53de9f 100644 (file)
@@ -33,7 +33,7 @@ function [x,y,typ]=POWBLK_f(job,arg1,arg2)
             exprs=exprs(2),
         end //compatibility
         while %t do
-            [ok,a,exprs]=scicos_getvalue("Set u^a block parameters",..
+            [ok,a,exprs]=scicos_getvalue("u^a: raise each element of the input",..
             "to the power of",list("vec",1),exprs)
             if ~ok then
                 break,
index 7fe953a..1cb44ed 100644 (file)
@@ -5,7 +5,7 @@
     </body>
     <display title="_(Display)">
         <body>
-            <scinotes-display highlight-current-line="false" current-line-color="#FACADE" show-line-numbers="true" wrap-lines="true" keywords-colorization="true" highlight-brackets="true" brackets-color="#E40087" brackets-highlightment="Framed" brackets-onmouseover="true" highlight-keywords="true" keywords-color="#FFF3D2" keywords-highlightment="Filled" keywords-onmouseover="true" whereami="true" tab-size="4" tab-representation="chevrons" use-spaces="true" indent-size="4" automatic-indent="true" auto-complete-openers="true" auto-complete-keywords="true" background-color="#FFFFFF" caret-color="#000000"/>
+            <scinotes-display highlight-current-line="false" current-line-color="#FACADE" show-line-numbers="true" wrap-lines="true" keywords-colorization="true" highlight-brackets="true" brackets-color="#E40087" brackets-highlightment="Underlined" brackets-onmouseover="true" highlight-keywords="true" keywords-color="#FFF3D2" keywords-highlightment="Filled" keywords-onmouseover="true" whereami="true" tab-size="4" tab-representation="chevrons" use-spaces="true" indent-size="4" automatic-indent="true" auto-complete-openers="true" auto-complete-keywords="true" background-color="#FFFFFF" caret-color="#000000"/>
         </body>
     </display>
     <header title="_(Header)">
index 1108996..1cae65b 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/gw_scinotes.c, line: 37
 # File: src/noscinotes/noscinotes.c, line: 22
index 6ed3fa4..4ed2906 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_conv2.c, line: 38
 # File: sci_gateway/c/sci_conv2.c, line: 99
index b2a3757..cde9fba 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: demos/SAIsing2ddemo.sce, line: 10
 # File: demos/SAdemo.sce, line: 10
index cab95d9..a35b211 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_PlaySound.c, line: 48
 # File: sci_gateway/c/sci_PlaySound.c, line: 56
index 8a7e65f..329d207 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: includes/spDefs.h, line: 379
 #, c-format
index 14f0152..5865c42 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_besselh.c, line: 74
 # File: sci_gateway/c/sci_besselh.c, line: 103
index 1cec727..373b14b 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/gw_csv_helpers.c, line: 72
 # File: sci_gateway/c/gw_csv_helpers.c, line: 137
index 983c3eb..aabfd08 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: src/c/initMPI.c, line: 27
 #, c-format
index 320fa58..0ae1135 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_cdfbet.c, line: 45
 msgid "X,Y,A and B"
index a2c6344..64fe824 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_ascii.c, line: 171
 msgid "WARNING : \n"
index 8d348b4..9c792e5 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/gw_symbolic.c, line: 33
 #, c-format
index 6195c78..f2c33af 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/gw_tclsci.c, line: 72
 msgid "Warning: Problem(s) with TCL/TK interface. Interface not enabled.\n"
index a147ccc..d03956d 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_calendar.c, line: 59
 # File: sci_gateway/c/sci_calendar.c, line: 65
index c1feb71..5625256 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: src/java/org/scilab/modules/types/ScilabTypeEnumDescription.java, line: 24
 msgid "Double"
index a21f7f7..1f4bf94 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/gw_ui_data.c, line: 40
 # File: src/noui_data/noui_data.c, line: 28
index 14bb84c..5c38b97 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_res_with_prec.c, line: 169
 #, c-format
index 45d8826..66789e2 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/sci_consolebox.c, line: 51
 # File: sci_gateway/c/sci_consolebox.c, line: 93
index 4d4d807..a944e5e 100644 (file)
Binary files a/scilab/modules/xcos/demos/ModelicaBlocks/Rotational_system.zcos and b/scilab/modules/xcos/demos/ModelicaBlocks/Rotational_system.zcos differ
index 8d5e060..3dda0fa 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/c/gw_xcos.c, line: 56
 # File: src/noxcos/noxcos.c, line: 22
@@ -1531,6 +1531,16 @@ msgid "RLC circuit"
 msgstr ""
 
 #
+# File: demos/modelica_demos.dem.gateway.sce, line: 14
+msgid "Heat conduction in a rod"
+msgstr ""
+
+#
+# File: demos/modelica_demos.dem.gateway.sce, line: 15
+msgid "Second order rotational system"
+msgstr ""
+
+#
 # File: demos/old_demos.dem.gateway.sce, line: 7
 msgid "Old Gain Block"
 msgstr ""
index 9f8f6dd..8eb2ec5 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2015-03-27 13:54+0100\n"
+"Revision-Date: 2015-07-03 10:13+0100\n"
 
 # File: sci_gateway/cpp/sci_htmlDump.cpp, line: 55
 # File: sci_gateway/cpp/sci_htmlDump.cpp, line: 80