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

329 files changed:
scilab/CHANGES_5.6.X [new file with mode: 0644]
scilab/Version.incl
scilab/configure
scilab/configure.ac
scilab/etc/modules.xml.in
scilab/etc/scilab.start
scilab/libs/GetWindowsVersion/GetWindowsVersion.rc
scilab/modules/action_binding/src/c/action_binding.rc
scilab/modules/action_binding/src/noaction_binding/noaction_binding.rc
scilab/modules/api_scilab/src/c/api_scilab.rc
scilab/modules/arnoldi/src/c/arnoldi.rc
scilab/modules/atoms/etc/repositories
scilab/modules/atoms/tests/unit_tests/repositories.orig
scilab/modules/boolean/src/c/boolean.rc
scilab/modules/boolean/src/fortran/boolean_f.rc
scilab/modules/cacsd/src/c/cacsd.rc
scilab/modules/cacsd/src/fortran/cacsd_f.rc
scilab/modules/cacsd/src/slicot/slicot_f/slicot_f.rc
scilab/modules/call_scilab/src/c/call_scilab.rc
scilab/modules/commons/src/c/commons.rc
scilab/modules/commons/src/fortran/commons_f.rc
scilab/modules/completion/src/c/completion.rc
scilab/modules/completion/src/nocompletion/nocompletion.rc
scilab/modules/console/src/c/console.rc
scilab/modules/console/src/noconsole/noconsole.rc
scilab/modules/core/includes/machine.h.in
scilab/modules/core/includes/version.h.in
scilab/modules/core/includes/version.h.vc
scilab/modules/data_structures/src/c/data_structures.rc
scilab/modules/data_structures/src/fortran/data_structures_f.rc
scilab/modules/differential_equations/src/c/differential_equations.rc
scilab/modules/differential_equations/src/fortran/differential_equations_f.rc
scilab/modules/double/src/c/double.rc
scilab/modules/double/src/fortran/double_f.rc
scilab/modules/dynamic_link/src/c/dynamic_link.rc
scilab/modules/dynamic_link/src/fortran/dynamic_link_f.rc
scilab/modules/elementary_functions/src/c/elementary_functions.rc
scilab/modules/elementary_functions/src/fortran/eispack/eispack_f.rc
scilab/modules/elementary_functions/src/fortran/elementary_functions_f.rc
scilab/modules/elementary_functions/src/fortran/linpack/linpack_f.rc
scilab/modules/elementary_functions/src/fortran/slatec/slatec_f.rc
scilab/modules/external_objects/external_objects.rc
scilab/modules/external_objects_java/external_objects_java.rc
scilab/modules/fftw/src/c/fftw.rc
scilab/modules/fftw/src/nofftw/nofftw.rc
scilab/modules/fileio/src/c/fileio.rc
scilab/modules/functions/src/c/functions.rc
scilab/modules/functions/src/fortran/functions_f.rc
scilab/modules/graphic_export/graphic_export.rc
scilab/modules/graphic_export/src/nographic_export/nographic_export.rc
scilab/modules/graphic_objects/includes/DataProperties.hxx
scilab/modules/graphic_objects/includes/NgonGeneralData.hxx
scilab/modules/graphic_objects/includes/NgonPolylineData.hxx
scilab/modules/graphic_objects/includes/graphicObjectProperties.h
scilab/modules/graphic_objects/src/cpp/NgonGeneralData.cpp
scilab/modules/graphic_objects/src/cpp/NgonPolylineData.cpp
scilab/modules/graphic_objects/src/cpp/PolylineDecomposer.cpp
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/contouredObject/ContouredObject.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/contouredObject/Mark.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObjectProperties.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/polyline/Polyline.java
scilab/modules/graphic_objects/src/scripts/propertiesMap.properties
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/demos/colormap/colormap.dem.sce
scilab/modules/graphics/demos/misc/misc.dem.sce
scilab/modules/graphics/graphic.rc
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/help/en_US/2d_plot/scatter.xml [new file with mode: 0644]
scilab/modules/graphics/help/en_US/3d_plot/scatter3.xml [new file with mode: 0644]
scilab/modules/graphics/help/en_US/color_management/autumncolormap.xml
scilab/modules/graphics/help/en_US/color_management/bonecolormap.xml
scilab/modules/graphics/help/en_US/color_management/colormap.xml
scilab/modules/graphics/help/en_US/color_management/coolcolormap.xml
scilab/modules/graphics/help/en_US/color_management/graycolormap.xml
scilab/modules/graphics/help/en_US/color_management/hotcolormap.xml
scilab/modules/graphics/help/en_US/color_management/hsvcolormap.xml
scilab/modules/graphics/help/en_US/color_management/jetcolormap.xml
scilab/modules/graphics/help/en_US/color_management/name2rgb.xml
scilab/modules/graphics/help/en_US/color_management/oceancolormap.xml
scilab/modules/graphics/help/en_US/color_management/parulacolormap.xml [new file with mode: 0644]
scilab/modules/graphics/help/en_US/color_management/pinkcolormap.xml
scilab/modules/graphics/help/en_US/color_management/rainbowcolormap.xml
scilab/modules/graphics/help/en_US/color_management/springcolormap.xml
scilab/modules/graphics/help/en_US/color_management/summercolormap.xml
scilab/modules/graphics/help/en_US/color_management/whitecolormap.xml
scilab/modules/graphics/help/en_US/color_management/wintercolormap.xml
scilab/modules/graphics/includes/SetProperty.h
scilab/modules/graphics/macros/%h_p.sci
scilab/modules/graphics/macros/parulacolormap.sci [new file with mode: 0644]
scilab/modules/graphics/macros/scatter.sci [new file with mode: 0644]
scilab/modules/graphics/macros/scatter3.sci [new file with mode: 0644]
scilab/modules/graphics/sci_gateway/c/sci_name2rgb.c
scilab/modules/graphics/src/c/SetProperty.c
scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/get_colors_property.c [new file with mode: 0644]
scilab/modules/graphics/src/c/getHandleProperty/get_mark_background_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_mark_foreground_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_mark_size_property.c
scilab/modules/graphics/src/c/getHandleProperty/setHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/set_colors_property.c [new file with mode: 0644]
scilab/modules/graphics/src/c/getHandleProperty/set_mark_background_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_mark_foreground_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_mark_size_property.c
scilab/modules/graphics/src/nographics/nographics.rc
scilab/modules/graphics/tests/unit_tests/name2rgb.dia.ref [new file with mode: 0644]
scilab/modules/graphics/tests/unit_tests/name2rgb.tst [new file with mode: 0644]
scilab/modules/graphics/tests/unit_tests/parulacolormap.dia.ref [new file with mode: 0644]
scilab/modules/graphics/tests/unit_tests/parulacolormap.tst [new file with mode: 0644]
scilab/modules/graphics/tests/unit_tests/scatter.dia.ref [new file with mode: 0644]
scilab/modules/graphics/tests/unit_tests/scatter.tst [new file with mode: 0644]
scilab/modules/graphics/tests/unit_tests/scatter3.dia.ref [new file with mode: 0644]
scilab/modules/graphics/tests/unit_tests/scatter3.tst [new file with mode: 0644]
scilab/modules/gui/images/icons/aboutscilab.png
scilab/modules/gui/src/c/gui.rc
scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/checkbox/SwingScilabCheckBox.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/editbox/SwingScilabEditBox.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/editbox/SwingScilabSpinner.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/frame/SwingScilabFrame.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/frame/SwingScilabScrollableFrame.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/label/SwingScilabLabel.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/listbox/SwingScilabListBox.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/popupmenu/SwingScilabPopupMenu.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/pushbutton/SwingScilabPushButton.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/radiobutton/SwingScilabRadioButton.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/slider/SwingScilabScroll.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/slider/SwingScilabSlider.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/tab/SwingScilabDockablePanel.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/tab/SwingScilabTabGroup.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/toolbar/SwingScilabToolBar.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/uitable/SwingScilabUiTable.java
scilab/modules/gui/src/java/org/scilab/modules/gui/checkbox/CheckBox.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/checkbox/ScilabCheckBox.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/checkbox/ScilabCheckBoxBridge.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/checkbox/SimpleCheckBox.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/console/ScilabConsoleBridge.java
scilab/modules/gui/src/java/org/scilab/modules/gui/editbox/EditBox.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/editbox/ScilabEditBox.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/editbox/ScilabEditBoxBridge.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/editbox/SimpleEditBox.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/frame/Frame.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/frame/ScilabFrame.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/frame/ScilabFrameBridge.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/frame/SimpleFrame.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/SwingInspector.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ged/actions/ShowHide.java
scilab/modules/gui/src/java/org/scilab/modules/gui/label/Label.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/label/ScilabLabel.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/label/ScilabLabelBridge.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/label/SimpleLabel.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/listbox/ListBox.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/listbox/ScilabListBox.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/listbox/ScilabListBoxBridge.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/listbox/SimpleListBox.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/plotbrowser/SwingPlotBrowser.java
scilab/modules/gui/src/java/org/scilab/modules/gui/plotbrowser/actions/RefreshAction.java
scilab/modules/gui/src/java/org/scilab/modules/gui/popupmenu/PopupMenu.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/popupmenu/ScilabPopupMenu.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/popupmenu/ScilabPopupMenuBridge.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/popupmenu/SimplePopupMenu.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/pushbutton/PushButton.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/pushbutton/ScilabPushButton.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/pushbutton/ScilabPushButtonBridge.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/pushbutton/SimplePushButton.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/radiobutton/RadioButton.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/radiobutton/ScilabRadioButton.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/radiobutton/ScilabRadioButtonBridge.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/radiobutton/SimpleRadioButton.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/slider/ScilabSlider.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/slider/ScilabSliderBridge.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/slider/SimpleSlider.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/slider/Slider.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/tab/ScilabTab.java
scilab/modules/gui/src/java/org/scilab/modules/gui/tab/ScilabTabBridge.java
scilab/modules/gui/src/java/org/scilab/modules/gui/tab/SimpleTab.java
scilab/modules/gui/src/java/org/scilab/modules/gui/tab/Tab.java
scilab/modules/gui/src/java/org/scilab/modules/gui/toolbar/ScilabToolBar.java
scilab/modules/gui/src/java/org/scilab/modules/gui/toolbar/ScilabToolBarBridge.java
scilab/modules/gui/src/java/org/scilab/modules/gui/toolbar/SimpleToolBar.java
scilab/modules/gui/src/java/org/scilab/modules/gui/toolbar/ToolBar.java
scilab/modules/gui/src/java/org/scilab/modules/gui/uitable/ScilabUiTable.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/uitable/ScilabUiTableBridge.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/uitable/SimpleUiTable.java [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/uitable/UiTable.java [deleted file]
scilab/modules/gui/src/nogui/nogui.rc
scilab/modules/hdf5/src/c/hdf5.rc
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html
scilab/modules/helptools/data/pages/homepage-ru_RU.html
scilab/modules/helptools/etc/SciDocConf.xml.vc
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/helptools/images/parulacolormap_1.png [new file with mode: 0644]
scilab/modules/helptools/images/scatter3_1.png [new file with mode: 0644]
scilab/modules/helptools/images/scatter3_2.png [new file with mode: 0644]
scilab/modules/helptools/images/scatter3_3.png [new file with mode: 0644]
scilab/modules/helptools/images/scatter3_4.png [new file with mode: 0644]
scilab/modules/helptools/images/scatter3_5.png [new file with mode: 0644]
scilab/modules/helptools/images/scatter3_6.png [new file with mode: 0644]
scilab/modules/helptools/images/scatter3_7.png [new file with mode: 0644]
scilab/modules/helptools/images/scatter3_8.png [new file with mode: 0644]
scilab/modules/helptools/images/scatter3_9.png [new file with mode: 0644]
scilab/modules/helptools/images/scatter_1.png [new file with mode: 0644]
scilab/modules/helptools/images/scatter_2.png [new file with mode: 0644]
scilab/modules/helptools/images/scatter_3.png [new file with mode: 0644]
scilab/modules/helptools/images/scatter_4.png [new file with mode: 0644]
scilab/modules/helptools/images/scatter_5.png [new file with mode: 0644]
scilab/modules/helptools/images/scatter_6.png [new file with mode: 0644]
scilab/modules/helptools/images/scatter_7.png [new file with mode: 0644]
scilab/modules/helptools/images/scatter_8.png [new file with mode: 0644]
scilab/modules/helptools/images/scatter_9.png [new file with mode: 0644]
scilab/modules/helptools/src/c/helptools.rc
scilab/modules/history_browser/src/c/history_browser.rc
scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.rc
scilab/modules/history_manager/src/c/history_manager.rc
scilab/modules/integer/src/c/integer.rc
scilab/modules/integer/src/fortran/integer_f.rc
scilab/modules/interpolation/src/c/interpolation.rc
scilab/modules/interpolation/src/fortran/interpolation_f.rc
scilab/modules/intersci/src/lib/intersci.rc
scilab/modules/io/macros/%_save.sci
scilab/modules/io/src/c/io.rc
scilab/modules/io/src/fortran/io_f.rc
scilab/modules/javasci/Makefile.in
scilab/modules/javasci/javasci.rc
scilab/modules/jvm/src/c/libjvm.rc
scilab/modules/jvm/src/nojvm/nojvm.rc
scilab/modules/linear_algebra/src/c/linear_algebra.rc
scilab/modules/linear_algebra/src/fortran/linear_algebra_f.rc
scilab/modules/localization/src/localization.rc
scilab/modules/matio/src/c/matio.rc
scilab/modules/matio/src/nomatio/nomatio.rc
scilab/modules/mexlib/src/libmat/libmat.rc
scilab/modules/mexlib/src/libmex/libmex.rc
scilab/modules/mexlib/src/libmx/libmx.rc
scilab/modules/mpi/src/c/mpi.rc
scilab/modules/optimization/src/c/optimization.rc
scilab/modules/optimization/src/fortran/optimization_f.rc
scilab/modules/output_stream/src/c/output_stream.rc
scilab/modules/output_stream/src/fortran/output_stream_f.rc
scilab/modules/parallel/src/c/parallel.rc
scilab/modules/parameters/src/c/parameters.rc
scilab/modules/polynomials/src/c/polynomials.rc
scilab/modules/polynomials/src/fortran/polynomials_f.rc
scilab/modules/preferences/src/c/preferences.rc
scilab/modules/preferences/src/java/org/scilab/modules/preferences/Component/Slider.java
scilab/modules/randlib/src/c/randlib.rc
scilab/modules/randlib/src/fortran/randlib_f.rc
scilab/modules/randlib/src/norandlib/norandlib.rc
scilab/modules/renderer/renderer.rc
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/DrawerVisitor.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/mark/MarkSpriteFactory.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/mark/MarkSpriteManager.java
scilab/modules/renderer/src/norenderer/norenderer.rc
scilab/modules/renderer/tests/unit_tests/mark_color.tst [new file with mode: 0644]
scilab/modules/renderer/tests/unit_tests/mark_color3d.tst [new file with mode: 0644]
scilab/modules/scicos/macros/scicos_scicos/do_version.sci
scilab/modules/scicos/macros/scicos_scicos/message.sci
scilab/modules/scicos/src/c/cli/scicos-cli.rc
scilab/modules/scicos/src/c/noscicos/noscicos.rc
scilab/modules/scicos/src/c/scicos.rc
scilab/modules/scicos/src/fortran/scicos_f.rc
scilab/modules/scicos/src/scicos_sundials/scicos_sundials.rc
scilab/modules/scicos_blocks/macros/Sinks/TOWS_c.sci
scilab/modules/scicos_blocks/macros/Sinks/WFILE_f.sci
scilab/modules/scicos_blocks/macros/Sinks/WRITEAU_f.sci
scilab/modules/scicos_blocks/macros/Sinks/WRITEC_f.sci
scilab/modules/scicos_blocks/macros/Sources/FROMWS_c.sci
scilab/modules/scicos_blocks/macros/Sources/READAU_f.sci
scilab/modules/scicos_blocks/macros/Sources/READC_f.sci
scilab/modules/scicos_blocks/macros/Sources/RFILE_f.sci
scilab/modules/scicos_blocks/src/c/cli/scicos_blocks-cli.rc
scilab/modules/scicos_blocks/src/c/cscope.c
scilab/modules/scicos_blocks/src/c/fromws_c.c
scilab/modules/scicos_blocks/src/c/readau.c
scilab/modules/scicos_blocks/src/c/readc.c
scilab/modules/scicos_blocks/src/c/scicos_blocks.rc
scilab/modules/scicos_blocks/src/c/writec.c
scilab/modules/scicos_blocks/src/fortran/readf.f
scilab/modules/scicos_blocks/src/fortran/scicos_blocks_f.rc
scilab/modules/scinotes/src/c/scinotes.rc
scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/DrawingTools.java
scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/g2d/G2DDrawingTools.java
scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Motor3D.java
scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/g2d/motor/SpritedRectangle.java
scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/g2d/texture/G2DTextureDrawingTools.java
scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java
scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java
scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
scilab/modules/signal_processing/src/c/signal_processing.rc
scilab/modules/signal_processing/src/fortran/signal_processing_f.rc
scilab/modules/sound/src/c/sound.rc
scilab/modules/sound/src/nosound/nosound.rc
scilab/modules/sparse/src/c/sparse.rc
scilab/modules/sparse/src/fortran/sparse_f.rc
scilab/modules/special_functions/src/c/special_functions.rc
scilab/modules/special_functions/src/fortran/special_functions_f.rc
scilab/modules/spreadsheet/src/c/spreadsheet.rc
scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.rc
scilab/modules/statistics/src/c/statistics.rc
scilab/modules/statistics/src/dcdflib/dcd_f/dcd_f.rc
scilab/modules/string/src/c/string.rc
scilab/modules/string/src/fortran/string_f.rc
scilab/modules/symbolic/src/c/symbolic.rc
scilab/modules/symbolic/src/fortran/symbolic_f.rc
scilab/modules/tclsci/src/c/tclsci.rc
scilab/modules/time/src/c/time.rc
scilab/modules/ui_data/src/c/ui_data.rc
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionLongeAction.java
scilab/modules/ui_data/src/noui_data/noui_data.rc
scilab/modules/umfpack/src/c/umfpack.rc
scilab/modules/umfpack/src/noumfpack/noumfpack.rc
scilab/modules/windows_tools/src/c/CScilex/CScilex.rc
scilab/modules/windows_tools/src/c/WScilex/WScilex.rc
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.rc
scilab/modules/windows_tools/src/c/windows_tools.rc
scilab/modules/windows_tools/src/nowindows_tools/nowindows_tools.rc
scilab/modules/xcos/help/en_US/batch_functions/xcos_simulate.xml
scilab/modules/xcos/macros/xcos_simulate.sci
scilab/modules/xcos/src/c/xcos.rc
scilab/modules/xcos/tests/unit_tests/SimpleGENSINExport.sod [new file with mode: 0644]
scilab/modules/xcos/tests/unit_tests/SimpleGENSINSCOPE.sod [new file with mode: 0644]
scilab/modules/xcos/tests/unit_tests/xcos_simulate.dia.ref [new file with mode: 0644]
scilab/modules/xcos/tests/unit_tests/xcos_simulate.tst [new file with mode: 0644]
scilab/modules/xml/src/c/xml.rc

diff --git a/scilab/CHANGES_5.6.X b/scilab/CHANGES_5.6.X
new file mode 100644 (file)
index 0000000..4abc1af
--- /dev/null
@@ -0,0 +1,24 @@
+                     Changes between version 5.5.2 and 5.6.0
+                     =======================================
+
+New Features
+=============
+
+* scatter/scatter3 plot with different mark colors is now available.
+
+* parulacolormap is now available.
+
+* name2rgb can now handle a single string and a matrix of strings.
+
+
+Compilation
+============
+
+* --without-xcos now only disable Xcos compilation. Xcos Graphic interface is disabled
+using --without-gui.
+
+
+Scilab Bug Fixes
+================
+
+* Bug #6064 fixed - scatter function did not exist in Scilab.
index 560a19c..35088ac 100644 (file)
@@ -1,2 +1,2 @@
-SCIVERSION=Scilab-Branch-5.5-GIT
+SCIVERSION=Scilab-Branch-master-GIT
 
index c95ce97..fd0e339 100755 (executable)
@@ -3140,8 +3140,8 @@ else
 fi
 
 SCILAB_VERSION_MAJOR=5
-SCILAB_VERSION_MINOR=5
-SCILAB_VERSION_MAINTENANCE=3
+SCILAB_VERSION_MINOR=6
+SCILAB_VERSION_MAINTENANCE=0
 
 
 
 
 
 if test "$with_gui" = no; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GUI is disabled. Disabling then xcos" >&5
-$as_echo "$as_me: WARNING: GUI is disabled. Disabling then xcos" >&2;}
-   with_xcos=no
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GUI is disabled. Disabling then Xcos GUI" >&5
+$as_echo "$as_me: WARNING: GUI is disabled. Disabling then Xcos GUI" >&2;}
 fi
 
 XCOS_ENABLE=no
 
-if test "$with_xcos" != no -a "$with_gui" != no; then
+if test "$with_xcos" != no; then
 
 $as_echo "#define WITH_XCOS /**/" >>confdefs.h
 
@@ -13068,7 +13067,7 @@ fi
 
         if test "$with_gui" != no; then
 
-                if test $XCOS_ENABLE = yes; then
+                if test "$with_xcos" != no; then
                    # jgraphx
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking jgraphx" >&5
index eb2482c..15628bb 100644 (file)
@@ -37,8 +37,8 @@ else
 fi
 
 SCILAB_VERSION_MAJOR=5
-SCILAB_VERSION_MINOR=5
-SCILAB_VERSION_MAINTENANCE=3
+SCILAB_VERSION_MINOR=6
+SCILAB_VERSION_MAINTENANCE=0
 AC_SUBST(SCILAB_VERSION_MAJOR)
 AC_SUBST(SCILAB_VERSION_MINOR)
 AC_SUBST(SCILAB_VERSION_MAINTENANCE)
@@ -765,21 +765,20 @@ AM_CONDITIONAL(EXTERNAL_SCIRENDERER, test "$with_external_scirenderer" = yes)
 #################
 
 AC_ARG_WITH(xcos,
-    AC_HELP_STRING([--without-xcos],[Disable Xcos]))
+    AC_HELP_STRING([--without-xcos], [Disable Xcos]))
 
 AC_ARG_WITH(modelica,
     AC_HELP_STRING([--without-modelica],[Disable the OCaml module (modelica)]))
 
 
 if test "$with_gui" = no; then
-   AC_MSG_WARN([GUI is disabled. Disabling then xcos])
-   with_xcos=no
+   AC_MSG_WARN([GUI is disabled. Disabling then Xcos GUI])
 fi
 
 XCOS_ENABLE=no
 
-if test "$with_xcos" != no -a "$with_gui" != no; then
-   AC_DEFINE([WITH_XCOS], [], [With XCOS])
+if test "$with_xcos" != no; then
+   AC_DEFINE([WITH_XCOS], [], [with XCos])
 
    save_LIBS="$LIBS"
 
@@ -862,7 +861,7 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
 
         if test "$with_gui" != no; then
 
-                if test $XCOS_ENABLE = yes; then
+                if test "$with_xcos" != no; then
                    # jgraphx
                    AC_JAVA_CHECK_PACKAGE([jgraphx],[com.mxgraph.model.mxCell],[Diagram design])
                    JGRAPHX=$PACKAGE_JAR_FILE
index 912fb53..9e4b8d4 100644 (file)
@@ -76,7 +76,7 @@
 <module name="matio" activate="@MATIO_ENABLE@"/>
 <module name="types" activate="@JAVA_ENABLE@"/>
 <module name="hdf5" activate="yes"/>
-<module name="xcos" activate="@GUI_ENABLE@"/>
+<module name="xcos" activate="@XCOS_ENABLE@"/>
 <module name="mpi" activate="@MPI_ENABLE@"/>
 <module name="graphic_objects" activate="@GUI_ENABLE@"/>
 <module name="scinotes" activate="@GUI_ENABLE@"/>
@@ -92,4 +92,3 @@
 <module name="external_objects" activate="yes"/>
 <module name="external_objects_java" activate="@JAVA_ENABLE@"/>
 </modules>
-
index ae0fbbc..095f1aa 100644 (file)
@@ -147,19 +147,28 @@ if sciargs()<>"-nouserstartup" then
 
   startupfiles = [ SCIHOME + filesep() + ".scilab"     ; .. // Home directory startup
                    SCIHOME + filesep() + "scilab.ini" ];    //  ""      ""    startup
-
-  if SCIHOME <> pwd() then
-    startupfiles = [ startupfiles     ; ..
-                     ".scilab"        ; .. // Working directory startup
-                     "scilab.ini" ]   ;    //  ""         ""    startup
-  end
-
   for i = 1:size(startupfiles, "*")
     if isfile(startupfiles(i)) then
       exec(startupfiles(i),-1);
     end
   end
 
+  // execute .scilab and scilab.start only
+  // if last exec does not change current directory to SCIHOME
+  // See bug #4150
+  workingDirectory = pwd();
+  if SCIHOME <> workingDirectory then
+
+      workingfiles = [ workingDirectory + filesep() + ".scilab"     ; .. // Working directory startup
+                       workingDirectory + filesep() + "scilab.ini" ];    //  ""      ""    startup
+
+      for i = 1:size(startupfiles, "*")
+        if isfile(startupfiles(i)) then
+          exec(startupfiles(i),-1);
+        end
+      end
+  end
+
   clear i;
   clear startupfiles;
 end
index 8927dac..1e9779c 100644 (file)
@@ -48,8 +48,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "GetWindowsVersion library for Scilab 5.x"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "GetWindowsVersion library for Scilab 5.x"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "GetWindowsVersion.dll"
             VALUE "ProductName", "GetWindowsVersion library for Scilab 5.x"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index a85aa51..27dbb3f 100644 (file)
@@ -49,8 +49,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -66,12 +66,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "action_binding module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "action_binding module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "action_binding.dll"
             VALUE "ProductName", " action_binding"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 43b9e74..7be0838 100644 (file)
@@ -49,8 +49,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -66,12 +66,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "noaction_binding module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "noaction_binding module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "noaction_binding.dll"
             VALUE "ProductName", " noaction_binding"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index d5d1847..7f6c9e9 100644 (file)
@@ -48,8 +48,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "api_scilab module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "api_scilab module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "api_scilab.dll"
             VALUE "ProductName", "api_scilab module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index aad6cf7..6e58b92 100644 (file)
@@ -53,8 +53,8 @@ END
 //
 
 1 VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -70,12 +70,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "arnoldi module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "arnoldi"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "arnoldi.dll"
             VALUE "ProductName", "arnoldi module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 363a637..2e533f5 100644 (file)
@@ -1 +1 @@
-http://atoms.scilab.org/5.5
+http://atoms.scilab.org/5.6
index f0c5aba..8aa6699 100644 (file)
@@ -48,8 +48,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "boolean module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "boolean module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "boolean.dll"
             VALUE "ProductName", "boolean module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 634beab..3dd7f08 100644 (file)
@@ -48,8 +48,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "boolean_f module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "boolean_f module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "boolean_f.dll"
             VALUE "ProductName", "boolean_f module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 805267f..08fde24 100644 (file)
@@ -47,8 +47,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -64,12 +64,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "cacsd module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "cacsd module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "cacsd.dll"
             VALUE "ProductName", "cacsd module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 8cb5231..60e4bb3 100644 (file)
@@ -47,8 +47,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -64,12 +64,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "elementary_functions_f module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "elementary_functions_f module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "elementary_functions_f.dll"
             VALUE "ProductName", "elementary_functions_f module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index aa2e229..fbfb0a2 100644 (file)
@@ -48,8 +48,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "slicot_f module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "slicot_f module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "slicot_f.dll"
             VALUE "ProductName", "slicot_f module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index e833f8f..96a80bb 100644 (file)
@@ -48,8 +48,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "call_scilab module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "call_scilab module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "call_scilab.dll"
             VALUE "ProductName", " call_scilab module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 9e71a91..26a5bb6 100644 (file)
@@ -47,8 +47,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -64,12 +64,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "commons module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "commons module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "commons.dll"
             VALUE "ProductName", "commons module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 7ed113e..b254623 100644 (file)
@@ -47,8 +47,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -64,12 +64,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "commons_f module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "commons_f module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "commons_f.dll"
             VALUE "ProductName", "commons_f module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 40b2597..eddd136 100644 (file)
@@ -49,8 +49,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -66,12 +66,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "completion module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "completion module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "completion.dll"
             VALUE "ProductName", " completion"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index ea207a4..10c634f 100644 (file)
@@ -49,8 +49,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -66,12 +66,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "nocompletion module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "nocompletion module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "nocompletion.dll"
             VALUE "ProductName", " nocompletion"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 94329ef..d05ea5e 100644 (file)
@@ -48,8 +48,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "console module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "console module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "sciconsole.dll"
             VALUE "ProductName", " console module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 15b5ba5..6a9cd0e 100644 (file)
@@ -49,8 +49,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -66,12 +66,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "noconsole module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "noconsole module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "noconsole.dll"
             VALUE "ProductName", " noconsole"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index a342cdd..c99c58e 100644 (file)
 /* With the UMFPACK library */
 #undef WITH_UMFPACK
 
-/* With XCOS */
+/* with XCos */
 #undef WITH_XCOS
 
 /* If leading underscores */
index aef7a72..d37b43a 100644 (file)
@@ -15,7 +15,7 @@
 #define SCI_VERSION_MAJOR @SCILAB_VERSION_MAJOR@
 #define SCI_VERSION_MINOR @SCILAB_VERSION_MINOR@
 #define SCI_VERSION_MAINTENANCE @SCILAB_VERSION_MAINTENANCE@
-#define SCI_VERSION_STRING "scilab-branch-5.5"
+#define SCI_VERSION_STRING "scilab-branch-master"
 /* SCI_VERSION_REVISION --> hash key commit */
 #define SCI_VERSION_REVISION 0
 #define SCI_VERSION_TIMESTAMP 0
@@ -25,7 +25,7 @@ void disp_scilab_version(void);
 /* for compatibility */
 /* Deprecated */
 #define SCI_VERSION SCI_VERSION_STRING
-#define DEFAULT_SCI_VERSION_MESSAGE "scilab-branch-5.5"
+#define DEFAULT_SCI_VERSION_MESSAGE "scilab-branch-master"
 
 #endif
 /*--------------------------------------------------------------------------*/
index 01b3318..d9b5778 100644 (file)
@@ -13,9 +13,9 @@
 #define SCI_VERSION_H
 
 #define SCI_VERSION_MAJOR 5
-#define SCI_VERSION_MINOR 5
-#define SCI_VERSION_MAINTENANCE 3
-#define SCI_VERSION_STRING "scilab-branch-5.5"
+#define SCI_VERSION_MINOR 6
+#define SCI_VERSION_MAINTENANCE 0
+#define SCI_VERSION_STRING "scilab-branch-master"
 /* SCI_VERSION_REVISION --> hash key commit */
 #define SCI_VERSION_REVISION 0
 #define SCI_VERSION_TIMESTAMP 0
@@ -25,7 +25,7 @@ void disp_scilab_version(void);
 /* for compatibility */
 /* Deprecated */
 #define SCI_VERSION SCI_VERSION_STRING
-#define DEFAULT_SCI_VERSION_MESSAGE "scilab-branch-5.5"
+#define DEFAULT_SCI_VERSION_MESSAGE "scilab-branch-master"
 
 
 #endif
index 91d786f..c7d69e9 100644 (file)
@@ -47,8 +47,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -64,12 +64,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "data_structures module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "data_structures module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "data_structures.dll"
             VALUE "ProductName", "data_structures module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 8cb5231..60e4bb3 100644 (file)
@@ -47,8 +47,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -64,12 +64,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "elementary_functions_f module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "elementary_functions_f module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "elementary_functions_f.dll"
             VALUE "ProductName", "elementary_functions_f module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index b8d851d..31a194d 100644 (file)
@@ -47,8 +47,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -64,12 +64,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "differential_equations module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "differential_equations module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "differential_equations.dll"
             VALUE "ProductName", "differential_equations module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 8a72a0e..d6f9df7 100644 (file)
@@ -47,8 +47,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -64,12 +64,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "differential_equations_f module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "differential_equations_f module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "differential_equations_f.dll"
             VALUE "ProductName", "differential_equations_f module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 0de1ad4..2f85377 100644 (file)
@@ -48,8 +48,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "double module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "double module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "double.dll"
             VALUE "ProductName", "double module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 0f2876b..af9eb78 100644 (file)
@@ -48,8 +48,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "double_f module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "double_f module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "double_f.dll"
             VALUE "ProductName", "double_f module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 496c237..820c76c 100644 (file)
@@ -48,8 +48,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "dynamic_link module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "dynamic_link module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "dynamic_link.dll"
             VALUE "ProductName", "dynamic_link module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 7d402e8..e94e4e7 100644 (file)
@@ -48,8 +48,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "dynamic_link_f module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "dynamic_link_f module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "dynamic_link_f.dll"
             VALUE "ProductName", "dynamic_link_f module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index c2a5f0c..e56be36 100644 (file)
@@ -47,8 +47,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -64,12 +64,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "elementary_functions module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "elementary_functions module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "elementary_functions.dll"
             VALUE "ProductName", "elementary_functions module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 68f9845..e92b9d4 100644 (file)
@@ -48,8 +48,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "eispack library"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "eispack library for scilab 5.x"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "eispack.dll"
             VALUE "ProductName", "eispack library for scilab 5.x"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 8cb5231..60e4bb3 100644 (file)
@@ -47,8 +47,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -64,12 +64,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "elementary_functions_f module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "elementary_functions_f module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "elementary_functions_f.dll"
             VALUE "ProductName", "elementary_functions_f module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 001e18a..f6e68fc 100644 (file)
@@ -48,8 +48,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "linpack_f module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "linpack_f module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "linpack_f.dll"
             VALUE "ProductName", "linpack_f module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 0265a54..977bd0e 100644 (file)
@@ -48,8 +48,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "slatec_f module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "slatec_f module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "slatec_f.dll"
             VALUE "ProductName", "slatec_f module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index ad20914..c705e9e 100644 (file)
@@ -49,8 +49,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -66,12 +66,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "external_objects module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "external_objects module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "external_objects.dll"
             VALUE "ProductName", " external_objects"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index a762287..9fe065b 100644 (file)
@@ -49,8 +49,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -66,12 +66,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "external_objects_java module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "external_objects_java module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "external_objects_java.dll"
             VALUE "ProductName", " external_objects_java"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index e30282e..84d4b36 100644 (file)
@@ -48,8 +48,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -66,12 +66,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Scilab"
             VALUE "FileDescription", "fftw module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "fftw"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "fftw.rc"
             VALUE "ProductName", " fftw"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 39a0c50..896d41c 100644 (file)
@@ -49,8 +49,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -66,12 +66,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "nofftw module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "nofftw module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "nofftw.dll"
             VALUE "ProductName", " nofftw"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 8414503..70e0607 100644 (file)
@@ -49,8 +49,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -66,12 +66,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "fileio module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "fileio module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "fileio.dll"
             VALUE "ProductName", " fileio"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 48ac6a2..7b2031e 100644 (file)
@@ -48,8 +48,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "functions module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "functions module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "functions.dll"
             VALUE "ProductName", "functions module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index e797c25..96c8756 100644 (file)
@@ -48,8 +48,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "functions_f module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "functions_f module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "functions_f.dll"
             VALUE "ProductName", "functions_f module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 4500af2..ce671c1 100644 (file)
@@ -48,8 +48,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "graphic_export module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "graphic_export module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "scigraphic_export.dll"
             VALUE "ProductName", "graphic_export module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index 632ea06..1d2a1ce 100644 (file)
@@ -49,8 +49,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -66,12 +66,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "nographic_export module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "nographic_export module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "nographic_export.dll"
             VALUE "ProductName", " nographic_export"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index a037232..2a20fe2 100644 (file)
@@ -70,4 +70,7 @@
 #define DISPLAY_FUNCTION_DATA       40
 #define DISPLAY_FUNCTION_DATA_SIZE  41
 
+#define SIZES                       42
+#define NUM_SIZES                   43
+
 #endif
index 89a4494..99352db 100644 (file)
@@ -34,7 +34,7 @@ private :
     double* colorValues;
 
     /** The size of the color values array */
-    int numColors;
+    int numColorValues;
 
 protected :
     /** The coordinates array */
index b6e9df4..e8e796e 100644 (file)
@@ -59,6 +59,10 @@ private :
     int* display_function_data;
     int display_function_data_size;
 
+    /** The colors array */
+    int* colors;
+       int numColors;
+
 public :
     /**
      * Constructor
@@ -214,6 +218,26 @@ public :
     void copyShiftCoordinatesArray(double * newShift, double const* oldShift, int numElementsNew);
 
     /**
+     * Sets the colors array
+     * @param[in] newColors a pointer to the array with the colors
+     * @param[in] numElements the colors array number of elements
+     * @return 1 if it succeeded, 0 if the allocation failed
+     */
+    int setColors(int const* newColors, int numElements);
+
+    /**
+     * Gets the colors array
+     * @return pointer to the array with the colors
+     */
+    int * getColors();
+
+    /**
+     * Gets the number of colors in the array
+     * @return number of colors in the array
+     */
+    int getNumColors();
+
+    /**
      * Deletes the coordinates and shift arrays
      */
     void deleteCoordinatesArrays(void);
index 63f71de..3a22fd8 100755 (executable)
 #define __GO_UI_TITLE_SCROLL__ 391
 #define __GO_UI_FRAME_BORDER_TYPE__ 392
 #define __GO_UI_SCROLLABLE__ 393
+#define __GO_COLOR_SET__ 394
+#define __GO_MARK_SIZES__ 395
+#define __GO_NUM_MARK_SIZES__ 396
+#define __GO_MARK_FOREGROUNDS__ 397
+#define __GO_NUM_MARK_FOREGROUNDS__ 398
+#define __GO_MARK_BACKGROUNDS__ 399
+#define __GO_NUM_MARK_BACKGROUNDS__ 400
 
 #endif /* !__GRAPHIC_OBJECT_PROPERTIES_H__ */
index b8ea011..7a6c564 100644 (file)
@@ -31,7 +31,7 @@ NgonGeneralData::NgonGeneralData(void)
     coordinates = NULL;
 
     colorValues = NULL;
-    numColors = 0;
+    numColorValues = 0;
 }
 
 NgonGeneralData::~NgonGeneralData(void)
@@ -41,7 +41,7 @@ NgonGeneralData::~NgonGeneralData(void)
         delete [] coordinates;
     }
 
-    if (numColors > 0)
+    if (numColorValues > 0)
     {
         delete [] colorValues;
     }
@@ -224,7 +224,7 @@ int NgonGeneralData::setNumElementsArray(int const* numElementsArray)
         result = 1;
     }
 
-    if (numElementsArray[2] != this->numColors)
+    if (numElementsArray[2] != this->numColorValues)
     {
         if (numElementsArray[2] > 0)
         {
@@ -258,13 +258,13 @@ int NgonGeneralData::setNumElementsArray(int const* numElementsArray)
 
         if (newColorValues != NULL || numElementsArray[2] == 0)
         {
-            if (this->numColors > 0)
+            if (this->numColorValues > 0)
             {
                 delete [] colorValues;
             }
 
             colorValues = newColorValues;
-            this->numColors = numElementsArray[2];
+            this->numColorValues = numElementsArray[2];
         }
     }
     else
@@ -290,7 +290,7 @@ double* NgonGeneralData::getColors(void)
 
 void NgonGeneralData::setColors(double const* colors, int numElements)
 {
-    if (numElements > numColors)
+    if (numElements > numColorValues)
     {
         return;
     }
@@ -299,6 +299,5 @@ void NgonGeneralData::setColors(double const* colors, int numElements)
 
 int NgonGeneralData::getNumColors(void)
 {
-    return numColors;
+    return numColorValues;
 }
-
index d28fd2d..c537f81 100644 (file)
@@ -40,6 +40,7 @@ NgonPolylineData::NgonPolylineData(void)
     display_function_data = NULL;
     display_function_data_size = 0;
 
+    colors = NULL;
 }
 
 NgonPolylineData::~NgonPolylineData(void)
@@ -63,6 +64,11 @@ NgonPolylineData::~NgonPolylineData(void)
     {
         delete[] display_function_data;
     }
+
+    if (colors)
+    {
+        delete [] colors;
+    }
 }
 
 int NgonPolylineData::getPropertyFromName(int propertyName)
@@ -91,6 +97,10 @@ int NgonPolylineData::getPropertyFromName(int propertyName)
             return DISPLAY_FUNCTION_DATA;
         case __GO_DATA_MODEL_DISPLAY_FUNCTION_SIZE__ :
             return DISPLAY_FUNCTION_DATA_SIZE;
+        case __GO_DATA_MODEL_COLORS__ :
+            return COLORS;
+        case __GO_DATA_MODEL_NUM_COLORS__ :
+            return NUM_COLORS;
         default :
             return NgonGeneralData::getPropertyFromName(propertyName);
     }
@@ -112,24 +122,29 @@ int NgonPolylineData::setDataProperty(int property, void const* value, int numEl
             return setZCoordinatesShift((double const*) value, numElements);
         case X_COORDINATES_SHIFT_SET :
             setXCoordinatesShiftSet(*((int const*) value));
+                       return 1;
             break;
         case Y_COORDINATES_SHIFT_SET :
             setYCoordinatesShiftSet(*((int const*) value));
-            break;
+            return 1;
+                       break;
         case Z_COORDINATES_SHIFT_SET :
             setZCoordinatesShiftSet(*((int const*) value));
+                       return 1;
             break;
         case Z_COORDINATES_SET :
             setZCoordinatesSet(*((int const*) value));
+                       return 1;
             break;
         case DISPLAY_FUNCTION_DATA :
-            setDisplayFunctionData((int const*) value, numElements);
+            return setDisplayFunctionData((int const*) value, numElements);
+            break;
+        case COLORS :
+            return setColors((int const*) value, numElements);
             break;
         default :
             return NgonGeneralData::setDataProperty(property, value, numElements);
     }
-
-    return 1;
 }
 
 void NgonPolylineData::getDataProperty(int property, void **_pvData)
@@ -166,6 +181,12 @@ void NgonPolylineData::getDataProperty(int property, void **_pvData)
         case DISPLAY_FUNCTION_DATA_SIZE :
             ((int *) *_pvData)[0] = getDisplayFunctionDataSize();
             break;
+        case COLORS :
+            *_pvData = getColors();
+            break;
+        case NUM_COLORS :
+            ((int *) *_pvData)[0] = getNumColors();
+            break;
         default :
             NgonGeneralData::getDataProperty(property, _pvData);
     }
@@ -480,6 +501,54 @@ int NgonPolylineData::setNumElementsArray(int const* numElementsArray)
     return result;
 }
 
+int NgonPolylineData::getNumColors(void)
+{
+    return numColors;
+}
+
+int* NgonPolylineData::getColors(void)
+{
+    return colors;
+}
+
+int NgonPolylineData::setColors(int const* newColors, int numElements)
+{
+    int * _newColors = 0;
+
+    if (numElements == 0)
+    {
+        if (colors)
+        {
+            delete[] colors;
+        }
+        colors = NULL;
+        numColors = 0;
+
+        return 1;
+    }
+
+    try
+    {
+        _newColors = new int[numElements];
+    }
+    catch (const std::exception& e)
+    {
+        e.what();
+        return 0;
+    }
+
+    memcpy(_newColors, newColors, numElements * sizeof(int));
+    if (colors)
+    {
+        delete[] colors;
+    }
+
+    colors = _newColors;
+    numColors = numElements;
+
+    return 1;
+}
+
 void NgonPolylineData::copyShiftCoordinatesArray(double * newShift, double const* oldShift, int numElementsNew)
 {
     int numElementsCopied = 0;
@@ -565,4 +634,4 @@ int NgonPolylineData::setDisplayFunctionData(int const* data, int numElements)
 
     memcpy(display_function_data, data, display_function_data_size * sizeof(int));
     return 1;
-}
\ No newline at end of file
+}
index 6d9310b..f238614 100644 (file)
@@ -667,6 +667,8 @@ void PolylineDecomposer::fillColors(int id, float* buffer, int bufferLength, int
 
     int interpColorMode = 0;
     int* piInterpColorMode = &interpColorMode;
+    int colorSet = 0;
+    int* piColorSet = &colorSet;
     int polylineStyle = 0;
     int* piPolylineStyle = &polylineStyle;
     int nPoints = 0;
@@ -679,15 +681,16 @@ void PolylineDecomposer::fillColors(int id, float* buffer, int bufferLength, int
     double* colormap = NULL;
 
     getGraphicObjectProperty(id, __GO_INTERP_COLOR_MODE__, jni_bool, (void**) &piInterpColorMode);
+    getGraphicObjectProperty(id, __GO_COLOR_SET__, jni_bool, (void**) &piColorSet);
 
-    if (interpColorMode == 0)
+    if (interpColorMode == 0 && colorSet == 0)
     {
         return;
     }
 
     getGraphicObjectProperty(id, __GO_POLYLINE_STYLE__, jni_int, (void**) &piPolylineStyle);
 
-    if (polylineStyle  != 1)
+    if (polylineStyle != 1 && colorSet == 0)
     {
         return;
     }
@@ -718,39 +721,100 @@ void PolylineDecomposer::fillColors(int id, float* buffer, int bufferLength, int
         return;
     }
 
-    /*
-     * The interpolated color vector is a 3- or 4-element vector.
-     * However, if nPoints is greater than 4, we choose to output
-     * 4 colors (this behaviour is kept for compatibility, see fillTriangleIndices).
-     */
-    if (nPoints < 3)
+    if (interpColorMode == 1)
     {
-        return;
-    }
+        /*
+         * The interpolated color vector is a 3- or 4-element vector.
+         * However, if nPoints is greater than 4, we choose to output
+         * 4 colors (this behaviour is kept for compatibility, see fillTriangleIndices).
+         */
+        if (nPoints < 3)
+        {
+            return;
+        }
 
-    getGraphicObjectProperty(id, __GO_INTERP_COLOR_VECTOR__, jni_int_vector, (void**) &interpColorVector);
-    getGraphicObjectProperty(parentFigure, __GO_COLORMAP__, jni_double_vector, (void**) &colormap);
-    getGraphicObjectProperty(parentFigure, __GO_COLORMAP_SIZE__, jni_int, (void**) &piColormapSize);
+        getGraphicObjectProperty(id, __GO_INTERP_COLOR_VECTOR__, jni_int_vector, (void**) &interpColorVector);
+        getGraphicObjectProperty(parentFigure, __GO_COLORMAP__, jni_double_vector, (void**) &colormap);
+        getGraphicObjectProperty(parentFigure, __GO_COLORMAP_SIZE__, jni_int, (void**) &piColormapSize);
 
-    if (nPoints > 4)
-    {
-        nPoints = 4;
-    }
+        if (nPoints > 4)
+        {
+            nPoints = 4;
+        }
 
-    for (int i = 0; i < nPoints; i++)
-    {
-        ColorComputer::getDirectColor((double) interpColorVector[i] - 1.0, colormap, colormapSize, &buffer[bufferOffset]);
+        for (int i = 0; i < nPoints; i++)
+        {
+            ColorComputer::getDirectColor((double) interpColorVector[i] - 1.0, colormap, colormapSize, &buffer[bufferOffset]);
+
+            if (elementsSize == 4)
+            {
+                buffer[bufferOffset + 3] = 1.0;
+            }
 
-        if (elementsSize == 4)
+            bufferOffset += elementsSize;
+        }
+
+        releaseGraphicObjectProperty(__GO_COLORMAP__, colormap, jni_double_vector, colormapSize);
+        releaseGraphicObjectProperty(__GO_INTERP_COLOR_VECTOR__, interpColorVector, jni_int_vector, 0);
+    }
+    else
+    {
+        int* colors = NULL;
+        int numColors = 0;
+        int * piNumColors = &numColors;
+        int min;
+
+               getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_COLORS__, jni_int, (void**) &piNumColors);
+               if (numColors > 0) 
+               {
+               getGraphicObjectProperty(id, __GO_DATA_MODEL_COLORS__, jni_int_vector, (void**) &colors);
+               }
+
+               if (numColors == 0 || colors == NULL)
+               {
+                       // try to load mark background colors 
+                       getGraphicObjectProperty(id, __GO_NUM_MARK_BACKGROUNDS__, jni_int, (void**) &piNumColors);
+                       if (numColors > 0) 
+                       {
+                           getGraphicObjectProperty(id, __GO_MARK_BACKGROUNDS__, jni_int_vector, (void**) &colors);
+                       }
+               }
+
+               if (numColors == 0 || colors == NULL)
+               {
+                       // try to load mark foreground colors 
+                       getGraphicObjectProperty(id, __GO_NUM_MARK_FOREGROUNDS__, jni_int, (void**) &piNumColors);
+                       if (numColors > 0) 
+                       {
+                           getGraphicObjectProperty(id, __GO_MARK_FOREGROUNDS__, jni_int_vector, (void**) &colors);
+                       }
+               }
+
+               if (!colors)
         {
             buffer[bufferOffset + 3] = 1.0;
         }
 
-        bufferOffset += elementsSize;
-    }
+        min = nPoints < numColors ? nPoints : numColors;
 
-    releaseGraphicObjectProperty(__GO_COLORMAP__, colormap, jni_double_vector, colormapSize);
-    releaseGraphicObjectProperty(__GO_INTERP_COLOR_VECTOR__, interpColorVector, jni_int_vector, 0);
+        getGraphicObjectProperty(parentFigure, __GO_COLORMAP__, jni_double_vector, (void**) &colormap);
+        getGraphicObjectProperty(parentFigure, __GO_COLORMAP_SIZE__, jni_int, (void**) &piColormapSize);
+
+        for (int i = 0; i < min; i++)
+        {
+            ColorComputer::getDirectColor(colors[i] - 1.0, colormap, colormapSize, &buffer[bufferOffset]);
+
+            if (elementsSize == 4)
+            {
+                buffer[bufferOffset + 3] = 1.0;
+            }
+
+            bufferOffset += elementsSize;
+        }
+
+        releaseGraphicObjectProperty(__GO_COLORMAP__, colormap, jni_double_vector, colormapSize);
+        releaseGraphicObjectProperty(__GO_INTERP_COLOR_VECTOR__, interpColorVector, jni_int_vector, 0);
+    }
 }
 
 void PolylineDecomposer::fillTextureCoordinates(int id, float* buffer, int bufferLength)
index a249d5d..2e0520f 100644 (file)
@@ -27,7 +27,7 @@ import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProp
  */
 public abstract class ContouredObject extends GraphicObject {
     /** ContouredObject properties */
-    public enum ContouredObjectPropertyType { LINE, FILLMODE, BACKGROUND, MARK, MARK_OFFSET, MARK_STRIDE, SELECTED };
+    public enum ContouredObjectPropertyType { LINE, FILLMODE, BACKGROUND, MARK, MARK_OFFSET, MARK_STRIDE, MARK_SIZES, NUM_MARK_SIZES, MARK_FOREGROUNDS, NUM_MARK_FOREGROUNDS, MARK_BACKGROUNDS, NUM_MARK_BACKGROUNDS, SELECTED };
 
     /** Line property */
     private Line line;
@@ -46,6 +46,27 @@ public abstract class ContouredObject extends GraphicObject {
 
     private boolean selected;
     private final Integer selectedColor = new Integer(-3);
+    
+    /** Mark sizes
+     *  The class Mark only handles a single size.
+     *  The mark_sizes array is used to handle different sizes for the marks.
+     *  The mark_sizes array is empty in case of a single size.  
+     *  */
+    private Integer[] mark_sizes;
+
+    /** Mark foreground colors
+     *  The class Mark only handles a single foreground color.
+     *  The mark_foregrounds array is used to handle different foreground colors for the marks.
+     *  The mark_foregrounds array is empty in case of a single color. 
+     *  */
+    private Integer[] mark_foregrounds;
+
+    /** Mark background colors
+     *  The class Mark only handles a single background color.
+     *  The mark_backgrounds array is used to handle different background colors for the marks.
+     *  The mark_backgrounds array is empty in case of a single color. 
+     *  */
+    private Integer[] mark_backgrounds;
 
     /** Default constructor */
     public ContouredObject() {
@@ -56,6 +77,9 @@ public abstract class ContouredObject extends GraphicObject {
         offset = 0;
         stride = 1;
         selected = false;
+        mark_sizes = new Integer[0];
+        mark_foregrounds = new Integer[0];
+        mark_backgrounds = new Integer[0];
     }
 
     public ContouredObject clone() {
@@ -63,6 +87,9 @@ public abstract class ContouredObject extends GraphicObject {
 
         copy.line = new Line(line);
         copy.mark = new Mark(mark);
+        copy.mark_sizes = mark_sizes; 
+        copy.mark_foregrounds = mark_foregrounds;
+        copy.mark_backgrounds = mark_backgrounds; 
 
         return copy;
     }
@@ -98,10 +125,22 @@ public abstract class ContouredObject extends GraphicObject {
                 return MarkPropertyType.SIZEUNIT;
             case __GO_MARK_SIZE__ :
                 return MarkPropertyType.SIZE;
+            case __GO_MARK_SIZES__ :
+                return ContouredObjectPropertyType.MARK_SIZES;
+            case __GO_NUM_MARK_SIZES__ :
+                return ContouredObjectPropertyType.NUM_MARK_SIZES;
             case __GO_MARK_FOREGROUND__ :
                 return MarkPropertyType.FOREGROUND;
+            case __GO_MARK_FOREGROUNDS__ :
+                return ContouredObjectPropertyType.MARK_FOREGROUNDS;
+            case __GO_NUM_MARK_FOREGROUNDS__ :
+                return ContouredObjectPropertyType.NUM_MARK_FOREGROUNDS;
             case __GO_MARK_BACKGROUND__ :
                 return MarkPropertyType.BACKGROUND;
+            case __GO_MARK_BACKGROUNDS__ :
+                return ContouredObjectPropertyType.MARK_BACKGROUNDS;
+            case __GO_NUM_MARK_BACKGROUNDS__ :
+                return ContouredObjectPropertyType.NUM_MARK_BACKGROUNDS;
             case __GO_MARK_OFFSET__ :
                 return ContouredObjectPropertyType.MARK_OFFSET;
             case __GO_MARK_STRIDE__ :
@@ -143,10 +182,22 @@ public abstract class ContouredObject extends GraphicObject {
             return getMarkSizeUnit();
         } else if (property == MarkPropertyType.SIZE) {
             return getMarkSize();
+        } else if (property == ContouredObjectPropertyType.MARK_SIZES) {
+            return getMarkSizes();
+        } else if (property == ContouredObjectPropertyType.NUM_MARK_SIZES) {
+            return getNumMarkSizes();
         } else if (property == MarkPropertyType.FOREGROUND) {
             return getMarkForeground();
+        } else if (property == ContouredObjectPropertyType.MARK_FOREGROUNDS) {
+            return getMarkForegrounds();
+        } else if (property == ContouredObjectPropertyType.NUM_MARK_FOREGROUNDS) {
+            return getNumMarkForegrounds();
         } else if (property == MarkPropertyType.BACKGROUND) {
             return getMarkBackground();
+        } else if (property == ContouredObjectPropertyType.MARK_BACKGROUNDS) {
+            return getMarkBackgrounds();
+        } else if (property == ContouredObjectPropertyType.NUM_MARK_BACKGROUNDS) {
+            return getNumMarkBackgrounds();
         } else if (property == ContouredObjectPropertyType.MARK_OFFSET) {
             return getMarkOffset();
         } else if (property == ContouredObjectPropertyType.MARK_STRIDE) {
@@ -189,10 +240,16 @@ public abstract class ContouredObject extends GraphicObject {
             setMarkSizeUnit((Integer) value);
         } else if (property == MarkPropertyType.SIZE) {
             return setMarkSize((Integer) value);
+        } else if (property == ContouredObjectPropertyType.MARK_SIZES) {
+            return setMarkSizes((Integer []) value);
         } else if (property == MarkPropertyType.FOREGROUND) {
             this.setMarkForeground((Integer) value);
+        } else if (property == ContouredObjectPropertyType.MARK_FOREGROUNDS) {
+            return setMarkForegrounds((Integer []) value);
         } else if (property == MarkPropertyType.BACKGROUND) {
             this.setMarkBackground((Integer) value);
+        } else if (property == ContouredObjectPropertyType.MARK_BACKGROUNDS) {
+            return setMarkBackgrounds((Integer []) value);
         } else if (property == ContouredObjectPropertyType.MARK_OFFSET) {
             this.setMarkOffset((Integer) value);
         } else if (property == ContouredObjectPropertyType.MARK_STRIDE) {
@@ -412,7 +469,10 @@ public abstract class ContouredObject extends GraphicObject {
      * @param mark the mark to set
      */
     public UpdateStatus setMark(Mark mark) {
-        this.mark = mark;
+       mark_sizes = new Integer[0];
+       mark_foregrounds = new Integer[0];
+       mark_backgrounds = new Integer[0];
+       this.mark = mark;
         return UpdateStatus.Success;
     }
 
@@ -425,15 +485,42 @@ public abstract class ContouredObject extends GraphicObject {
     }
 
     /**
+     * Get the mark backgrounds
+     * @return the background colors
+     */
+    public Integer[] getMarkBackgrounds() {
+        return mark_backgrounds;
+    }
+
+    /**
+     * Get the number of mark backgrounds
+     * @return the number of background colors
+     */
+    public int getNumMarkBackgrounds() {
+        return mark_backgrounds.length;
+    }
+
+    /**
      * Set the mark background
      * @param background the background to set
      */
     public UpdateStatus setMarkBackground(Integer background) {
+       mark_backgrounds = new Integer[0];
         mark.setBackground(background);
         return UpdateStatus.Success;
     }
 
     /**
+     * Set the mark backgrounds
+     * @param backgrounds the background colors to set
+     */
+    public UpdateStatus setMarkBackgrounds(Integer[] backgrounds) {
+               mark_backgrounds = backgrounds;
+        mark.setBackground(-3);
+       return UpdateStatus.Success;
+    }
+
+    /**
      * Get the mark foreground
      * @return the foreground
      */
@@ -442,15 +529,42 @@ public abstract class ContouredObject extends GraphicObject {
     }
 
     /**
+     * Get the mark foregrounds
+     * @return the foreground colors
+     */
+    public Integer[] getMarkForegrounds() {
+        return mark_foregrounds;
+    }
+
+    /**
+     * Get the number of mark foregrounds
+     * @return the number of foreground colors
+     */
+    public int getNumMarkForegrounds() {
+        return mark_foregrounds.length;
+    }
+
+    /**
      * Set the mark foreground
      * @param foreground the foreground to set
      */
     public UpdateStatus setMarkForeground(Integer foreground) {
+       mark_foregrounds = new Integer[0];
         mark.setForeground(foreground);
         return UpdateStatus.Success;
     }
 
     /**
+     * Set the mark foregrounds
+     * @param foregrounds the foreground colors to set
+     */
+    public UpdateStatus setMarkForegrounds(Integer[] foregrounds) {
+               mark_foregrounds = foregrounds;
+        mark.setForeground(-3);
+       return UpdateStatus.Success;
+    }
+
+    /**
      * Get the mark size unit
      * @return the markSizeUnit
      */
@@ -493,11 +607,37 @@ public abstract class ContouredObject extends GraphicObject {
     }
 
     /**
+     * Get the mark sizes
+     * @return the sizes
+     */
+    public Integer[] getMarkSizes() {
+        return mark_sizes;
+    }
+
+    /**
+     * Get the number of mark sizes
+     * @return the number of sizes
+     */
+    public int getNumMarkSizes() {
+        return mark_sizes.length;
+    }
+
+    /**
      * Set the mark size
      * @param size the size to set
      */
     public UpdateStatus setMarkSize(Integer size) {
-        return mark.setSize(size);
+       mark_sizes = new Integer[0];
+       return mark.setSize(size);
+    }
+    /**
+     * Set the mark sizes
+     * @param sizes the sizes to set
+     */
+    public UpdateStatus setMarkSizes(Integer[] sizes) {
+               mark_sizes = sizes;
+       return UpdateStatus.Success;
     }
 
     /**
index 3aa1e69..b1e3d9d 100644 (file)
@@ -68,6 +68,7 @@ public class Mark {
         mode = false;
         style = 0;
         markSizeUnit = MarkSizeUnitType.POINT;
+        size = 0;
         foreground = 0;
         background = 0;
     }
index f5b4305..035bd5f 100755 (executable)
@@ -415,5 +415,12 @@ public class GraphicObjectProperties {
     public static final int __GO_UI_TITLE_SCROLL__ = 391;
     public static final int __GO_UI_FRAME_BORDER_TYPE__ = 392;
     public static final int __GO_UI_SCROLLABLE__ = 393;
+    public static final int __GO_COLOR_SET__ = 394;
+    public static final int __GO_MARK_SIZES__ = 395;
+    public static final int __GO_NUM_MARK_SIZES__ = 396;
+    public static final int __GO_MARK_FOREGROUNDS__ = 397;
+    public static final int __GO_NUM_MARK_FOREGROUNDS__ = 398;
+    public static final int __GO_MARK_BACKGROUNDS__ = 399;
+    public static final int __GO_NUM_MARK_BACKGROUNDS__ = 400;
 
 }
index 0c3892f..a475c71 100644 (file)
@@ -26,6 +26,7 @@ import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProp
 import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_X_SHIFT__;
 import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_Y_SHIFT__;
 import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_Z_SHIFT__;
+import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_COLOR_SET__;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -50,7 +51,8 @@ public class Polyline extends ClippableContouredObject {
     /** Polyline properties names */
     private enum PolylineProperty { CLOSED, ARROWSIZEFACTOR, POLYLINESTYLE,
                                     INTERPCOLORVECTOR, INTERPCOLORVECTORSET, INTERPCOLORMODE,
-                                    XSHIFT, YSHIFT, ZSHIFT, BARWIDTH, DATATIPS, DATATIPSCOUNT, TIP_DISPLAY_FNC, TIP_MARK
+                                    XSHIFT, YSHIFT, ZSHIFT, BARWIDTH, DATATIPS, DATATIPSCOUNT,
+                                    TIP_DISPLAY_FNC, TIP_MARK, COLORSET
                                   };
 
     /** Specifies whether the polyline is closed */
@@ -91,6 +93,9 @@ public class Polyline extends ClippableContouredObject {
 
     private Integer tipMark;
 
+    /** has color set */
+    private boolean colorSet;
+
     /** Constructor */
     public Polyline() {
         super();
@@ -107,6 +112,7 @@ public class Polyline extends ClippableContouredObject {
         datatips = new ArrayList<Integer>();
         displayFnc = "";
         tipMark = 11;
+        colorSet = false;
     }
 
     @Override
@@ -149,6 +155,8 @@ public class Polyline extends ClippableContouredObject {
                 return PolylineProperty.TIP_DISPLAY_FNC;
             case __GO_DATATIP_MARK__ :
                 return PolylineProperty.TIP_MARK;
+            case __GO_COLOR_SET__ :
+                return PolylineProperty.COLORSET;
             default :
                 return super.getPropertyFromName(propertyName);
         }
@@ -190,6 +198,8 @@ public class Polyline extends ClippableContouredObject {
                     return getDisplayFunction();
                 case TIP_MARK:
                     return getTipMark();
+                case COLORSET:
+                    return getColorSet();
             }
         }
         return super.getProperty(property);
@@ -235,12 +245,18 @@ public class Polyline extends ClippableContouredObject {
                     case DATATIPS:
                         setDatatips((Integer[]) value);
                         break;
+                    case DATATIPSCOUNT:
+                       // nothing should be done
+                        break;
                     case TIP_DISPLAY_FNC:
                         setDisplayFunction((String) value);
                         break;
                     case TIP_MARK:
                         setTipMark((Integer) value);
                         break;
+                    case COLORSET:
+                        setColorSet((Boolean) value);
+                        break;
                 }
             }
             return super.setProperty(property, value);
@@ -418,13 +434,6 @@ public class Polyline extends ClippableContouredObject {
     }
 
     /**
-     * @return Type as String
-     */
-    public Integer getType() {
-        return GraphicObjectProperties.__GO_POLYLINE__;
-    }
-
-    /**
      * @return datatips
      */
     public Integer[] getDatatips() {
@@ -434,14 +443,6 @@ public class Polyline extends ClippableContouredObject {
     /**
      * @param datatips the datatips to set
      */
-    private UpdateStatus setDatatips(List<Integer> datatips) {
-        this.datatips = datatips;
-        return UpdateStatus.Success;
-    }
-
-    /**
-     * @param datatips the datatips to set
-     */
     public UpdateStatus setDatatips(Integer[] datatips) {
         this.datatips = new LinkedList<Integer>(Arrays.asList(datatips));
         return UpdateStatus.Success;
@@ -475,4 +476,26 @@ public class Polyline extends ClippableContouredObject {
 
         return UpdateStatus.NoChange;
     }
+
+    /**
+     * @return the colorSet
+     */
+    public Boolean getColorSet() {
+        return colorSet;
+    }
+
+    /**
+     * @param colorSet the colorSet to set
+     */
+    public UpdateStatus setColorSet(Boolean colorSet) {
+        this.colorSet = colorSet;
+        return UpdateStatus.Success;
+    }
+
+    /**
+     * @return Type as String
+     */
+    public Integer getType() {
+        return GraphicObjectProperties.__GO_POLYLINE__;
+    }
 }
index fe4eb7b..e9b1bc8 100755 (executable)
@@ -444,4 +444,10 @@ __GO_UI_TITLE_POSITION__
 __GO_UI_TITLE_SCROLL__
 __GO_UI_FRAME_BORDER_TYPE__
 __GO_UI_SCROLLABLE__
-
+__GO_COLOR_SET__
+__GO_MARK_SIZES__
+__GO_NUM_MARK_SIZES__
+__GO_MARK_FOREGROUNDS__
+__GO_NUM_MARK_FOREGROUNDS__
+__GO_MARK_BACKGROUNDS__
+__GO_NUM_MARK_BACKGROUNDS__
index 40c6204..d3df5e5 100644 (file)
@@ -348,6 +348,8 @@ src/c/getHandleProperty/get_marks_count_property.c \
 src/c/getHandleProperty/set_marks_count_property.c \
 src/c/getHandleProperty/get_line_width_property.c \
 src/c/getHandleProperty/set_line_width_property.c \
+src/c/getHandleProperty/set_colors_property.c \
+src/c/getHandleProperty/get_colors_property.c \
 src/c/DefaultCommandArg.c \
 src/c/Axes.c \
 src/c/sciMatrix.c \
index 060b475..6fbd0c8 100644 (file)
@@ -495,6 +495,8 @@ am__objects_1 = src/c/libscigraphics_algo_la-GetCommandArg.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-set_marks_count_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-get_line_width_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-set_line_width_property.lo \
+       src/c/getHandleProperty/libscigraphics_algo_la-set_colors_property.lo \
+       src/c/getHandleProperty/libscigraphics_algo_la-get_colors_property.lo \
        src/c/libscigraphics_algo_la-DefaultCommandArg.lo \
        src/c/libscigraphics_algo_la-Axes.lo \
        src/c/libscigraphics_algo_la-sciMatrix.lo \
@@ -1322,6 +1324,8 @@ src/c/getHandleProperty/get_marks_count_property.c \
 src/c/getHandleProperty/set_marks_count_property.c \
 src/c/getHandleProperty/get_line_width_property.c \
 src/c/getHandleProperty/set_line_width_property.c \
+src/c/getHandleProperty/set_colors_property.c \
+src/c/getHandleProperty/get_colors_property.c \
 src/c/DefaultCommandArg.c \
 src/c/Axes.c \
 src/c/sciMatrix.c \
@@ -2656,6 +2660,12 @@ src/c/getHandleProperty/libscigraphics_algo_la-get_line_width_property.lo:  \
 src/c/getHandleProperty/libscigraphics_algo_la-set_line_width_property.lo:  \
        src/c/getHandleProperty/$(am__dirstamp) \
        src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
+src/c/getHandleProperty/libscigraphics_algo_la-set_colors_property.lo:  \
+       src/c/getHandleProperty/$(am__dirstamp) \
+       src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
+src/c/getHandleProperty/libscigraphics_algo_la-get_colors_property.lo:  \
+       src/c/getHandleProperty/$(am__dirstamp) \
+       src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
 src/c/libscigraphics_algo_la-DefaultCommandArg.lo:  \
        src/c/$(am__dirstamp) src/c/$(DEPDIR)/$(am__dirstamp)
 src/c/libscigraphics_algo_la-Axes.lo: src/c/$(am__dirstamp) \
@@ -3153,6 +3163,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_color_mode_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_color_range_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_colored_property.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_colors_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_constraints_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_cube_scaling_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_current_axes_property.Plo@am__quote@
@@ -3320,6 +3331,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_color_mode_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_color_range_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_colored_property.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_colors_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_constraints_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_cube_scaling_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_current_axes_property.Plo@am__quote@
@@ -5737,6 +5749,20 @@ src/c/getHandleProperty/libscigraphics_algo_la-set_line_width_property.lo: src/c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/getHandleProperty/libscigraphics_algo_la-set_line_width_property.lo `test -f 'src/c/getHandleProperty/set_line_width_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_line_width_property.c
 
+src/c/getHandleProperty/libscigraphics_algo_la-set_colors_property.lo: src/c/getHandleProperty/set_colors_property.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/c/getHandleProperty/libscigraphics_algo_la-set_colors_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_colors_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-set_colors_property.lo `test -f 'src/c/getHandleProperty/set_colors_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_colors_property.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_colors_property.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_colors_property.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/set_colors_property.c' object='src/c/getHandleProperty/libscigraphics_algo_la-set_colors_property.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/getHandleProperty/libscigraphics_algo_la-set_colors_property.lo `test -f 'src/c/getHandleProperty/set_colors_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_colors_property.c
+
+src/c/getHandleProperty/libscigraphics_algo_la-get_colors_property.lo: src/c/getHandleProperty/get_colors_property.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/c/getHandleProperty/libscigraphics_algo_la-get_colors_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_colors_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-get_colors_property.lo `test -f 'src/c/getHandleProperty/get_colors_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_colors_property.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_colors_property.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_colors_property.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/get_colors_property.c' object='src/c/getHandleProperty/libscigraphics_algo_la-get_colors_property.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/getHandleProperty/libscigraphics_algo_la-get_colors_property.lo `test -f 'src/c/getHandleProperty/get_colors_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_colors_property.c
+
 src/c/libscigraphics_algo_la-DefaultCommandArg.lo: src/c/DefaultCommandArg.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/c/libscigraphics_algo_la-DefaultCommandArg.lo -MD -MP -MF src/c/$(DEPDIR)/libscigraphics_algo_la-DefaultCommandArg.Tpo -c -o src/c/libscigraphics_algo_la-DefaultCommandArg.lo `test -f 'src/c/DefaultCommandArg.c' || echo '$(srcdir)/'`src/c/DefaultCommandArg.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/$(DEPDIR)/libscigraphics_algo_la-DefaultCommandArg.Tpo src/c/$(DEPDIR)/libscigraphics_algo_la-DefaultCommandArg.Plo
index ad7968d..1681f33 100644 (file)
@@ -109,13 +109,27 @@ function demo_colormap()
     "callback"           , "demo_update_colormap",...
     "tag"                , "jetcolormap_radio");
 
+    jetcolormap_radio = uicontrol( ...
+    "parent"             , demo_plot3d,...
+    "style"              , "radiobutton",...
+    "string"             , "Parula",...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-70 my_cmap_frame_w-25 15],...
+    "horizontalalignment", "left",...
+    "fontname"           , defaultfont,...
+    "fontunits"          , "points",...
+    "fontsize"           , text_font_size,...
+    "value"              , 0, ...
+    "background"          , [1 1 1], ...
+    "callback"           , "demo_update_colormap",...
+    "tag"                , "parulacolormap_radio");
+
     // Colormap : HSVcolormap
 
     HSVcolormap_radio = uicontrol( ...
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , "HSV",...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-70 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-90 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -131,7 +145,7 @@ function demo_colormap()
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , "Hot",...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-90 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-110 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -147,7 +161,7 @@ function demo_colormap()
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , "Gray",...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-110 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-130 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -163,7 +177,7 @@ function demo_colormap()
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , "Winter",...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-130 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-150 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -179,7 +193,7 @@ function demo_colormap()
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , "Spring",...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-150 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-170 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -195,7 +209,7 @@ function demo_colormap()
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , "Summer",...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-170 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-190 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -211,7 +225,7 @@ function demo_colormap()
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , "Autumn",...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-190 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-210 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -227,7 +241,7 @@ function demo_colormap()
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , "Bone",...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-210 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-230 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -243,7 +257,7 @@ function demo_colormap()
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , "Copper",...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-230 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-250 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -259,7 +273,7 @@ function demo_colormap()
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , "Pink",...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-250 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-270 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -275,7 +289,7 @@ function demo_colormap()
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , "Rainbow",...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-270 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-290 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -291,7 +305,7 @@ function demo_colormap()
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , "Ocean",...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-290 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-310 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -307,7 +321,7 @@ function demo_colormap()
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , "White",...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-310 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-330 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -374,6 +388,7 @@ function demo_update_colormap()
     my_figure.immediate_drawing = "off";
 
     set(findobj("tag", "jetcolormap_radio")     , "value", 0);
+    set(findobj("tag", "parulacolormap_radio")     , "value", 0);
     set(findobj("tag", "hotcolormap_radio")     , "value", 0);
     set(findobj("tag", "graycolormap_radio")    , "value", 0);
     set(findobj("tag", "wintercolormap_radio")  , "value", 0);
@@ -394,6 +409,8 @@ function demo_update_colormap()
 
     if get(gcbo, "tag") == "jetcolormap_radio" then
         my_figure.color_map = jetcolormap(128);
+    elseif get(gcbo, "tag") == "parulacolormap_radio" then
+        my_figure.color_map = parulacolormap(128);
     elseif get(gcbo, "tag") == "hotcolormap_radio" then
         my_figure.color_map = hotcolormap(128);
     elseif get(gcbo, "tag") == "graycolormap_radio" then
index 795ef67..762fbe9 100644 (file)
@@ -104,13 +104,29 @@ function demo_misc()
     "callback"           , "demo_update_misc",...
     "tag"                , "jetcolormap_radio");
 
+     // Colormap : Parulacolormap
+
+    jetcolormap_radio = uicontrol( ...
+    "parent"             , demo_plot3d,...
+    "style"              , "radiobutton",...
+    "string"             , gettext("Parula"),...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-70 my_cmap_frame_w-25 15],...
+    "horizontalalignment", "left",...
+    "fontname"           , defaultfont,...
+    "fontunits"          , "points",...
+    "fontsize"           , text_font_size,...
+    "value"              , 0, ...
+    "background"          , [1 1 1], ...
+    "callback"           , "demo_update_misc",...
+    "tag"                , "parulacolormap_radio");
+
     // Colormap : HSVcolormap
 
     HSVcolormap_radio = uicontrol( ...
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , gettext("HSV"),...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-70 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-90 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -126,7 +142,7 @@ function demo_misc()
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , gettext("Hot"),...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-90 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-110 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -142,7 +158,7 @@ function demo_misc()
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , gettext("Gray"),...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-110 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-130 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -158,7 +174,7 @@ function demo_misc()
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , gettext("Winter"),...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-130 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-150 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -174,7 +190,7 @@ function demo_misc()
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , gettext("Spring"),...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-150 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-170 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -190,7 +206,7 @@ function demo_misc()
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , gettext("Summer"),...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-170 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-190 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -206,7 +222,7 @@ function demo_misc()
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , gettext("Autumn"),...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-190 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-210 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -222,7 +238,7 @@ function demo_misc()
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , gettext("Bone"),...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-210 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-230 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -238,7 +254,7 @@ function demo_misc()
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , gettext("Copper"),...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-230 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-250 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -254,7 +270,7 @@ function demo_misc()
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , gettext("Pink"),...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-250 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-270 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -270,7 +286,7 @@ function demo_misc()
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , gettext("Rainbow"),...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-270 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-290 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -286,7 +302,7 @@ function demo_misc()
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , gettext("Ocean"),...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-290 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-310 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -302,7 +318,7 @@ function demo_misc()
     "parent"             , demo_plot3d,...
     "style"              , "radiobutton",...
     "string"             , gettext("White"),...
-    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-310 my_cmap_frame_w-25 15],...
+    "position"           , [ my_frame_pos_x+10 my_frame_pos_y+my_cmap_frame_h-330 my_cmap_frame_w-25 15],...
     "horizontalalignment", "left",...
     "fontname"           , defaultfont,...
     "fontunits"          , "points",...
@@ -404,6 +420,8 @@ function demo_update_misc()
     my_figure.immediate_drawing = "off";
 
     set(findobj("tag", "jetcolormap_radio")     , "value", 0);
+    set(findobj("tag", "parulacolormap_radio")  , "value", 0);
+    set(findobj("tag", "HSVcolormap_radio")     , "value", 0);
     set(findobj("tag", "hotcolormap_radio")     , "value", 0);
     set(findobj("tag", "graycolormap_radio")    , "value", 0);
     set(findobj("tag", "wintercolormap_radio")  , "value", 0);
@@ -413,7 +431,6 @@ function demo_update_misc()
     set(findobj("tag", "bonecolormap_radio")    , "value", 0);
     set(findobj("tag", "coppercolormap_radio")  , "value", 0);
     set(findobj("tag", "pinkcolormap_radio")    , "value", 0);
-    set(findobj("tag", "HSVcolormap_radio")     , "value", 0);
     set(findobj("tag", "rainbowcolormap_radio") , "value", 0);
     set(findobj("tag", "oceancolormap_radio")   , "value", 0);
     set(findobj("tag", "whitecolormap_radio")   , "value", 0);
@@ -424,6 +441,8 @@ function demo_update_misc()
 
     if get(gcbo, "tag") == "jetcolormap_radio" then
         my_figure.color_map = jetcolormap(128);
+    elseif get(gcbo, "tag") == "parulacolormap_radio" then
+        my_figure.color_map = parulacolormap(128);
     elseif get(gcbo, "tag") == "hotcolormap_radio" then
         my_figure.color_map = hotcolormap(128);
     elseif get(gcbo, "tag") == "graycolormap_radio" then
index 062dc49..5367b2b 100644 (file)
@@ -48,8 +48,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,5,3,0
- PRODUCTVERSION 5,5,3,0
+ FILEVERSION 5,6,0,0
+ PRODUCTVERSION 5,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "graphics module"
-            VALUE "FileVersion", "5, 5, 3, 0"
+            VALUE "FileVersion", "5, 6, 0, 0"
             VALUE "InternalName", "graphics module"
             VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "graphics.dll"
             VALUE "ProductName", "graphics module"
-            VALUE "ProductVersion", "5, 5, 3, 0"
+            VALUE "ProductVersion", "5, 6, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
index e0e63e4..1cde132 100644 (file)
@@ -241,6 +241,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ClCompile Include="src\c\getHandleProperty\get_bar_layout_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_bar_width_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_border_property.c" />
+    <ClCompile Include="src\c\getHandleProperty\get_colors_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_constraints_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_datatips_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_box_property.c" />
@@ -356,6 +357,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ClCompile Include="src\c\getHandleProperty\get_use_color_material_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_ambient_color_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_border_property.c" />
+    <ClCompile Include="src\c\getHandleProperty\set_colors_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_constraints_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_default_axes_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_diffuse_color_property.c" />
index 446bcbb..6ea2a2b 100644 (file)
     <ClCompile Include="src\cpp\ContourOnMesh.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\c\getHandleProperty\get_colors_property.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\c\getHandleProperty\set_colors_property.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="includes\Axes.h">
diff --git a/scilab/modules/graphics/help/en_US/2d_plot/scatter.xml b/scilab/modules/graphics/help/en_US/2d_plot/scatter.xml
new file mode 100644 (file)
index 0000000..5eb21ef
--- /dev/null
@@ -0,0 +1,504 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) Scilab Enterprises - 2015 - 2012 - Juergen Koch
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
+ *
+ -->
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:lang="en" xml:id="scatter">
+    <refnamediv>
+        <refname>scatter</refname>
+        <refpurpose>2D scatter plot</refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>Calling Sequence</title>
+        <synopsis>
+            p = scatter(x,y,&lt;s&gt;,&lt;c&gt;,&lt;"fill"&gt;,&lt;marker&gt;,&lt;marker_property,value&gt;)
+            p = scatter(&lt;axes_handle&gt;,...)
+        </synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Arguments</title>
+        <variablelist>
+            <varlistentry>
+                <term>x</term>
+                <listitem>
+                    <para>
+                        A column or row vector of n real numbers
+                        specifying the x positions of the markers center.
+                        x and y must be vectors of the same length.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>y</term>
+                <listitem>
+                    <para>
+                        A column or row vector of n real numbers
+                        specifying the y positions of the markers center.
+                        x and y must be vectors of the same length.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;s&gt;</term>
+                <listitem>
+                    <para>
+                        Specifying the sizes of the markers.
+                        To plot each marker with equal size, specify s as a scalar.
+                        To plot each marker with a diferent size, specify s as a vector with length equal to the length of x and y.
+                        The units for s is points squared with a default value of 36 points squared.
+                        The size equals the area of the circle surrounding the marker.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;c&gt;</term>
+                <listitem>
+                    <para>
+                        Specifying the colors of the markers.
+                        To plot each marker with the same color, specify c as a string representing a known color, see <link linkend="color_list">color_list</link>.
+                        A color can also be specified by a vector of 3 RGB values.
+                        RGB values correspond to red, green and blue intensity between 0 and 1.
+                        To plot each marker with a diferent color, specify c as a vector with length equal to the length of x and y.
+                        The values of c are linarly mapped to the colors in the current colormap.
+                        Colors can also by specified by a matrix of RGB values or a vector of strings representing known colors.
+                        A matrix of RGB values has 3 columns and the number of rows equals the length of x and y.
+                        The default color is "blue". 
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;"fill"&gt;</term>
+                <listitem>
+                    <para>
+                        This string indicates that the markers are filled with colors.
+                        The markers background colors are set using the values of c.
+                        If c is not specified the fill color can be defined by the marker property "markerFaceColor" or "markerBackgroundColor".
+                        The default color is "blue".  
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;marker&gt;</term>
+                <listitem>
+                    <para>
+                        Select the type of the marker.
+                        The figure below shows the 15 different marker types.
+                    </para>
+                    <para>
+                        <inlinemediaobject>
+                            <imageobject>
+                                <imagedata fileref="../../images/marks.svg"/>
+                            </imageobject>
+                        </inlinemediaobject>
+                    </para>
+                    <para>
+                        Marker types are specified by strings, see the table below.
+                    </para>
+                    <para>
+                        <informaltable border="1">
+                            <tr>
+                                <td>
+                                    String
+                                </td>
+                                <td>
+                                    Marker type
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"."</literal>
+                                </td>
+                                <td>Point</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"+"</literal>
+                                </td>
+                                <td>Plus sign</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"x"</literal>
+                                </td>
+                                <td>Cross</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"circle plus"</literal>
+                                </td>
+                                <td>Circle with plus</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"filled diamond"</literal>
+                                </td>
+                                <td>Filled diamond</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"d"</literal> or
+                                    <literal>"diamond"</literal>
+                                </td>
+                                <td>Diamond</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"^"</literal>
+                                </td>
+                                <td>Upward-pointing triangle</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"v"</literal>
+                                </td>
+                                <td>Downward-pointing triangle</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"diamond plus"</literal>
+                                </td>
+                                <td>Diamond with plus</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"o"</literal>
+                                </td>
+                                <td>Circle (default)</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"*"</literal>
+                                </td>
+                                <td>Asterisk</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"s"</literal> or
+                                    <literal>"square"</literal>
+                                </td>
+                                <td>Square</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"&gt;"</literal>
+                                </td>
+                                <td>Right-pointing triangle</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"&lt;"</literal>
+                                </td>
+                                <td>Left-pointing triangle</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"pentagram"</literal> or
+                                    <literal>"p"</literal>
+                                </td>
+                                <td>Five-pointed star</td>
+                            </tr>
+                        </informaltable>
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;marker_property,value&gt;</term>
+                <listitem>
+                    <para>
+                        A sequence of property value pairs can be used to specify type, color and line width of the markers.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;"marker",value&gt; or &lt;"markerStyle",value&gt;</term>
+                <listitem>
+                    <para>
+                        Specify the type of the marker, see the table above.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;"markerEdgeColor",value&gt; or &lt;"markerForground",value&gt;</term>
+                <listitem>
+                    <para>
+                        Specify the foreground color of the marker.
+                        A color can be specified by a string representing a known color, see <link linkend="color_list">color_list</link>.
+                        A color can also be specified by a vector of 3 RGB values.
+                        RGB values correspond to red, green and blue intensity between 0 and 1.
+                        This option is superseded by argument c.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;"markerFaceColor",value&gt; or &lt;"markerBackground",value&gt;</term>
+                <listitem>
+                    <para>
+                        Specify the background color of the marker.
+                        A color can be specified by a string representing a known color, see <link linkend="color_list">color_list</link>.
+                        A color can also be specified by a vector of 3 RGB values.
+                        RGB values correspond to red, green and blue intensity between 0 and 1.
+                        This option is superseded by argument c.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;"linewidth",value&gt; or &lt;"thickness",value&gt;</term>
+                <listitem>
+                    <para>
+                        Specify the thickness of the edge of the marker.
+                        The unit for the value is one point.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;axes_handle&gt;</term>
+                <listitem>
+                    <para>This optional argument forces the scatter plot to appear inside the
+                        selected axes given by <literal>axes_handle</literal> rather than inside the
+                        current axes, see <link linkend="gca">gca</link>.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;p&gt;</term>
+                <listitem>
+                    <para>
+                        Returns a handle to the created polyline.
+                    </para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Description</title>
+        <para>
+            <literal>scatter(x,y)</literal> creates a scatter plot with markers at the locations specified by x and y.
+            The default type of the marker is a circle, the default color is "blue" and the default size is 36.
+            This means the circle surrounding the marker has an area of 36 points squared. 
+        </para>
+        <para>
+            Using <literal>scatter(x,y,s,c)</literal> different sizes and colors for each marker can be specified. 
+            There are many different ways to specify marker types, marker colors and marker sizes.
+            For more details see the description of the arguments and the examples.
+        </para>
+    </refsection>
+    <refsection>
+        <title>Remarks</title>
+        <para>
+            If you want to specify colors without specifying sizes use <literal>scatter(x,y,[],c)</literal>. 
+        </para>
+    </refsection>
+    <refsection>
+        <title>Examples</title>
+        <para>
+            Create 2D scatter plot
+        </para>
+        <programlisting role="example"><![CDATA[
+// x and y initialisation
+x = linspace(0,2,200)
+y = exp(-x).*cos(10*x) + 0.2*rand(1,length(x))
+// create 2D scatter plot
+scatter(x,y)
+ ]]></programlisting>
+        <scilab:image>
+            x = linspace(0,2,200)
+            y = exp(-x).*cos(10*x) + 0.2*rand(1,length(x))
+            scatter(x,y)
+        </scilab:image>
+        <para>
+            Vary marker size
+        </para>
+        <programlisting role="example"><![CDATA[
+// x and y initialisation
+x = linspace(0,2,200)
+y = exp(-x).*cos(10*x) + 0.2*rand(1,length(x))
+// specify different sizes
+s = linspace(1,30,length(x))
+// create 2D scatter plot
+scatter(x,y,s)
+ ]]></programlisting>
+        <scilab:image>
+            x = linspace(0,2,200)
+            y = exp(-x).*cos(10*x) + 0.2*rand(1,length(x))
+            s = linspace(1,30,length(x))
+            scatter(x,y,s)
+        </scilab:image>
+        <para>
+            Vary marker size and color
+        </para>
+        <programlisting role="example"><![CDATA[
+// x and y initialisation
+x = linspace(0,2,200)
+y = exp(-x).*cos(10*x) + 0.2*rand(1,length(x))
+// specify different sizes
+s = linspace(1,30,length(x))
+// set color map
+set(gcf(),"color_map",coolcolormap(64))
+// colors according to x values 
+c = x
+// create 2D scatter plot
+scatter(x,y,s,c)
+ ]]></programlisting>
+        <scilab:image>
+            x = linspace(0,2,200)
+            y = exp(-x).*cos(10*x) + 0.2*rand(1,length(x))
+            s = linspace(1,30,length(x))
+            set(gcf(),"color_map",coolcolormap(64))
+            c = x
+            scatter(x,y,s,c)
+        </scilab:image>
+        <para>
+            Fill the markers
+        </para>
+        <programlisting role="example"><![CDATA[
+// x and y initialisation
+x = linspace(0,2,200)
+y = exp(-x).*cos(10*x) + 0.2*rand(1,length(x))
+// specify different sizes
+s = linspace(1,30,length(x))
+// set color map
+set(gcf(),"color_map",coolcolormap(64))
+// colors according to y values 
+c = y
+// create 2D scatter plot
+scatter(x,y,s,c,"fill")
+ ]]></programlisting>
+        <scilab:image>
+            x = linspace(0,2,200)
+            y = exp(-x).*cos(10*x) + 0.2*rand(1,length(x))
+            s = linspace(1,30,length(x))
+            set(gcf(),"color_map",coolcolormap(64))
+            c = y
+            scatter(x,y,s,c,"fill")
+        </scilab:image>
+        <para>
+            Specify marker symbol
+        </para>
+        <programlisting role="example"><![CDATA[
+// x and y initialisation
+x = rand(1,200)
+y = rand(1,200)
+// create 2D scatter plot
+scatter(x,y,"d")
+ ]]></programlisting>
+        <scilab:image>
+            x = rand(1,200)
+            y = rand(1,200)
+            scatter(x,y,"d")
+        </scilab:image>
+        <para>
+            Change marker color and line width
+        </para>
+        <programlisting role="example"><![CDATA[
+// x and y initialisation
+x = rand(1,200)
+y = rand(1,200)
+// create 2D scatter plot
+scatter(x,y,"markerEdgeColor",[0 .4 .4],...
+            "markerFaceColor",[0 .8 .8],...
+            "linewidth",1.5)
+ ]]></programlisting>
+        <scilab:image>
+            x = rand(1,200)
+            y = rand(1,200)
+            scatter(x,y,"markerEdgeColor",[0 .4 .4],...
+            "markerFaceColor",[0 .8 .8],...
+            "linewidth",1.5)
+        </scilab:image>
+        <para>
+            Specify subplot for scatter plot
+        </para>
+        <programlisting role="example"><![CDATA[
+// x and y initialisation
+x = linspace(0,2,100)
+y = exp(-x).*cos(10*x) + 0.2*rand(1,length(x))
+// create 2D scatter subplot
+subplot(2,1,1)
+scatter(gca(),x,y)
+// create 2D scatter subplot
+subplot(2,1,2)
+scatter(gca(),x,y,"fill","s")
+ ]]></programlisting>
+        <scilab:image>
+            x = linspace(0,2,100)
+            y = exp(-x).*cos(10*x) + 0.2*rand(1,length(x))
+            subplot(2,1,1)
+            scatter(gca(),x,y)
+            subplot(2,1,2)
+            scatter(gca(),x,y,"fill","s")
+        </scilab:image>
+        <para>
+            Modify scatter plot after creation
+        </para>
+        <programlisting role="example"><![CDATA[
+// x and y initialisation
+t = linspace(0,1,200)
+x = t.*cos(10*%pi*t)
+y = t.*sin(10*%pi*t)
+// create 2D scatter plot
+p = scatter(x,y)
+ ]]></programlisting>
+        <scilab:image>
+            t = linspace(0,25,200)
+            x = t.*cos(t)
+            y = t.*sin(t)
+            p = scatter(x,y,t)
+        </scilab:image>
+        <programlisting role="example"><![CDATA[
+// modify ployline 
+p.thickness = 0.5
+p.mark_foreground = addcolor(name2rgb("darkblue")/255)
+p.mark_background = addcolor(name2rgb("darkcyan")/255)
+ ]]></programlisting>
+        <scilab:image>
+            t = linspace(0,25,200)
+            x = t.*cos(t)
+            y = t.*sin(t)
+            p = scatter(x,y,t)
+            p.thickness = 0.5
+            p.mark_foreground = addcolor(name2rgb("darkblue")/255)
+            p.mark_background = addcolor(name2rgb("darkcyan")/255)
+        </scilab:image>
+    </refsection>
+    <refsection role="see also">
+        <title>See Also</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="scatter3">scatter3</link>
+            </member>
+            <member>
+                <link linkend="plot">plot</link>
+            </member>
+            <member>
+                <link linkend="gca">gca</link>
+            </member>
+            <member>
+                <link linkend="gcf">gcf</link>
+            </member>
+            <member>
+                <link linkend="color_list">color_list</link>
+            </member>
+            <member>
+                <link linkend="polyline_properties">polyline_properties</link>
+            </member>
+        </simplelist>
+    </refsection>
+    <refsection>
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.6.0</revnumber>
+                <revremark>
+                    Function <function>scatter</function> introduced.
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
+</refentry>
diff --git a/scilab/modules/graphics/help/en_US/3d_plot/scatter3.xml b/scilab/modules/graphics/help/en_US/3d_plot/scatter3.xml
new file mode 100644 (file)
index 0000000..e19e803
--- /dev/null
@@ -0,0 +1,559 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) Scilab Enterprises - 2015 - 2012 - Juergen Koch
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
+ *
+ -->
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:lang="en" xml:id="scatter3">
+    <refnamediv>
+        <refname>scatter3</refname>
+        <refpurpose>3D scatter plot</refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>Calling Sequence</title>
+        <synopsis>
+            p = scatter3(x,y,z,&lt;s&gt;,&lt;c&gt;,&lt;"fill"&gt;,&lt;marker&gt;,&lt;marker_property,value&gt;)
+            p = scatter3(&lt;axes_handle&gt;,...)
+        </synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Arguments</title>
+        <variablelist>
+            <varlistentry>
+                <term>x</term>
+                <listitem>
+                    <para>
+                        A column or row vector of n real numbers
+                        specifying the x positions of the markers center.
+                        x, y and z must be vectors of the same length.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>y</term>
+                <listitem>
+                    <para>
+                        A column or row vector of n real numbers
+                        specifying the y positions of the markers center.
+                        x, y and z must be vectors of the same length.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>z</term>
+                <listitem>
+                    <para>
+                        A column or row vector of n real numbers
+                        specifying the y positions of the markers center.
+                        x, y and z must be vectors of the same length.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;s&gt;</term>
+                <listitem>
+                    <para>
+                        Specifying the sizes of the markers.
+                        To plot each marker with equal size, specify s as a scalar.
+                        To plot each marker with a diferent size, specify s as a vector with length equal to the length of x, y and z.
+                        The units for s is points squared with a default value of 36 points squared.
+                        The size equals the area of the circle surrounding the marker.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;c&gt;</term>
+                <listitem>
+                    <para>
+                        Specifying the colors of the markers.
+                        To plot each marker with the same color, specify c as a string representing a known color, see <link linkend="color_list">color_list</link>.
+                        A color can also be specified by a vector of 3 RGB values.
+                        RGB values correspond to red, green and blue intensity between 0 and 1.
+                        To plot each marker with a diferent color, specify c as a vector with length equal to the length of x, y and z.
+                        The values of c are linarly mapped to the colors in the current colormap.
+                        Colors can also by specified by a matrix of RGB values or a vector of strings representing known colors.
+                        A matrix of RGB values has 3 columns and the number of rows equals the length of x, y and z.
+                        The default color is "blue". 
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;"fill"&gt;</term>
+                <listitem>
+                    <para>
+                        This string indicates that the markers are filled with colors.
+                        The markers background colors are set using the values of c.
+                        If c is not specified the fill color can be defined by the marker property "markerFaceColor" or "markerBackgroundColor".
+                        The default color is "blue".  
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;marker&gt;</term>
+                <listitem>
+                    <para>
+                        Select the type of the marker.
+                        The figure below shows the 15 different marker types.
+                    </para>
+                    <para>
+                        <inlinemediaobject>
+                            <imageobject>
+                                <imagedata fileref="../../images/marks.svg"/>
+                            </imageobject>
+                        </inlinemediaobject>
+                    </para>
+                    <para>
+                        Marker types are specified by strings, see the table below.
+                    </para>
+                    <para>
+                        <informaltable border="1">
+                            <tr>
+                                <td>
+                                    String
+                                </td>
+                                <td>
+                                    Marker type
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"."</literal>
+                                </td>
+                                <td>Point</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"+"</literal>
+                                </td>
+                                <td>Plus sign</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"x"</literal>
+                                </td>
+                                <td>Cross</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"circle plus"</literal>
+                                </td>
+                                <td>Circle with plus</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"filled diamond"</literal>
+                                </td>
+                                <td>Filled diamond</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"d"</literal> or
+                                    <literal>"diamond"</literal>
+                                </td>
+                                <td>Diamond</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"^"</literal>
+                                </td>
+                                <td>Upward-pointing triangle</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"v"</literal>
+                                </td>
+                                <td>Downward-pointing triangle</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"diamond plus"</literal>
+                                </td>
+                                <td>Diamond with plus</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"o"</literal>
+                                </td>
+                                <td>Circle (default)</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"*"</literal>
+                                </td>
+                                <td>Asterisk</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"s"</literal> or
+                                    <literal>"square"</literal>
+                                </td>
+                                <td>Square</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"&gt;"</literal>
+                                </td>
+                                <td>Right-pointing triangle</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"&lt;"</literal>
+                                </td>
+                                <td>Left-pointing triangle</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <literal>"pentagram"</literal> or
+                                    <literal>"p"</literal>
+                                </td>
+                                <td>Five-pointed star</td>
+                            </tr>
+                        </informaltable>
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;marker_property,value&gt;</term>
+                <listitem>
+                    <para>
+                        A sequence of property value pairs can be used to specify type, color and line width of the markers.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;"marker",value&gt; or &lt;"markerStyle",value&gt;</term>
+                <listitem>
+                    <para>
+                        Specify the type of the marker, see the table above.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;"markerEdgeColor",value&gt; or &lt;"markerForground",value&gt;</term>
+                <listitem>
+                    <para>
+                        Specify the foreground color of the marker.
+                        A color can be specified by a string representing a known color, see <link linkend="color_list">color_list</link>.
+                        A color can also be specified by a vector of 3 RGB values.
+                        RGB values correspond to red, green and blue intensity between 0 and 1.
+                        This option is superseded by argument c.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;"markerFaceColor",value&gt; or &lt;"markerBackground",value&gt;</term>
+                <listitem>
+                    <para>
+                        Specify the background color of the marker.
+                        A color can be specified by a string representing a known color, see <link linkend="color_list">color_list</link>.
+                        A color can also be specified by a vector of 3 RGB values.
+                        RGB values correspond to red, green and blue intensity between 0 and 1.
+                        This option is superseded by argument c.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;"linewidth",value&gt; or &lt;"thickness",value&gt;</term>
+                <listitem>
+                    <para>
+                        Specify the thickness of the edge of the marker.
+                        The unit for the value is one point.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;axes_handle&gt;</term>
+                <listitem>
+                    <para>This optional argument forces the scatter plot to appear inside the
+                        selected axes given by <literal>axes_handle</literal> rather than inside the
+                        current axes, see <link linkend="gca">gca</link>.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;p&gt;</term>
+                <listitem>
+                    <para>
+                        Returns a handle to the created polyline.
+                    </para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Description</title>
+        <para>
+            <literal>scatter3(x,y)</literal> creates a scatter plot with markers at the locations specified by x and y.
+            The default type of the marker is a circle, the default color is "blue" and the default size is 36.
+            This means the circle surrounding the marker has an area of 36 points squared. 
+        </para>
+        <para>
+            Using <literal>scatter3(x,y,s,c)</literal> different sizes and colors for each marker can be specified. 
+            There are many different ways to specify marker types, marker colors and marker sizes.
+            For more details see the description of the arguments and the examples.
+        </para>
+    </refsection>
+    <refsection>
+        <title>Remarks</title>
+        <para>
+            If you want to specify colors without specifying sizes use <literal>scatter3(x,y,[],c)</literal>. 
+        </para>
+    </refsection>
+    <refsection>
+        <title>Examples</title>
+        <para>
+            Create 3D scatter plot
+        </para>
+        <programlisting role="example"><![CDATA[
+// x, y and z initialisation
+t = 1:200
+x = t.*cos(t).*sin(t)
+y = t.*sin(t).*sin(t)
+z = t.*cos(t)
+// create 3D scatter plot
+scatter3(x,y,z)
+// modify rotation angles
+set(gca(),"rotation_angles",[60,45])
+ ]]></programlisting>
+        <scilab:image>
+            t = 1:200
+            x = t.*cos(t).*sin(t)
+            y = t.*sin(t).*sin(t)
+            z = t.*cos(t)
+            scatter3(x,y,z)
+            set(gca(),"rotation_angles",[60,45])
+        </scilab:image>
+        <para>
+            Vary marker size
+        </para>
+        <programlisting role="example"><![CDATA[
+// x, y and z initialisation
+t = 1:200
+x = t.*cos(t).*sin(t)
+y = t.*sin(t).*sin(t)
+z = t.*cos(t)
+// size according to radius
+s = linspace(50,1,length(t))
+// create 3D scatter plot
+scatter3(x,y,z,s)
+// modify rotation angles
+set(gca(),"rotation_angles",[60,45])
+ ]]></programlisting>
+        <scilab:image>
+            t = 1:200
+            x = t.*cos(t).*sin(t)
+            y = t.*sin(t).*sin(t)
+            z = t.*cos(t)
+            s = linspace(50,1,length(t))
+            scatter3(x,y,z,s)
+            set(gca(),"rotation_angles",[60,45])
+        </scilab:image>
+        <para>
+            Vary marker size and color
+        </para>
+        <programlisting role="example"><![CDATA[
+// x, y and z initialisation
+t = 1:200
+x = t.*cos(t).*sin(t)
+y = t.*sin(t).*sin(t)
+z = t.*cos(t)
+// size according to radius
+s = linspace(50,1,length(t))
+// set color map
+set(gcf(),"color_map",coolcolormap(64))
+// color according to radius
+c = t
+// create 3D scatter plot
+scatter3(x,y,z,s,c)
+// modify rotation angles
+set(gca(),"rotation_angles",[60,45])
+ ]]></programlisting>
+        <scilab:image>
+            t = 1:200
+            x = t.*cos(t).*sin(t)
+            y = t.*sin(t).*sin(t)
+            z = t.*cos(t)
+            s = linspace(50,1,length(t))
+            set(gcf(),"color_map",coolcolormap(64))
+            c = t
+            scatter3(x,y,z,s,c)
+            set(gca(),"rotation_angles",[60,45])
+        </scilab:image>
+        <para>
+            Fill the markers
+        </para>
+        <programlisting role="example"><![CDATA[
+// x, y and z initialisation
+z = linspace(0,25,200)
+x = z.*cos(z)
+y = z.*sin(z)
+// create 3D scatter plot
+scatter3(x,y,z,"fill")
+// modify rotation angles
+set(gca(),"rotation_angles",[60,45])
+ ]]></programlisting>
+        <scilab:image>
+            z = linspace(0,25,200)
+            x = z.*cos(z)
+            y = z.*sin(z)
+            scatter3(x,y,z,"fill")
+            set(gca(),"rotation_angles",[60,45])
+        </scilab:image>
+        <para>
+            Specify marker symbol
+        </para>
+        <programlisting role="example"><![CDATA[
+// x, y and z initialisation
+z = linspace(0,25,200)
+x = z.*cos(z)
+y = z.*sin(z)
+// create 3D scatter plot
+scatter3(x,y,z,"*")
+// modify rotation angles
+set(gca(),"rotation_angles",[60,45])
+ ]]></programlisting>
+        <scilab:image>
+            z = linspace(0,25,200)
+            x = z.*cos(z)
+            y = z.*sin(z)
+            scatter3(x,y,z,"*")
+            set(gca(),"rotation_angles",[60,45])
+        </scilab:image>
+        <para>
+            Change marker edge and face color
+        </para>
+        <programlisting role="example"><![CDATA[
+// x, y and z initialisation
+z = linspace(0,25,200)
+x = z.*cos(z)
+y = z.*sin(z)
+// create 3D scatter plot
+scatter3(x,y,z,...
+        "markerEdgeColor","black",...
+        "markerFaceColor",[0 .8 .8])
+// modify rotation angles
+set(gca(),"rotation_angles",[60,45])
+ ]]></programlisting>
+        <scilab:image>
+            z = linspace(0,25,200)
+            x = z.*cos(z)
+            y = z.*sin(z)
+            scatter3(x,y,z,...
+            "markerEdgeColor","black",...
+            "markerFaceColor",[0 .8 .8])
+            set(gca(),"rotation_angles",[60,45])
+        </scilab:image>
+        <para>
+            Specify subplot for scatter plot
+        </para>
+        <programlisting role="example"><![CDATA[
+// x, y and z initialisation
+n = 20
+[x,y] = meshgrid(linspace(-2,2,n))
+z = exp(-x.^2-y.^2)
+// create 3D scatter subplot
+subplot(2,1,1)
+scatter3(gca(),x(:),y(:),z(:))
+// modify rotation angles
+set(gca(),"rotation_angles",[60,45])
+// create 3D scatter subplot
+subplot(2,1,2)
+scatter3(gca(),x(:),y(:),z(:),"markerFaceColor",[0 .8 .8])
+// modify rotation angles
+set(gca(),"rotation_angles",[60,45])
+ ]]></programlisting>
+        <scilab:image>
+            n = 20
+            [x,y] = meshgrid(linspace(-2,2,n))
+            z = exp(-x.^2-y.^2)
+            subplot(2,1,1)
+            scatter3(gca(),x(:),y(:),z(:))
+            set(gca(),"rotation_angles",[60,45])
+            subplot(2,1,2)
+            scatter3(gca(),x(:),y(:),z(:),"markerFaceColor",[0 .8 .8])
+            set(gca(),"rotation_angles",[60,45])        
+        </scilab:image>
+        <para>
+            Modify scatter plot after creation
+        </para>
+        <programlisting role="example"><![CDATA[
+// x, y and z initialisation
+t = 1:200
+x = t.*cos(t).*sin(t)
+y = t.*sin(t).*sin(t)
+z = t.*cos(t)
+// size according to radius
+s = linspace(50,1,length(t))
+// create 3D scatter plot
+scatter3(x,y,z,s)
+// modify rotation angles
+set(gca(),"rotation_angles",[60,45])
+ ]]></programlisting>
+        <scilab:image>
+            t = 1:200
+            x = t.*cos(t).*sin(t)
+            y = t.*sin(t).*sin(t)
+            z = t.*cos(t)
+            s = linspace(50,1,length(t))
+            p = scatter3(x,y,z,s)
+            set(gca(),"rotation_angles",[60,45])
+        </scilab:image>
+        <programlisting role="example"><![CDATA[
+// modify ployline 
+p.mark_foreground = addcolor([0.5 0 0])
+p.mark_background = addcolor([0.5 0.5 0])
+ ]]></programlisting>
+        <scilab:image>
+            t = 1:200
+            x = t.*cos(t).*sin(t)
+            y = t.*sin(t).*sin(t)
+            z = t.*cos(t)
+            s = linspace(50,1,length(t))
+            p = scatter3(x,y,z,s)
+            set(gca(),"rotation_angles",[60,45])
+            // modify ployline 
+            p.mark_foreground = addcolor([0.5 0 0])
+            p.mark_background = addcolor([0.5 0.5 0])
+        </scilab:image>
+    </refsection>
+    <refsection role="see also">
+        <title>See Also</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="scatter">scatter</link>
+            </member>
+            <member>
+                <link linkend="param3d">param3d</link>
+            </member>
+            <member>
+                <link linkend="gca">gca</link>
+            </member>
+            <member>
+                <link linkend="gcf">gcf</link>
+            </member>
+            <member>
+                <link linkend="color_list">color_list</link>
+            </member>
+            <member>
+                <link linkend="polyline_properties">polyline_properties</link>
+            </member>
+        </simplelist>
+    </refsection>
+    <refsection>
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.6.0</revnumber>
+                <revremark>
+                    Function <function>scatter3</function> introduced.
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
+</refentry>
index 4c60788..4d6387d 100644 (file)
@@ -89,6 +89,9 @@ f.color_map = autumncolormap(32);
                 <link linkend="oceancolormap">oceancolormap</link>
             </member>
             <member>
+                <link linkend="parulacolormap">parulacolormap</link>
+            </member>
+            <member>
                 <link linkend="pinkcolormap">pinkcolormap</link>
             </member>
             <member>
index f82653b..8c2896f 100644 (file)
@@ -88,6 +88,9 @@ f.color_map = bonecolormap(32);
                 <link linkend="oceancolormap">oceancolormap</link>
             </member>
             <member>
+                <link linkend="parulacolormap">parulacolormap</link>
+            </member>
+            <member>
                 <link linkend="pinkcolormap">pinkcolormap</link>
             </member>
             <member>
index c627b0d..50aba5f 100644 (file)
@@ -96,6 +96,9 @@ f.color_map=get(sdf(),"color_map");
                 <link linkend="oceancolormap">oceancolormap</link>
             </member>
             <member>
+                <link linkend="parulacolormap">parulacolormap</link>
+            </member>
+            <member>
                 <link linkend="pinkcolormap">pinkcolormap</link>
             </member>
             <member>
index c335537..57d58ae 100644 (file)
@@ -90,6 +90,9 @@ f.color_map = coolcolormap(32);
                 <link linkend="oceancolormap">oceancolormap</link>
             </member>
             <member>
+                <link linkend="parulacolormap">parulacolormap</link>
+            </member>
+            <member>
                 <link linkend="pinkcolormap">pinkcolormap</link>
             </member>
             <member>
index 243192c..76e2927 100644 (file)
@@ -92,6 +92,9 @@ f.color_map = graycolormap(32);
                 <link linkend="oceancolormap">oceancolormap</link>
             </member>
             <member>
+                <link linkend="parulacolormap">parulacolormap</link>
+            </member>
+            <member>
                 <link linkend="pinkcolormap">pinkcolormap</link>
             </member>
             <member>
index 7d91ec6..f32c9c3 100644 (file)
@@ -92,6 +92,9 @@ f.color_map = hotcolormap(32);
                 <link linkend="oceancolormap">oceancolormap</link>
             </member>
             <member>
+                <link linkend="parulacolormap">parulacolormap</link>
+            </member>
+            <member>
                 <link linkend="pinkcolormap">pinkcolormap</link>
             </member>
             <member>
index 98450c7..4186b7d 100644 (file)
@@ -96,6 +96,9 @@ plot3d1(t,t,z,35,45,"X@Y@Z",[-2,2,2])
                 <link linkend="oceancolormap">oceancolormap</link>
             </member>
             <member>
+                <link linkend="parulacolormap">parulacolormap</link>
+            </member>
+            <member>
                 <link linkend="pinkcolormap">pinkcolormap</link>
             </member>
             <member>
index 653218e..09f7d63 100644 (file)
@@ -90,6 +90,9 @@ f.color_map = jetcolormap(32);
                 <link linkend="oceancolormap">oceancolormap</link>
             </member>
             <member>
+                <link linkend="parulacolormap">parulacolormap</link>
+            </member>
+            <member>
                 <link linkend="pinkcolormap">pinkcolormap</link>
             </member>
             <member>
index 247f128..e5f225e 100644 (file)
             <varlistentry>
                 <term>name</term>
                 <listitem>
-                    <para>name of the color.</para>
+                    <para>name of the color or matrix with names of the colors.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>rgb</term>
                 <listitem>
-                    <para>vector of RGB integer values of a color.</para>
+                    <para>vector or matrix with 3 columns of RGB integer values of the colors.</para>
                 </listitem>
             </varlistentry>
         </variablelist>
@@ -40,7 +40,7 @@
         <title>Description</title>
         <para>
             <literal>name2rgb</literal> returns the RGB values of a color given by its name. The result is
-            a vector <literal>[r,g,b]</literal> where <literal>r</literal>, <literal>g</literal> and <literal>b</literal> are integers between 0 and 255
+            a vector or a matrix with 3 columns <literal>[r,g,b]</literal> where <literal>r</literal>, <literal>g</literal> and <literal>b</literal> are integers between 0 and 255
             corresponding to colors components red, green and blue. As usual 0 means no intensity and 
             255 means all the intensity of the color.
         </para>
@@ -72,4 +72,15 @@ rgb2name(rgb)
             </member>
         </simplelist>
     </refsection>
+    <refsection>
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.6.0</revnumber>
+                <revremark>
+                    Function <function>name2rgb</function> can now handle a single string and a matrix of strings.
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index 77c1119..bb59057 100644 (file)
@@ -89,6 +89,9 @@ f.color_map = oceancolormap(32);
                 <link linkend="jetcolormap">jetcolormap</link>
             </member>
             <member>
+                <link linkend="parulacolormap">parulacolormap</link>
+            </member>
+            <member>
                 <link linkend="pinkcolormap">pinkcolormap</link>
             </member>
             <member>
diff --git a/scilab/modules/graphics/help/en_US/color_management/parulacolormap.xml b/scilab/modules/graphics/help/en_US/color_management/parulacolormap.xml
new file mode 100644 (file)
index 0000000..a7ad296
--- /dev/null
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) Scilab Enterprises - 2015 - Juergen Koch
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
+ *
+ -->
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:lang="en" xml:id="parulacolormap">
+    <refnamediv>
+        <refname>parulacolormap</refname>
+        <refpurpose>blue to yellow colormap</refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>Calling Sequence</title>
+        <synopsis>cmap=parulacolormap(n)</synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Arguments</title>
+        <variablelist>
+            <varlistentry>
+                <term>n</term>
+                <listitem>
+                    <para>integer &gt;= 3, the colormap size.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>cmap</term>
+                <listitem>
+                    <para>
+                        matrix with 3 columns <literal>[R,G,B]</literal>.
+                    </para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Description</title>
+        <para>
+            <literal>parulacolormap</literal> computes a colormap with <literal>n</literal> colors
+            varying from blue to yellow.
+        </para>
+    </refsection>
+    <refsection>
+        <title>Examples</title>
+        <programlisting role="example"><![CDATA[ 
+f = scf();
+plot3d1();
+f.color_map = parulacolormap(32);
+ ]]></programlisting>
+        <scilab:image> 
+            f = scf();
+            plot3d1();
+            f.color_map = parulacolormap(32);
+        </scilab:image>
+        
+    </refsection>
+    <refsection role="see also">
+        <title>See Also</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="colormap">colormap</link>
+            </member>
+            <member>
+                <link linkend="autumncolormap">autumncolormap</link>
+            </member>
+            <member>
+                <link linkend="bonecolormap">bonecolormap</link>
+            </member>
+            <member>
+                <link linkend="coppercolormap">coppercolormap</link>
+            </member>
+            <member>
+                <link linkend="coolcolormap">coolcolormap</link>
+            </member>
+            <member>
+                <link linkend="graycolormap">graycolormap</link>
+            </member>
+            <member>
+                <link linkend="hotcolormap">hotcolormap</link>
+            </member>
+            <member>
+                <link linkend="hsvcolormap">hsvcolormap</link>
+            </member>
+            <member>
+                <link linkend="jetcolormap">jetcolormap</link>
+            </member>
+            <member>
+                <link linkend="oceancolormap">oceancolormap</link>
+            </member>
+            <member>
+                <link linkend="parulacolormap">parulacolormap</link>
+            </member>
+            <member>
+                <link linkend="pinkcolormap">pinkcolormap</link>
+            </member>
+            <member>
+                <link linkend="rainbowcolormap">rainbowcolormap</link>
+            </member>
+            <member>
+                <link linkend="springcolormap">springcolormap</link>
+            </member>
+            <member>
+                <link linkend="summercolormap">summercolormap</link>
+            </member>
+            <member>
+                <link linkend="whitecolormap">whitecolormap</link>
+            </member>
+            <member>
+                <link linkend="wintercolormap">wintercolormap</link>
+            </member>
+        </simplelist>
+    </refsection>
+    <refsection>
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.6.0</revnumber>
+                <revremark>
+                    Function <function>parulacolormap</function> introduced.
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
+</refentry>
index 0d60754..dc884a2 100644 (file)
@@ -92,6 +92,9 @@ f.color_map = pinkcolormap(32);
                 <link linkend="oceancolormap">oceancolormap</link>
             </member>
             <member>
+                <link linkend="parulacolormap">parulacolormap</link>
+            </member>
+            <member>
                 <link linkend="rainbowcolormap">rainbowcolormap</link>
             </member>
             <member>
index 7f6a632..abb6b71 100644 (file)
@@ -92,6 +92,9 @@ f.color_map = rainbowcolormap(32);
                 <link linkend="oceancolormap">oceancolormap</link>
             </member>
             <member>
+                <link linkend="parulacolormap">parulacolormap</link>
+            </member>
+            <member>
                 <link linkend="pinkcolormap">pinkcolormap</link>
             </member>
             <member>
index 9cb0a92..79ec459 100644 (file)
@@ -92,6 +92,9 @@ f.color_map = springcolormap(32);
                 <link linkend="oceancolormap">oceancolormap</link>
             </member>
             <member>
+                <link linkend="parulacolormap">parulacolormap</link>
+            </member>
+            <member>
                 <link linkend="pinkcolormap">pinkcolormap</link>
             </member>
             <member>
index ddf8b2e..f5b0b4f 100644 (file)
@@ -92,6 +92,9 @@ f.color_map = summercolormap(32);
                 <link linkend="oceancolormap">oceancolormap</link>
             </member>
             <member>
+                <link linkend="parulacolormap">parulacolormap</link>
+            </member>
+            <member>
                 <link linkend="pinkcolormap">pinkcolormap</link>
             </member>
             <member>
index eaf8a81..e805558 100644 (file)
@@ -88,7 +88,10 @@ f.color_map = whitecolormap(32);
             <member>
                 <link linkend="oceancolormap">oceancolormap</link>
             </member>
-            <member>
+             <member>
+                <link linkend="parulacolormap">parulacolormap</link>
+            </member>
+           <member>
                 <link linkend="pinkcolormap">pinkcolormap</link>
             </member>
             <member>
index 327b814..76fce9c 100644 (file)
@@ -93,6 +93,9 @@ f.color_map = wintercolormap(32);
                 <link linkend="oceancolormap">oceancolormap</link>
             </member>
             <member>
+                <link linkend="parulacolormap">parulacolormap</link>
+            </member>
+            <member>
                 <link linkend="pinkcolormap">pinkcolormap</link>
             </member>
             <member>
index e7febb2..de0c310 100644 (file)
@@ -38,7 +38,7 @@ GRAPHICS_IMPEXP int sciSetLineWidth (int iObj, double linewidth) ;  /* SET */
 
 GRAPHICS_IMPEXP int sciSetLineStyle (int iObj, int linestyle) ; /* SET */
 
-GRAPHICS_IMPEXP int sciSetMarkSize (int iObj, int marksize); /* SET */
+GRAPHICS_IMPEXP int sciSetMarkSize (int iObj, int *markSizes, int numMarkSizes); /* SET */
 
 /* Text Functions */
 GRAPHICS_IMPEXP int sciSetText (int iObj, char ** text, int nbRow, int nbCol) ; /* SET */
index 90428f8..37c2fec 100755 (executable)
@@ -55,6 +55,27 @@ function %h_p(h)
                 if length(bzs)>70 then bzs="matrix "+strcat(string(size(h.z_shift)),"x"),end
             end
 
+            if size(h.mark_size,"*") > 10 then
+                msz="matrix "+strcat(string(size(h.mark_size)),"x")
+            else
+                msz=sci2exp(h.mark_size,0)
+                if length(msz)>70 then msz="matrix "+strcat(string(size(h.mark_size)),"x"),end
+            end
+
+            if size(h.mark_foreground,"*") > 10 then
+                mfg="matrix "+strcat(string(size(h.mark_foreground)),"x")
+            else
+                mfg=sci2exp(h.mark_foreground,0)
+                if length(mfg)>70 then mfg="matrix "+strcat(string(size(h.mark_foreground)),"x"),end
+            end
+
+            if size(h.mark_background,"*") > 10 then
+                mbg="matrix "+strcat(string(size(h.mark_background)),"x")
+            else
+                mbg=sci2exp(h.mark_background,0)
+                if length(mbg)>70 then mbg="matrix "+strcat(string(size(h.mark_background)),"x"),end
+            end
+
             u=h.user_data;
             t=[t;
             "parent: "+h.parent.type
@@ -75,12 +96,13 @@ function %h_p(h)
             "background = "+string(h.background)
             "interp_color_vector = "+sci2exp(h.interp_color_vector)
             "interp_color_mode = "+sci2exp(h.interp_color_mode)
+            "colors = "+sci2exp(h.colors)
             "mark_mode = "+sci2exp(h.mark_mode)
             "mark_style = "+sci2exp(h.mark_style)
             "mark_size_unit = "+sci2exp(h.mark_size_unit)
-            "mark_size = "+string(h.mark_size)
-            "mark_foreground = "+string(h.mark_foreground)
-            "mark_background = "+string(h.mark_background)
+            "mark_size = "+msz
+            "mark_foreground = "+mfg
+            "mark_background = "+mbg
             "mark_offset = "+string(h.mark_offset)
             "mark_stride = "+string(h.mark_stride)
             "x_shift = "+bxs
diff --git a/scilab/modules/graphics/macros/parulacolormap.sci b/scilab/modules/graphics/macros/parulacolormap.sci
new file mode 100644 (file)
index 0000000..2f8cef5
--- /dev/null
@@ -0,0 +1,108 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) Scilab Enterprises - 2015 - Juergen Koch <juergen.koch@hs-esslingen.de>
+// 
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at    
+// http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
+
+function cmap = parulacolormap(varargin)
+
+    nDefault = 64;
+    
+    // Check number of input argument
+    if size(varargin) > 1 then
+        error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"), "parulacolormap", 1));
+    end
+    if size(varargin) == 0 then
+        n = nDefault;
+    else
+        n = varargin(1);       
+         // Check type of input argument
+        // Check if input argument is real
+        if typeof(n)<>"constant" | ~isreal(n) then
+            error(msprintf(gettext("%s: Wrong type for input argument #%d: a real scalar expected.\n"), "parulacolormap", 1));
+        end
+        // Check size of input argument
+        if size(n,"*")<>1 then
+            error(msprintf(gettext("%s: Wrong size for input argument #%d: a real scalar expected.\n"), "parulacolormap", 1));
+        end
+    end
+    
+cmapDefault =[
+    0.2081    0.1663    0.5292
+    0.2116    0.1898    0.5777
+    0.2123    0.2138    0.6270
+    0.2081    0.2386    0.6771
+    0.1959    0.2645    0.7279
+    0.1707    0.2919    0.7792
+    0.1253    0.3242    0.8303
+    0.0591    0.3598    0.8683
+    0.0117    0.3875    0.8820
+    0.0060    0.4086    0.8828
+    0.0165    0.4266    0.8786
+    0.0329    0.4430    0.8720
+    0.0498    0.4586    0.8641
+    0.0629    0.4737    0.8554
+    0.0723    0.4887    0.8467
+    0.0779    0.5040    0.8384
+    0.0793    0.5200    0.8312
+    0.0749    0.5375    0.8263
+    0.0641    0.5570    0.8240
+    0.0488    0.5772    0.8228
+    0.0343    0.5966    0.8199
+    0.0265    0.6137    0.8135
+    0.0239    0.6287    0.8038
+    0.0231    0.6418    0.7913
+    0.0228    0.6535    0.7768
+    0.0267    0.6642    0.7607
+    0.0384    0.6743    0.7436
+    0.0590    0.6838    0.7254
+    0.0843    0.6928    0.7062
+    0.1133    0.7015    0.6859
+    0.1453    0.7098    0.6646
+    0.1801    0.7177    0.6424
+    0.2178    0.7250    0.6193
+    0.2586    0.7317    0.5954
+    0.3022    0.7376    0.5712
+    0.3482    0.7424    0.5473
+    0.3953    0.7459    0.5244
+    0.4420    0.7481    0.5033
+    0.4871    0.7491    0.4840
+    0.5300    0.7491    0.4661
+    0.5709    0.7485    0.4494
+    0.6099    0.7473    0.4337
+    0.6473    0.7456    0.4188
+    0.6834    0.7435    0.4044
+    0.7184    0.7411    0.3905
+    0.7525    0.7384    0.3768
+    0.7858    0.7356    0.3633
+    0.8185    0.7327    0.3498
+    0.8507    0.7299    0.3360
+    0.8824    0.7274    0.3217
+    0.9139    0.7258    0.3063
+    0.9450    0.7261    0.2886
+    0.9739    0.7314    0.2666
+    0.9938    0.7455    0.2403
+    0.9990    0.7653    0.2164
+    0.9955    0.7861    0.1967
+    0.9880    0.8066    0.1794
+    0.9789    0.8271    0.1633
+    0.9697    0.8481    0.1475
+    0.9626    0.8705    0.1309
+    0.9589    0.8949    0.1132
+    0.9598    0.9218    0.0948
+    0.9661    0.9514    0.0755
+    0.9763    0.9831    0.0538
+]
+
+if n == 0 then
+    cmap = [];
+elseif n == nDefault then
+    cmap = cmapDefault;
+else
+    cmap = interp1(1:nDefault, cmapDefault, linspace(1,nDefault,n),"linear");
+end
+
+endfunction
diff --git a/scilab/modules/graphics/macros/scatter.sci b/scilab/modules/graphics/macros/scatter.sci
new file mode 100644 (file)
index 0000000..123d00f
--- /dev/null
@@ -0,0 +1,53 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) Scilab Enterprises - 2015 - 2012 - Juergen Koch <juergen.koch@hs-esslingen.de>
+// 
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at    
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+function polyLine = scatter(varargin)
+
+    polyLine = 0;
+    [lhs,rhs] = argn(0);
+
+    if ~rhs
+        clf;
+        t = linspace(0,25,200);
+        x = t.*cos(t);
+        y = t.*sin(t);
+        polyLine = scatter(x,y,t,t,"fill","markerEdgeColor","darkblue")
+        return;
+    end
+
+    //detect and set the current axes now:
+    n = size(varargin);
+    if type(varargin(1)) == 9 then // graphic handle
+        hdle = varargin(1);
+        if hdle.type == "Axes" then
+            if n < 3 then
+                warning("Not enough input arguments.")
+                return;
+            else
+                axesHandle = varargin(1);
+                X = varargin(2);
+                Y = varargin(3);
+                polyLine = scatter3(axesHandle,X,Y,[],varargin(4:n));
+            end
+        else
+            warning("Handle should be an Axes handle.")
+            return;
+        end
+    else
+        if size(varargin) < 2 then
+            warning("Not enough input arguments.")
+            return;
+        else
+            X = varargin(1);
+            Y = varargin(2);
+            polyLine = scatter3(X,Y,[],varargin(3:n));
+        end
+    end
+    
+endfunction
diff --git a/scilab/modules/graphics/macros/scatter3.sci b/scilab/modules/graphics/macros/scatter3.sci
new file mode 100644 (file)
index 0000000..d6539b0
--- /dev/null
@@ -0,0 +1,435 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) Scilab Enterprises - 2015 - 2012 - Juergen Koch <juergen.koch@hs-esslingen.de>
+// 
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at    
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+function polyLine = scatter3(varargin)
+
+    polyLine = 0;
+    [lhs,rhs] = argn(0);
+
+    if ~rhs
+        clf;
+        z = linspace(0,25,200);
+        x = z.*cos(z);
+        y = z.*sin(z);
+        polyLine = scatter3(x,y,z,z,z,"fill","markerEdgeColor","darkblue");
+        set(gca(),"rotation_angles",[60,45])
+        return;
+    end
+
+   //detect and set the current axes now:
+    if type(varargin(1)) == 9 then // graphic handle
+        hdle = varargin(1);
+        if hdle.type == "Axes" then
+            if size(varargin) < 4 then
+                warning("Not enough input arguments.")
+                return;
+            else
+                axesHandle = varargin(1);
+                X = varargin(2);
+                Y = varargin(3);
+                Z = varargin(4);
+                nextArgin = 5;
+            end
+        else
+            warning("Handle should be an Axes handle.")
+            return;
+        end
+    else
+        if size(varargin) < 3 then
+            warning("Not enough input arguments.")
+            return;
+        else
+            axesHandle = [];
+            X = varargin(1);
+            Y = varargin(2);
+            Z = varargin(3);
+            nextArgin = 4;
+        end
+    end
+
+    if (isempty(X) & isempty(Y) & isempty(Z)) then
+        // nothing has to be done
+        return;
+    end
+    
+    if ( isempty(Z) ) then
+        if (~isvector(X) | ~isvector(Y) | size(X) ~= size(Y)) then
+            warning("X and Y must be vectors of the same length.")
+            return;
+        end
+    else
+        if (~isvector(X) | ~isvector(Y) | ~isvector(Z) | or(size(X) ~= size(Y)) | or(size(X) ~= size(Z))) then
+            warning("X, Y and Z must be vectors of the same length.")
+            return;
+        end
+    end
+        
+    n = length(X);
+    [S,C,thickness,markStyle,markFg,markBg,fill,scanFailed] = scatterScanVargin(varargin,nextArgin,n);
+    if (scanFailed) then
+        return;
+    end
+    
+    drawlater();
+
+    if isempty(Z) then 
+        if isempty(axesHandle) then
+            plot(X,Y);
+        else
+            plot(axesHandle,X,Y);
+        end
+        currentEntity = gce();
+        polyLine = currentEntity.children;
+    else
+        if isempty(axesHandle) then
+            param3d(X,Y,Z);
+        else
+            set("current_axes",axesHandle)
+            param3d(X,Y,Z);
+        end
+        polyLine = gce();
+    end
+    
+    if polyLine.Type <> "Polyline" then
+        warning("Handle should be a Polyline handle.");
+        return;
+    end
+
+    scatterSetPolyline(polyLine,S,C,thickness,markStyle,markFg,markBg,fill);
+    
+    if ~isempty(Z) then
+        set(gca(),"cube_scaling","on");
+        set(gca(),"grid",[1 1 1]);
+    end
+    
+    drawnow();
+
+endfunction
+
+function [S,C,thickness,markStyle,markFg,markBg,fill,scanFailed] = scatterScanVargin(argins,nextArgin,n)
+
+    scanFailed = %F;
+    
+    // check for size argument
+    S = [];
+    if  size(argins) >= nextArgin then
+        if isempty(argins(nextArgin)) then
+            nextArgin = nextArgin + 1;
+        else
+            if type(argins(nextArgin)) == 1 then
+                [n1,n2] = size(argins(nextArgin));
+                if (n1 == 1 & n2 == 1) | (n1 == n & n2 == 1) | (n1 == 1 & n2 == n) then
+                    S = argins(nextArgin);
+                    if iscolumn(S) then
+                        S = S.';
+                    end
+                    nextArgin = nextArgin + 1;
+                else
+                    warning("S must be a scalar or a vector of the same length as X.");
+                    scanFailed = %T;
+                    return;
+                end
+            end
+        end
+    end
+
+    // check for color argument
+    C = [];
+    if  size(argins) >= nextArgin then
+        if isempty(argins(nextArgin)) then
+            nextArgin = nextArgin + 1;
+        else
+            [n1,n2] = size(argins(nextArgin));
+            if type(argins(nextArgin)) == 1 then
+                if (n1 == n & n2 == 1) | (n1 == 1 & n2 == n) then
+                    C = scatterLinearColorMap(argins(nextArgin));
+                    nextArgin = nextArgin + 1;
+                elseif n1 == n & n2 == 3 then
+                    C = addcolor(argins(nextArgin));            
+                    nextArgin = nextArgin + 1;
+                else
+                    warning("C must be a vector or a matrix of the same length as X.");
+                    scanFailed = %T;
+                    return;
+                end
+                if iscolumn(C) then
+                    C = C.';
+                end
+            elseif type(argins(nextArgin)) == 10 then
+                if n1 == 1 & n2 == 1 then
+                    // check if string specifies a color
+                    colorRGB = name2rgb(argins(nextArgin));
+                    if ~isempty(colorRGB) then
+                        C = addcolor(colorRGB/255);
+                        nextArgin = nextArgin + 1;
+                    end        
+                elseif (n1 == n & n2 == 1) | (n1 == 1 & n2 == n) then
+                    C = addcolor(name2rgb(argins(nextArgin))/255);
+                    if isempty(C) then
+                        warning("Wrong color specified.");
+                        scanFailed = %T;
+                        return;
+                    else
+                         nextArgin = nextArgin + 1;
+                    end
+                end
+            end
+        end
+    end
+
+    // check for "fill" argument
+    fill = %F;
+    if  size(argins) >= nextArgin then
+        if type(argins(nextArgin)) == 10 then
+            if argins(nextArgin) == "fill" then
+                fill = %T;
+                nextArgin = nextArgin + 1;
+            end
+        end
+    end
+
+    // check for marker argument
+    markStyle = 9; // default circle
+    if  size(argins) >= nextArgin then
+        if type(argins(nextArgin)) == 10 then
+            ms = getMarkStyle(argins(nextArgin));
+            if ms >= 0 & ms <= 14 then
+                markStyle = ms;
+                nextArgin = nextArgin + 1;
+            end
+        end
+    end
+
+    // check for property-value pairs
+    markFg = -1;
+    markBg = -1;
+    thickness = 1.0; // default
+    while  size(argins) >= nextArgin do
+        if size(argins) == nextArgin then
+            warning("Incorrect number of inputs for property-value pairs.");
+            scanFailed = %T;
+            return;
+        else
+            select argins(nextArgin)
+            case "marker"
+                markStyle = getMarkStyle(argins(nextArgin+1));
+                if markStyle == -1 then
+                    warning(strcat([argins(nextArgin+1) " is not a valid value for property marker."]));
+                    scanFailed = %T;
+                    return;
+                end
+            case "markerStyle"
+                markStyle = getMarkStyle(argin(nextArgin+1));
+                if markStyle == -1 then
+                    warning(strcat([argins(nextArgin+1) " is not a valid value for property markerStyle."]));
+                    scanFailed = %T;
+                    return;
+                end
+            case "markerEdgeColor"
+                markFg = colorIndex(argins(nextArgin+1));
+                if markFg == -1 then
+                    warning(strcat([argins(nextArgin+1) " is not a valid value for property markerEdgeColor."]));
+                    scanFailed = %T;
+                    return;
+                end;
+            case "markerForeground"
+                markFg = colorIndex(argins(nextArgin+1));
+                if markFg == -1 then
+                    warning(strcat([argins(nextArgin+1) " is not a valid value for property markerForeground."]));
+                    scanFailed = %T;
+                    return;
+                end;
+            case "markerFaceColor"
+                fill = %T;
+                markBg = colorIndex(argins(nextArgin+1));
+                if markBg == -1 then
+                    warning(strcat([argins(nextArgin+1) " is not a valid value for property markerFaceColor."]));
+                    scanFailed = %T;
+                    return;
+                end;
+            case "markerBackground"
+                fill = %T;
+                markBg = colorIndex(argins(nextArgin+1));
+                if markBg == -1 then
+                    warning(strcat([argins(nextArgin+1) " is not a valid value for property markerBackground."]));
+                    scanFailed = %T;
+                    return;
+                end;
+            case "linewidth"
+                if type(argins(nextArgin+1)) == 1 then
+                    thickness = argins(nextArgin+1);
+                else
+                    warning(strcat([argins(nextArgin+1) " is not a valid value for property linewidth."]));
+                    scanFailed = %T;
+                    return;
+                end 
+            case "thickness"
+                if type(argins(nextArgin+1)) == 1 then
+                    thickness = argins(nextArgin+1);
+                else
+                    warning(strcat([argins(nextArgin+1) " is not a valid value for property thickness."]));
+                    scanFailed = %T;
+                    return;
+                end
+            else
+                warning(strcat(["There is no " argins(nextArgin) " property on the Scatter class."]));
+                scanFailed = %T;
+                return;
+            end
+        end
+        nextArgin = nextArgin + 2;
+    end
+
+endfunction
+
+function colorInd = colorIndex(colorSpec)
+    colorInd = -1;
+    if type(colorSpec) == 10 & size(colorSpec) == [1 1] then
+        colorRGB = name2rgb(colorSpec);
+        if ~isempty(colorRGB) then
+            colorInd = addcolor(colorRGB/255);
+            return;
+        end
+    elseif type(colorSpec) == 1 & (size(colorSpec) == [1 3] | size(colorSpec) == [3 1]) then
+        colorInd = addcolor(colorSpec);
+        return; 
+    end
+    warning("Specified string is an invalid color value.");
+endfunction
+
+function markStyle = getMarkStyle(name)
+    if type(name) ~= 10 then
+        markStyle = -1;
+    else
+        select name
+        case "."
+            markStyle = 0;
+        case "+"
+            markStyle = 1;
+        case "x"
+            markStyle = 2;
+        case "circle plus"
+            markStyle = 3;
+        case "filled diamond"
+            markStyle = 4;
+        case "d"
+            markStyle = 5;
+        case "diamond"
+            markStyle = 5;
+        case "^"
+            markStyle = 6;
+        case "v"
+            markStyle = 7;
+        case "diamond plus"
+            markStyle = 8;
+        case "o"
+            markStyle = 9;
+        case "*"
+            markStyle = 10;
+        case "s"
+            markStyle = 11;
+        case "square"
+            markStyle = 11;
+        case ">"
+            markStyle = 12;
+        case "<"
+            markStyle = 13;
+        case "p"
+            markStyle = 14;
+        case "pentagram"