Reorganization
Allan Cornet [Mon, 31 Jul 2006 14:14:28 +0000 (14:14 +0000)]
Graphics Module

sort modules/graphics in modules/graphics/*/
ged

BWidget-1.7.0 --> in modules/tclsci/tcl  common with scigui

remove in /tcl some files

485 files changed:
scilab/modules/core/sci_gateway/fundef
scilab/modules/graphics/FeC.p [deleted file]
scilab/modules/graphics/Math.c [deleted file]
scilab/modules/graphics/Math.h [deleted file]
scilab/modules/graphics/README [deleted file]
scilab/modules/graphics/Tests.c [deleted file]
scilab/modules/graphics/graphics.vcproj
scilab/modules/graphics/includes/Axes.h [moved from scilab/modules/graphics/Axes.h with 100% similarity]
scilab/modules/graphics/includes/BuildObjects.h [moved from scilab/modules/graphics/BuildObjects.h with 100% similarity]
scilab/modules/graphics/includes/CloneObjects.h [moved from scilab/modules/graphics/CloneObjects.h with 100% similarity]
scilab/modules/graphics/includes/DestroyObjects.h [moved from scilab/modules/graphics/DestroyObjects.h with 100% similarity]
scilab/modules/graphics/includes/DrawObjects.h [moved from scilab/modules/graphics/DrawObjects.h with 99% similarity]
scilab/modules/graphics/includes/Events.h [moved from scilab/modules/graphics/Events.h with 100% similarity]
scilab/modules/graphics/includes/GetProperty.h [moved from scilab/modules/graphics/GetProperty.h with 100% similarity]
scilab/modules/graphics/includes/Graphics.h [moved from scilab/modules/graphics/Graphics.h with 100% similarity]
scilab/modules/graphics/includes/HandleManagement.h [moved from scilab/modules/graphics/HandleManagement.h with 100% similarity]
scilab/modules/graphics/includes/InitObjects.h [moved from scilab/modules/graphics/InitObjects.h with 100% similarity]
scilab/modules/graphics/includes/Interaction.h [moved from scilab/modules/graphics/Interaction.h with 100% similarity]
scilab/modules/graphics/includes/ObjectStructure.h [moved from scilab/modules/graphics/ObjectStructure.h with 99% similarity]
scilab/modules/graphics/includes/PloEch.h [moved from scilab/modules/graphics/PloEch.h with 100% similarity]
scilab/modules/graphics/includes/Rec.h [moved from scilab/modules/graphics/Rec.h with 100% similarity]
scilab/modules/graphics/includes/SetProperty.h [moved from scilab/modules/graphics/SetProperty.h with 100% similarity]
scilab/modules/graphics/includes/StringMatrix.h [moved from scilab/modules/graphics/StringMatrix.h with 100% similarity]
scilab/modules/graphics/includes/Vect2Matrix.h [moved from scilab/modules/graphics/Vect2Matrix.h with 100% similarity]
scilab/modules/graphics/includes/bcg.h [moved from scilab/modules/graphics/bcg.h with 100% similarity]
scilab/modules/graphics/includes/clipping.h [moved from scilab/modules/graphics/clipping.h with 100% similarity]
scilab/modules/graphics/includes/color.h [moved from scilab/modules/graphics/color.h with 100% similarity]
scilab/modules/graphics/includes/fig.h [moved from scilab/modules/graphics/fig.h with 100% similarity]
scilab/modules/graphics/includes/giffonts.h [moved from scilab/modules/graphics/giffonts.h with 100% similarity]
scilab/modules/graphics/includes/gsort.h [moved from scilab/modules/graphics/gsort.h with 100% similarity]
scilab/modules/graphics/includes/gw_graphics.h [moved from scilab/modules/graphics/gw_graphics.h with 100% similarity]
scilab/modules/graphics/includes/intcommongraphics.h [moved from scilab/modules/graphics/intcommongraphics.h with 100% similarity]
scilab/modules/graphics/includes/matdes.h [moved from scilab/modules/graphics/matdes.h with 100% similarity]
scilab/modules/graphics/includes/math_graphics.h [moved from scilab/modules/graphics/math_graphics.h with 100% similarity]
scilab/modules/graphics/includes/paintop.h [moved from scilab/modules/graphics/paintop.h with 100% similarity]
scilab/modules/graphics/includes/periFig.h [moved from scilab/modules/graphics/periFig.h with 100% similarity]
scilab/modules/graphics/includes/periGif.h [moved from scilab/modules/graphics/periGif.h with 100% similarity]
scilab/modules/graphics/includes/periMac.h [moved from scilab/modules/graphics/periMac.h with 100% similarity]
scilab/modules/graphics/includes/periPos.h [moved from scilab/modules/graphics/periPos.h with 100% similarity]
scilab/modules/graphics/includes/periWin.h [moved from scilab/modules/graphics/periWin.h with 100% similarity]
scilab/modules/graphics/includes/periX11.h [moved from scilab/modules/graphics/periX11.h with 100% similarity]
scilab/modules/graphics/includes/resources.h [moved from scilab/modules/graphics/resources.h with 100% similarity]
scilab/modules/graphics/includes/sciMatrix.h [moved from scilab/modules/graphics/sciMatrix.h with 100% similarity]
scilab/modules/graphics/includes/sci_get.h [moved from scilab/modules/graphics/includes/intgget.h with 100% similarity]
scilab/modules/graphics/includes/sci_set.h [moved from scilab/modules/graphics/includes/intgset.h with 100% similarity]
scilab/modules/graphics/includes/scigraphic.h [moved from scilab/modules/graphics/scigraphic.h with 100% similarity]
scilab/modules/graphics/includes/w_rottext.h [moved from scilab/modules/graphics/w_rottext.h with 100% similarity]
scilab/modules/graphics/intgget.h [deleted file]
scilab/modules/graphics/intgset.h [deleted file]
scilab/modules/graphics/macros/ged.sci
scilab/modules/graphics/sci_gateway/graphics.fundef [moved from scilab/modules/graphics/graphics.fundef with 100% similarity]
scilab/modules/graphics/sci_gateway/gw_graphics.c [moved from scilab/modules/graphics/gw_graphics.c with 100% similarity]
scilab/modules/graphics/sci_gateway/intgget.c [deleted file]
scilab/modules/graphics/sci_gateway/intgset.c [deleted file]
scilab/modules/graphics/sci_gateway/matdes.c [moved from scilab/modules/graphics/matdes.c with 99% similarity]
scilab/modules/graphics/sci_gateway/sci_get.c [moved from scilab/modules/graphics/intgget.c with 99% similarity]
scilab/modules/graphics/sci_gateway/sci_set.c [moved from scilab/modules/graphics/intgset.c with 99% similarity]
scilab/modules/graphics/src/c/Actions.c [moved from scilab/modules/graphics/Actions.c with 99% similarity]
scilab/modules/graphics/src/c/Alloc.c [moved from scilab/modules/graphics/Alloc.c with 98% similarity]
scilab/modules/graphics/src/c/Axes.c [moved from scilab/modules/graphics/Axes.c with 99% similarity]
scilab/modules/graphics/src/c/BuildObjects.c [moved from scilab/modules/graphics/BuildObjects.c with 100% similarity]
scilab/modules/graphics/src/c/Champ.c [moved from scilab/modules/graphics/Champ.c with 99% similarity]
scilab/modules/graphics/src/c/CloneObjects.c [moved from scilab/modules/graphics/CloneObjects.c with 100% similarity]
scilab/modules/graphics/src/c/Contour.c [moved from scilab/modules/graphics/Contour.c with 99% similarity]
scilab/modules/graphics/src/c/DestroyObjects.c [moved from scilab/modules/graphics/DestroyObjects.c with 99% similarity]
scilab/modules/graphics/src/c/DrawObjects.c [moved from scilab/modules/graphics/DrawObjects.c with 99% similarity]
scilab/modules/graphics/src/c/Events.c [moved from scilab/modules/graphics/Events.c with 100% similarity]
scilab/modules/graphics/src/c/FeC.c [moved from scilab/modules/graphics/FeC.c with 99% similarity]
scilab/modules/graphics/src/c/Format.c [moved from scilab/modules/graphics/Format.c with 99% similarity]
scilab/modules/graphics/src/c/GetProperty.c [moved from scilab/modules/graphics/GetProperty.c with 100% similarity]
scilab/modules/graphics/src/c/Gray.c [moved from scilab/modules/graphics/Gray.c with 99% similarity]
scilab/modules/graphics/src/c/HandleManagement.c [moved from scilab/modules/graphics/HandleManagement.c with 100% similarity]
scilab/modules/graphics/src/c/InitObjects.c [moved from scilab/modules/graphics/InitObjects.c with 100% similarity]
scilab/modules/graphics/src/c/Interaction.c [moved from scilab/modules/graphics/Interaction.c with 100% similarity]
scilab/modules/graphics/src/c/MacMenus.c [moved from scilab/modules/graphics/MacMenus.c with 100% similarity]
scilab/modules/graphics/src/c/MacWinOther.c [moved from scilab/modules/graphics/MacWinOther.c with 100% similarity]
scilab/modules/graphics/src/c/Plo2d.c [moved from scilab/modules/graphics/Plo2d.c with 99% similarity]
scilab/modules/graphics/src/c/Plo2d1.c [moved from scilab/modules/graphics/Plo2d1.c with 99% similarity]
scilab/modules/graphics/src/c/Plo2d2.c [moved from scilab/modules/graphics/Plo2d2.c with 99% similarity]
scilab/modules/graphics/src/c/Plo2d3.c [moved from scilab/modules/graphics/Plo2d3.c with 99% similarity]
scilab/modules/graphics/src/c/Plo2d4.c [moved from scilab/modules/graphics/Plo2d4.c with 99% similarity]
scilab/modules/graphics/src/c/Plo2dEch.c [moved from scilab/modules/graphics/Plo2dEch.c with 99% similarity]
scilab/modules/graphics/src/c/Plo2dn.c [moved from scilab/modules/graphics/Plo2dn.c with 99% similarity]
scilab/modules/graphics/src/c/Plo3d.c [moved from scilab/modules/graphics/Plo3d.c with 99% similarity]
scilab/modules/graphics/src/c/Plo3dn.c [moved from scilab/modules/graphics/Plo3dn.c with 99% similarity]
scilab/modules/graphics/src/c/Rec.c [moved from scilab/modules/graphics/Rec.c with 99% similarity]
scilab/modules/graphics/src/c/RecLoad.c [moved from scilab/modules/graphics/RecLoad.c with 99% similarity]
scilab/modules/graphics/src/c/RecSave.c [moved from scilab/modules/graphics/RecSave.c with 99% similarity]
scilab/modules/graphics/src/c/SetProperty.c [moved from scilab/modules/graphics/SetProperty.c with 99% similarity]
scilab/modules/graphics/src/c/StringMatrix.c [moved from scilab/modules/graphics/StringMatrix.c with 100% similarity]
scilab/modules/graphics/src/c/Vect2Matrix.c [moved from scilab/modules/graphics/Vect2Matrix.c with 99% similarity]
scilab/modules/graphics/src/c/Xcall.c [moved from scilab/modules/graphics/Xcall.c with 99% similarity]
scilab/modules/graphics/src/c/Xcall1.c [moved from scilab/modules/graphics/Xcall1.c with 99% similarity]
scilab/modules/graphics/src/c/clipping.c [moved from scilab/modules/graphics/clipping.c with 99% similarity]
scilab/modules/graphics/src/c/dr1Call.c [moved from scilab/modules/graphics/dr1Call.c with 100% similarity]
scilab/modules/graphics/src/c/gsort.c [moved from scilab/modules/graphics/gsort.c with 99% similarity]
scilab/modules/graphics/src/c/math_graphics.c [moved from scilab/modules/graphics/math_graphics.c with 99% similarity]
scilab/modules/graphics/src/c/nues1.c [moved from scilab/modules/graphics/nues1.c with 99% similarity]
scilab/modules/graphics/src/c/periFig.c [moved from scilab/modules/graphics/periFig.c with 99% similarity]
scilab/modules/graphics/src/c/periGif.c [moved from scilab/modules/graphics/periGif.c with 99% similarity]
scilab/modules/graphics/src/c/periPos.c [moved from scilab/modules/graphics/periPos.c with 99% similarity]
scilab/modules/graphics/src/c/periWin.c [moved from scilab/modules/graphics/periWin.c with 99% similarity]
scilab/modules/graphics/src/c/periX11.c [moved from scilab/modules/graphics/periX11.c with 100% similarity]
scilab/modules/graphics/src/c/qsort-char.c [moved from scilab/modules/graphics/qsort-char.c with 100% similarity]
scilab/modules/graphics/src/c/qsort-double.c [moved from scilab/modules/graphics/qsort-double.c with 100% similarity]
scilab/modules/graphics/src/c/qsort-int.c [moved from scilab/modules/graphics/qsort-int.c with 100% similarity]
scilab/modules/graphics/src/c/qsort-int16.c [moved from scilab/modules/graphics/qsort-int16.c with 100% similarity]
scilab/modules/graphics/src/c/qsort-short.c [moved from scilab/modules/graphics/qsort-short.c with 100% similarity]
scilab/modules/graphics/src/c/qsort-string.c [moved from scilab/modules/graphics/qsort-string.c with 100% similarity]
scilab/modules/graphics/src/c/qsort.c [moved from scilab/modules/graphics/qsort.c with 100% similarity]
scilab/modules/graphics/src/c/sciCall.c [moved from scilab/modules/graphics/sciCall.c with 100% similarity]
scilab/modules/graphics/src/c/sciMatrix.c [moved from scilab/modules/graphics/sciMatrix.c with 100% similarity]
scilab/modules/graphics/src/c/w_rottext.c [moved from scilab/modules/graphics/w_rottext.c with 100% similarity]
scilab/modules/graphics/tcl/ged/Arc.tcl
scilab/modules/graphics/tcl/ged/Axes.tcl
scilab/modules/graphics/tcl/ged/Axis.tcl
scilab/modules/graphics/tcl/ged/Champ.tcl
scilab/modules/graphics/tcl/ged/Compound.tcl
scilab/modules/graphics/tcl/ged/Fac3d.tcl
scilab/modules/graphics/tcl/ged/Fec.tcl
scilab/modules/graphics/tcl/ged/Figure.tcl
scilab/modules/graphics/tcl/ged/Grayplot.tcl
scilab/modules/graphics/tcl/ged/Legend.tcl
scilab/modules/graphics/tcl/ged/Matplot.tcl
scilab/modules/graphics/tcl/ged/ObjectsBrowser.tcl
scilab/modules/graphics/tcl/ged/Plot3d.tcl
scilab/modules/graphics/tcl/ged/Polyline.tcl
scilab/modules/graphics/tcl/ged/Rectangle.tcl
scilab/modules/graphics/tcl/ged/Segs.tcl
scilab/modules/graphics/tcl/ged/Text.tcl
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/ArrowButton.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/ArrowButton.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/BWidget.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/BWidget.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/Button.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/Button.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/ButtonBox.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/ButtonBox.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/ComboBox.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/ComboBox.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/Dialog.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/Dialog.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/DragSite.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/DragSite.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/DropSite.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/DropSite.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/DynamicHelp.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/DynamicHelp.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/Entry.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/Entry.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/Label.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/Label.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/LabelEntry.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/LabelEntry.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/LabelFrame.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/LabelFrame.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/ListBox.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/ListBox.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/MainFrame.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/MainFrame.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/MessageDlg.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/MessageDlg.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/NoteBook.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/NoteBook.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/PagesManager.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/PagesManager.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/PanedWindow.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/PanedWindow.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/PasswdDlg.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/PasswdDlg.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/ProgressBar.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/ProgressBar.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/ProgressDlg.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/ProgressDlg.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/ScrollView.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/ScrollView.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/ScrollableFrame.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/ScrollableFrame.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/ScrolledWindow.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/ScrolledWindow.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/SelectColor.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/SelectColor.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/SelectFont.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/SelectFont.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/Separator.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/Separator.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/SpinBox.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/SpinBox.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/TitleFrame.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/TitleFrame.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/Tree.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/Tree.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/Widget.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/Widget.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/contents.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/contents.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/index.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/index.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/navtree.html [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/navtree.html with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/BWman/options.htm [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/BWman/options.htm with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/CHANGES.txt [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/CHANGES.txt with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/ChangeLog [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/ChangeLog with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/LICENSE.txt [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/LICENSE.txt with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/Makefile.in [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/Makefile.in with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/README.txt [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/README.txt with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/aclocal.m4 [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/aclocal.m4 with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/arrow.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/arrow.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/bitmap.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/bitmap.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/button.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/button.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/buttonbox.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/buttonbox.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/color.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/color.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/combobox.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/combobox.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/configure.in [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/configure.in with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/demo/basic.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/demo/basic.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/demo/bwidget.xbm [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/demo/bwidget.xbm with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/demo/demo.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/demo/demo.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/demo/dnd.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/demo/dnd.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/demo/manager.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/demo/manager.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/demo/select.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/demo/select.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/demo/tmpldlg.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/demo/tmpldlg.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/demo/tree.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/demo/tree.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/demo/x1.xbm [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/demo/x1.xbm with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/dialog.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/dialog.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/dragsite.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/dragsite.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/dropsite.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/dropsite.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/dynhelp.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/dynhelp.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/entry.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/entry.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/font.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/font.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/bold.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/bold.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/copy.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/copy.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/cut.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/cut.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/dragfile.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/dragfile.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/dragicon.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/dragicon.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/error.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/error.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/file.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/file.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/folder.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/folder.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/hourglass.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/hourglass.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/info.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/info.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/italic.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/italic.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/minus.xbm [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/minus.xbm with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/new.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/new.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/opcopy.xbm [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/opcopy.xbm with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/open.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/open.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/openfold.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/openfold.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/oplink.xbm [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/oplink.xbm with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/opmove.xbm [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/opmove.xbm with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/overstrike.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/overstrike.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/palette.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/palette.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/passwd.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/passwd.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/paste.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/paste.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/plus.xbm [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/plus.xbm with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/print.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/print.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/question.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/question.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/redo.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/redo.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/save.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/save.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/target.xbm [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/target.xbm with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/underline.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/underline.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/undo.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/undo.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/images/warning.gif [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/images/warning.gif with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/init.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/init.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/label.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/label.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/labelentry.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/labelentry.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/labelframe.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/labelframe.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/lang/da.rc [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/lang/da.rc with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/lang/de.rc [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/lang/de.rc with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/lang/en.rc [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/lang/en.rc with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/lang/es.rc [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/lang/es.rc with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/lang/fr.rc [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/lang/fr.rc with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/listbox.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/listbox.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/mainframe.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/mainframe.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/messagedlg.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/messagedlg.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/notebook.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/notebook.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/pagesmgr.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/pagesmgr.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/panedw.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/panedw.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/panelframe.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/panelframe.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/passwddlg.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/passwddlg.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/pkgIndex.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/pkgIndex.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/progressbar.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/progressbar.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/progressdlg.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/progressdlg.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/scrollframe.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/scrollframe.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/scrollview.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/scrollview.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/scrollw.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/scrollw.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/separator.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/separator.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/spinbox.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/spinbox.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/statusbar.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/statusbar.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/tests/entry.test [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/tests/entry.test with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/titleframe.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/titleframe.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/tree.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/tree.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/utils.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/utils.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/widget.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/widget.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/wizard.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/wizard.tcl with 100% similarity]
scilab/modules/tclsci/tcl/BWidget-1.7.0/xpm2image.tcl [moved from scilab/modules/graphics/tcl/BWidget-1.7.0/xpm2image.tcl with 100% similarity]
scilab/modules/tclsci/tcl/sciGUI/sciEditVar.tcl
scilab/routines/int/gifimg.c
scilab/tcl/BWidget-1.7.0/BWman/ArrowButton.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/BWidget.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/Button.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/ButtonBox.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/ComboBox.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/Dialog.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/DragSite.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/DropSite.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/DynamicHelp.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/Entry.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/Label.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/LabelEntry.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/LabelFrame.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/ListBox.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/MainFrame.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/MessageDlg.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/NoteBook.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/PagesManager.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/PanedWindow.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/PasswdDlg.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/ProgressBar.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/ProgressDlg.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/ScrollView.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/ScrollableFrame.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/ScrolledWindow.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/SelectColor.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/SelectFont.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/Separator.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/SpinBox.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/TitleFrame.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/Tree.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/Widget.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/contents.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/index.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/navtree.html [deleted file]
scilab/tcl/BWidget-1.7.0/BWman/options.htm [deleted file]
scilab/tcl/BWidget-1.7.0/CHANGES.txt [deleted file]
scilab/tcl/BWidget-1.7.0/ChangeLog [deleted file]
scilab/tcl/BWidget-1.7.0/LICENSE.txt [deleted file]
scilab/tcl/BWidget-1.7.0/Makefile.in [deleted file]
scilab/tcl/BWidget-1.7.0/README.txt [deleted file]
scilab/tcl/BWidget-1.7.0/aclocal.m4 [deleted file]
scilab/tcl/BWidget-1.7.0/arrow.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/bitmap.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/button.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/buttonbox.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/color.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/combobox.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/configure.in [deleted file]
scilab/tcl/BWidget-1.7.0/demo/basic.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/demo/bwidget.xbm [deleted file]
scilab/tcl/BWidget-1.7.0/demo/demo.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/demo/dnd.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/demo/manager.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/demo/select.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/demo/tmpldlg.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/demo/tree.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/demo/x1.xbm [deleted file]
scilab/tcl/BWidget-1.7.0/dialog.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/dragsite.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/dropsite.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/dynhelp.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/entry.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/font.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/images/bold.gif [deleted file]
scilab/tcl/BWidget-1.7.0/images/copy.gif [deleted file]
scilab/tcl/BWidget-1.7.0/images/cut.gif [deleted file]
scilab/tcl/BWidget-1.7.0/images/dragfile.gif [deleted file]
scilab/tcl/BWidget-1.7.0/images/dragicon.gif [deleted file]
scilab/tcl/BWidget-1.7.0/images/error.gif [deleted file]
scilab/tcl/BWidget-1.7.0/images/file.gif [deleted file]
scilab/tcl/BWidget-1.7.0/images/folder.gif [deleted file]
scilab/tcl/BWidget-1.7.0/images/hourglass.gif [deleted file]
scilab/tcl/BWidget-1.7.0/images/info.gif [deleted file]
scilab/tcl/BWidget-1.7.0/images/italic.gif [deleted file]
scilab/tcl/BWidget-1.7.0/images/minus.xbm [deleted file]
scilab/tcl/BWidget-1.7.0/images/new.gif [deleted file]
scilab/tcl/BWidget-1.7.0/images/opcopy.xbm [deleted file]
scilab/tcl/BWidget-1.7.0/images/open.gif [deleted file]
scilab/tcl/BWidget-1.7.0/images/openfold.gif [deleted file]
scilab/tcl/BWidget-1.7.0/images/oplink.xbm [deleted file]
scilab/tcl/BWidget-1.7.0/images/opmove.xbm [deleted file]
scilab/tcl/BWidget-1.7.0/images/overstrike.gif [deleted file]
scilab/tcl/BWidget-1.7.0/images/palette.gif [deleted file]
scilab/tcl/BWidget-1.7.0/images/passwd.gif [deleted file]
scilab/tcl/BWidget-1.7.0/images/paste.gif [deleted file]
scilab/tcl/BWidget-1.7.0/images/plus.xbm [deleted file]
scilab/tcl/BWidget-1.7.0/images/print.gif [deleted file]
scilab/tcl/BWidget-1.7.0/images/question.gif [deleted file]
scilab/tcl/BWidget-1.7.0/images/redo.gif [deleted file]
scilab/tcl/BWidget-1.7.0/images/save.gif [deleted file]
scilab/tcl/BWidget-1.7.0/images/target.xbm [deleted file]
scilab/tcl/BWidget-1.7.0/images/underline.gif [deleted file]
scilab/tcl/BWidget-1.7.0/images/undo.gif [deleted file]
scilab/tcl/BWidget-1.7.0/images/warning.gif [deleted file]
scilab/tcl/BWidget-1.7.0/init.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/label.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/labelentry.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/labelframe.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/lang/da.rc [deleted file]
scilab/tcl/BWidget-1.7.0/lang/de.rc [deleted file]
scilab/tcl/BWidget-1.7.0/lang/en.rc [deleted file]
scilab/tcl/BWidget-1.7.0/lang/es.rc [deleted file]
scilab/tcl/BWidget-1.7.0/lang/fr.rc [deleted file]
scilab/tcl/BWidget-1.7.0/listbox.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/mainframe.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/messagedlg.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/notebook.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/pagesmgr.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/panedw.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/panelframe.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/passwddlg.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/pkgIndex.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/progressbar.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/progressdlg.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/scrollframe.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/scrollview.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/scrollw.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/separator.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/spinbox.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/statusbar.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/tests/entry.test [deleted file]
scilab/tcl/BWidget-1.7.0/titleframe.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/tree.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/utils.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/widget.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/wizard.tcl [deleted file]
scilab/tcl/BWidget-1.7.0/xpm2image.tcl [deleted file]
scilab/tcl/TK_Scilab.tcl [deleted file]
scilab/tcl/browsehelp.tcl [deleted file]
scilab/tcl/callbacks.tcl [deleted file]
scilab/tcl/figure.tcl [deleted file]
scilab/tcl/ged/Arc.tcl [deleted file]
scilab/tcl/ged/Axes.tcl [deleted file]
scilab/tcl/ged/Axis.tcl [deleted file]
scilab/tcl/ged/Champ.tcl [deleted file]
scilab/tcl/ged/Compound.tcl [deleted file]
scilab/tcl/ged/Fac3d.tcl [deleted file]
scilab/tcl/ged/Fec.tcl [deleted file]
scilab/tcl/ged/Figure.tcl [deleted file]
scilab/tcl/ged/Grayplot.tcl [deleted file]
scilab/tcl/ged/Legend.tcl [deleted file]
scilab/tcl/ged/Matplot.tcl [deleted file]
scilab/tcl/ged/ObjectsBrowser.tcl [deleted file]
scilab/tcl/ged/Plot3d.tcl [deleted file]
scilab/tcl/ged/Polyline.tcl [deleted file]
scilab/tcl/ged/Rectangle.tcl [deleted file]
scilab/tcl/ged/Segs.tcl [deleted file]
scilab/tcl/ged/Text.tcl [deleted file]
scilab/tcl/ged/images/arc.gif [deleted file]
scilab/tcl/ged/images/axes.gif [deleted file]
scilab/tcl/ged/images/axis.gif [deleted file]
scilab/tcl/ged/images/champ.gif [deleted file]
scilab/tcl/ged/images/compound.gif [deleted file]
scilab/tcl/ged/images/fac3d.gif [deleted file]
scilab/tcl/ged/images/fec.gif [deleted file]
scilab/tcl/ged/images/figure.gif [deleted file]
scilab/tcl/ged/images/grayplot.gif [deleted file]
scilab/tcl/ged/images/leaf.gif [deleted file]
scilab/tcl/ged/images/legend.gif [deleted file]
scilab/tcl/ged/images/matplot.gif [deleted file]
scilab/tcl/ged/images/passwd.gif [deleted file]
scilab/tcl/ged/images/plot3d.gif [deleted file]
scilab/tcl/ged/images/polyline.gif [deleted file]
scilab/tcl/ged/images/rectangle.gif [deleted file]
scilab/tcl/ged/images/segs.gif [deleted file]
scilab/tcl/ged/images/text.gif [deleted file]
scilab/tcl/get.tcl [deleted file]
scilab/tcl/html_library.tcl [deleted file]
scilab/tcl/misc.tcl [deleted file]
scilab/tcl/sciGUI/data/dontshow.txt [deleted file]
scilab/tcl/sciGUI/data/error.gif [deleted file]
scilab/tcl/sciGUI/data/giftable.txt [deleted file]
scilab/tcl/sciGUI/data/hourglass.gif [deleted file]
scilab/tcl/sciGUI/data/icontable.txt [deleted file]
scilab/tcl/sciGUI/data/info.gif [deleted file]
scilab/tcl/sciGUI/data/initial [deleted file]
scilab/tcl/sciGUI/data/initial.help [deleted file]
scilab/tcl/sciGUI/data/ndemo_tx01.txt [deleted file]
scilab/tcl/sciGUI/data/passwd.gif [deleted file]
scilab/tcl/sciGUI/data/question.gif [deleted file]
scilab/tcl/sciGUI/data/scilab01.gif [deleted file]
scilab/tcl/sciGUI/data/tp00.gif [deleted file]
scilab/tcl/sciGUI/data/tp01.gif [deleted file]
scilab/tcl/sciGUI/data/tp02.gif [deleted file]
scilab/tcl/sciGUI/data/tp04.gif [deleted file]
scilab/tcl/sciGUI/data/tp05.gif [deleted file]
scilab/tcl/sciGUI/data/tp06.gif [deleted file]
scilab/tcl/sciGUI/data/tp08.gif [deleted file]
scilab/tcl/sciGUI/data/tp10.gif [deleted file]
scilab/tcl/sciGUI/data/tp15.gif [deleted file]
scilab/tcl/sciGUI/data/tp16.gif [deleted file]
scilab/tcl/sciGUI/data/tp17.gif [deleted file]
scilab/tcl/sciGUI/data/warning.gif [deleted file]
scilab/tcl/sciGUI/license.txt [deleted file]
scilab/tcl/sciGUI/local_extra/HelpSystem-1.5/gpl.txt [deleted file]
scilab/tcl/sciGUI/local_extra/HelpSystem-1.5/help.tcl [deleted file]
scilab/tcl/sciGUI/local_extra/HelpSystem-1.5/help_2htm.tcl [deleted file]
scilab/tcl/sciGUI/local_extra/HelpSystem-1.5/help_chk.tcl [deleted file]
scilab/tcl/sciGUI/local_extra/HelpSystem-1.5/help_tbl.tcl [deleted file]
scilab/tcl/sciGUI/local_extra/HelpSystem-1.5/license.txt [deleted file]
scilab/tcl/sciGUI/local_extra/HelpSystem-1.5/readme.txt [deleted file]
scilab/tcl/sciGUI/local_extra/balloonhelp.tcl [deleted file]
scilab/tcl/sciGUI/local_extra/combobox-2.3/ANNOUNCE.txt [deleted file]
scilab/tcl/sciGUI/local_extra/combobox-2.3/README.txt [deleted file]
scilab/tcl/sciGUI/local_extra/combobox-2.3/combobox.html [deleted file]
scilab/tcl/sciGUI/local_extra/combobox-2.3/combobox.tcl [deleted file]
scilab/tcl/sciGUI/local_extra/combobox-2.3/example.tcl [deleted file]
scilab/tcl/sciGUI/local_extra/rnotebook.tcl [deleted file]
scilab/tcl/sciGUI/local_extra/spinbutton.tcl [deleted file]
scilab/tcl/sciGUI/sciBar.tcl [deleted file]
scilab/tcl/sciGUI/sciBrowseHelp.tcl [deleted file]
scilab/tcl/sciGUI/sciBrowseVar.tcl [deleted file]
scilab/tcl/sciGUI/sciConfig.tcl [deleted file]
scilab/tcl/sciGUI/sciDemoPlay.tcl [deleted file]
scilab/tcl/sciGUI/sciEditVar.tcl [deleted file]
scilab/tcl/sciGUI/sciGUI.tcl [deleted file]
scilab/tcl/set.tcl [deleted file]
scilab/tcl/tkcontrols.tcl [deleted file]
scilab/tcl/uicontrol.tcl [deleted file]
scilab/tcl/uimenu.tcl [deleted file]
scilab/tcl/utils/Balloon.tcl [deleted file]
scilab/tcl/utils/Combobox.tcl [deleted file]
scilab/tcl/utils/Notebook.tcl [deleted file]
scilab/tcl/utils/tk_choose.tcl [deleted file]

index bf45415..138d9db 100644 (file)
@@ -15,7 +15,7 @@
 #include "../../../../routines/calelm/calelm.fundef"  
        
 #define  IN_matdes  7
-#include "../../../../routines/graphics/graphics.fundef"       
+#include "../../graphics/sci_gateway/graphics.fundef"  
   
 #define  IN_matqz  8
 #include "../../../../routines/interf/qz.fundef"  
diff --git a/scilab/modules/graphics/FeC.p b/scilab/modules/graphics/FeC.p
deleted file mode 100644 (file)
index 7909120..0000000
+++ /dev/null
@@ -1,227 +0,0 @@
-/*------------------------------------------------------------------------
- *    Graphic library for 2D and 3D plotting 
- *    Copyright (C) 1998 Chancelier Jean-Philippe
- *    jpc@cergrene.enpc.fr 
- * --------------------------------------------------------------------------*/
-
-
-#include <stdio.h>
-#include <math.h>
-#include <string.h>
-#include "Math.h"
-
-static void triang();
-static int  zcote();
-
-/*------------------------------------------------------------
- *  Iso contour with grey level or colors 
- *  for a function defined by finite elements 
- *  ( f is linear on triangles )
- *  we give two versions of the function : a 
- *  quick version wich only fill triangles according to the average 
- *  value of f on a triangle
- *  and a slow version but more sexy which use the fact that f is linear
- *  on each triangle.
- *  Nodes (x[no],y[no])
- *  Triangles (Matrix: [ numero, no1,no2,no3,iflag;...]
- *  func[no] : Function value on Nodes.
- *  Nnode : number of nodes 
- *  Ntr   : number of triangles 
- *  strflag,legend,brect,aint : see plot2d 
----------------------------------------------------------------*/
-
-int C2F(fec)(x,y,triangles,func,Nnode,Ntr,strflag,legend,brect,aaint,lstr1,lstr2)
-     double x[],y[],triangles[],func[];
-     integer *Nnode,*Ntr;
-     double brect[];
-     integer  aaint[];
-     char legend[],strflag[];
-     integer lstr1,lstr2;
-{
-  static char logflag[]="nn";
-  double FRect[4],scx,scy,xofset,yofset;
-  integer IRect[4],i;
-  integer Xdec[3],Ydec[3];
-  integer err=0,*xm,*ym,job=1,n1=1,j,k;
-  /* Storing values if using the Record driver */
-  if (GetDriver()=='R') 
-    StoreFec("fec",x,y,triangles,func,Nnode,Ntr,strflag,legend,brect,aaint);
-  /** Boundaries of the frame **/
-  FrameBounds("gnn",x,y,&n1,Nnode,aaint,strflag,brect,FRect,Xdec,Ydec);
-  if ( (int)strlen(strflag) >=2 && strflag[1]=='0') job=0;
-  Scale2D(job,FRect,IRect,aaint,&scx,&scy,&xofset,&yofset,logflag,&xm,&ym,*Nnode,&err);
-  if ( err == 0) return(0);
-  
-  C2F(echelle2d)(x,y,xm,ym,Nnode,&n1,IRect,"f2i",3L);
-  /** Draw Axis or only rectangle **/
-  if ((int)strlen(strflag) >= 3 && strflag[2] == '1')
-    {
-      if ( strflag[1] == '5' || strflag[1]=='6' )
-       {
-         /* utilisation des bornes automatiques */
-         C2F(aplot1)(FRect,IRect,Xdec,Ydec,&(aaint[0]),&(aaint[2]),"nn",scx,scy,xofset,yofset);
-       }
-      else
-       {
-         double xmin1,xmax1, ymin1,ymax1;
-         C2F(aplot)(IRect,(xmin1=FRect[0],&xmin1),(ymin1=FRect[1],&ymin1),
-                (xmax1=FRect[2],&xmax1),(ymax1=FRect[3],&ymax1),
-                &(aaint[0]),&(aaint[2]),"nn"); 
-       }
-    }
-  else 
-    {
-      if ((int)strlen(strflag) >= 3 && strflag[2] == '2')
-       C2F(dr)("xrect","v",&IRect[0],&IRect[1],&IRect[2],&IRect[3],
-               PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-    }
-  /* Fec code */
-  C2F(dr)("xset","clipping",&IRect[0],&IRect[1],&IRect[2],&IRect[3]
-         ,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-  {
-    integer nz;
-    integer verbose=0,whiteid,narg;
-    double zmin,zmax;
-    /** Filling the triangles **/
-    zmin=(double) Mini(func,*Nnode); 
-    zmax=(double) Maxi(func,*Nnode);
-    C2F(dr)("xget","lastpattern",&verbose,&whiteid,&narg,
-           PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-    nz=whiteid;
-    for ( i =0 ; i < nz ; i++)
-      {
-       int fill = -( i+1 );
-       double vmin,vmax;
-       vmin=zmin + i*(zmax-zmin)/(nz);
-       vmax=zmin + (i+1)*(zmax-zmin)/(nz);
-       for ( j = 0 ; j < *Ntr ; j++)
-         {
-           integer sx[3],sy[3];
-           integer resx[6],resy[6];
-           double fxy[3];
-           integer ncont,nr;
-           for ( k=0 ; k< 3 ; k++)
-             {
-               integer ii=(integer) triangles[j+(*Ntr)*(k+1)];
-               sx[k]= xm[ii-1];
-               sy[k]= ym[ii-1];
-               fxy[k]= func[ii-1];
-             }
-           triang(sx,sy,fxy,&vmin,&vmax,resx,resy,&nr);
-           if ( nr != 0)
-             C2F(dr)("xliness","str",resx,resy,&fill,
-                     (ncont=1,&ncont),&nr, PI0,PD0,PD0,PD0,PD0,0L,0L);
-         }
-      }
-  }
-  C2F(dr)("xset","clipoff",PI0,PI0,PI0,PI0, PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-  /** Drawing the Legends **/
-  if ((int)strlen(strflag) >=1  && strflag[0] == '1')
-    {
-      integer style = -1;
-      n1=1;
-      Legends(IRect,&style,&n1,legend);
-    }
-  return(0);
-}
-
-
-static void triang(sx, sy, fxy, zmin, zmax, resx, resy, nx)
-     integer *sx;
-     integer *sy;
-     double *fxy;
-     double *zmin;
-     double *zmax;
-     integer *resx;
-     integer *resy;
-     integer *nx;
-{
-  integer cot;
-  /* Cherche le polygone inclus ds le triangle 
-     defini par sx,sy 
-     pour lequel la valeur de f est comprise entre zmin 
-     et zmax f est lineaire sur le triangle 
-     */
-  *nx = -1;
-  for (cot=0;cot<3;cot++)
-    {
-      integer cotn = (cot+1)%3;
-      double alpha1,alpha2;
-      if (zcote(cot, cotn,fxy,zmin,zmax,&alpha1,&alpha2) != 0)
-       {
-         (*nx)++;
-         resx[*nx]=inint(alpha1*sx[cotn]+(1.0-alpha1)*sx[cot]);
-         resy[*nx]=inint(alpha1*sy[cotn]+(1.0-alpha1)*sy[cot]);
-         (*nx)++;
-         resx[*nx]=inint(alpha2*sx[cotn]+(1.0-alpha2)*sx[cot]);
-         resy[*nx]=inint(alpha2*sy[cotn]+(1.0-alpha2)*sy[cot]);
-       }
-    }
-  (*nx)++;
-}
-
-static int zcote(i, j, fxy, zmin, zmax, alpha1, alpha2)
-     integer i;
-     integer j;
-     double *fxy;
-     double *zmin;
-     double *zmax;
-     double *alpha1;
-     double *alpha2;
-{
-  if ( fxy[i] >= *zmin && fxy[i] <= *zmax )
-    {
-      *alpha1=0.0;
-      if ( fxy[j] >= fxy[i]) 
-       {
-         if ( fxy[j] > fxy[i])
-           *alpha2=Min((*zmax-fxy[i])/(fxy[j]-fxy[i]),1.0);
-         else
-           *alpha2=1.0;
-       }
-      else 
-       {
-         *alpha2=Min((*zmin-fxy[i])/(fxy[j]-fxy[i]),1.0);
-       }
-    }
-  else 
-    {
-      if ( fxy[i] < *zmin )
-       {
-         if ( fxy[j] < *zmin) 
-           return(0);
-         else 
-           {
-             *alpha1=Min((*zmin-fxy[i])/(fxy[j]-fxy[i]),1.0);
-             if (fxy[j] <= *zmax)
-               *alpha2=1;
-             else 
-               *alpha2=Min((*zmax-fxy[i])/(fxy[j]-fxy[i]),1.0);
-           }
-       }
-      else
-       if ( fxy[i] > *zmax )
-         {
-           if ( fxy[j] > *zmax) return(0);
-           else 
-             {
-               *alpha1=Min((*zmax-fxy[i])/(fxy[j]-fxy[i]),1.0);
-               if (fxy[j] > *zmin)
-                 *alpha2=1;
-               else 
-                 *alpha2=Min((*zmin-fxy[i])/(fxy[j]-fxy[i]),1.0);
-             }
-         }
-    }
-  return(1);
-}
-
-
-
-
-
-
-
-
-
-
diff --git a/scilab/modules/graphics/Math.c b/scilab/modules/graphics/Math.c
deleted file mode 100644 (file)
index 6c99cdb..0000000
+++ /dev/null
@@ -1,153 +0,0 @@
-/*------------------------------------------------------------------------
- *    Graphic library
- *    Copyright (C) 1998-2001 Enpc/Jean-Philippe Chancelier
- *    jpc@cermics.enpc.fr 
- --------------------------------------------------------------------------*/
-
-#include "Math.h"
-
-/* 
- * we use spConfig.h for machine constants 
- * XXX : spConfig should be merged and unified 
- *       with other machine constant scilab code 
- */
-
-#define spINSIDE_SPARSE
-#if defined(THINK_C)
-#include "::sparse:spConfig.h" 
-#else
-#include "../../routines/sparse/spConfig.h"
-#endif
-
-double Mini(vect, n)
-     double *vect;
-     integer n;
-{
-  int i;
-  double vmin;
-  vmin = LARGEST_REAL;
-  for (i = 0 ; i < n ; i++)
-    /*    if ( isinf(vect[i])== 0 && isnan(vect[i])==0 && vect[i] < vmin)  */
-    if ( finite(vect[i])== 1 && vect[i] < vmin) 
-      vmin=vect[i];
-  return(vmin);
-}
-
-double Maxi(vect, n)
-     double *vect;
-     integer n;
-{
-  int i;
-  double maxi;
-  maxi= - LARGEST_REAL;
-  for (i =0 ; i < n ; i++)
-    /* if ( isinf(vect[i])== 0 && isnan(vect[i])==0 && vect[i] > maxi) */
-    if ( finite(vect[i])== 1 && vect[i] > maxi) 
-      maxi=vect[i];
-  return(maxi);
-}
-
-/*----------------------------------------------------------------------------*/
-
-/* perform the rotation of point from to point dest  */
-void rotate2D( double from[2], double center[2], double angle, double dest[2] )
-{
-  rotate2Dim( from, center, cos( angle ), sin( angle ), dest ) ;
-}
-
-/*----------------------------------------------------------------------------*/
-/* perform the rotation of point from to point to. */
-/* the angle is directly given with its sine and cosine for speed */
-void rotate2Dim( double from[2]   ,
-                 double center[2] ,
-                 double cosAngle  ,
-                 double sinAngle  ,
-                 double dest[2]    )
-{
-  double diff[2] ;
-
-  /* put the center to (0,0) */
-  diff[0] = from[0] - center[0] ;
-  diff[1] = from[1] - center[1] ;
-
-  /* turn and translate back */
-  dest[0] = diff[0] * cosAngle - diff[1] * sinAngle + center[0] ;
-  dest[1] = diff[0] * sinAngle + diff[1] * cosAngle + center[1] ;
-}
-/*----------------------------------------------------------------------------*/
-/* perform the rotation of point from to point dest given in int with angle in radian  */
-void iRotate2D( int from[2], int center[2], double angle, int dest[2] )
-{
-  iRotate2Dim( from, center, cos( angle ), sin( angle ), dest ) ;
-}
-
-/*----------------------------------------------------------------------------*/
-/* perform the rotation of point from to point to. */
-/* the angle is directly given with its sine and cosine for speed */
-void iRotate2Dim( int    from[2]   ,
-                  int    center[2] ,
-                  double cosAngle  ,
-                  double sinAngle  ,
-                  int    dest[2]    )
-{
-  int diff[2] ;
-
-  /* put the center to (0,0) */
-  diff[0] = from[0] - center[0] ;
-  diff[1] = from[1] - center[1] ;
-
-  /* turn and translate back */
-  dest[0] = round( diff[0] * cosAngle - diff[1] * sinAngle + center[0] ) ;
-  dest[1] = round( diff[0] * sinAngle + diff[1] * cosAngle + center[1] ) ;
-}
-/*----------------------------------------------------------------------------*/
-/* perform an homethety point from to point dest. The 2 factors stand for the ration */
-/* along the 2 coordinates */
-void homothety2D( double from[2], double center[2], double factors[2], double dest[2] )
-{
-  dest[0] = center[0] + factors[0] * ( from[0] - center[0] ) ;
-  dest[1] = center[1] + factors[1] * ( from[1] - center[1] ) ;
-}
-/*----------------------------------------------------------------------------*/
-/* perform an homethety point from to point dest given in pixels. */
-/* The 2 factors stand for the ration along the 2 coordinates */
-void iHomothety2D( int from[2], int center[2], double factors[2], int dest[2] )
-{
-  dest[0] = round( center[0] + factors[0] * ( from[0] - center[0] ) ) ;
-  dest[1] = round( center[1] + factors[1] * ( from[1] - center[1] ) ) ;
-}
-/*----------------------------------------------------------------------------*/
-/* perform the translation of point from to point to with vector trans */
-void translate2D( double from[2], double trans[2], double dest[2] )
-{
-  dest[0] = from[0] + trans[0] ;
-  dest[1] = from[1] + trans[1] ;
-}
-/*----------------------------------------------------------------------------*/
-void iTranslate2D( int from[2], int trans[2], int dest[2] )
-{
-  dest[0] = from[0] + trans[0] ;
-  dest[1] = from[1] + trans[1] ;
-}
-/*----------------------------------------------------------------------------*/
-void normalize2d( double vect[2] )
-{
-  double norm = sqrt( vect[0] * vect[0] + vect[1] * vect[1] ) ;
-  vect[0] /= norm ;
-  vect[1] /= norm ;
-}
-/*----------------------------------------------------------------------------*/
-void iNormalize2d( int vect[2] )
-{
-  double norm = sqrt( vect[0] * vect[0] + vect[1] * vect[1] ) ;
-  vect[0] = round( vect[0] / norm ) ;
-  vect[1] = round( vect[1] / norm ) ;
-}
-/*----------------------------------------------------------------------------*/
-/* check if two values can be considered equal given an accurracy */
-int safeEqual( double val1, double val2, double accuracy )
-{
-  /* the val1 == val2 is put to avoid division by 0 */
-  return ( val1 == val2 ) || ( Abs( val1 - val2 ) < accuracy * Max( Abs(val1), Abs(val2 ) ) ) ;
-}
-/*----------------------------------------------------------------------------*/
diff --git a/scilab/modules/graphics/Math.h b/scilab/modules/graphics/Math.h
deleted file mode 100644 (file)
index a9e3f15..0000000
+++ /dev/null
@@ -1,207 +0,0 @@
-/*------------------------------------------------------------------------
- *    Graphic library
- *    Copyright (C) 1998-2000 Enpc/Jean-Philippe Chancelier
- *    jpc@cereve.enpc.fr 
- --------------------------------------------------------------------------*/
-
-#ifndef __SCIMATH_H__
-#define __SCIMATH_H__
-#include "machine.h"
-#include <limits.h>
-
-#include <math.h>
-
-#ifdef __STDC__
-#include <stdlib.h>
-#endif
-
-
-
-
-#ifdef _MSC_VER 
-               #include <float.h>
-               #define finite(x) _finite(x) 
-#else  /* _MSC_VER */ 
-       /** This should only be provided when finite prototype is missing **/
-       /** XXX : to be tested **/
-       #ifndef __cplusplus
-       int finite __PARAMS((double));
-       #endif
-#endif /* _MSC_VER */
-
-#ifdef _MSC_VER 
-       #include <float.h>
-       #define ISNAN(x) _isnan(x)
-#else 
-       #define ISNAN(x) isnan(x)
-#endif 
-
-#define Abs(x) ( ( (x) >= 0) ? (x) : -( x) )
-#ifndef Min
-#define Min(x,y)       (((x)<(y))?(x):(y))
-#endif 
-
-#ifndef Max 
-#define Max(x,y)       (((x)>(y))?(x):(y))
-#endif
-
-#define PI0 (integer *) 0
-#define PD0 (double *) 0
-#define SMDOUBLE 1.e-200 /* Smalest number to avoid dividing by zero */
-
-/* angle conversion */
-#define PI_OVER_180  0.01745329251994329576913914624236578987393
-#define _180_OVER_PI 57.29577951308232087665461840231273527024
-#define DEG2RAD(x) ((x) * PI_OVER_180  )
-#define RAD2DEG(x) ((x) * _180_OVER_PI )
-
-#define                round(a)        (int)(((a)<0.0)?(a)-.5:(a)+.5)
-#define EPSILON 1.0e-13
-
-
-
-/** 
-  #define linint(x) ((integer) floor(x)) 
-  #define inint(x) ((int) floor(x))  
-**/
-
-/** 
-  if we suppose that the x transmited is in the range of integers 
-  we could also use :
-  #define inint(x) (( x > 0 ) ? ((int) (x + 0.5)) : ((int) (x - 0.5));
- **/
-
-#define linint(x) ((integer) floor(x + 0.5 )) 
-#define inint(x) ((int) floor(x + 0.5 ))  
-
-/* XWindow function arguments can be  int16 or unsigned16 */
-
-#define SCIINT16   short
-#define INT16MAX   SHRT_MAX
-#define INT16MIN   SHRT_MIN
-#define int16max   0x7FFF
-#define uns16max   0xFFFF
-
-#if (defined(sun) && defined(SYSV)) 
-#include <ieeefp.h>
-#endif
-
-#if defined(THINK_C)|| defined(_MSC_VER)
-  #define M_PI 3.14159265358979323846
-#else
-  #if defined(HAVE_VALUES_H)
-    #include <values.h>
-  #else
-    #if defined(HAVE_LIMITS_H)
-     #include <limits.h>
-    #endif
-  #endif
-#endif
-
-#ifndef M_PI
-#define M_PI 3.14159265358979323846 
-#endif
-
-
-extern double exp10 __PARAMS((double));
-
-/* prototypes */
-
-/*----------------------------------------------------------------------------*/
-/* perform the rotation of point from to point dest with angle in radian  */
-void rotate2D( double from[2], double center[2], double angle, double dest[2] ) ;
-
-/* perform the rotation of point from to point to. */
-/* the angle is directly given with its sine and cosine for speed */
-void rotate2Dim( double from[2]   ,
-                 double center[2] ,
-                 double cosAngle  ,
-                 double sinAngle  ,
-                 double dest[2]    ) ;
-
-/* perform the rotation of point from to point dest given in int with angle in radian  */
-void iRotate2D( int from[2], int center[2], double angle, int dest[2] ) ;
-
-/* perform the rotation of point from to point dest given in int. */
-/* the angle is directly given with its sine and cosine for speed */
-void iRotate2Dim( int    from[2]   ,
-                  int    center[2] ,
-                  double cosAngle  ,
-                  double sinAngle  ,
-                  int    dest[2]    ) ;
-
-/* perform an homethety point from to point dest. The 2 factors stand for the ration */
-/* along the 2 coordinates */
-void homothety2D( double from[2], double center[2], double factors[2], double dest[2] ) ;
-
-/* perform an homethety point from to point dest given in pixels. */
-/* The 2 factors stand for the ration along the 2 coordinates */
-void iHomothety2D( int from[2], int center[2], double factors[2], int dest[2] ) ;
-
-
-/* perform the translation of point from to point dest with vector trans */
-void translate2D( double from[2], double trans[2], double dest[2] ) ;
-
-/* perform the translation of point from to point dest with vector trans given in pixels.*/
-void iTranslate2D( int from[2], int trans[2], int dest[2] ) ;
-
-/**
- * Normalize a 2d vector.
- */
-void normalize2d( double vect[2] ) ;
-
-/**
- * Normalize a 2d vector in pixels coordinates.
- */
-void iNormalize2d( int vect[2] ) ;
-
-/**
- * return the scalar product of two 2d vectors.
- */
-#define DOT_PROD_2D(v1,v2) ( ((v1)[0]) * ((v2)[0]) + ((v1)[1]) * ((v2)[1]) )
-
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-/* check if two values can be considered equal given an accurracy */
-int safeEqual( double val1, double val2, double accuracy ) ;
-
-/* with a macro it is faster */
-/* the x == y test is put to avoid division by 0 */
-#define SAFE_EQUAL(x,y,acc) ( (x) == (y) ) || ( Abs( (x) - (y) ) < (acc) * Max( Abs( (x) ), Abs( (y) ) ) )
-
-/* test if a value if lesser than an other or just sligthy greater */
-#define SAFE_LT(x,y,acc) ( (x) == (y) || ( (x) - (y) ) < (acc) * Max( Abs( (x) ), Abs( (y) ) ) )
-#define SAFE_GT(x,y,acc) ( (x) == (y) || ( (y) - (x) ) < (acc) * Max( Abs( (x) ), Abs( (y) ) ) )
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-/* truncate an integer to a 16 bits integer. Overflow value are trucated to the min */
-/* and max of 16 bits integer. */
-#define INT_2_16B(i) ( (i) > INT16MAX ? (INT16MAX) : ( (i) < INT16MIN ? INT16MIN : ((SCIINT16) i)) )
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-/* truncate an integer to a char. Overflow value are trucated to the min */
-/* and max of char integer. */
-#define INT_2_UCHAR(i) ( (i) > UCHAR_MAX ? (UCHAR_MAX) : ( (i) < 0  ? 0 : ((char) i)) )
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-/* truncate a float or double to an int. Overflow value are trucated to the min */
-/* and max of 32 bits integer. */
-#define FLOAT_2_INT(f) ( (f) > INT_MAX ? (INT_MAX) : ( (f) < INT_MIN ? (INT_MIN) : ( inint( f ) ) ) )
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-/* return the number of digits of a positive integer (ie for 10236 it is 5 )  */
-/* the added 0.5 is to avoid trouble with 10^i which could become 9.999999999 */
-#define GET_NB_DIGITS(i) ( (i) == 0 ? 1 : ((int) floor( log10( (i) + 0.5 ) ) ) + 1 )
-/*----------------------------------------------------------------------------*/
-
-
-
-
-
-#endif /* SCI_MATH.HG */
-
diff --git a/scilab/modules/graphics/README b/scilab/modules/graphics/README
deleted file mode 100644 (file)
index 5e35725..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-copyright INRIA 2006
-
-You are reading the readme of the graphic module.
\ No newline at end of file
diff --git a/scilab/modules/graphics/Tests.c b/scilab/modules/graphics/Tests.c
deleted file mode 100644 (file)
index c1d78c3..0000000
+++ /dev/null
@@ -1,853 +0,0 @@
-/*------------------------------------------------------------------------
- *    Graphic library
- *    Copyright (C) 1998-2001 Enpc/Jean-Philippe Chancelier
- *    jpc@cermics.enpc.fr 
- --------------------------------------------------------------------------*/
-
-#include <stdio.h>
-#include <math.h>
-#include "Math.h"
-
-#define XN2D 63
-#define NCURVES2D  3
-static void polycorps(),corps();
-static void fixbounds();
-
-static void test2DD()
-{
-  integer sec=10;
-  integer style[NCURVES2D],aaint[4],n1,n2;
-  double x[NCURVES2D*XN2D],y[NCURVES2D*XN2D],brect[4],Wrect[4],Frect[4];
-  integer i,j,k;
-  for ( k= 0 ; k < 50 ; k++)
-    {
-      for ( j =0 ; j < NCURVES2D ; j++)
-       for ( i=0 ; i < XN2D ; i++)
-         {
-           x[i+ XN2D*j]= ((double) i)/10.0;
-           y[i+ XN2D*j]= (double) sin((j+1)*x[i+XN2D*j]);
-         }
-      for ( i=0 ; i < NCURVES2D ; i++)
-       style[i]= -NCURVES2D+i;
-      n1=NCURVES2D;n2=XN2D;
-      aaint[0]=aaint[2]=2;aaint[1]=aaint[3]=10;
-      C2F(dr1)("xpause","v",&sec,PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-      Wrect[0]=Wrect[1]=Wrect[2]=Wrect[3]=0.5;
-      for ( i=0 ; i < 4 ; i++)
-       {
-         Frect[i]=Wrect[i];
-       }
-      Wrect[0]=Wrect[1]=Wrect[2]=Wrect[3]=0.5;
-      C2F(setscale2d)(Wrect,Frect,"nn",0L);
-      C2F(plot2d)(x,y,&n1,&n2,style,"021"," ",brect,aaint,0L,0L);
-      Wrect[0]=Wrect[1]=0;Wrect[2]=Wrect[3]=1.0;
-      C2F(setscale2d)(Wrect,Frect,"nn",0L);
-    }
-}
-
-#define XN2DD 2
-#define NCURVES2DD  1
-
-void test2D()
-{
-  integer style[NCURVES2DD],aaint[4],n1,n2;
-  double x[NCURVES2DD*XN2DD],y[NCURVES2DD*XN2DD],brect[4];
-  integer i,j;
-  for ( j =0 ; j < NCURVES2DD ; j++)
-    {
-      i=0;
-      x[i+ XN2DD*j]= ((double) i)/10.0;
-      y[i+ XN2DD*j]= -9.75;
-      i=1;
-      x[i+ XN2DD*j]= ((double) i)/10.0;
-      y[i+ XN2DD*j]= 1.10;
-      }
-  for ( i=0 ; i < NCURVES2DD ; i++)
-    style[i]= -NCURVES2DD+i;
-  n1=NCURVES2DD;n2=XN2DD;
-  aaint[0]=aaint[2]=2;aaint[1]=aaint[3]=10;
-  brect[0]=brect[1]=0;brect[2]=brect[3]=1.0;
-  C2F(plot2d)(x,y,&n1,&n2,style,"011"," ",brect,aaint,0L,0L);
-}
-
-#define XN2D2 200
-#define NCURVES2D2 1
-
-static void test2D2()
-{
-  integer style[NCURVES2D2],aaint[4],n1,n2;
-  double x[NCURVES2D2*XN2D2],y[NCURVES2D2*XN2D2],brect[4];
-  integer i,j,k,on=1;
-  C2F(dr1)("xset","pixmap",&on,PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-  for ( k=0 ; k < 50 ; k++) 
-    {
-      for ( j =0 ; j < NCURVES2D2 ; j++)
-       for ( i=0 ; i < XN2D2 ; i++)
-         {
-           x[i+ XN2D2*j]= 6*((double) i)/((double) XN2D2);
-           y[i+ XN2D2*j]= (double) sin(k/10.0 +(j+1)*3.14*x[i+XN2D2*j]);
-         }
-      n1=NCURVES2D2;n2=XN2D2;
-      brect[0]=0;brect[1]= -1.2;brect[2]=7.0;brect[3]=1.2;
-      aaint[0]=aaint[2]=2;aaint[1]=aaint[3]=10;
-      for ( i=0 ; i < NCURVES2D2 ; i++)
-       style[i]= -i-1;
-      C2F(plot2d2)("gnn",x,y,&n1,&n2,style,"111",
-                  " y=sin(x/10)@y=sin(2*x/10)",brect,aaint,0L,0L,0L);
-      C2F(dr1)("xset","wshow",PI0,PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-      C2F(dr1)("xset","wwpc",PI0,PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-    }
-  on=0;
-  C2F(dr1)("xset","pixmap",&on,PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-}
-
-
-#define XN2D3 63
-#define NCURVES2D3 2
-
-static void test2D3()
-{
-  integer style[NCURVES2D3],aaint[4],n1,n2;
-  double x[NCURVES2D3*XN2D3],y[NCURVES2D3*XN2D3],brect[4];
-  integer i,j;
-  for ( j =0 ; j < NCURVES2D3 ; j++)
-    for ( i=0 ; i < XN2D3 ; i++)
-      {
-       x[i+ XN2D3*j]= ((double) i)/10.0;
-       y[i+ XN2D3*j]= (double) sin((j+1)*x[i+XN2D3*j]);
-      }
-  n1=NCURVES2D3;n2=XN2D3;
-  brect[0]=0;brect[1]= -1.2;brect[2]=7.0;brect[3]=1.2;
-  aaint[0]=aaint[2]=2;aaint[1]=aaint[3]=10;
-  for ( i=0 ; i < NCURVES2D3 ; i++)
-    style[i]= -i-1;
-  C2F(plot2d3)("gnn",x,y,&n1,&n2,style,"111",
-          " y=sin(x/10)@y=sin(2*x/10)",brect,aaint,0L,0L,0L);
-
-}
-
-
-#define XN2D4 63
-#define NCURVES2D4 2
-
-static void test2D4()
-{
-  integer style[NCURVES2D4],aaint[4],n1,n2;
-  double x[NCURVES2D4*XN2D4],y[NCURVES2D4*XN2D4],brect[4];
-  integer i,j;
-  for ( j =0 ; j < NCURVES2D4 ; j++)
-    for ( i=0 ; i < XN2D4 ; i++)
-      {
-       x[i+ XN2D4*j]= ((double) i)/10.0;
-       y[i+ XN2D4*j]= (double) sin((j+1)*x[i+XN2D4*j]);
-      }
-  n1=NCURVES2D4;n2=XN2D4;
-  brect[0]=0;brect[1]= -1.2;brect[2]=7.0;brect[3]=1.2;
-  aaint[0]=aaint[2]=2;aaint[1]=aaint[3]=10;
-  for ( i=0 ; i < NCURVES2D4 ; i++)
-    style[i]= -i-1;
-  C2F(plot2d4)("gnn",x,y,&n1,&n2,style,"111",
-          " y=sin(x/10)@y=sin(2*x/10)",brect,aaint,0L,0L,0L);
-}
-
-
-#define XNN1 200
-#define NCURVESN1 2
-
-
-#define XDDN1 10
-#define NC2DN1 1
-
-static void test2DN1()
-{
-  integer style[NC2DN1],aaint[4],n1,n2;
-  double x[NC2DN1*XDDN1],y[NC2DN1*XDDN1],brect[4];
-  integer i,j;
-  for ( j =0 ; j < NC2DN1 ; j++)
-    for ( i=0 ; i < XDDN1 ; i++)
-      {
-       double xx;
-       x[i+ XDDN1*j]= xx=10.3+i;
-       y[i+ XDDN1*j]= (double) i;
-      }
-  for ( i=0 ; i < NC2DN1 ; i++) style[i]= -NC2DN1+i;
-  n1=NC2DN1;n2=XDDN1;
-  aaint[0]=aaint[2]=2;aaint[1]=aaint[3]=10;
-  brect[3] = 3.8561362479999999;
-  brect[2] = 4.8584755555555557;
-  brect[1] = 3.856136206;
-  brect[0] = 4.8546488888888888;
-  C2F(plot2d1)("enn",x,y,&n1,&n2,style,"151",
-          " ",brect,aaint,0L,0L,0L);
-}
-
-static void test2DN2()
-{
-  integer style[NCURVESN1],aaint[4],n1,n2;
-  double x[NCURVESN1*XNN1],y[NCURVESN1*XNN1],brect[4];
-  integer i,j;
-  for ( j =0 ; j < NCURVESN1 ; j++)
-    for ( i=0 ; i < XNN1 ; i++)
-      {
-       double xx;
-       x[i+ XNN1*j]= xx=10.3+i;
-       if ( j ==0) 
-         y[i+ XNN1*j]= (double) log10((double) xx);
-       else 
-         y[i+ XNN1*j]= (double) exp10((double) xx/2000);
-
-      }
-  for ( i=0 ; i < NCURVESN1 ; i++)
-    style[i]= -NCURVESN1+i;
-  n1=NCURVESN1;n2=XNN1;
-  aaint[0]=aaint[2]=2;aaint[1]=aaint[3]=10;
-  C2F(plot2d1)("gln",x,y,&n1,&n2,style,"121",
-          "C1:y=log10(x)@C2:y=exp10(x/2.e3) ",brect,aaint,0L,0L,0L);
-}
-
-static void test2DN3()
-{
-  integer style[NCURVESN1],aaint[4],n1,n2;
-  double x[NCURVESN1*XNN1],y[NCURVESN1*XNN1],brect[4];
-  integer i,j;
-  for ( j =0 ; j < NCURVESN1 ; j++)
-    for ( i=0 ; i < XNN1 ; i++)
-      {
-       double xx;
-       x[i+ XNN1*j]= xx=10.3+i;
-       if ( j ==0) 
-         y[i+ XNN1*j]= (double) log10((double) xx);
-       else 
-         y[i+ XNN1*j]= (double) exp10((double) xx/2000);
-
-      }
-  for ( i=0 ; i < NCURVESN1 ; i++)
-    style[i]= -NCURVESN1+i;
-  n1=NCURVESN1;n2=XNN1;
-  aaint[0]=aaint[2]=2;aaint[1]=aaint[3]=10;
-  C2F(plot2d1)("gnl",x,y,&n1,&n2,style,"121",
-          "C1:y=log10(x)@C2:y=exp10(x/2.e3) ",brect,aaint,0L,0L,0L);
-}
-
-
-#define XN3D 21
-#define YN3D 21
-#define VX3D 10
-
-void test3D()
-{
-  double z[XN3D*YN3D],x[XN3D],y[YN3D],bbox[6];
-  integer flag[3],p,q;
-  double teta,alpha;
-  integer i ,j ;
-  for ( i=0 ; i < XN3D ; i++) x[i]=10*i;
-  for ( j=0 ; j < YN3D ; j++) y[j]=10*j;
-  for ( i=0 ; i < XN3D ; i++)
-    for ( j=0 ; j < YN3D ; j++) z[i+XN3D*j]= (i-VX3D)*(i-VX3D)+(j-VX3D)*(j-VX3D);
-  p= XN3D ; q= YN3D;  teta=alpha=35;
-  flag[0]=2;flag[1]=2,flag[2]=4;
-  p= XN3D ; q= YN3D;  teta=alpha=35;
-  C2F(plot3d)(x,y,z,&p,&q,&teta,&alpha,"X@Y@Z",flag,bbox,0L);
-}
-
-
-
-#define XN3DA 21
-#define YN3DA 21
-#define VX3DA 10
-
-void test3DA()
-{
-  double z[XN3DA*YN3DA],x[XN3DA],y[YN3DA],bbox[6];
-  integer flag[3],p,q,k,c=1;
-  double teta,alpha;
-  integer i ,j,on=1;
-  C2F(dr1)("xset","pixmap",&on,PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-  C2F(dr1)("xset","use color",(c=1,&c),PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-  for ( i=0 ; i < XN3DA ; i++) x[i]=i/((double) XN3DA) - 2.0;
-  for ( j=0 ; j < YN3DA ; j++) y[j]=j/((double) YN3DA) - 2.0;
-  for ( k = 0 ; k < 20 ; k++)
-    {
-      for ( i=0 ; i < XN3DA ; i++)
-       for ( j=0 ; j < YN3DA ; j++) z[i+XN3DA*j]= cos( 2*3.14*x[i])*sin(3.14*2*y[j]*(k/40.0+1));
-      p= XN3DA ; q= YN3DA;  teta=alpha=35;
-      flag[0]=2;flag[1]=(k== 0)? 2:0,flag[2]=0;
-      p= XN3DA ; q= YN3DA;  teta=alpha=35;
-      C2F(plot3d1)(x,y,z,&p,&q,&teta,&alpha,"X@Y@Z",flag,bbox,0L);
-      C2F(dr1)("xset","wshow",PI0,PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-      C2F(dr1)("xset","wwpc",PI0,PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-    }
-  C2F(dr1)("xset","pixmap",(on=0,&on),PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-  C2F(dr1)("xset","use color",(c=0,&c),PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-}
-
-
-#define XN3D1 21
-#define YN3D1 21
-#define VX 10
-
-static void test3D1()
-{
-  double z[XN3D1*YN3D1],x[XN3D1],y[YN3D1],bbox[6];
-  integer flag[3],p,q;
-  double teta,alpha;
-  integer i ,j ;
-  for ( i=0 ; i < XN3D1 ; i++) x[i]=10*i;
-  for ( j=0 ; j < YN3D1 ; j++) y[j]=10*j;
-  for ( i=0 ; i < XN3D1 ; i++)
-    for ( j=0 ; j < YN3D1 ; j++) z[i+XN3D1*j]= (i-VX)*(i-VX)+(j-VX)*(j-VX);
-  p= XN3D1 ; q= YN3D1;  teta=alpha=35;
-  flag[0]=2;flag[1]=2,flag[2]=3;
-  C2F(plot3d1)(x,y,z,&p,&q,&teta,&alpha,"X@Y@Z",flag,bbox,0L);
-  I3dRotation() ;
-}
-
-
-#define XN3D2 21
-#define YN3D2 21
-#define VX3D2 5
-
-static void test3D2()
-{
-  double z[XN3D2*YN3D2],x[XN3D2],y[YN3D2],bbox[6];
-  integer flag[3],p,q;
-  double teta,alpha;
-  integer i ,j ;
-  for ( i=0 ; i < XN3D2 ; i++) x[i]=10*i;
-  for ( j=0 ; j < YN3D2 ; j++) y[j]=10*j;
-  for ( i=0 ; i < XN3D2 ; i++)
-    for ( j=0 ; j < YN3D2 ; j++) z[i+XN3D2*j]= (i-VX3D2)*(i-VX3D2);
-  p= XN3D2 ; q= YN3D2;  teta=alpha=35;
-  flag[0]=2;flag[1]=2,flag[2]=3;
-  C2F(plot3d1)(x,y,z,&p,&q,&teta,&alpha,"X@Y@Z",flag,bbox,0L);
-}
-
-
-
-static void testArrows()
-{
-  integer narrowx2=20,j,style=0,iflag=0;
-  double arsizex10=20.0;
-  double polyx[20],polyy[20];
-  double dx=100;
-  fixbounds(0.0,500.0,0.0,500.0);
-  for ( j =0 ; j < 10 ; j++)
-    {polyx[2*j]=250;polyy[2*j]=250;}
-  for ( j =0 ; j < 10 ; j++)
-    {
-      integer alpha;
-      alpha=36*j;
-      polyx[2*j+1]=250+ cos(3.14116*alpha/180.0)*dx;
-      polyy[2*j+1]=250 -sin(3.14116*alpha/180.0)*dx;
-    }
-  C2F(dr1)("xarrow","str",&style,&iflag,&narrowx2,PI0,PI0,PI0,polyx,polyy,&arsizex10,PD0,0L,0L);
-}
-
-#define XNC 21
-#define YNC 21
-#define VXC 10
-
-static void TestC(ii)
-     int ii;
-{
-  double z[XNC*YNC],x[XNC],y[YNC];
-  double zz,bbox[6],zlev=10.0;
-  integer p,q,i,j,nz,flagnz=0;
-  double teta=35,alpha=45;
-  integer flag[3];
-  zz=1;
-  for ( i=0 ; i < XNC ; i++) x[i]=10*i;
-  for ( j=0 ; j < YNC ; j++) y[j]=10*j;
-  for ( i=0 ; i < XNC ; i++)
-    for ( j=0 ; j < YNC ; j++) 
-      z[i+XNC*j]= (i-VXC)*(i-VXC)-(j-VXC)*(j-VXC);
-  p= XNC ; q= YNC; nz= 10;
-  flag[0]=ii;
-  flag[1]=2;
-  flag[2]=3;
- C2F(contour)(x,y,z,&p,&q,&flagnz,&nz,&zz,&teta,&alpha, "X@Y@Z",flag,bbox,&zlev,0L);
-}
-
-#define LEVELNUM 10
-
-static void TestC2d()
-{
-  integer aaint[4];
-  double brect[4];
-  double z[XNC*YNC],x[XNC],y[YNC];
-  int style[LEVELNUM];
-  double zz;
-  integer p,q,i,j,nz,flagnz=0;
-  zz=1;
-  for ( i=0 ; i < XNC ; i++) x[i]=10*i;
-  for ( j=0 ; j < YNC ; j++) y[j]=10*j;
-  for ( i=0 ; i < XNC ; i++)
-    for ( j=0 ; j < YNC ; j++) 
-      z[i+XNC*j]= (i-VXC)*(i-VXC)-(j-VXC)*(j-VXC);
-  p= XNC ; q= YNC; nz= 10;
-  aaint[0]=aaint[2]=2;aaint[1]=aaint[3]=10;
-  brect[0]=brect[1]=0;brect[2]=brect[3]=200.0;
-  for (i=0; i < LEVELNUM; i++) 
-    style[i]= i;
-  C2F(contour2)(x,y,z,&p,&q,&flagnz,&nz,&zz,style,"011", "X@Y@Z",brect,aaint,0L,0L);
-}
-
-static void testC1() { TestC(2);}
-static void testC2() { TestC(0);}
-static void testC3() { TestC(1);}
-
-
-#define XNCh 21
-#define YNCh 21
-
-static void testCh()
-{
-  double x[XNCh],y[YNCh];
-  double fx[XNCh*YNCh], fy[XNCh*YNCh], vrect[4],arfact;
-  integer i ,j;
-  static char fax[]="021";
-  for ( i=0 ; i < XNCh ; i++)
-    x[i]= -1+2*((double) i)/XNCh;
-  for ( j=0 ; j < YNCh ; j++)
-    y[j]= -1+2*((double) j)/YNCh;
-  for ( i=0 ; i < XNCh ; i++)
-    for ( j=0 ; j < YNCh ; j++)
-      { 
-       fx[i+XNCh*j]= y[j];
-       fy[i+XNCh*j]= -x[i] +(1-x[i]*x[i])*y[j];
-       
-      }
-
-  vrect[0]=vrect[1]= -1 ,vrect[2]=vrect[3]=1;
-  arfact=1.0;
-  C2F(champ)(x,y,fx,fy,(i=XNCh,&i),(j=YNCh,&j),fax,vrect,&arfact,0L);
-}
-
-
-#define XNG 21
-#define YNG 21
-#define VXG 10
-
-static void testG()
-{
-  integer aaint[4];
-  double brect[4];
-  double z[XNG*YNG],x[XNG],y[YNG];
-  integer p,q,i,j;
-  for ( i=0 ; i < XNG ; i++) x[i]=10*i;
-  for ( j=0 ; j < YNG ; j++) y[j]=10*j;
-  for ( i=0 ; i < XNG ; i++)
-    for ( j=0 ; j < YNG ; j++) 
-      z[i+XNG*j]= (i-VXG)*(i-VXG)-(j-VXG)*(j-VXG);
-  p= XNG ; q= YNG;
-  aaint[0]=aaint[2]=2;aaint[1]=aaint[3]=10;
-  C2F(xgray)(x,y,z,&p,&q,"021",brect,aaint,0,0L);
-}
-
-
-#define XNP3D 201
-
-static void testP3D()
-{
-  double z[XNP3D],x[XNP3D],y[XNP3D],bbox[6];
-  integer n,flag[3],i;
-  double theta,alpha;
-  for ( i=0 ; i < XNP3D ; i++)
-    {
-      x[i]=10.0*sin(i/10.0);
-      y[i]=10.0*cos(i/10.0)+i/10.0;
-      z[i]= i*i/1000.0;
-    }
-  theta=alpha=35;
-  flag[0]=0;
-  flag[1]=2;
-  flag[2]=2;
-  C2F(param3d)(x,y,z,(n=XNP3D,&n),&theta,&alpha,"X@Y@Z",flag,bbox,0L);
-}
-
-
-
-static void testPattern()
-{
-  double x=10,y=10,w=50,h=50;
-  integer i=0,j,k;
-  fixbounds(-0.0,500.0,-50.0,200.0);
-  for ( k =0 ; k < 4 ; k++)
-    {
-      for ( j =0 ; j < 5 ; j++)
-       { integer pat;
-         pat=j+5*k;
-         C2F(dr1)("xset","pattern",&pat,PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-         C2F(dr1)("xfrect","v",PI0,PI0,PI0,PI0,PI0,PI0,&x,&y,&w,&h,0L,0L);
-         C2F(dr1)("xset","pattern",&i,PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-         C2F(dr1)("xrect","v",PI0,PI0,PI0,PI0,PI0,PI0,&x,&y,&w,&h,0L,0L);
-         x=x+w+5.0;
-       }
-      y=y+h+5.0;
-      x=10.0;
-    }
-}
-
-static void testColor()
-{
-  double x=10,y=10,w=50,h=50;
-  integer j,k;
-  fixbounds(-0.0,500.0,-50.0,200.0);
-  for ( k =0 ; k < 4 ; k++)
-    {
-      for ( j =0 ; j < 5 ; j++)
-       { 
-         integer pat;
-         pat=j+5*k;
-         set_c(pat);
-         C2F(dr1)("xrect","v",PI0,PI0,PI0,PI0,PI0,PI0,&x,&y,&w,&h,0L,0L);
-         C2F(dr1)("xfrect","v",PI0,PI0,PI0,PI0,PI0,PI0,&x,&y,&w,&h,0L,0L);
-         x=x+w+5.0;
-       }
-      y=y+h+5.0;
-      x=10.0;
-    }
-  set_c(0L);
-}
-
-
-#define XMP 1
-#define NCURVESP  2
-  
-static void testPrim()
-{
-  integer style[NCURVESP],aaint[4],n1,n2;
-  double x[NCURVESP*XMP],y[NCURVESP*XMP],brect[4];
-  x[0]= -100.0;x[1]=500.0;
-  y[0]= -100.0;y[1]=600.0;
-  style[0]= -1;
-  n1=NCURVESP;n2=XMP;
-  aaint[0]=aaint[2]=2;aaint[1]=aaint[3]=10;
-  C2F(plot2d)(x,y,&n1,&n2,style,"022"," ",brect,aaint,0L,0L);
-  corps();
-}
-
-/**
-static void transl(x,n,val)
-     double x[];
-     integer n,val;
-{
-  integer i;
-  for (i=0 ; i < n ; i++)    x[i]=x[i]+val;
-}
-**/
-
-static void corps()
-{
-  double x[7],y[7],boxes[7*4],arcs[7*6],xpols[7*7],ypols[7*7],arsize;
-  integer pats[7],n,i,j,iflag;
-  integer verbose=0,narg,whiteid,style=0,xiflag=0;
-  /* C2F(dr)("xset","default",PI0,PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L); */
-  n=7;
-  C2F(dr)("xget","lastpattern",&verbose,&whiteid,&narg,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-  for (i=0; i < 7; i++) x[i]=i*40.00;
-  for (i=0; i < 7; i++)
-    {
-      boxes[4*i]=x[i];
-      boxes[4*i+1]=10.000;
-      boxes[4*i+2]=30.000;
-      boxes[4*i+3]=30.000;
-      pats[i]=whiteid+1;
-    }
-  C2F(dr1)("xrects","v",PI0,pats,&n,PI0,PI0,PI0,boxes,PD0,PD0,PD0,0L,0L);
-  for (i=0; i < 7; i++) boxes[4*i+1]=45.000;
-  pats[0]=0;pats[1]=4;pats[2]=8;pats[3]=12;
-  pats[4]=15;pats[5]=whiteid;pats[6]=0;
-  C2F(dr1)("xrects","v",PI0,pats,&n,PI0,PI0,PI0,boxes,PD0,PD0,PD0,0L,0L);
-  for (i=0; i < 7; i++)
-    {
-      arcs[6*i]=x[i];
-      arcs[6*i+1]=90.000;
-      arcs[6*i+2]=30.000;
-      arcs[6*i+3]=30.000;
-      arcs[6*i+4]=0.000;
-      arcs[6*i+5]=64.0*180.000;
-    }
-  C2F(dr1)("xarcs","v",PI0,pats,&n,PI0,PI0,PI0,arcs,PD0,PD0,PD0,0L,0L);
-  for (i=0; i < 7; i++)
-    {
-      arcs[6*i+1]=135.000;
-      arcs[6*i+5]=64*360.000;
-      pats[i]=whiteid+1;
-    }
-  C2F(dr1)("xarcs","v",PI0,pats,&n,PI0,PI0,PI0,arcs,PD0,PD0,PD0,0L,0L);
-  x[0]=x[6]=0.0;x[5]=x[1]=10.0,x[4]=x[2]=20.0;x[3]=30.0;
-  y[0]=15.0;y[1]=y[2]=30.0;y[3]=15.0;y[4]=y[5]=0.0;y[6]=15.0;
-  for (i=0;i< 7 ; i++) y[i]=y[i]+160.0;
-  for (j=0;j<7;j++)
-    {
-      for (i=0;i< 7 ; i++) 
-       {
-         xpols[i+j*7]=x[i]+40*j;
-         ypols[i+j*7]=y[i];
-       }
-    }
-  /* C2F(dr1)("xliness","v",PI0,PI0,pats,&n,&n,PI0,xpols,ypols,PD0,PD0,0L,0L); */
-  pats[0]=0;pats[1]=4;pats[2]=8;pats[3]=12;
-  pats[4]=15;pats[5]=whiteid;pats[6]=0;
-  for (j=0;j<7;j++)
-      for (i=0;i< 7 ; i++) 
-         ypols[i+j*7]=ypols[i+j*7]+60;
-  /* C2F(dr1)("xliness","v",PI0,PI0,pats,&n,&n,PI0,xpols,ypols,PD0,PD0,0L,0L); */
-  for (j=0;j<7;j++)
-    for (i=0;i< 7 ; i++) 
-      ypols[i+j*7]=ypols[i+j*7]+60;
-  for (j=0;j<7;j++) pats[j]=j;
-  C2F(dr1)("xpolys","v",PI0,PI0,pats,&n,&n,PI0,xpols,ypols,PD0,PD0,0L,0L);
-  for (j=0;j<7;j++)
-    for (i=0;i< 7 ; i++) 
-      ypols[i+j*7]=ypols[i+j*7]+60;
-  for (j=0;j<7;j++) pats[j]= -j;
-  C2F(dr1)("xpolys","v",PI0,PI0,pats,&n,&n,PI0,xpols,ypols,PD0,PD0,0L,0L);
-  for (i=0; i < 7; i++)
-    {
-      xpols[2*i]=40*i;
-      xpols[2*i+1]=xpols[2*i]+30.0;
-      ypols[2*i]=360.0+40.0;
-      ypols[2*i+1]=360.0+70.0;
-    }
-  n=14;
-  C2F(dr1)("xsegs","v",&style,&xiflag,&n,PI0,PI0,PI0,xpols,ypols,PD0,PD0,0L,0L);
-  for (i=0; i < 7; i++)
-    {
-      ypols[2*i]=360.0+70.0;
-      ypols[2*i+1]=360.0+100.0;
-    }
-  arsize=50;
-  C2F(dr1)("xarrow","v",&style,&xiflag,&n,PI0,PI0,PI0,xpols,ypols,&arsize,PD0,0L,0L);
-  x[0]=0;x[1]=100;x[2]=200;
-  for (i=0; i < 3 ; i++) y[i]=500;
-  xpols[0]=10.0;xpols[1]=20.0;xpols[2]=35;
-  ypols[0]=ypols[1]=ypols[2]=0.0;
-  n=3;
-  iflag=1;
-  C2F(dr1)("xnum","v",PI0,PI0,PI0,PI0,&n,&iflag,x,y,xpols,ypols,0L,0L);
-  for (i=0; i < 3 ; i++) y[i]=550;
-  iflag=0;
-  C2F(dr1)("xnum","v",PI0,PI0,PI0,PI0,&n,&iflag,x,y,xpols,ypols,0L,0L);
-
-  }
-
-static void testString()
-{
-  integer j,siz,v=0,pat=1;
-  double x=50.0,y=0.0;
-  double angle;
-  fixbounds(-200.0,200.0,-200.0,200.0);
-  C2F(dr)("xset","font",(j=2,&j),(siz=10,&siz),PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-  for ( j =0 ; j < 360; j=j+45)
-    {
-      pat=pat+2;
-      C2F(dr1)("xset","pattern",&pat,PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-      C2F(dr1)("xstring","   String",PI0,PI0,PI0,&v,PI0,PI0,&x,&y,(angle=j,&angle),PD0,0L,0L);
-    }
-  C2F(dr)("xset","default",PI0,PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-}
-
-static void testXormode()
-{
-  integer j=6;
-  C2F(dr)("xset","alufunction",&j,PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-  testPattern();
-  testString();
-  j=3;
-  C2F(dr)("xset","alufunction",&j,PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-}
-
-static void testXliness()
-{
-  char info[10];
-  integer j,k,ii=0;
-  double ang=0.0;
-  double x=20.0,y=20.0,w=40.0,h=30.0;
-  integer npoly=1,polysize=5;
-  double polyx[5],polyy[5];
-  integer whiteid,verbose=0,narg;
-  fixbounds(0.0,500.0,0.0,250.0);
-  C2F(dr)("xget","lastpattern",&verbose,&whiteid,&narg,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-  sprintf(info,"white=%d",(int)whiteid);
-  C2F(dr1)("xstring",info,PI0,PI0,PI0,&ii,PI0,PI0,&x,&y,&ang,PD0,0L,0L);
-  x=10;y=40;
-  for ( k =0 ; k < 4 ; k++)
-    {
-      for ( j =0 ; j < 10 ; j++)
-       { integer pat;
-         pat=j+10*k;
-         polyx[0]=x;polyx[1]=x+w;polyx[2]=x+w;polyx[3]=x;polyx[4]=x;
-         polyy[0]=y;polyy[1]=y;polyy[2]=y+h;polyy[3]=y+h;polyy[4]=y;
-         C2F(dr1)("xliness","str",PI0,PI0,&pat,&npoly,&polysize,PI0,polyx,polyy,PD0,PD0,0L,0L);
-         polyy[0]=polyy[0]-10.0;
-         sprintf(info,"gl=%d",(int)pat);
-         C2F(dr1)("xstring",info,PI0,PI0,PI0,&ii,PI0,PI0,polyx,polyy,&ang,PD0,0L,0L);
-         x=x+w+5;
-       }
-      y=y+h+20;
-      x=10;
-    }
-}
-
-static void testMarks()
-{
-  integer style[2],aaint[4],n1,n2,nn1;
-  static double x[4],y[4],brect[4];
-  n1=2;n2=2;
-  x[0]=0; x[1] =0;x[2]=-1;x[3]=1;
-  y[0]=-1; y[1] =1;y[2]=0;y[3]=0;
-  style[0]=1;style[1]=1;
-  aaint[0]=aaint[2]=2;aaint[1]=aaint[3]=10;
-  brect[0]=brect[1]=0;brect[2]=brect[3]=1.0;
-  C2F(plot2d)(x,y,&n1,&n2,style,"021"," ",brect,aaint,0L,0L);
-  n1=2,nn1=10;
-  C2F(dr1)("xset","mark",&n1,&nn1,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-  n1=1,n2=1;
-  x[0]=0;y[0]=0;
-  style[0] = -4;
-  C2F(plot2d)(x,y,&n1,&n2,style,"001"," ",brect,aaint,0L,0L);
-}
-
-
-static void testXrects()
-{
-  integer j,k,nrect=1;
-  double rect[4],xx=10.0,yy=10.0,w=40.0,h=40.0;
-  fixbounds(-0.0,500.0,-50.0,200.0);
-  for ( k =0 ; k < 4 ; k++)
-    {
-      for ( j =0 ; j < 10 ; j++)
-       { integer pat;
-         pat=j+10*k;
-         rect[0]=xx;rect[1]=yy;rect[2]=w;rect[3]=h;
-         C2F(dr1)("xrects","str",PI0,&pat,&nrect,PI0,PI0,PI0,rect,PD0,PD0,PD0,0L,0L);
-         xx=xx+w+5.0;
-       }
-      yy=yy+h+5.0;
-      xx=10.0;
-    }
-}
-
-
-#define NF 1
-#define NCU  2
-
-static void fixbounds(xmin, xmax, ymin, ymax)
-     double xmin;
-     double xmax;
-     double ymin;
-     double ymax;
-{
-  integer style[NCU],aaint[4],n1=1,n2=1;
-  double x[NCU*NF],y[NCU*NF],brect[4];
-  x[0]=xmin;x[1]=xmax;
-  y[0]=ymin;y[1]=ymax;
-  style[0]= -1;
-  n1=NCU;n2=NF;
-  aaint[0]=aaint[2]=2;aaint[1]=aaint[3]=10;
-  C2F(plot2d)(x,y,&n1,&n2,style,"022"," ",brect,aaint,0L,0L);
-}
-  
-static void testPoly()
-{
-  integer style[1],aaint[4],n1=1,n2=1;
-  double brect[4],x[1],y[1];
-  brect[0]= -5.0;brect[2]=35.0;
-  brect[1]= -5.0;brect[3]=35.0;
-  style[0]= -1;
-  C2F(plot2d)(x,y,&n1,&n2,style,"010"," ",brect,aaint,0L,0L);
-  polycorps();
-}
-
-#define NPC 7
-
-static void polycorps()
-{
-  double x[NPC],y[NPC];
-  integer n=NPC,cf=0;
-  x[0]=x[6]=0.0;x[5]=x[1]=10.0,x[4]=x[2]=20.0;x[3]=30.0;
-  y[0]=15.0;y[1]=y[2]=30.0;y[3]=15.0;y[4]=y[5]=0.0;y[6]=15.0;
-  C2F(dr1)("xlines","v",&n,PI0,PI0,&cf,PI0,PI0,x,y,PD0,PD0,0L,0L);
-}
-
-typedef  struct  {
-  char *name;
-  void  (*fonc)();} TestOpTab ;
-
-static void vide()
- {}
-
-TestOpTab GraphicTestTab[] ={
- {"test2D+xsetech", test2DD},
- {"test2D", test2D},
- {"plot2d with animation", test2D2},
- {"test2D3", test2D3},
- {"test2D4", test2D4},
- {"test2DN 1", test2DN1},
- {"test2DN 2", test2DN2},
- {"test2DN 3", test2DN3},
- {"test3D", test3D},
- {"test3D animation", test3DA},
- {"test3D1", test3D1},
- {"test3D2", test3D2},
- {"testArrows", testArrows},
- {"testC 1", testC1},
- {"testC 2", testC2},
- {"testC 3", testC3},
- {"testC2d", TestC2d},
- {"testCh", testCh},
- {"testG", testG},
- {"testP3D", testP3D},
- {"testPattern", testPattern},
- {"testColor", testColor},
- {"testPrim", testPrim},
- {"testString", testString},
- {"testXor", testXormode},
- {"testXliness", testXliness},
- {"testXrects", testXrects},
- {"testXpoly", testPoly},
- {"testMark", testMarks},
- {(char *) NULL,vide}
-};
-
-#ifndef _MSC_VER 
-#ifdef WITH_GTK
-int call_graphics_predefined_callbacks(char *name, int winid)
-{
-  if (strcmp(name,"$test2DD")==0) test2DD();
-  else if (strcmp(name,"$test2D")==0) test2D();
-  else if (strcmp(name,"$test2D2")==0) test2D2();
-  else if (strcmp(name,"$test2D3")==0) test2D3();
-  else if (strcmp(name,"$test2D4")==0) test2D4();
-  else if (strcmp(name,"$test2DN1")==0) test2DN1();
-  else if (strcmp(name,"$test2DN2")==0) test2DN2();
-  else if (strcmp(name,"$test2DN3")==0) test2DN3();
-  else if (strcmp(name,"$test3D")==0) test3D();
-  else if (strcmp(name,"$test3DA")==0) test3DA();
-  else if (strcmp(name,"$test3D1")==0) test3D1();
-  else if (strcmp(name,"$test3D2")==0) test3D2();
-  else if (strcmp(name,"$testArrows")==0) testArrows();
-  else if (strcmp(name,"$testC1")==0) testC1();
-  else if (strcmp(name,"$testC2")==0) testC2();
-  else if (strcmp(name,"$testC3")==0) testC3();
-  else if (strcmp(name,"$TestC2d")==0) TestC2d();
-  else if (strcmp(name,"$testCh")==0) testCh();
-  else if (strcmp(name,"$testG")==0) testG();
-  else if (strcmp(name,"$testP3D")==0) testP3D();
-  else if (strcmp(name,"$testPattern")==0) testPattern();
-  else if (strcmp(name,"$testColor")==0) testColor();
-  else if (strcmp(name,"$testPrim")==0) testPrim();
-  else if (strcmp(name,"$testString")==0) testString();
-  else if (strcmp(name,"$testXormode")==0) testXormode();
-  else if (strcmp(name,"$testXliness")==0) testXliness();
-  else if (strcmp(name,"$testXrects")==0) testXrects();
-  else if (strcmp(name,"$testPoly")==0) testPoly();
-  else if (strcmp(name,"$testMarks")==0) testMarks();
-  else if (strcmp(name,"$gtk_main_quit")==0) gtk_main_quit();
-  else return 0;
-  return 1;
-}
-#endif
-#endif
index 716957c..608333b 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../core/includes;../../libs/MALLOC/includes"\r
+                               AdditionalIncludeDirectories="includes;../core/includes;../../libs/MALLOC/includes"\r
                                PreprocessorDefinitions="_LIB;STRICT;WITH_TK;_DEBUG;_CRT_SECURE_NO_DEPRECATE"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
                                FavorSizeOrSpeed="1"\r
-                               AdditionalIncludeDirectories="../core/includes;../../libs/MALLOC/includes"\r
+                               AdditionalIncludeDirectories="includes;../core/includes;../../libs/MALLOC/includes"\r
                                PreprocessorDefinitions="NDEBUG;_LIB;STRICT;WITH_TK;_CRT_SECURE_NO_DEPRECATE"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
                        Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
                        >\r
                        <File\r
-                               RelativePath=".\Actions.c"\r
+                               RelativePath=".\src\c\Actions.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Alloc.c"\r
+                               RelativePath=".\src\c\Alloc.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Axes.c"\r
+                               RelativePath=".\src\c\Axes.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\BuildObjects.c"\r
+                               RelativePath=".\src\c\BuildObjects.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Champ.c"\r
+                               RelativePath=".\src\c\Champ.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\clipping.c"\r
+                               RelativePath=".\src\c\clipping.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\CloneObjects.c"\r
+                               RelativePath=".\src\c\CloneObjects.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Contour.c"\r
+                               RelativePath=".\src\c\Contour.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DestroyObjects.c"\r
+                               RelativePath=".\src\c\DestroyObjects.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\dr1Call.c"\r
+                               RelativePath=".\src\c\dr1Call.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DrawObjects.c"\r
+                               RelativePath=".\src\c\DrawObjects.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Events.c"\r
+                               RelativePath=".\src\c\Events.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\FeC.c"\r
+                               RelativePath=".\src\c\FeC.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Format.c"\r
+                               RelativePath=".\src\c\Format.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\GetProperty.c"\r
+                               RelativePath=".\src\c\GetProperty.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Gray.c"\r
+                               RelativePath=".\src\c\Gray.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\gsort.c"\r
+                               RelativePath=".\src\c\gsort.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\gw_graphics.c"\r
+                               RelativePath=".\sci_gateway\gw_graphics.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\HandleManagement.c"\r
+                               RelativePath=".\src\c\HandleManagement.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\InitObjects.c"\r
+                               RelativePath=".\src\c\InitObjects.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Interaction.c"\r
+                               RelativePath=".\src\c\Interaction.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\intgget.c"\r
+                               RelativePath=".\sci_gateway\sci_get.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\intgset.c"\r
+                               RelativePath=".\sci_gateway\sci_set.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\matdes.c"\r
+                               RelativePath=".\sci_gateway\matdes.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Math.c"\r
+                               RelativePath=".\src\c\math_graphics.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\nues1.c"\r
+                               RelativePath=".\src\c\nues1.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\periFig.c"\r
+                               RelativePath=".\src\c\periFig.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\periGif.c"\r
+                               RelativePath=".\src\c\periGif.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\periPos.c"\r
+                               RelativePath=".\src\c\periPos.c"\r
                                >\r
                        </File>\r
                        <File\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Plo2d.c"\r
+                               RelativePath=".\src\c\Plo2d.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Plo2d1.c"\r
+                               RelativePath=".\src\c\Plo2d1.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Plo2d2.c"\r
+                               RelativePath=".\src\c\Plo2d2.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Plo2d3.c"\r
+                               RelativePath=".\src\c\Plo2d3.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Plo2d4.c"\r
+                               RelativePath=".\src\c\Plo2d4.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Plo2dEch.c"\r
+                               RelativePath=".\src\c\Plo2dEch.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Plo2dn.c"\r
+                               RelativePath=".\src\c\Plo2dn.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Plo3d.c"\r
+                               RelativePath=".\src\c\Plo3d.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Plo3dn.c"\r
+                               RelativePath=".\src\c\Plo3dn.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\qsort.c"\r
+                               RelativePath=".\src\c\qsort.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Rec.c"\r
+                               RelativePath=".\src\c\Rec.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\RecLoad.c"\r
+                               RelativePath=".\src\c\RecLoad.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\RecSave.c"\r
+                               RelativePath=".\src\c\RecSave.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\sciCall.c"\r
+                               RelativePath=".\src\c\sciCall.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\sciMatrix.c"\r
+                               RelativePath=".\src\c\sciMatrix.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\SetProperty.c"\r
+                               RelativePath=".\src\c\SetProperty.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\StringMatrix.c"\r
+                               RelativePath=".\src\c\StringMatrix.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Vect2Matrix.c"\r
+                               RelativePath=".\src\c\Vect2Matrix.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Xcall.c"\r
+                               RelativePath=".\src\c\Xcall.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Xcall1.c"\r
+                               RelativePath=".\src\c\Xcall1.c"\r
                                >\r
                        </File>\r
                </Filter>\r
                        Filter="h;hpp;hxx;hm;inl"\r
                        >\r
                        <File\r
-                               RelativePath="bcg.h"\r
+                               RelativePath=".\includes\bcg.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\BuildObjects.h"\r
+                               RelativePath=".\includes\BuildObjects.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\clipping.h"\r
+                               RelativePath=".\includes\clipping.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\CloneObjects.h"\r
+                               RelativePath=".\includes\CloneObjects.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="color.h"\r
+                               RelativePath=".\includes\color.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DestroyObjects.h"\r
+                               RelativePath=".\includes\DestroyObjects.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DrawObjects.h"\r
+                               RelativePath=".\includes\DrawObjects.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Events.h"\r
+                               RelativePath=".\includes\Events.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\GetProperty.h"\r
+                               RelativePath=".\includes\GetProperty.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="giffonts.h"\r
+                               RelativePath=".\includes\giffonts.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="Graphics.h"\r
+                               RelativePath=".\includes\Graphics.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\gw_graphics.h"\r
+                               RelativePath=".\includes\gw_graphics.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\HandleManagement.h"\r
+                               RelativePath=".\includes\HandleManagement.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\InitObjects.h"\r
+                               RelativePath=".\includes\InitObjects.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\intcommongraphics.h"\r
+                               RelativePath=".\includes\intcommongraphics.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Interaction.h"\r
+                               RelativePath=".\includes\Interaction.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\intgget.h"\r
+                               RelativePath=".\includes\sci_get.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\intgset.h"\r
+                               RelativePath=".\includes\sci_set.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="Math.h"\r
+                               RelativePath=".\includes\math_graphics.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\ObjectStructure.h"\r
+                               RelativePath=".\includes\ObjectStructure.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="periFig.h"\r
+                               RelativePath=".\includes\periFig.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="periGif.h"\r
+                               RelativePath=".\includes\periGif.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="periPos.h"\r
+                               RelativePath=".\includes\periPos.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="periWin.h"\r
+                               RelativePath=".\includes\periWin.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="PloEch.h"\r
+                               RelativePath=".\includes\PloEch.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="Rec.h"\r
+                               RelativePath=".\includes\Rec.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="scigraphic.h"\r
+                               RelativePath=".\includes\scigraphic.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\sciMatrix.h"\r
+                               RelativePath=".\includes\sciMatrix.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\SetProperty.h"\r
+                               RelativePath=".\includes\SetProperty.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\StringMatrix.h"\r
+                               RelativePath=".\includes\StringMatrix.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Vect2Matrix.h"\r
+                               RelativePath=".\includes\Vect2Matrix.h"\r
                                >\r
                        </File>\r
                </Filter>\r
                <File\r
-                       RelativePath=".\graphics.fundef"\r
+                       RelativePath=".\sci_gateway\graphics.fundef"\r
                        >\r
                </File>\r
        </Files>\r
similarity index 99%
rename from scilab/modules/graphics/DrawObjects.h
rename to scilab/modules/graphics/includes/DrawObjects.h
index 607c60f..db98b8e 100644 (file)
@@ -21,7 +21,7 @@
 #if defined(THINK_C)
 #include "::sparse:spConfig.h" 
 #else
-#include "../../routines/sparse/spConfig.h"
+#include "../../../routines/sparse/spConfig.h"
 #endif
 
 #include "bcg.h"
@@ -20,7 +20,7 @@
 #include <commctrl.h>
 #endif
 #include <winuser.h>
-#include "../../routines/wsci/wgnuplib.h"
+#include "../../../routines/wsci/wgnuplib.h"
 #endif
 
 /*en fait il n'y a essentiellement besion que de Math.h dans stack-c.h
diff --git a/scilab/modules/graphics/intgget.h b/scilab/modules/graphics/intgget.h
deleted file mode 100644 (file)
index 60b2f19..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*-----------------------------------------------------------------------------------*/
-/* Copyright (C) 1998-2000 INRIA/Enpc */
-/* Fabrice LERAY INRIA 2005 */
-/* Allan CORNET INRIA 2005 */
-/*-----------------------------------------------------------------------------------*/
-#ifndef __INTGGET__
-#define  __INTGGET__
-
-#include <string.h>
-#include <stdio.h>
-#include <math.h>
-
-int gget(char *fname,unsigned long fname_len);
-
-/*-----------------------------------------------------------------------------------*/
-/* copy the string value into the scilab stack for output */
-int sciReturnString( const char * value ) ;
-
-/* copy an int in the scilab stack for output */
-int sciReturnInt( int value ) ;
-
-/* copy a row vector in the scilab stack for output */
-int sciReturnRowVector( double values[], int nbValues ) ;
-
-/*-----------------------------------------------------------------------------------*/
-
-#endif /*__INTGGET__*/
-/*-----------------------------------------------------------------------------------*/
diff --git a/scilab/modules/graphics/intgset.h b/scilab/modules/graphics/intgset.h
deleted file mode 100644 (file)
index 5336d83..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/*-----------------------------------------------------------------------------------*/
-/* Copyright (C) 1998-2000 INRIA/Enpc */
-/* Fabrice LERAY INRIA 2005 */
-/* Allan CORNET INRIA 2005 */
-/* Jean-Baptiste SILVY 2006 */
-/*-----------------------------------------------------------------------------------*/
-#ifndef __INTGSET__
-#define  __INTGSET__
-
-#include <string.h>
-#include <stdio.h>
-#include <math.h>
-#include "ObjectStructure.h"
-
-
-int gset(char *fname,unsigned long fname_len);
-int CheckAndUpdate_x_shift(sciPointObj * pobj, int numrow);
-int CheckAndUpdate_y_shift(sciPointObj * pobj, int numrow);
-int CheckAndUpdate_z_shift(sciPointObj * pobj, int numrow);
-
-/*-----------------------------------------------------------------------------------*/
-/* this function compute the final staus of modifications when two consecutive call */
-/* to sciSet*** have been made. A bit tricky I agree. JB Silvy 03/2006 */
-int sciSetFinalStatus( int status1, int status2 ) ;
-
-/*-----------------------------------------------------------------------------------*/
-
-#endif /*__INTGSET__*/
-/*-----------------------------------------------------------------------------------*/
index 8a968cd..baff1c3 100644 (file)
@@ -3,8 +3,6 @@ function ged(k,win)
 
   global ged_current_figure
   global ged_cur_fig_handle
-  global SCI_GRAPHICS_MODULE_PATH ;
-  SCI_GRAPHICS_MODULE_PATH = "../" + get_absolute_file_path('ged.sci') ;
   
   ged_current_figure=xget('window')
   xset('window',win) 
@@ -97,7 +95,7 @@ function ged(k,win)
       seteventhandler("")
   end
   xset('window',ged_current_figure)
-  clearglobal SCI_GRAPHICS_MODULE_PATH ;
+
 endfunction
 
 
@@ -351,7 +349,7 @@ endfunction
 function ged_Compound(h)
   global ged_handle;ged_handle=h;
   TCL_SetVar("curvis",h.visible)
-  TCL_EvalFile(SCI_GRAPHICS_MODULE_PATH+'/tcl/ged/Compound.tcl')
+  TCL_EvalFile(SCI+'/modules/graphics/tcl/ged/Compound.tcl')
 endfunction
 
 
@@ -374,7 +372,7 @@ function ged_figure(h)
   TCL_SetVar("curpdm",h.pixel_drawing_mode)
   TCL_SetVar("curautoresize",h.auto_resize)
   TCL_SetVar("currotation_style",h.rotation_style)
-  TCL_EvalFile(SCI_GRAPHICS_MODULE_PATH+'/tcl/ged/Figure.tcl')
+  TCL_EvalFile(SCI+'/modules/graphics/tcl/ged/Figure.tcl')
 endfunction
 
 
@@ -558,7 +556,7 @@ function ged_axes(h)
     TCL_SetVar("dbzmax",string(h.data_bounds(2,3)))
   end
  
-  TCL_EvalFile(SCI_GRAPHICS_MODULE_PATH+'/tcl/ged/Axes.tcl')
+  TCL_EvalFile(SCI+'/modules/graphics/tcl/ged/Axes.tcl')
 endfunction
 
 function ged_rectangle(h)
@@ -625,7 +623,7 @@ function ged_rectangle(h)
     TCL_SetVar("Wval",string(h.data(4)))
     TCL_SetVar("Hval",string(h.data(5)))
   end
-  TCL_EvalFile(SCI_GRAPHICS_MODULE_PATH+'/tcl/ged/Rectangle.tcl')
+  TCL_EvalFile(SCI+'/modules/graphics/tcl/ged/Rectangle.tcl')
 endfunction
 
 function ged_polyline(h)
@@ -690,7 +688,7 @@ function ged_polyline(h)
       case "3d"
       TCL_SetVar("nbcol",string(3));
     end
-    TCL_EvalFile(SCI_GRAPHICS_MODULE_PATH+'/tcl/ged/Polyline.tcl')
+    TCL_EvalFile(SCI+'/modules/graphics/tcl/ged/Polyline.tcl')
 endfunction
 
 
@@ -751,7 +749,7 @@ function ged_plot3d(h)
     d="["+strcat(string(size(h.data.color)),'x')+" integer array]"
     TCL_SetVar("curdata_color",d);
   end
-  TCL_EvalFile(SCI_GRAPHICS_MODULE_PATH+'/tcl/ged/Plot3d.tcl')
+  TCL_EvalFile(SCI+'/modules/graphics/tcl/ged/Plot3d.tcl')
 endfunction
 
 
@@ -814,7 +812,7 @@ function ged_fac3d(h)
   end
 
 
-  TCL_EvalFile(SCI_GRAPHICS_MODULE_PATH+'/tcl/ged/Fac3d.tcl')
+  TCL_EvalFile(SCI+'/modules/graphics/tcl/ged/Fac3d.tcl')
 endfunction
 
 
@@ -870,7 +868,7 @@ function ged_text(h)
   TCL_SetVar("textBoxHeight", string( h.text_box(2) ) ) ;
   TCL_SetVar("curAlignment",string(h.alignment) ) ;
   
-  TCL_EvalFile(SCI_GRAPHICS_MODULE_PATH+'/tcl/ged/Text.tcl')
+  TCL_EvalFile(SCI+'/modules/graphics/tcl/ged/Text.tcl')
 endfunction
 
 
@@ -886,7 +884,7 @@ function ged_legend(h)
   TCL_SetVar("curfontsize",string(h.font_size))
   TCL_SetVar("curtext",h.text)
 
-  TCL_EvalFile(SCI_GRAPHICS_MODULE_PATH+'/tcl/ged/Legend.tcl')
+  TCL_EvalFile(SCI+'/modules/graphics/tcl/ged/Legend.tcl')
 endfunction
 
 
@@ -953,7 +951,7 @@ function ged_arc(h)
     TCL_SetVar("A1val",string(h.data(6)))
     TCL_SetVar("A2val",string(h.data(7)))
   end
-  TCL_EvalFile(SCI_GRAPHICS_MODULE_PATH+'/tcl/ged/Arc.tcl')
+  TCL_EvalFile(SCI+'/modules/graphics/tcl/ged/Arc.tcl')
 endfunction
 
 
@@ -1010,7 +1008,7 @@ function ged_segs(h)
   end
   TCL_SetVar("curclipstate",h.clip_state);
 
-  TCL_EvalFile(SCI_GRAPHICS_MODULE_PATH+'/tcl/ged/Segs.tcl')
+  TCL_EvalFile(SCI+'/modules/graphics/tcl/ged/Segs.tcl')
 endfunction
 
 
@@ -1054,7 +1052,7 @@ function ged_champ(h)
   end
   TCL_SetVar("curclipstate",h.clip_state);
 
-  TCL_EvalFile(SCI_GRAPHICS_MODULE_PATH+'/tcl/ged/Champ.tcl')
+  TCL_EvalFile(SCI+'/modules/graphics/tcl/ged/Champ.tcl')
 endfunction
 
 function ged_fec(h)
@@ -1093,7 +1091,7 @@ function ged_fec(h)
 //  end
 //  TCL_SetVar("curclipstate",h.clip_state);
 
-  TCL_EvalFile(SCI_GRAPHICS_MODULE_PATH+'/tcl/ged/Fec.tcl')
+  TCL_EvalFile(SCI+'/modules/graphics/tcl/ged/Fec.tcl')
 endfunction
 
 
@@ -1110,7 +1108,7 @@ function ged_grayplot(h)
   d="["+strcat(string(size(h.data.z)),'x')+" double array]"
   TCL_SetVar("curdata_z",d);
 
-  TCL_EvalFile(SCI_GRAPHICS_MODULE_PATH+'/tcl/ged/Grayplot.tcl')
+  TCL_EvalFile(SCI+'/modules/graphics/tcl/ged/Grayplot.tcl')
 
 endfunction
 
@@ -1121,7 +1119,7 @@ function ged_matplot(h)
   d="["+strcat(string(size(h.data)),'x')+" double array]"
   TCL_SetVar("curdata",d);
 
-  TCL_EvalFile(SCI_GRAPHICS_MODULE_PATH+'/tcl/ged/Matplot.tcl')
+  TCL_EvalFile(SCI+'/modules/graphics/tcl/ged/Matplot.tcl')
 
 endfunction
 
@@ -1163,7 +1161,7 @@ function ged_axis(h)
   end
   TCL_SetVar("curclipstate",h.clip_state);
 
-  TCL_EvalFile(SCI_GRAPHICS_MODULE_PATH+'/tcl/ged/Axis.tcl')
+  TCL_EvalFile(SCI+'/modules/graphics/tcl/ged/Axis.tcl')
 endfunction
 
 
diff --git a/scilab/modules/graphics/sci_gateway/intgget.c b/scilab/modules/graphics/sci_gateway/intgget.c
deleted file mode 100644 (file)
index 5a84446..0000000
+++ /dev/null
@@ -1,2723 +0,0 @@
-/*-----------------------------------------------------------------------------------*/
-/* Copyright (C) 1998-2000 INRIA/Enpc */
-/* Fabrice LERAY INRIA 2005 */
-/* Allan CORNET INRIA 2005 */
-/*-----------------------------------------------------------------------------------*/
-#include "intgget.h"
-/*-----------------------------------------------------------------------------------*/
-#include "bcg.h"
-#include "Graphics.h" 
-#include "stack-c.h"
-#include "CloneObjects.h"
-#include "Interaction.h"
-#include "SetProperty.h"
-#include "GetProperty.h"
-#include "InitObjects.h"
-#include "DrawObjects.h"
-
-/* Constructors should NOT be called at this level (not inside matdes.c) */
-#include "BuildObjects.h"
-#include "DestroyObjects.h"
-#include "StringMatrix.h"
-
-#include "intcommongraphics.h"
-
-
-#include "MALLOC.h" /* MALLOC */
-/*-----------------------------------------------------------------------------------*/
-#ifdef WITH_TK
-extern int GetTclCurrentFigure(void);
-#endif
-
-/*-----------------------------------------------------------------------------------*/
-extern sciPointObj *pfiguremdl;
-extern sciPointObj *paxesmdl;
-extern int versionflag;
-/*-----------------------------------------------------------------------------------*/
-static char error_message[128];
-/*-----------------------------------------------------------------------------------*/
-int sciGet(sciPointObj *pobj,char *marker);
-int getgrayplotdata(sciPointObj *pobj);
-int getchampdata(sciPointObj *pobj);
-int get3ddata(sciPointObj *pobj);
-int getticks(char * xyztick, sciPointObj* psubwin);
-int ChooseGoodFormat(char * c_format,char logflag, double *_grads,int n_grads);
-int BuildTListForTicks(double * locations, char ** labels, int nbtics);
-double * ReBuildTicksLog2Lin(char logflag, int nbtics, double *grads);
-BOOL GetHandleVisibilityOnUimenu(sciPointObj * pobj);
-/*-----------------------------------------------------------------------------------*/
-int gget(char *fname,unsigned long fname_len)
-{
-  integer m1,n1,numrow2,numcol2,l2 ;
-  int l1;
-  unsigned long hdl;
-
-  int lw;
-  sciPointObj *pobj;
-
-  CheckRhs(1,2);
-  CheckLhs(0,1);
-  
-  /*  set or create a graphic window */
-
-  /* le premier argument peut etre soit un Id, ou un marker(auquel cas, get renvoi la valeur de 
-     l'objet courant ) */
-  switch(VarType(1))
-    {
-    case 1: /* tclsci handle */
-      lw = 1 + Top - Rhs;
-      C2F(overload)(&lw,"get",3);return 0;
-      return 0;
-      break;
-    case 9: /* scalar argument (hdl + string) */
-      CheckRhs(2,2);
-      GetRhsVar(1,"h",&m1,&n1,&l1);
-      if (m1!=1||n1!=1) { 
-       lw = 1 + Top - Rhs;
-       C2F(overload)(&lw,"get",3);return 0;
-      }
-      GetRhsVar(2,"c",&numrow2,&numcol2,&l2);
-      if ( *hstk(l1) != sciGetHandle(pfiguremdl) && *hstk(l1) != sciGetHandle(paxesmdl)
-          &&  *hstk(l1) != sciGetHandle(pSUBWIN_FEATURE(paxesmdl)->mon_title)
-          &&  *hstk(l1) != sciGetHandle(pSUBWIN_FEATURE(paxesmdl)->mon_x_label)
-          &&  *hstk(l1) != sciGetHandle(pSUBWIN_FEATURE(paxesmdl)->mon_y_label) /* Addings here F.Leray 10.06.04 */
-          &&  *hstk(l1) != sciGetHandle(pSUBWIN_FEATURE(paxesmdl)->mon_z_label))
-       {
-         if ((strcmp(cstk(l2),"old_style") !=0)
-             &&(strcmp(cstk(l2),"default_figure") !=0) 
-             && (strcmp(cstk(l2),"default_axes") !=0) ) SciWin();
-         if (version_flag() ==0)
-           hdl = (unsigned long)*hstk(l1); /* on recupere le pointeur d'objet par le handle */
-         else
-           hdl = (unsigned long)0;
-       }/* DJ.A 08/01/04 */
-      else 
-       hdl = (unsigned long)*hstk(l1);
-      break;
-    case 10:/* string argument (string) */
-      CheckRhs(1,1);
-      GetRhsVar(1,"c",&numrow2,&numcol2,&l2);
-      if (strcmp(cstk(l2),"default_figure") !=0 && strcmp(cstk(l2),"default_axes") !=0 )
-       {
-         if (strcmp(cstk(l2),"old_style") == 0 || strcmp(cstk(l2),"current_figure") ==0) {
-           hdl = (unsigned long)0;
-         }
-         else
-           {
-             SciWin();
-             if (version_flag() == 0)
-               {
-                 /* Test debug F.Leray 13.04.04 */
-                 sciPointObj * ppobj;
-                 if ((strcmp(cstk(l2),"children") != 0) &&  
-                     (strcmp(cstk(l2),"zoom_") !=0) && 
-                     (strcmp(cstk(l2),"clip_box") !=0) && 
-                     (strcmp(cstk(l2),"auto_") !=0)) 
-                   {
-                     ppobj = sciGetCurrentObj();
-                     hdl = (unsigned long ) sciGetHandle(sciGetCurrentObj ());}
-                 else  
-                   hdl = (unsigned long ) sciGetHandle(sciGetSelectedSubWin (sciGetCurrentFigure ()));/* on recupere le pointeur d'objet par le handle */
-               }
-             else
-               hdl = (unsigned long)0;
-           }/* DJ.A 08/01/04 */
-       }
-      else
-       hdl = (unsigned long)0;
-    
-      break;
-    default:
-      lw = 1 + Top - Rhs;
-      C2F(overload)(&lw,"get",3);return 0;
-      /*Scierror(999,"%s: Incorrect argument\r\n",fname);*/
-      return 0;
-      break;
-    }
-  /* cstk(l2) est la commande, l3 l'indice sur les parametres de la commande */
-  CheckLhs(0,1);
-  if (hdl == (unsigned long)0 ) {
-    if (sciGet((sciPointObj *) NULL, cstk(l2))!=0) {
-      Scierror(999,"%s: %s\r\n",fname,error_message);
-      return 0;
-    }
-  }
-  else {
-    if ((pobj = sciGetPointerFromHandle(hdl))){
-
-      if(sciGetEntityType(pobj) == SCI_SUBWIN && (strcmp(cstk(l2),"x_ticks")==0 ||
-                                                 strcmp(cstk(l2),"y_ticks")==0 ||
-                                                 strcmp(cstk(l2),"z_ticks")==0))
-       {
-         if(getticks(cstk(l2),pobj)!=0)
-           return 0;
-       }
-      else if(strcmp(cstk(l2),"data") == 0){ /* distinction for "data" treatment for champ and surface objects */
-       if(sciGetEntityType(pobj) == SCI_SURFACE)
-         {
-           if (get3ddata(pobj)!=0)
-             return 0;
-         }
-       else if((sciGetEntityType(pobj) == SCI_SEGS) && (pSEGS_FEATURE(pobj)->ptype == 1))
-         {
-           if (getchampdata(pobj)!=0)
-             return 0;
-         }  
-       else if((sciGetEntityType(pobj) == SCI_GRAYPLOT)  && (pGRAYPLOT_FEATURE(pobj)->type == 0)) /* case 0: real grayplot */
-         {
-           if (getgrayplotdata(pobj)!=0)
-             return 0;
-         } 
-       else /* F.Leray 02.05.05 : "data" case for others (using sciGetPoint routine inside GetProperty.c) */
-         {
-           if (sciGet(pobj, cstk(l2))!=0)
-             {
-               Scierror(999,"%s: %s\r\n",fname,error_message);
-               return 0;
-             }
-         }
-      }
-      else /* F.Leray 02.05.05 : main case (all but "data") (using sciGetPoint routine inside GetProperty.c) */
-       {
-         if (sciGet(pobj, cstk(l2))!=0)
-           {
-             Scierror(999,"%s: %s\r\n",fname,error_message);
-             return 0;
-           }
-       }
-    }
-    else
-      Scierror(999,"%s :the handle is not or no more valid\r\n",fname);
-  }
-  LhsVar(1)=Rhs+1;
-  return 0;
-}
-/*-----------------------------------------------------------------------------------*/
-/* @name sciGet(sciPointObj *pobj,) */
-/* Sets the value to the object */
-int sciGet(sciPointObj *pobj,char *marker)
-{
-  int numrow, numcol, outindex, i,j,k;
-  integer x[2], itmp = 0, na ;
-  double *tab;
-  char **str;
-  sciPointObj *psubwin;
-  int Etype,ids,iflag=0;
-
-  if (pobj != (sciPointObj *)NULL && pobj  != pfiguremdl  && pobj  != paxesmdl
-      && pobj != pSUBWIN_FEATURE(paxesmdl)->mon_title
-      && pobj != pSUBWIN_FEATURE(paxesmdl)->mon_x_label
-      && pobj != pSUBWIN_FEATURE(paxesmdl)->mon_y_label
-      && pobj != pSUBWIN_FEATURE(paxesmdl)->mon_z_label ){ /* Addings F.Leray 10.06.04 */
-    psubwin = sciGetSelectedSubWin (sciGetCurrentFigure ());
-    Etype=sciGetEntityType (pobj);}
-
-  if ((pobj == (sciPointObj *)NULL) && 
-      (strcmp(marker,"old_style") !=0 ) && 
-      (strcmp(marker,"figure_style") != 0) && 
-      (strcmp(marker,"current_figure") != 0) &&
-      (strcmp(marker,"default_figure") !=0) && 
-      (strcmp(marker,"default_axes") !=0))
-    {
-      if (version_flag() == 0)
-       {strcpy(error_message,"handle is not valid");return -1;}
-      else
-       {strcpy(error_message,"function not valid under old graphics style");return -1;}
-    }
-  else if (strcmp(marker,"figures_id") == 0){
-    sciGetIdFigure (&ids,&numcol,&iflag);
-    numrow   = 1;
-    CreateVar(Rhs+1,"i",&numrow,&numcol,&outindex);
-    iflag = 1; 
-    sciGetIdFigure (istk(outindex),&numcol,&iflag);
-
-  }
-  /***************** graphics mode *******************************/ 
-  else if (strcmp(marker,"visible") == 0) {
-    if (sciGetVisibility((sciPointObj *)pobj)){
-      numrow   = 1;
-      numcol   = 2;
-      CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-      strncpy(cstk(outindex),"on", numrow*numcol);
-    }
-    else {
-      numrow   = 1;
-      numcol   = 3;
-      CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-      strncpy(cstk(outindex),"off", numrow*numcol);
-    }
-  }
-  else if (strcmp(marker,"pixel_drawing_mode") == 0) 
-    {
-      if (sciGetEntityType (pobj) == SCI_FIGURE) {
-       numrow = 1;
-       i=pFIGURE_FEATURE (pobj)->gmode.xormode;
-       numcol = strlen(pmodes[i]);
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),pmodes[i], numrow*numcol);
-      }
-      else
-       {strcpy(error_message,"pixel_drawing_mode do not exist for this handle");return -1;}
-
-    }  
-  else if (strcmp(marker,"old_style") == 0)
-    {
-      if (versionflag != 0){
-       numrow   = 1;
-       numcol   = 2;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"on", numrow*numcol);
-      }
-      else {
-       numrow   = 1;
-       numcol   = 3;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"off", numrow*numcol);
-      }
-    }
-  else if (strcmp(marker,"figure_style") == 0)
-    {
-      numrow   = 1;
-      if (pobj != pfiguremdl)
-       {
-         numcol   = 3;
-         CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-         if (version_flag()!=0)
-           strncpy(cstk(outindex),"old", numrow*numcol); 
-         else 
-           strncpy(cstk(outindex),"new", numrow*numcol);      
-       }
-      else /* what is it usefull for ? F.Leray 20.04.05 */
-       {
-         numcol   = 10;
-         CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-         strncpy(cstk(outindex),"customised", numrow*numcol);
-       }
-    }
-  else if (strcmp(marker,"auto_resize") == 0)
-    {
-      if (sciGetResize((sciPointObj *) pobj)){
-       numrow   = 1;
-       numcol   = 2;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"on", numrow*numcol); 
-      }
-      else {
-       numrow   = 1;
-       numcol   = 3;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"off", numrow*numcol);
-      }
-    }
-  /************************  figure Properties *****************************/ 
-  else if (strcmp(marker,"figure_position") == 0)
-    {
-      if (sciGetEntityType (pobj) != SCI_FIGURE) {
-       sprintf(error_message,"%s property undefined for this object",marker);
-       return -1;
-      }
-      numrow   = 1;numcol   = 2;
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);  
-      if ((sciPointObj *) pobj != pfiguremdl)
-       {
-#if _MSC_VER /* Correction pour figure_position (Windows) Allan CORNET Mai 2004 */
-         stk(outindex)[0] = sciGetFigurePosX ((sciPointObj *) pobj); 
-         stk(outindex)[1] = sciGetFigurePosY ((sciPointObj *) pobj);
-#else
-         stk(outindex)[0] = sciGetFigurePosX ((sciPointObj *) pobj)-4; 
-         stk(outindex)[1] = sciGetFigurePosY ((sciPointObj *) pobj)-20;
-#endif
-       }
-      else
-       {
-         stk(outindex)[0] = pFIGURE_FEATURE (pobj)->inrootposx; 
-         stk(outindex)[1] = pFIGURE_FEATURE (pobj)->inrootposy;
-       }
-    }  
-  else if (strcmp(marker,"axes_size") == 0)
-    {
-      if (sciGetEntityType (pobj) != SCI_FIGURE) {
-       sprintf(error_message,"%s property undefined for this object",marker);
-       return -1;
-      }
-      numrow   = 1;
-      numcol   = 2;
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-      if ((sciPointObj *) pobj != pfiguremdl)
-       { 
-         stk(outindex)[0] = sciGetWidth ((sciPointObj *) pobj); 
-         stk(outindex)[1] = sciGetHeight ((sciPointObj *) pobj); 
-       }
-      else
-       {
-         stk(outindex)[0] = pFIGURE_FEATURE (pobj)->windowdimwidth;
-         stk(outindex)[1] = pFIGURE_FEATURE (pobj)->windowdimheight; 
-       }
-    } 
-  else if (strcmp(marker,"figure_size") == 0)
-    {
-      if (sciGetEntityType (pobj) != SCI_FIGURE) {
-       sprintf(error_message,"%s property undefined for this object",marker);
-       return -1;
-      }
-      numrow   = 1;
-      numcol   = 2;
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-      if ((sciPointObj *) pobj != pfiguremdl)
-       {
-         int cur,num=pFIGURE_FEATURE(pobj)->number;
-         C2F(dr)("xget","window",&itmp,&cur,&na,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);  
-         C2F(dr)("xset","window",&num,PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-
-         C2F(dr)("xget","wpdim",&itmp,x,&na,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-         C2F(dr)("xset","window",&cur,PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-
-         pFIGURE_FEATURE((sciPointObj *)pobj)->figuredimwidth=x[0];  
-         pFIGURE_FEATURE((sciPointObj *)pobj)->figuredimheight=x[1]; 
-       }
-      stk(outindex)[0] = pFIGURE_FEATURE((sciPointObj *)pobj)->figuredimwidth;  
-      stk(outindex)[1] = pFIGURE_FEATURE((sciPointObj *)pobj)->figuredimheight;  
-    }
-  else if (strcmp(marker,"figure_name") == 0)
-    {
-      if (sciGetEntityType (pobj) != SCI_FIGURE) {
-       sprintf(error_message,"%s property undefined for this object",marker);
-       return -1;
-      }
-      numrow = 1;
-      numcol = sciGetNameLength((sciPointObj *) pobj);
-      CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-      strncpy(cstk(outindex), sciGetName((sciPointObj *) pobj), numrow*numcol);
-    }
-  else if (strcmp(marker,"figure_id") == 0)
-    {
-      numrow = 1;
-      numcol = 1;
-      CreateVar(Rhs+1,"i",&numrow,&numcol,&outindex);
-      *istk(outindex) = sciGetNum((sciPointObj *)pobj);
-    }
-  else if (strcmp(marker,"rotation_style") == 0) 
-    {
-      if (sciGetEntityType (pobj) != SCI_FIGURE) {
-       sprintf(error_message,"%s property undefined for this object",marker);
-       return -1;
-      }
-      if (pFIGURE_FEATURE((sciPointObj *)pobj)->rotstyle == 0){
-       numrow   = 1;
-       numcol   = 5;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"unary", numrow*numcol);
-      }
-      else {
-       numrow   = 1;
-       numcol   = 8;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"multiple",numrow*numcol);
-      }
-    }
-  else if (strcmp(marker,"immediate_drawing") == 0) 
-    {
-      if (sciGetEntityType (pobj) != SCI_FIGURE) {
-       sprintf(error_message,"%s property undefined for this object",marker);
-       return -1;
-      }
-      if (pFIGURE_FEATURE((sciPointObj *)pobj)->auto_redraw == TRUE){
-       numrow   = 1;
-       numcol   = 2;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"on", numrow*numcol);
-      }
-      else {
-       numrow   = 1;
-       numcol   = 3;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"off",numrow*numcol);
-      }
-    }
-  /*Ajout A.Djalel*/
-  else if (strcmp(marker,"pixmap") == 0)
-    {
-      if (sciGetEntityType (pobj) != SCI_FIGURE) {
-       sprintf(error_message,"%s property undefined for this object",marker);
-       return -1;
-      }
-      if (pFIGURE_FEATURE(pobj)->pixmap==1){
-       numrow   = 1;
-       numcol   = 2;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"on", numrow*numcol);
-      }
-      else {
-       numrow   = 1;
-       numcol   = 3;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"off", numrow*numcol);
-      }
-    }
-
-  /********** Handles Properties *********************************************/       
-  else if (strcmp(marker,"type") == 0)
-    {
-      numrow = 1;  
-      numcol = strlen(sciGetCharEntityType((sciPointObj *) pobj));
-      CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-      strncpy(cstk(outindex), sciGetCharEntityType((sciPointObj *) pobj), numrow*numcol);
-    }
-  else if (strcmp(marker,"parent") == 0)
-    {
-      numrow   = 1;
-      numcol   = 1;
-      CreateVar(Rhs+1,"h",&numrow,&numcol,&outindex);
-      *hstk(outindex) = sciGetHandle(sciGetParent((sciPointObj *)pobj));
-    }
-  else if (strcmp(marker,"current_axes") == 0)
-    {
-      /*       sciPointObj * psubwin = sciGetSelectedSubWin(sciGetCurrentFigure()); */
-      numrow   = 1;
-      numcol   = 1;
-      CreateVar(Rhs+1,"h",&numrow,&numcol,&outindex);
-      *hstk(outindex) = sciGetHandle(sciGetSelectedSubWin(sciGetCurrentFigure()));
-    }
-
-  else if (strcmp(marker,"current_figure") == 0)
-    {
-
-      if (cf_type==1) {
-       C2F(sciwin)();/*SciWin();*/
-       numrow   = 1;
-       numcol   = 1;
-       if(version_flag() == 0)
-         { /* return handle on the current figure */
-           CreateVar(Rhs+1,"h",&numrow,&numcol,&outindex);
-           *hstk(outindex) = sciGetHandle(sciGetCurrentFigure());
-         }
-       else
-         { /* return id of the current figure */
-           double *XGC,dv=0;
-           int v=0;
-           struct BCG *CurrentScilabXgc = (struct BCG *) NULL;
-           C2F(dr)("xget","gc",&v,&v,&v,&v,&v,&v,(double *)&XGC,&dv,&dv,&dv,5L,10L); /* ajout cast ???*/
-           CurrentScilabXgc=(struct BCG *)XGC;
-
-
-           CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-           *stk(outindex) = (double) CurrentScilabXgc->CurWindow;
-         }
-      }
-      else {
-       numrow   = 1;
-       numcol   = 1;
-       CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-#ifdef WITH_TK
-       *stk(outindex) = (double )GetTclCurrentFigure();
-#endif
-      }
-    }
-  else if((strcmp(marker,"current_obj") == 0) || (strcmp(marker,"current_entity") == 0))
-    {
-      numrow   = 1;
-      numcol   = 1;
-      CreateVar(Rhs+1,"h",&numrow,&numcol,&outindex);
-      *hstk(outindex) = sciGetHandle(sciGetCurrentObj());
-    }
-  else if (strcmp(marker,"children") == 0)
-  { 
-    sciSons * curSon = NULL ;
-    numrow = sciGetNbAccessibleChildren( pobj ) ;
-    numcol = 1 ;
-    if ( numrow == 0 )
-    {
-      /* empty matrix */
-      CreateVar(Rhs+1,"d",&numrow,&numrow,&outindex) ;
-      }
-    else
-    {
-      int index = 0 ;
-      CreateVar(Rhs+1,"h",&numrow,&numcol,&outindex) ;
-      curSon = sciGetFirstAccessibleSon( pobj ) ;
-      
-      while ( curSon != NULL && curSon->pointobj != NULL )
-      {
-          hstk(outindex)[index] = sciGetHandle( curSon->pointobj ) ;
-          index++ ;
-          curSon = sciGetNextAccessibleSon( curSon ) ;
-      }
-    }
-  }
-  else if (strcmp(marker,"hdl") == 0)
-    {
-      numrow   = 1;
-      numcol   = 1;
-      CreateVar(Rhs+1,"h",&numrow,&numcol,&outindex);
-      *hstk(outindex) = sciGetHandle(sciGetCurrentObj());
-    }
-  /* DJ.A 08/01/04 */
-  else if (strcmp(marker,"default_figure") == 0)
-    {
-      if (pfiguremdl != (sciPointObj *) NULL) 
-       {
-         numrow   = 1;
-         numcol   = 1; 
-         CreateVar(Rhs+1,"h",&numrow,&numcol,&outindex);
-         *hstk(outindex) =  sciGetHandle(pfiguremdl);
-       }
-      else
-       {
-         strcpy(error_message,"Default figure do not existed ");
-         return -1;
-       }
-    }
-  else if (strcmp(marker,"default_axes") == 0)
-    { 
-      if (paxesmdl != (sciPointObj *) NULL) 
-       {
-         numrow   = 1;
-         numcol   = 1;
-         CreateVar(Rhs+1,"h",&numrow,&numcol,&outindex);
-         *hstk(outindex) = sciGetHandle(paxesmdl);     
-       }
-      else
-       {
-         strcpy(error_message,"Default axes do not existed ");
-         return -1;
-       }
-    }
-  /******************************** context graphique  *****************************************/
-
-  else if ( strcmp(marker,"color_map") == 0 )
-  {
-    if ( sciGetEntityType( pobj ) != SCI_FIGURE )
-    {
-      strcpy(error_message,"color_map property does not exist for this handle.");
-      return -1;
-    }
-    if ((sciPointObj *) pobj != pfiguremdl)
-    {
-      numcol = 3;
-      numrow = sciGetNumColors (pobj);
-      if ( numrow == 0 ) numcol=0;
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-      for  ( i = 0 ; i < numcol*numrow ; i++ )
-      {
-        stk(outindex)[i] = pFIGURE_FEATURE(pobj)->pcolormap[i];
-      }
-    }
-    else
-    {
-      numcol = 3;
-      numrow = sciGetNumColors (pobj);
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-      for  ( i = 0; i < numcol*numrow; i++ )
-      {
-        stk(outindex)[i] = pFIGURE_FEATURE(pfiguremdl)->pcolormap[i];
-      }
-    }
-  }
-  else if (strcmp(marker,"interp_color_vector") == 0)
-    {
-      int * vectmp = sciGetInterpVector((sciPointObj *) pobj);
-
-      if(sciGetEntityType(pobj) != SCI_POLYLINE)
-       { strcpy(error_message,"interp_color_vector property does not exist for this handle"); return -1;}
-
-      if(vectmp != NULL){
-       numrow = 1;
-       numcol = pPOLYLINE_FEATURE(pobj)->dim_icv;
-
-       CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex); 
-       for (i=0;i<numcol;i++)
-         stk(outindex)[i] =  vectmp[i];
-      }
-      else{
-       numrow = 0;
-       numcol = 0;
-
-       CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex); 
-      }
-    }
-  else if (strcmp(marker,"interp_color_mode") == 0)
-    {
-      if(pPOLYLINE_FEATURE(pobj)->isinterpshaded == TRUE){
-       numrow = 1;
-       numcol = 2;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"on", numrow*numcol);
-      }
-      else{
-       numrow = 1;
-       numcol = 3;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"off", numrow*numcol);
-      }
-    }
-  else if (strcmp(marker,"background") == 0) /**DJ.Abdemouche 2003**/
-    {
-      numrow   = 1;numcol   = 1;
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-
-      *stk(outindex) = sciGetBackgroundToDisplay((sciPointObj *) pobj);
-    }
-  else if (strcmp(marker,"foreground") == 0) 
-    {
-      numrow   = 1;numcol   = 1;
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-
-      *stk(outindex) = sciGetForegroundToDisplay((sciPointObj *) pobj);
-    }
-  else if (strcmp(marker,"fill_mode") == 0) 
-    {
-      if (sciGetIsFilled((sciPointObj *) pobj)==1) {
-       numrow   = 1;
-       numcol   = 2;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"on", numrow*numcol);
-      }
-      else {
-       numrow   = 1;
-       numcol   = 3;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"off", numrow*numcol);
-      }
-    }
-  else if (strcmp(marker,"thickness") == 0) 
-    {
-      numrow   = 1;numcol   = 1;
-        
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-      *stk(outindex) = sciGetLineWidth((sciPointObj *) pobj);
-    }
-  else if (strcmp(marker,"arrow_size_factor") == 0) 
-    {
-      numrow   = 1;numcol   = 1;
-      if(sciGetEntityType(pobj) == SCI_POLYLINE){
-       CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-       *stk(outindex) = pPOLYLINE_FEATURE(pobj)->arsize_factor;
-      }
-    }
-  else if (strcmp(marker,"line_style") == 0)
-    {
-      numrow   = 1;numcol   = 1;
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-      *stk(outindex) = sciGetLineStyle((sciPointObj *) pobj);
-    }
-  else if (strcmp(marker,"line_mode") == 0)
-    {
-      if (sciGetIsLine((sciPointObj *)pobj) == 1) {
-       numrow   = 1;
-       numcol   = 2;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"on", numrow*numcol);
-      }
-      else {   
-       numrow   = 1;
-       numcol   = 3;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"off", numrow*numcol);
-      }
-    }
-  else if (strcmp(marker,"surface_mode") == 0)
-    {
-      if((sciGetEntityType(pobj) == SCI_PLOT3D) ||
-        (sciGetEntityType(pobj) == SCI_FAC3D)  ||
-        (sciGetEntityType(pobj) == SCI_SURFACE)){
-       if (sciGetIsLine((sciPointObj *)pobj) == 1) {
-         numrow   = 1;
-         numcol   = 2;
-         CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-         strncpy(cstk(outindex),"on", numrow*numcol);
-       }
-       else {
-         numrow   = 1;
-         numcol   = 3;
-         CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-         strncpy(cstk(outindex),"off", numrow*numcol);
-       }
-      }
-      else {strcpy(error_message,"Surface_mode value can not be accessed with this object, use line_mode"); return -1;}
-    }
-  else if (strcmp(marker,"mark_style") == 0)
-    {
-      numrow   = 1;numcol   = 1;
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-      *stk(outindex) = sciGetMarkStyle((sciPointObj *) pobj);
-    }
-  else if (strcmp(marker,"mark_mode") == 0)
-    {
-      if (sciGetIsMark((sciPointObj *)pobj) == 1) {
-       numrow   = 1;
-       numcol   = 2;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"on", numrow*numcol);
-      }
-      else {
-       numrow   = 1;
-       numcol   = 3;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"off", numrow*numcol);
-      }
-    }
-  else if (strcmp(marker,"mark_size_unit") == 0)
-    {
-      numrow   = 1;
-      if (sciGetMarkSizeUnit((sciPointObj *)pobj) == 1){
-       numcol = 5;
-       CreateVar(Rhs+1,"c", &numrow, &numcol, &outindex);
-       strncpy(cstk(outindex),"point", numrow*numcol);
-      }
-      else if(sciGetMarkSizeUnit((sciPointObj *)pobj) == 2){
-       numcol = 9;
-       CreateVar(Rhs+1,"c", &numrow, &numcol, &outindex);
-       strncpy(cstk(outindex),"tabulated", numrow*numcol);
-      }
-    }
-  else if (strcmp(marker,"mark_size") == 0)
-    {
-      numrow   = 1;numcol   = 1;
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-      *stk(outindex) = sciGetMarkSize((sciPointObj *) pobj);
-    }
-  else if (strcmp(marker,"mark_foreground") == 0)
-    {
-      numrow   = 1;numcol   = 1;
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-      *stk(outindex) = sciGetMarkForegroundToDisplay((sciPointObj *) pobj);
-    }
-  else if (strcmp(marker,"mark_background") == 0)
-    {
-      numrow   = 1;numcol   = 1;
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-      *stk(outindex) = sciGetMarkBackgroundToDisplay((sciPointObj *) pobj);
-    }
-  else if (strcmp(marker,"bar_layout") == 0)
-    {
-      if (sciGetEntityType (pobj) == SCI_POLYLINE)
-       {   
-         numrow   = 1;
-         numcol   = 7;
-
-         if(pPOLYLINE_FEATURE (pobj)->bar_layout == 0)
-           { /* 0 grouped; 1 stacked */
-             
-             CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-             strncpy(cstk(outindex),"grouped", numrow*numcol);
-           }
-         else
-           {
-             CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-             strncpy(cstk(outindex),"stacked", numrow*numcol);
-           }
-       }
-      else
-       { strcpy(error_message,"Unknown polyline property"); return -1;}
-    }
-  else if (strcmp(marker,"bar_width") == 0)
-    {
-      numrow   = 1;numcol   = 1;
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);  
-      if (sciGetEntityType (pobj) == SCI_POLYLINE)
-       *stk(outindex) = pPOLYLINE_FEATURE (pobj)->bar_width;
-      else
-       { strcpy(error_message,"Unknown polyline property"); return -1;}
-    }
-  else if (strcmp(marker,"x_shift") == 0)
-    {
-      if (sciGetEntityType (pobj) == SCI_POLYLINE)
-       {
-         sciPolyline *  ppolyline = pPOLYLINE_FEATURE (pobj);
-         
-         if(ppolyline->x_shift == (double *) NULL)
-           {
-             numrow = numcol = 0;
-             CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);  
-           }
-         else
-           {
-             numrow   = 1;numcol   = ppolyline->n1;
-             CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);  
-             
-             for (i=0;i<numcol;i++)
-               stk(outindex)[i] = ppolyline->x_shift[i];
-           }
-       }
-      else
-       { strcpy(error_message,"Unknown polyline property"); return -1;}
-    } 
-  else if (strcmp(marker,"y_shift") == 0)
-    {
-      if (sciGetEntityType (pobj) == SCI_POLYLINE)
-       {
-         sciPolyline *  ppolyline = pPOLYLINE_FEATURE (pobj);
-         
-         if(ppolyline->y_shift == (double *) NULL)
-           {
-             numrow = numcol = 0;
-             CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);  
-           }
-         else
-           {
-             numrow   = 1;numcol   = ppolyline->n1;
-             CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);  
-             
-             for (i=0;i<numcol;i++)
-               stk(outindex)[i] = ppolyline->y_shift[i];
-           }
-       }
-      else
-       { strcpy(error_message,"Unknown polyline property"); return -1;}
-    } 
-  else if (strcmp(marker,"z_shift") == 0)
-    {
-      if (sciGetEntityType (pobj) == SCI_POLYLINE)
-       {
-         sciPolyline *  ppolyline = pPOLYLINE_FEATURE (pobj);
-         
-         if(ppolyline->z_shift == (double *) NULL)
-           {
-             numrow = numcol = 0;
-             CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);  
-           }
-         else
-           {
-             numrow   = 1;numcol   = ppolyline->n1;
-             CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);  
-             
-             for (i=0;i<numcol;i++)
-               stk(outindex)[i] = ppolyline->z_shift[i];
-           }
-       }
-      else
-       { strcpy(error_message,"Unknown polyline property"); return -1;}
-    } 
-  else if (strcmp(marker,"polyline_style") == 0)
-    {
-      numrow   = 1;numcol   = 1;
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);  
-  if (sciGetEntityType (pobj) == SCI_POLYLINE)
-    *stk(outindex) = pPOLYLINE_FEATURE (pobj)->plot;
-  else
-    { strcpy(error_message,"Unknown polyline property"); return -1;}
-    } 
-  
-  /****************************************************/
-  else if (strcmp(marker,"font_size") == 0)
-    {
-      numrow = 1;numcol = 1;
-      CreateVar(Rhs+1,"i",&numrow,&numcol,&outindex);
-      *istk(outindex) = sciGetFontDeciWidth((sciPointObj *)pobj)/100;
-    }
-  else if (strcmp(marker,"font_angle") == 0)
-    {
-      numrow = 1; numcol = 1;
-      CreateVar(Rhs+1,"i",&numrow,&numcol,&outindex);
-      *istk(outindex) = (sciGetFontOrientation((sciPointObj *)pobj))/10;
-    }
-  else if (strcmp(marker,"font_foreground") == 0)
-    {
-      numrow = 1;numcol = 1;
-      CreateVar(Rhs+1,"i",&numrow,&numcol,&outindex);
-      *istk(outindex) = sciGetFontForegroundToDisplay((sciPointObj *)pobj);
-    }
-  else if (strcmp(marker,"font_color") == 0)   { /* F.Leray 09.04.04 : Added for FIGURE and SUBWIN objects */
-    numrow   = 1;numcol   = 1;
-    CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-    if (sciGetEntityType (pobj) == SCI_AXES)
-      *stk(outindex) = pAXES_FEATURE (pobj)->textcolor;
-    else if (sciGetEntityType (pobj) == SCI_SUBWIN || sciGetEntityType (pobj) == SCI_FIGURE){
-      *stk(outindex) = sciGetFontForegroundToDisplay(pobj);} /* F.Leray 08.04.04 */
-    else
-      {strcpy(error_message,"font_color property does not exist for this handle");return -1;}
-  }
-  else if (strcmp(marker,"font_style") == 0)
-    {
-      numrow = 1; numcol = 1;
-      CreateVar(Rhs+1,"i",&numrow,&numcol,&outindex);
-      *istk(outindex) = sciGetFontStyle((sciPointObj *)pobj);
-    }
-  else if (strcmp(marker,"font_name") == 0)
-    {
-      numrow = 1;
-      numcol = sciGetFontNameLength((sciPointObj *)pobj);
-      CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-      strncpy(cstk(outindex), sciGetFontName((sciPointObj *)pobj), numrow*numcol);
-    }
-  else if (strcmp(marker,"text_box_mode") == 0)
-    {
-      if (sciGetEntityType (pobj) == SCI_TEXT) 
-      {
-        if ( sciGetAutoSize( pobj ) )
-        {
-          if ( sciGetCenterPos( pobj ) )
-          {
-            sciReturnString( "centered" ) ;
-          }
-          else
-          {
-            sciReturnString( "off" ) ;
-          }
-        }
-        else
-        {
-          sciReturnString( "filled" ) ;
-        }
-      }
-      else
-      {
-        strcpy(error_message,"text_box_mode property does not exist for this handle");
-        return -1;
-      }
-    }
-  else if ( strcmp(marker,"auto_dimensionning") == 0 )
-  {
-    if ( sciGetEntityType( pobj ) == SCI_TEXT )
-    {
-      if ( sciGetAutoSize( pobj ) )
-      {
-        sciReturnString( "on" ) ;
-      }
-      else
-      {
-        sciReturnString( "off" ) ;
-      }
-    }
-    else
-    {
-      strcpy(error_message,"auto_dimensionning property does not exist for this handle");return -1;
-    }
-  }
-  else if ( strcmp(marker,"alignment") == 0 )
-  {
-    if ( sciGetEntityType( pobj ) == SCI_TEXT )
-    {
-      switch ( sciGetAlignment( pobj ) )
-      {
-      case ALIGN_LEFT :
-        sciReturnString("left") ;
-        break;
-      case ALIGN_RIGHT:
-        sciReturnString("right") ;
-        break ;
-      case ALIGN_CENTER:
-        sciReturnString("center");
-        break ;
-      default:
-        strcpy(error_message,"error acceding alignment property");
-        return -1 ;
-      }
-    }
-    else
-    {
-      strcpy(error_message,"alignment property does not exist for this handle");
-      return -1 ;
-    }
-  }
-  else if (strcmp(marker,"text_box") == 0)
-    {
-      if (sciGetEntityType (pobj) == SCI_TEXT) 
-      {
-       double size[2] ;
-        sciGetUserSize( pobj, &(size[0]), &(size[1]) ) ;
-        sciReturnRowVector( size, 2 ) ;
-      }
-      else
-      {
-        strcpy(error_message,"text_box property does not exist for this handle");
-        return -1;
-      }
-    }
-  else if (strcmp(marker,"text") == 0)
-    {
-      /* get the size of the text matrix */
-      sciGetTextSize( pobj , &numrow, &numcol ) ;
-      CreateVarFromPtr(Rhs+1,"S", &numrow, &numcol, getStrMatData( sciGetText( pobj ) ) ) ;
-    }
-
-  else if (strcmp(marker,"auto_clear") == 0)
-    {
-      if(   sciGetEntityType(pobj) != SCI_SUBWIN 
-         && sciGetEntityType(pobj) != SCI_FIGURE )
-       {strcpy(error_message,"Entity type not yet taken into account for this property");return -1;}
-       
-      if (!sciGetAddPlot((sciPointObj *)pobj)) {
-       numrow   = 1;
-       numcol   = 2;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"on", numrow*numcol);
-      }
-      else {   
-       numrow   = 1;
-       numcol   = 3;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"off",numrow*numcol);
-      }
-    }
-  else if (strcmp(marker,"auto_scale") == 0)
-    {
-      if ( sciGetAutoScale((sciPointObj *)pobj)) {
-       numrow   = 1;
-       numcol   = 2;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"on", numrow*numcol);
-      }
-      else {
-       numrow   = 1;
-       numcol   = 3;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"off",numrow*numcol);
-      }
-    }
-  else if ((strcmp(marker,"zoom_box") == 0) && (sciGetEntityType (pobj) == SCI_SUBWIN))
-    {
-      if (!sciGetZooming((sciPointObj *)pobj))
-       {
-         numrow=0; numcol=0;
-         CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-       }
-      else
-       {
-         numrow=1;numcol=4;
-         CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-         for (i=0;i<numcol;i++)
-           stk(outindex)[i] =  pSUBWIN_FEATURE(pobj)->ZRect[i];                        
-       } 
-    }
-  else if ((strcmp(marker,"zoom_state") == 0) && (sciGetEntityType (pobj) == SCI_SUBWIN))
-    {
-      if (sciGetZooming((sciPointObj *)pobj)) {
-       numrow   = 1;
-       numcol   = 2;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"on", numrow*numcol); 
-      }
-      else {
-       numrow   = 1;
-       numcol   = 3;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"off", numrow*numcol);
-      }
-    }
-  else if (strcmp(marker,"clip_box") == 0) 
-    {
-      if (sciGetIsClipping ((sciPointObj *) pobj) > 0)
-       {
-         double *cliparea = sciGetClipping(pobj);
-         numrow=1; numcol=4;
-         CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-         for (i=0;i<numcol;i++)
-           stk(outindex)[i] =  cliparea[i];
-       }
-      else
-       { 
-         numrow=0;numcol=0;
-         CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-       }
-    }
-  else if (strcmp(marker,"clip_state") == 0) 
-    {
-      if (sciGetIsClipping (pobj) == 0) {
-       numrow   = 1;
-       numcol   = 7;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"clipgrf", numrow*numcol); 
-      }
-      else if (sciGetIsClipping (pobj) > 0) {
-       numrow   = 1;
-       numcol   = 2;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"on", numrow*numcol);    
-      }
-      else {
-       numrow   = 1;
-       numcol   = 3;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"off", numrow*numcol);    
-      }
-    }
-  else if (strcmp(marker,"data") == 0)
-    {
-      if ((tab = sciGetPoint ((sciPointObj *)pobj, &numrow, &numcol)) == NULL)
-       {strcpy(error_message,"No point");return -1;}
-
-      /*  if(sciGetEntityType (pobj) != SCI_SURFACE){ */
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-      k=0;
-      for (j=0;j < numcol*numrow;j++)
-       stk(outindex)[j] = tab[j];
-
-      FREE(tab); tab = NULL;
-
-    }
-
-  /**************** callback *********************/
-  else if (strcmp(marker,"callbackmevent") == 0)
-    {
-      numrow = 1;numcol = 1;
-      CreateVar(Rhs+1,"i", &numrow, &numcol, &outindex);
-      istk(outindex)[0] = sciGetCallbackMouseEvent((sciPointObj *)pobj);
-    }
-  else if (strcmp(marker,"callback") == 0)
-    {
-      numrow = 1;
-      numcol = sciGetCallbackLen((sciPointObj *)pobj);
-      CreateVar(Rhs+1,"c", &numrow, &numcol, &outindex);
-      strncpy(cstk(outindex), sciGetCallback((sciPointObj *)pobj), numrow*numcol);
-    }
-
-
-
-  /**************************** AXES *************/
-  else if (strcmp(marker,"x_label") == 0) /* we send back a handle on the x_label object */
-    {
-      if (sciGetEntityType (pobj) != SCI_SUBWIN)
-       {strcpy(error_message,"x_label property undefined for this object");return -1;}
-      else{
-       numrow = 1;
-       numcol = 1;
-       CreateVar(Rhs+1,"h",&numrow,&numcol,&outindex);
-       hstk(outindex)[0] = sciGetHandle((sciPointObj *) pSUBWIN_FEATURE(pobj)->mon_x_label);
-
-      }
-    }
-  else if (strcmp(marker,"y_label") == 0)
-    {
-      if (sciGetEntityType (pobj) != SCI_SUBWIN)
-       {strcpy(error_message,"y_label property undefined for this object");return -1;}
-      else{
-       numrow = 1;
-       numcol = 1;
-       CreateVar(Rhs+1,"h",&numrow,&numcol,&outindex);
-       hstk(outindex)[0] = sciGetHandle((sciPointObj *) pSUBWIN_FEATURE(pobj)->mon_y_label);
-      }
-    }
-  else if (strcmp(marker,"z_label") == 0)
-    {
-      if (sciGetEntityType (pobj) != SCI_SUBWIN)
-       {strcpy(error_message,"z_label property undefined for this object");return -1;}
-      else{
-       numrow = 1;
-       numcol = 1;
-       CreateVar(Rhs+1,"h",&numrow,&numcol,&outindex);
-       hstk(outindex)[0] = sciGetHandle((sciPointObj *) pSUBWIN_FEATURE(pobj)->mon_z_label);
-      }
-    }
-  else if (strcmp(marker,"title") == 0)
-    {
-      if (sciGetEntityType (pobj) != SCI_SUBWIN)
-       {strcpy(error_message,"title property undefined for this object");return -1;}
-      else{
-       numrow = 1;
-       numcol = 1;
-       CreateVar(Rhs+1,"h",&numrow,&numcol,&outindex);
-       hstk(outindex)[0] = sciGetHandle((sciPointObj *) pSUBWIN_FEATURE(pobj)->mon_title);
-      }
-    }
-  else if (strcmp(marker,"log_flags") == 0)
-    {
-      if (sciGetEntityType (pobj) == SCI_SUBWIN) {
-       numrow = 1;numcol   = 3;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       *cstk(outindex)  = pSUBWIN_FEATURE (pobj)->logflags[0];
-       *cstk(outindex+1)= pSUBWIN_FEATURE (pobj)->logflags[1];
-       *cstk(outindex+2)= pSUBWIN_FEATURE (pobj)->logflags[2];
-
-      }
-      else     
-       {strcpy(error_message,"log_flag property undefined for this object");return -1;}
-
-    }
-  else if (strcmp(marker,"tics_direction") == 0)
-    {
-      numrow = 1;
-      switch (pAXES_FEATURE (pobj)->dir)
-       {
-       case 'u': 
-         numcol =  3;CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-         strncpy(cstk(outindex), "top" , numrow*numcol);
-         break;
-       case 'd': 
-         numcol =  6;CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-         strncpy(cstk(outindex), "bottom" , numrow*numcol);
-         break;
-       case 'r': 
-         numcol =  5;CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-         strncpy(cstk(outindex), "right" , numrow*numcol); 
-         break;
-       case 'l': 
-         numcol =  4;CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-         strncpy(cstk(outindex), "left", numrow*numcol); 
-         break;
-       default : 
-         strcpy(error_message, "Unexpected error");return -1;
-         break;
-       }
-    }
-  else if (strcmp(marker,"x_location") == 0) 
-    {
-      char loc;
-      numrow = 1;
-      if (sciGetEntityType (pobj) == SCI_SUBWIN)
-       loc = pSUBWIN_FEATURE (pobj)->axes.xdir;
-      else
-       {strcpy(error_message,"x_location property does not exist for this handle");return -1;}
-
-      switch (loc)
-       {
-       case 'u': 
-         numcol =  3;CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-         strncpy(cstk(outindex), "top" , numrow*numcol);
-         break;
-       case 'd': 
-         numcol =  6;CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-         strncpy(cstk(outindex), "bottom" , numrow*numcol);
-         break;
-       case 'c': 
-         numcol =  6;CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-         strncpy(cstk(outindex), "middle" , numrow*numcol); 
-         break;
-       default : 
-         strcpy(error_message, "Unexpected error"); return -1;
-         break;
-       }
-    }  
-  else if (strcmp(marker,"y_location") == 0)
-    {
-      char loc;
-      numrow = 1;
-      if (sciGetEntityType (pobj) == SCI_SUBWIN)
-       loc = pSUBWIN_FEATURE (pobj)->axes.ydir;
-      else
-       {strcpy(error_message,"x_location property does not exist for this handle");return -1;}
-
-      switch (loc)
-       {
-       case 'l': 
-         numcol =  4;CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-         strncpy(cstk(outindex), "left" , numrow*numcol);
-         break;
-       case 'r': 
-         numcol =  5;CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-         strncpy(cstk(outindex), "right" , numrow*numcol);
-         break;
-       case 'c': 
-         numcol =  6;CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-         strncpy(cstk(outindex), "middle" , numrow*numcol); 
-         break;
-       default : 
-         strcpy(error_message, "Unexpected error"); return -1;
-         break;
-       }
-    } 
-  else if (strcmp(marker,"tight_limits") == 0)
-    {
-      if (sciGetEntityType (pobj) == SCI_SUBWIN) {
-       if (pSUBWIN_FEATURE (pobj)->tight_limits == 1) {
-         numrow   = 1;
-         numcol   = 2;
-         CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-         strncpy(cstk(outindex),"on", numrow*numcol);
-       }
-       else {
-         numrow   = 1;
-         numcol   = 3;
-         CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-         strncpy(cstk(outindex),"off", numrow*numcol);      
-       }
-      }
-      else
-       {strcpy(error_message,"tight_limits property does not exist for this handle");return -1;}
-    }
-  else if (strcmp(marker,"closed") == 0) 
-    { 
-      if(sciGetEntityType(pobj) != SCI_POLYLINE)
-       {strcpy(error_message,"closed property does not exist for this handle");return -1;}
-
-      if (pPOLYLINE_FEATURE(pobj)->closed == 1) {
-       numrow   = 1;
-       numcol   = 2;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"on", numrow*numcol);
-      }
-      else {
-       numrow   = 1;
-       numcol   = 3;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"off", numrow*numcol);
-      }
-    }
-  else if (strcmp(marker,"auto_position") == 0) 
-    { 
-      if(sciGetEntityType(pobj) != SCI_LABEL)
-       {strcpy(error_message,"auto_position does not exist for this handle");return -1;}
-
-      if (pLABEL_FEATURE(pobj)->auto_position == TRUE) {
-       numrow   = 1;
-       numcol   = 2;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"on", numrow*numcol);
-      }
-      else {
-       numrow   = 1;
-       numcol   = 3;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"off", numrow*numcol);
-      }
-    }
-  else if (strcmp(marker,"auto_rotation") == 0) 
-    { 
-      if(sciGetEntityType(pobj) != SCI_LABEL)
-       {strcpy(error_message,"auto_rotation does not exist for this handle");return -1;}
-
-      if (pLABEL_FEATURE(pobj)->auto_rotation == TRUE) {
-       numrow   = 1;
-       numcol   = 2;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"on", numrow*numcol);
-      }
-      else {
-       numrow   = 1;
-       numcol   = 3;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"off", numrow*numcol);
-      }
-    }
-  else if (strcmp(marker,"position") == 0) 
-    {
-         if (sciGetEntityType(pobj) == SCI_UIMENU)
-                 {
-                         numrow = 1;
-                         numcol = 1;
-                         CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-                         stk(outindex)[0]=pUIMENU_FEATURE(pobj)->MenuPosition;
-                 }
-                 else if (sciGetEntityType(pobj) == SCI_LABEL)
-                 {
-                         numrow = 1;
-                         numcol = 2;
-                         CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-                         sciGetPosition(pobj,&stk(outindex)[0],&stk(outindex)[1]);
-                 }
-                 else
-                 {
-                         strcpy(error_message,"position does not exist for this handle");
-                         return -1;
-                 }
-         
-                 CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-
-                 
-
-      
-      
-
-      /*       /\* switch to manual mode for label position *\/ */
-      /*       pLABEL_FEATURE(pobj)->auto_position = FALSE; */
-    }
-  else if (strcmp(marker,"auto_ticks") == 0)
-    {
-      if (sciGetEntityType (pobj) == SCI_SUBWIN) {
-       char ** foo = (char **) NULL;
-       int i;
-
-       numrow   = 1;numcol   = 3;
-       if((foo=malloc(numcol*(sizeof(char *))))==NULL){
-         strcpy(error_message,"No memory left for allocating temporary auto_ticks");return -1;}
-
-       for(i=0;i<numcol;i++)
-         if( pSUBWIN_FEATURE (pobj)->axes.auto_ticks[i] == TRUE)
-           {
-             if((foo[i]=malloc(3*(sizeof(char))))==NULL){
-               strcpy(error_message,"No memory left for allocating temporary auto_ticks");return -1;}
-             strcpy(foo[i],"on");
-           }
-         else
-           {
-             if((foo[i]=malloc(4*(sizeof(char))))==NULL){
-               strcpy(error_message,"No memory left for allocating temporary auto_ticks");return -1;}
-             strcpy(foo[i],"off");
-           }    
-
-       CreateVarFromPtr(Rhs+1,"S",&numrow,&numcol,foo);
-
-        /* free the foo */
-        for ( i = 0 ; i < numcol ; i++ )
-        {
-          FREE( foo[i] ) ;
-        }
-        FREE( foo ) ;
-
-      }
-      else
-       {strcpy(error_message,"auto_ticks property does not exist for this handle");return -1;}
-    }
-  else if (strcmp(marker,"axes_reverse") == 0)
-    {
-      if (sciGetEntityType (pobj) == SCI_SUBWIN) {
-       char ** foo = (char **) NULL;
-       int i;
-
-       numrow   = 1;numcol   = 3;
-       if((foo=malloc(numcol*(sizeof(char *))))==NULL){
-         strcpy(error_message,"No memory left for allocating temporary reverse");return -1;}
-
-       for(i=0;i<numcol;i++)
-         if( pSUBWIN_FEATURE (pobj)->axes.reverse[i] == TRUE)
-           {
-             if((foo[i]=malloc(3*(sizeof(char))))==NULL){
-               strcpy(error_message,"No memory left for allocating temporary reverse");return -1;}
-             strcpy(foo[i],"on");
-           }
-         else
-           {
-             if((foo[i]=malloc(4*(sizeof(char))))==NULL){
-               strcpy(error_message,"No memory left for allocating temporary reverse");return -1;}
-             strcpy(foo[i],"off");
-           }    
-
-       CreateVarFromPtr(Rhs+1,"S",&numrow,&numcol,foo);
-
-        /* free the foo */
-        for ( i = 0 ; i < numcol ; i++ )
-        {
-          FREE( foo[i] ) ;
-        }
-        FREE( foo ) ;
-        
-      }
-      else
-       {strcpy(error_message,"reverse property does not exist for this handle");return -1;}
-    }
-  else if (strcmp(marker,"view") == 0)
-    {
-      if (sciGetEntityType (pobj) == SCI_SUBWIN) {
-       numrow   = 1;numcol   = 2;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       if ( sciGetIs3d( pobj ) )
-         strncpy(cstk(outindex),"3d", numrow*numcol); 
-       else 
-         strncpy(cstk(outindex),"2d", numrow*numcol);      
-      }
-      else
-       {strcpy(error_message,"view property does not exist for this handle");return -1;}
-    }
-  else if (strcmp(marker,"axes_bounds") == 0) {
-    if (sciGetEntityType (pobj) == SCI_SUBWIN) {
-      numrow   = 1;numcol   = 4;
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-      for (i=0;i<4;i++) {
-       stk(outindex)[i] = pSUBWIN_FEATURE (pobj)->WRect[i];
-      }
-    }
-    else
-      {strcpy(error_message,"axes_bounds property does not exist for this handle");return -1;}
-  }
-  else if (strcmp(marker,"data_bounds") == 0) {
-    if (sciGetEntityType (pobj) == SCI_SUBWIN) {
-      /**DJ.Abdemouche 2003**/
-      numrow   = 2;
-      numcol=(pSUBWIN_FEATURE (pobj)->is3d)? 3 : 2;
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-      stk(outindex)[0] = pSUBWIN_FEATURE (pobj)->SRect[0];
-      stk(outindex)[1] = pSUBWIN_FEATURE (pobj)->SRect[1];
-      stk(outindex)[2] = pSUBWIN_FEATURE (pobj)->SRect[2];
-      stk(outindex)[3] = pSUBWIN_FEATURE (pobj)->SRect[3];
-      if (pSUBWIN_FEATURE (pobj)->is3d)
-       {
-         stk(outindex)[4] = pSUBWIN_FEATURE (pobj)->SRect[4];
-         stk(outindex)[5] = pSUBWIN_FEATURE (pobj)->SRect[5];  
-       }
-    }
-    else if (sciGetEntityType (pobj) == SCI_SURFACE) { /* used for what ? F.Leray 20.04.05 */
-      numrow   = 3;numcol   = 2;
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-      for (i=0;i<numcol*numrow;i++) {
-       stk(outindex)[i] = pSURFACE_FEATURE (pobj)->ebox[i];
-      }
-    }
-    else
-      {strcpy(error_message,"data_bounds property does not exist for this handle");return -1;}
-  } 
-  else if (strcmp(marker,"margins") == 0) {
-    if (sciGetEntityType (pobj) == SCI_SUBWIN) {
-      /**SS  2004**/
-      numrow   = 1;
-      numcol=4;
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-      stk(outindex)[0] = pSUBWIN_FEATURE (pobj)->ARect[0];
-      stk(outindex)[1] = pSUBWIN_FEATURE (pobj)->ARect[1];
-      stk(outindex)[2] = pSUBWIN_FEATURE (pobj)->ARect[2];
-      stk(outindex)[3] = pSUBWIN_FEATURE (pobj)->ARect[3];
-    }
-    else
-      {strcpy(error_message,"margins property does not exist for this handle");return -1;}
-  } 
-  else if (strcmp(marker,"tics_color") == 0) 
-    {
-      numrow   = 1;numcol   = 1;
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-      if (sciGetEntityType (pobj) == SCI_AXES)
-       *stk(outindex) = pAXES_FEATURE (pobj)->ticscolor;
-      else if (sciGetEntityType (pobj) == SCI_SUBWIN){
-       sciprint("Warning: tics_color use is deprecated and no more taken into account, use foreground property to edit Axes color\n");
-       *stk(outindex) = pSUBWIN_FEATURE (pobj)->axes.ticscolor;
-      }
-      else
-       {strcpy(error_message,"tics_color property does not exist for this handle");return -1;}
-    }
-  else if (strcmp(marker,"tics_style") == 0)
-    {
-      numrow = 1; numcol = 1;
-      CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-      strncpy(cstk(outindex), &pAXES_FEATURE (pobj)->tics , numrow*numcol);
-    }
-  /*Dj.A 17/12/2003*/
-  /* modified jb Silvy 01/2006 */
-  else if ((strcmp(marker,"sub_tics") == 0) || (strcmp(marker,"sub_ticks") == 0))
-    {
-      numrow   = 1;
-      /*numcol   = (sciGetEntityType (pobj) == SCI_AXES) ? 1 : 2 ;*/
-      
-      if ( sciGetEntityType (pobj) == SCI_AXES )
-      {
-        numcol = 1 ;
-        CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-       *stk(outindex) = pAXES_FEATURE (pobj)->subint;
-      }
-      else if ( sciGetEntityType (pobj) == SCI_SUBWIN )
-      {
-        sciSubWindow * ppSubWin = pSUBWIN_FEATURE (pobj) ;
-        numcol = (ppSubWin->is3d)? 3 : 2;
-        CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-        for ( i = 0 ; i < numcol ; i++ )
-        {
-          stk(outindex)[i] = ppSubWin->axes.nbsubtics[i] - 1 ;
-        }
-      }
-      else
-      {
-        strcpy(error_message,"sub_ticks property does not exist for this handle");
-        return -1 ;
-      }
-    }
-  else if (strcmp(marker,"tics_segment") == 0) 
-    {
-      if (sciGetEntityType (pobj) == SCI_AXES) {
-       if (pAXES_FEATURE (pobj)->seg==1) {
-         numrow   = 1;
-         numcol   = 2;
-         CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-         strncpy(cstk(outindex),"on", numrow*numcol);
-       }
-       else {  
-         numrow   = 1;
-         numcol   = 3;
-         CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-         strncpy(cstk(outindex),"off", numrow*numcol);
-       }
-      }
-      else
-       {strcpy(error_message,"tics_segment property does not exist for this handle");return -1;}
-    }
-  else if (strcmp(marker,"labels_font_size") == 0)     {
-    numrow   = 1;numcol   = 1;
-    CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-    if (sciGetEntityType (pobj) == SCI_AXES)
-      *stk(outindex) = pAXES_FEATURE (pobj)->fontsize;
-    else if (sciGetEntityType (pobj) == SCI_SUBWIN || sciGetEntityType (pobj) == SCI_FIGURE){
-      /* *stk(outindex) = pSUBWIN_FEATURE (pobj)->axes.fontsize;*/
-      *stk(outindex) = sciGetFontDeciWidth(pobj)/100;} /* F.Leray 08.04.04 */
-    else
-      {strcpy(error_message,"labels_font_size property does not exist for this handle");return -1;}
-  }
-  else if (strcmp(marker,"labels_font_color") == 0)    {
-    numrow   = 1;numcol   = 1;
-    CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-    if (sciGetEntityType (pobj) == SCI_AXES)
-      *stk(outindex) = pAXES_FEATURE (pobj)->textcolor;
-    else if (sciGetEntityType (pobj) == SCI_SUBWIN || sciGetEntityType (pobj) == SCI_FIGURE){
-      /* *stk(outindex) = pSUBWIN_FEATURE (pobj)->axes.textcolor;*/
-      *stk(outindex) = sciGetFontForegroundToDisplay(pobj);} /* F.Leray 08.04.04 */
-    else
-      {strcpy(error_message,"labels_font_color property does not exist for this handle");return -1;}
-  }
-  else if (strcmp(marker,"labels_font_style") == 0)    { /* Adding F.Leray 09.04.04 */
-    numrow   = 1;numcol   = 1;
-    CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-    if (sciGetEntityType (pobj) == SCI_SUBWIN || sciGetEntityType (pobj) == SCI_FIGURE){ /* F.Leray 09.04.04: For the moment sciAxes have no font_style property*/
-      /* *stk(outindex) = pSUBWIN_FEATURE (pobj)->axes.textcolor;*/
-      *stk(outindex) = sciGetFontStyle(pobj);} /* F.Leray 08.04.04 */
-    else
-      {strcpy(error_message,"labels_font_style property does not exist for this handle");return -1;}
-  }
-  else if (strcmp(marker,"format_n") == 0)     {
-    if (sciGetEntityType (pobj) == SCI_AXES) {
-      numrow   = 1;numcol   = 1;
-      CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-      strncpy(cstk(outindex),pAXES_FEATURE (pobj)->format, numrow*numcol);
-    }
-    else
-      {strcpy(error_message,"format_n property does not exist for this handle");return -1;}
-  }
-  else if (strcmp(marker,"xtics_coord") == 0)
-    {
-      if (sciGetEntityType (pobj) == SCI_AXES) {
-       numrow=1;
-       numcol= pAXES_FEATURE (pobj)->nx;
-       CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-       for (i=0;i<numcol;i++)
-         stk(outindex)[i] = pAXES_FEATURE (pobj)->vx[i];
-      }
-      else
-       {strcpy(error_message,"xtics_coord property does not exist for this handle");return -1;}
-    }
-  else if (strcmp(marker,"ytics_coord") == 0)
-    {
-      if (sciGetEntityType (pobj) == SCI_AXES) {
-       numrow=1;
-       numcol= pAXES_FEATURE (pobj)->ny;
-       CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-       for (i=0;i<numcol;i++)
-         stk(outindex)[i] = pAXES_FEATURE (pobj)->vy[i];
-      }
-      else
-       {strcpy(error_message,"ytics_coord property does not exist for this handle");return -1;}
-    }
-  else if (strcmp(marker,"tics_labels") == 0)
-    {
-      char **foo = (char **) NULL;
-      int i;
-      int N;
-      if (sciGetEntityType (pobj) == SCI_AXES) 
-       {
-         numrow=1;
-         numcol= Max(pAXES_FEATURE (pobj)->nx,pAXES_FEATURE (pobj)->ny);
-         str = pAXES_FEATURE (pobj)->str;
-         if (str==NULL){
-
-           /*      for (i=0;i<numcol;i++){ */
-           if(pAXES_FEATURE (pobj)->format==NULL)
-             {
-               /* we need to compute a c_format */
-               char c_format[5];
-               double *vector = NULL;
-
-               if(ComputeXIntervals(pobj,pAXES_FEATURE (pobj)->tics,&vector,&N,1) != 0){
-                 Scierror(999,"Error: Bad size in tics_coord ; you must first increase the size of the tics_coord\n");
-                 return 0;
-               }
-
-               ComputeC_format(pobj,c_format);
-
-               if((foo=malloc(N*(sizeof(char *))))==NULL){
-                 strcpy(error_message,"No memory left for allocating temporary tics_labels");return -1;}
-               for(i=0;i<N;i++){
-                 if((foo[i]=malloc(256*(sizeof(char)+1)))==NULL){
-                   strcpy(error_message,"No memory left for allocating temporary tics_labels");return -1;}
-               }
-
-               for(i=0;i<N;i++){
-                 if(pAXES_FEATURE (pobj)->nx<numcol) 
-                   sprintf(foo[i],c_format,vector[i]);
-                 else
-                   sprintf(foo[i],c_format,vector[i]);
-               }
-               FREE(vector); vector = (double *) NULL;
-             }
-           else
-             {
-               double *vector = NULL;
-
-               if(ComputeXIntervals(pobj,pAXES_FEATURE (pobj)->tics,&vector,&N,1) != 0){
-                 Scierror(999,"Error: Bad size in tics_coord ; you must first increase the size of the tics_coord\n");
-                 return 0;
-               }
-
-               if((foo=malloc(N*(sizeof(char *))))==NULL){
-                 strcpy(error_message,"No memory left for allocating temporary tics_labels");return -1;}
-               for(i=0;i<N;i++){
-                 if((foo[i]=malloc(256*(sizeof(char)+1)))==NULL){
-                   strcpy(error_message,"No memory left for allocating temporary tics_labels");return -1;}
-               }
-
-               for(i=0;i<N;i++){
-                 if(pAXES_FEATURE (pobj)->nx<numcol) 
-                   sprintf(foo[i],pAXES_FEATURE (pobj)->format,vector[i]);
-                 else
-                   sprintf(foo[i],pAXES_FEATURE (pobj)->format,vector[i]);
-               }
-               FREE(vector); vector = (double *) NULL;
-             }
-           /*      } */
-
-           /* I recompute the nb_tics_labels */
-           pAXES_FEATURE (pobj)->nb_tics_labels = N;
-
-           CreateVarFromPtr(Rhs+1,"S",&numrow,&N,foo);
-
-           if(foo != NULL)
-             for(i=0;i<N;i++) { FREE(foo[i]); foo[i] = NULL;}
-           FREE(foo); foo = NULL;
-         }
-         else{ /* str has been previously set once */
-           N = pAXES_FEATURE (pobj)->nb_tics_labels;
-           CreateVarFromPtr(Rhs+1,"S",&numrow,&N,str);
-         }
-       }
-      else
-       {strcpy(error_message,"tics_labels property does not exist for this handle");return -1;}
-    }
-  else if ((strcmp(marker,"box") == 0))
-  {
-    if ( sciGetEntityType ( pobj ) == SCI_SUBWIN )
-    {
-      switch( sciGetBoxType( pobj ) )
-      {
-      case BT_OFF:
-        sciReturnString( "off" ) ;
-        break ;
-      case BT_ON:
-        sciReturnString( "on" ) ;
-        break ;
-      case BT_HIDDEN_AXIS:
-        sciReturnString( "hidden_axis" ) ;
-        break ;
-      case BT_BACK_HALF:
-        sciReturnString( "back_half" ) ;
-        break ;
-      }
-    }
-    else
-    {
-      if (sciGetIsBoxed(pobj))
-      {
-        numrow   = 1;
-        numcol   = 2;
-        CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-        strncpy(cstk(outindex),"on", numrow*numcol); 
-      }
-      else
-      {
-        numrow   = 1;
-        numcol   = 3;
-        CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-        strncpy(cstk(outindex),"off", numrow*numcol);  
-      }
-    }
-  }
-  /**DJ.Abdemouche 2003**/
-  else if (strcmp(marker,"grid") == 0) 
-    {
-      if (sciGetEntityType (pobj) == SCI_SUBWIN) 
-       {
-         numrow   = 1; 
-         numcol   = (pSUBWIN_FEATURE (pobj)->is3d)? 3 : 2;
-         CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-         for (i=0;i<numcol;i++) 
-           {stk(outindex)[i] = pSUBWIN_FEATURE (pobj)->grid[i];}
-       }
-      else
-       {strcpy(error_message,"grid property does not exist for this handle");return -1;}
-    }
-  else if (strcmp(marker,"axes_visible") == 0) {
-    if (sciGetEntityType (pobj) == SCI_SUBWIN) {
-      char ** foo = (char **) NULL;
-      int i;
-
-      numrow   = 1;numcol   = 3;
-      if((foo=malloc(numcol*(sizeof(char *))))==NULL){
-       strcpy(error_message,"No memory left for allocating temporary axes_visible");return -1;}
-      for(i=0;i<numcol;i++)
-       if( pSUBWIN_FEATURE (pobj)->axes.axes_visible[i] == TRUE)
-         {
-           if((foo[i]=malloc(3*(sizeof(char))))==NULL){
-             strcpy(error_message,"No memory left for allocating temporary axes_visible");return -1;}
-           strcpy(foo[i],"on");
-         }
-       else
-         {
-           if((foo[i]=malloc(4*(sizeof(char))))==NULL){
-             strcpy(error_message,"No memory left for allocating temporary axes_visible");return -1;}
-           strcpy(foo[i],"off");
-         }    
-
-      CreateVarFromPtr(Rhs+1,"S",&numrow,&numcol,foo);
-        
-      /* free the foo */
-      for ( i = 0 ; i < numcol ; i++ )
-      {
-        FREE( foo[i] ) ;
-      }
-      FREE( foo ) ;
-      
-    }
-    else
-      {strcpy(error_message,"axes_visible property does not exist for this handle");return -1;}
-  }
-  else if (strcmp(marker,"hiddencolor") == 0) 
-    {
-      if (sciGetEntityType (pobj) == SCI_SUBWIN) {
-       numrow   = 1;numcol   = 1;
-       CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-       *stk(outindex) = pSUBWIN_FEATURE (pobj)->hiddencolor;
-      }
-      else if (sciGetEntityType (pobj) == SCI_SURFACE) {
-       numrow   = 1;numcol   = 1;
-       CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-       *stk(outindex) = pSURFACE_FEATURE (pobj)->hiddencolor;
-      }
-      else{
-       strcpy(error_message,"hiddencolor property does not exist for this handle");
-       return -1;
-      }
-    }
-  /**DJ.Abdemouche 2003**/
-  else if (strcmp(marker,"isoview") == 0) {
-    if (sciGetEntityType (pobj) == SCI_SUBWIN) {
-      if (pSUBWIN_FEATURE (pobj)->isoview) {
-       numrow   = 1;
-       numcol   = 2;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"on", numrow*numcol); 
-      }
-      else {
-       numrow   = 1;
-       numcol   = 3;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"off", numrow*numcol);  
-      }
-    }
-    else
-      {strcpy(error_message,"isoview property does not exist for this handle");return -1;}
-  }
-  else if (strcmp(marker,"cube_scaling") == 0) {
-    if (sciGetEntityType (pobj) == SCI_SUBWIN) {
-      if (pSUBWIN_FEATURE (pobj)->cube_scaling) {
-       numrow   = 1;
-       numcol   = 2;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"on", numrow*numcol); 
-      }
-      else {
-       numrow   = 1;
-       numcol   = 3;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       strncpy(cstk(outindex),"off", numrow*numcol);  
-      }
-    }
-    else
-      {strcpy(error_message,"cube_scaling property does not exist for this handle");return -1;}
-  }
-  /**************** SEGS  *********************/
-  else if (strcmp(marker,"arrow_size") == 0)
-    {    
-      if (sciGetEntityType (pobj) == SCI_SEGS) {
-       numrow = 1;numcol = 1;
-       CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-       *stk(outindex) = pSEGS_FEATURE (pobj)->arrowsize ;
-      }
-      else
-       {strcpy(error_message,"arrow_size property does not exist for this handle");return -1;}
-    } 
-  else if ((strcmp(marker,"segs_color") == 0) && (sciGetEntityType (pobj) == SCI_SEGS))
-    {
-      if (pSEGS_FEATURE (pobj)->ptype == 0)
-       {
-         numrow = 1;numcol = (pSEGS_FEATURE (pobj)->Nbr1)/2;
-         CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-         for (i=0;i<numcol;i++) {
-           stk(outindex)[i] = pSEGS_FEATURE (pobj)->pstyle[i] ;
-         }
-       }
-    }  
-  else if ((strcmp(marker,"colored") == 0) && (sciGetEntityType (pobj) == SCI_SEGS)){
-    if (pSEGS_FEATURE (pobj)->ptype != 0)
-      { 
-       if (pSEGS_FEATURE (pobj)->typeofchamp == 1) {
-         numrow   = 1;
-         numcol   = 2;
-         CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-         strncpy(cstk(outindex),"on", numrow*numcol); 
-       }
-       else {  
-         numrow   = 1;
-         numcol   = 3;
-         CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-         strncpy(cstk(outindex),"off", numrow*numcol); 
-       }
-      }
-    else
-      {strcpy(error_message,"colored property does not exist for Segs");return -1;} 
-  }
-  /**************** Matplot Grayplot *********************/
-  else if (strcmp(marker,"data_mapping") == 0) {
-    if (sciGetEntityType (pobj) == SCI_GRAYPLOT) {
-      numrow = 1;numcol = 6;
-      CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-      strcpy(cstk(outindex),pGRAYPLOT_FEATURE (pobj)->datamapping);
-    }
-    else
-      {strcpy(error_message,"data_mapping property does not exist for this handle");return -1;}
-  } 
-  /**************** Surface *******************************/
-  else if (strcmp(marker,"rotation_angles") == 0) {
-    /* DJ.A 2003 */
-    if (sciGetEntityType (pobj) == SCI_SUBWIN) {
-      numrow = 1;numcol = 2;
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-      *stk(outindex)=pSUBWIN_FEATURE (pobj)->alpha;
-      *stk(outindex+1)=pSUBWIN_FEATURE (pobj)->theta;
-    }
-    else
-      {strcpy(error_message,"rotation_angle property does not exist for this handle");return -1;}
-  } 
-  else if (strcmp(marker,"color_mode") == 0) {/*DJ.A merge*/
-    if (sciGetEntityType (pobj) == SCI_SURFACE) {
-      numrow = 1;numcol = 1;
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-      *stk(outindex) = pSURFACE_FEATURE (pobj)->flag[0];
-    }
-    else
-      {strcpy(error_message,"color_mode property does not exist for this handle");return -1;}
-  } 
-  else if (strcmp(marker,"color_flag") == 0) {
-    if (sciGetEntityType (pobj) == SCI_SURFACE) {
-      numrow = 1;numcol = 1;
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-      stk(outindex)[0] = pSURFACE_FEATURE (pobj)->flagcolor;
-    }
-    else
-      {strcpy(error_message,"color_flag property does not exist for this handle");return -1;}
-  } 
-  else if (strcmp(marker,"cdata_mapping") == 0) {
-    if (sciGetEntityType (pobj) == SCI_SURFACE )
-    {
-      if (pSURFACE_FEATURE (pobj)->typeof3d==SCI_FAC3D)
-      {
-       numrow   = 1;numcol   = 6;
-       CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-       if(pSURFACE_FEATURE (pobj)->cdatamapping == 0)
-        { /* scaled mode */
-         strncpy(cstk(outindex),"scaled", numrow*numcol);
-        } 
-       else if( pSURFACE_FEATURE (pobj)->cdatamapping == 1)
-        { /* direct mode */
-         strncpy(cstk(outindex),"direct", numrow*numcol);
-        }
-      }
-      else
-      {
-        strcpy(error_message,"cdata_mapping property only exists for Fac3d surfaces.");
-        return -1;
-      }
-    }
-    else
-    {
-      strcpy(error_message,"cdata_mapping property does not exist for this handle.");
-      return -1;
-    }
-  }
-
-  else if (strcmp(marker,"surface_color") == 0) {
-    if (sciGetEntityType (pobj) == SCI_SURFACE) { 
-      if (pSURFACE_FEATURE (pobj)->typeof3d == SCI_PARAM3D1) {
-       numrow=1;
-       numcol=pSURFACE_FEATURE (pobj)->dimzy;
-       CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-       for (i=0;i<numcol*numrow;i++) 
-         stk(outindex)[i] = (double)pSURFACE_FEATURE (pobj)->zcol[i];
-      }
-      else if (pSURFACE_FEATURE (pobj)->typeof3d == SCI_FAC3D) {
-       if (pSURFACE_FEATURE (pobj)->flagcolor==2 || pSURFACE_FEATURE (pobj)->flagcolor==4) {
-         numrow=1;
-         numcol=pSURFACE_FEATURE (pobj)->dimzy;
-         CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-         for (i=0;i<numcol*numrow;i++) 
-           stk(outindex)[i] = (double)pSURFACE_FEATURE (pobj)->zcol[i];
-       }
-       else if  (pSURFACE_FEATURE (pobj)->flagcolor==3) {
-         numrow=pSURFACE_FEATURE (pobj)->dimzx;
-         numcol=pSURFACE_FEATURE (pobj)->dimzy;
-         CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-         for (i=0;i<numcol*numrow;i++) 
-           stk(outindex)[i] = (double)pSURFACE_FEATURE (pobj)->zcol[i];
-       }
-       else {
-         numrow=0; numcol=0;
-         CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-       }
-
-      }
-    }
-    else
-      {strcpy(error_message,"surface_color property does not exist for this handle");return -1;}
-  } 
-  /*  ===================================== FEC ======================================== */
-  else if (strcmp(marker,"triangles") == 0) {
-    if (sciGetEntityType (pobj) == SCI_FEC) { 
-      numrow=pFEC_FEATURE (pobj)->Ntr;
-      numcol=5;
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-      for (i=0;i<numcol*numrow;i++) 
-       stk(outindex)[i] = (double)pFEC_FEATURE (pobj)->pnoeud[i];
-    }
-    else
-      {strcpy(error_message,"triangles property does not exist for this handle");return -1;}
-  }
-  else if (strcmp(marker,"z_bounds") == 0) {
-    if (sciGetEntityType (pobj) == SCI_FEC) { 
-      numrow=1;
-      numcol=2;
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-      for (i=0;i<2;i++) 
-       stk(outindex)[i] = (double)pFEC_FEATURE (pobj)->zminmax[i];
-    }
-    else
-      {strcpy(error_message,"z_bounds property does not exist for this handle");return -1;}
-
-  }
-  else if (strcmp(marker,"user_data") == 0) {
-    /* user_data */
-    int *size_ptr, data_size;
-    int **user_data_ptr,*data_ptr;
-    sciGetPointerToUserData (pobj,&user_data_ptr, &size_ptr);
-
-    data_ptr=*user_data_ptr;
-    data_size=0;
-    if (*user_data_ptr==NULL||*size_ptr==0) {
-      numrow=0;
-      numcol=0;
-      CreateVar(Rhs+1,"d",&numrow,&numcol,&outindex);
-    }
-    else {
-      data_size=(int)((*size_ptr+1)/2);
-      SetWorkSize(Rhs+1,&data_size);
-      data_ptr=GetData(Rhs+1);
-      memcpy(data_ptr,*user_data_ptr,(*size_ptr)*sizeof (int));
-    }
-  }
-  else if (strcmp(marker,"handle_visible") == 0)
-  {
-         if (sciGetEntityType (pobj) == SCI_UIMENU)
-         {
-               if (GetHandleVisibilityOnUimenu((sciPointObj *)pobj))
-               {
-                 numrow   = 1;
-                 numcol   = 2;
-                 CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-                 strncpy(cstk(outindex),"on", numrow*numcol);
-               }
-               else 
-               {
-                 numrow   = 1;
-                 numcol   = 3;
-                 CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-                 strncpy(cstk(outindex),"off", numrow*numcol);
-               }
-        }
-         else
-         {
-                 strcpy(error_message,"handle_visible property does not exist for this handle");
-                 return -1;
-         }
-
-  }
-  else if (strcmp(marker,"callback_type") == 0)
-  {
-         if (sciGetEntityType (pobj) == SCI_UIMENU)
-         {
-                 char CallbackType[16];
-                 switch (pUIMENU_FEATURE(pobj)->CallbackType)
-                 {
-                       case -1:
-                               strcpy(CallbackType,"disable");
-                       break;
-                       case 0:
-                               strcpy(CallbackType,"string");
-                       break;
-                       case 1:
-                               strcpy(CallbackType,"C");
-                       break;
-                       case 2:
-                               strcpy(CallbackType,"internal");
-                       break;
-                       case 3:
-                               strcpy(CallbackType,"addmenu");
-                       break;
-                       default:
-                               strcpy(error_message,"unknow callbak type");
-                               return -1;
-                       break;
-                 }
-
-                 numrow   = 1;
-                 numcol   = strlen(CallbackType);
-                 CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-                 strncpy(cstk(outindex),CallbackType, numrow*numcol);
-
-         }
-         else
-         {
-                 strcpy(error_message,"callback_type property does not exist for this handle");
-                 return -1;
-         }
-  }
-  else if (strcmp(marker,"menu_enable") == 0)
-  {
-         if (sciGetEntityType (pobj) == SCI_UIMENU)
-         {
-               if (pUIMENU_FEATURE(pobj)->Enable == TRUE)
-                {
-                        numrow   = 1;
-                        numcol   = 2;
-                        CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-                        strncpy(cstk(outindex),"on", numrow*numcol);
-                }
-                else 
-                {
-                        numrow   = 1;
-                        numcol   = 3;
-                        CreateVar(Rhs+1,"c",&numrow,&numcol,&outindex);
-                        strncpy(cstk(outindex),"off", numrow*numcol);
-                }
-         }
-         else
-         {
-                 strcpy(error_message,"menu_enable property does not exist for this handle");
-                 return -1;
-         }
-  }
-  else if ( strcmp(marker,"hidden_axis_color") == 0 )
-  {
-    if ( sciGetEntityType (pobj) == SCI_SUBWIN )
-    {
-      sciReturnInt( pSUBWIN_FEATURE(pobj)->axes.hiddenAxisColor ) ;
-    }
-    else
-    {
-      strcpy(error_message,"hidden_axis_color property does not exist for this handle");
-      return -1;
-    }
-  }
-  else 
-    {sprintf(error_message,"Unknown  property %s",marker);return -1;}
-
-  return 0;
-}
-
-/*-----------------------------------------------------------------------------------*/
-/* F.Leray 29.04.05 */
-/* the grayplot data is now given as a tlist (like for surface and champ objects) */
-int getgrayplotdata(sciPointObj *pobj)
-{
-  char *variable_tlist[] = {"grayplotdata","x","y","z"};
-  int m_variable_tlist = 0;
-  int n_variable_tlist = 0;
-  /*int n_variable_tlist = 1; */
-
-  int  numrow, numcol,l;
-  /*   int nx,ny; */
-
-  /* F.Leray debug*/
-  sciGrayplot * ppgrayplot = pGRAYPLOT_FEATURE (pobj);
-
-  m_variable_tlist = 1;
-  n_variable_tlist = 4;
-
-  /* Add 'variable' tlist items to stack */
-  CreateVar(Rhs+1,"t",&n_variable_tlist,&m_variable_tlist,&l);
-  CreateListVarFromPtr(Rhs+1, 1, "S", &m_variable_tlist, &n_variable_tlist, variable_tlist);
-
-  numrow = ppgrayplot->nx;
-  numcol = 1;
-  CreateListVarFromPtr(Rhs+1, 2, "d", &numrow,&numcol, &ppgrayplot->pvecx);
-
-  numrow = ppgrayplot->ny;
-  numcol = 1;
-  CreateListVarFromPtr(Rhs+1, 3, "d", &numrow,&numcol, &ppgrayplot->pvecy);
-
-  numrow = ppgrayplot->nx;
-  numcol = ppgrayplot->ny;
-
-  CreateListVarFromPtr(Rhs+1, 4, "d", &numrow,&numcol, &ppgrayplot->pvecz);
-
-  return 0;
-}
-/*-----------------------------------------------------------------------------------*/
-/* F.Leray 29.04.05 */
-/* the champ data is now given as a tlist (like for surface objects) */
-int getchampdata(sciPointObj *pobj)
-{
-  char *variable_tlist[] = {"champdata","x","y","fx","fy"};
-  int m_variable_tlist = 0;
-  int n_variable_tlist = 0;
-  /*int n_variable_tlist = 1; */
-
-  int  numrow, numcol,l;
-
-  /* F.Leray debug*/
-  sciSegs * ppsegs = pSEGS_FEATURE (pobj);
-
-  m_variable_tlist = 1;
-  n_variable_tlist = 5;
-
-  /* Add 'variable' tlist items to stack */
-  CreateVar(Rhs+1,"t",&n_variable_tlist,&m_variable_tlist,&l);
-  CreateListVarFromPtr(Rhs+1, 1, "S", &m_variable_tlist, &n_variable_tlist, variable_tlist);
-
-  numrow = ppsegs->Nbr1;
-  numcol = 1;
-  CreateListVarFromPtr(Rhs+1, 2, "d", &numrow,&numcol, &ppsegs->vx);
-
-  numrow = ppsegs->Nbr2;
-  numcol = 1;
-  CreateListVarFromPtr(Rhs+1, 3, "d", &numrow,&numcol, &ppsegs->vy);
-
-  numrow = ppsegs->Nbr1;
-  numcol = ppsegs->Nbr2;
-  CreateListVarFromPtr(Rhs+1, 4, "d", &numrow,&numcol, &ppsegs->vfx);
-
-  /* same numrow and numcol */
-  CreateListVarFromPtr(Rhs+1, 5, "d", &numrow,&numcol, &ppsegs->vfy);
-
-  return 0;
-}
-/*-----------------------------------------------------------------------------------*/
-int get3ddata(sciPointObj *pobj)
-{
-  char *variable_tlist_color[] = {"3d","x","y","z","color"};
-  char *variable_tlist[] = {"3d","x","y","z"};
-  int m_variable_tlist = 0;
-  int n_variable_tlist = 0;
-  /*int n_variable_tlist = 1; */
-
-  int flag_c;
-  /*int one = 1;
-    int four = 4;*/
-  int  numrow, numcol,l;
-
-  /* F.Leray debug*/
-  /*sciSurface * psurf = pSURFACE_FEATURE (pobj); */
-
-  /* tests a faire sur presence et taille color */
-  flag_c = pSURFACE_FEATURE (pobj)->m3n;
-  if(flag_c !=0)
-    {
-      m_variable_tlist = 1;
-      n_variable_tlist = 5;
-
-      if(pSURFACE_FEATURE (pobj)->typeof3d == SCI_FAC3D)
-       {
-         numrow = pSURFACE_FEATURE (pobj)->m1;
-         numcol = pSURFACE_FEATURE (pobj)->n1; /* Normaly here m1=m2=m3 and n1=n2=n3*/
-         
-         /* Add 'variable' tlist items to stack */
-         CreateVar(Rhs+1,"t",&n_variable_tlist,&m_variable_tlist,&l);
-         CreateListVarFromPtr(Rhs+1, 1, "S", &m_variable_tlist, &n_variable_tlist, variable_tlist_color);
-
-
-         numrow = pSURFACE_FEATURE (pobj)->m1;
-         numcol = pSURFACE_FEATURE (pobj)->n1; /* Normaly here m1=m2=m3 and n1=n2=n3*/
-         CreateListVarFromPtr(Rhs+1, 2, "d", &numrow,&numcol, &pSURFACE_FEATURE (pobj)->pvecx);
-         CreateListVarFromPtr(Rhs+1, 3, "d", &numrow,&numcol, &pSURFACE_FEATURE (pobj)->pvecy);
-         CreateListVarFromPtr(Rhs+1, 4, "d", &numrow,&numcol, &pSURFACE_FEATURE (pobj)->pvecz);
-
-         numrow = pSURFACE_FEATURE (pobj)->m3n;
-         numcol = pSURFACE_FEATURE (pobj)->n3n;
-
-         /* F.Leray 24.03.04 Replaced by: */
-         CreateListVarFromPtr(Rhs+1, 5, "d", &numrow,&numcol, &pSURFACE_FEATURE (pobj)->inputCMoV);
-
-       }
-      else if(pSURFACE_FEATURE (pobj)->typeof3d == SCI_PLOT3D)
-       {
-         /* Add 'variable' tlist items to stack */
-         CreateVar(Rhs+1,"t",&n_variable_tlist,&m_variable_tlist,&l);
-         CreateListVarFromPtr(Rhs+1, 1, "S", &m_variable_tlist, &n_variable_tlist, variable_tlist_color);
-
-         numrow = pSURFACE_FEATURE (pobj)->m1;
-         numcol = pSURFACE_FEATURE (pobj)->n1; /* but here m1!=m2!=m3 and n1!=n2!=n3*/
-         CreateListVarFromPtr(Rhs+1, 2, "d", &numrow,&numcol, &pSURFACE_FEATURE (pobj)->pvecx);
-
-         numrow = pSURFACE_FEATURE (pobj)->m2;
-         numcol = pSURFACE_FEATURE (pobj)->n2;
-         CreateListVarFromPtr(Rhs+1, 3, "d", &numrow,&numcol, &pSURFACE_FEATURE (pobj)->pvecy);
-
-         numrow = pSURFACE_FEATURE (pobj)->m3;
-         numcol = pSURFACE_FEATURE (pobj)->n3;
-         CreateListVarFromPtr(Rhs+1, 4, "d", &numrow,&numcol, &pSURFACE_FEATURE (pobj)->pvecz);
-
-         numrow = pSURFACE_FEATURE (pobj)->m3n;
-         numcol = pSURFACE_FEATURE (pobj)->n3n;
-
-
-         /* F.Leray 24.03.04 Replaced by: */
-         CreateListVarFromPtr(Rhs+1, 5, "d", &numrow,&numcol, &pSURFACE_FEATURE (pobj)->inputCMoV);
-
-       }
-    }
-  else /* no color provided in input*/
-    {
-      m_variable_tlist = 1;
-      n_variable_tlist = 4;
-
-      if(pSURFACE_FEATURE (pobj)->typeof3d == SCI_FAC3D)
-       {
-         numrow = pSURFACE_FEATURE (pobj)->m1;
-         numcol = pSURFACE_FEATURE (pobj)->n1; /* Normaly here m1=m2=m3 and n1=n2=n3 */
-         /*
-           CreateVarFromPtr(Rhs+1, "d", &numrow,&numcol, &pSURFACE_FEATURE (pobj)->pvecx);
-           CreateVarFromPtr(Rhs+1, "d", &numrow,&numcol, &pSURFACE_FEATURE (pobj)->pvecz);
-           CreateVarFromPtr(Rhs+1, "S", &m_variable_tlist, &n_variable_tlist, variable_tlist);
-         */
-
-         /* Add 'variable' tlist items to stack */
-         CreateVar(Rhs+1,"t",&n_variable_tlist,&m_variable_tlist,&l);
-         CreateListVarFromPtr(Rhs+1, 1, "S", &m_variable_tlist, &n_variable_tlist, variable_tlist);
-
-         numrow = pSURFACE_FEATURE (pobj)->m1;
-         numcol = pSURFACE_FEATURE (pobj)->n1; /* Normaly here m1=m2=m3 and n1=n2=n3 */
-         CreateListVarFromPtr(Rhs+1, 2, "d", &numrow,&numcol, &pSURFACE_FEATURE (pobj)->pvecx);
-         CreateListVarFromPtr(Rhs+1, 3, "d", &numrow,&numcol, &pSURFACE_FEATURE (pobj)->pvecy);
-         CreateListVarFromPtr(Rhs+1, 4, "d", &numrow,&numcol, &pSURFACE_FEATURE (pobj)->pvecz);
-       }
-      else if(pSURFACE_FEATURE (pobj)->typeof3d == SCI_PLOT3D)
-       {
-         /* Add 'variable' tlist items to stack */
-         CreateVar(Rhs+1,"t",&n_variable_tlist,&m_variable_tlist,&l);
-         CreateListVarFromPtr(Rhs+1, 1, "S", &m_variable_tlist, &n_variable_tlist, variable_tlist);
-
-         numrow = pSURFACE_FEATURE (pobj)->m1;
-         numcol = pSURFACE_FEATURE (pobj)->n1; /* but here m1!=m2!=m3 and n1!=n2!=n3 */
-         CreateListVarFromPtr(Rhs+1, 2, "d", &numrow,&numcol, &pSURFACE_FEATURE (pobj)->pvecx);
-
-         numrow = pSURFACE_FEATURE (pobj)->m2;
-         numcol = pSURFACE_FEATURE (pobj)->n2;
-         CreateListVarFromPtr(Rhs+1, 3, "d", &numrow,&numcol, &pSURFACE_FEATURE (pobj)->pvecy);
-
-         numrow = pSURFACE_FEATURE (pobj)->m3;
-         numcol = pSURFACE_FEATURE (pobj)->n3;
-         CreateListVarFromPtr(Rhs+1, 4, "d", &numrow,&numcol, &pSURFACE_FEATURE (pobj)->pvecz);
-       }
-    }
-
-
-  return 0;
-}
-/*-----------------------------------------------------------------------------------*/
-
-int getticks(char * xyztick, sciPointObj* psubwin)
-{
-  int i,nbtics;
-  char c_format[5]; 
-  char **  ticklabel = (char**) NULL;
-  sciSubWindow * ppsubwin = pSUBWIN_FEATURE(psubwin);
-  double *tmp= NULL;
-
-  /* x */
-  if(strcmp(xyztick,"x_ticks")==0)
-    {
-      /* compute the c_format used for convert double to char (for labels) */
-      ChooseGoodFormat(c_format,ppsubwin->logflags[0],ppsubwin->axes.xgrads,ppsubwin->axes.nxgrads);
-
-      if(ppsubwin->axes.auto_ticks[0] == TRUE)
-       {
-         nbtics = ppsubwin->axes.nxgrads;
-
-         if((ticklabel=(char **)MALLOC(nbtics*sizeof(char *)))==NULL){
-           sciprint("No more place for allocating ticklabel");
-           return -1;
-         }
-
-         tmp = ReBuildTicksLog2Lin(ppsubwin->logflags[0],nbtics,ppsubwin->axes.xgrads);
-
-         for(i=0;i<nbtics;i++)
-           {  
-             char foo[100];
-
-             sprintf(foo,c_format,tmp[i]);
-
-             if((ticklabel[i]=(char *)MALLOC((strlen(foo)+1)*sizeof(char )))==NULL){
-               sciprint("No more place for allocating ticklabel");
-               return -1;
-             }
-
-             strcpy(ticklabel[i],foo);
-           }
-
-         /* construction de la tlist */
-
-         BuildTListForTicks(tmp,ticklabel, nbtics);
-          
-          /* free ticklabel */
-          for ( i = 0 ; i < nbtics ; i++ )
-          {
-            FREE( ticklabel[i] ) ;
-          }
-         FREE(ticklabel); ticklabel = (char **) NULL;
-         FREE(tmp); tmp = (double *) NULL;
-       }
-      else /* we display the x tics specified by the user*/
-       {
-         nbtics = ppsubwin->axes.u_nxgrads;
-
-         tmp = ReBuildTicksLog2Lin(ppsubwin->logflags[0],nbtics,ppsubwin->axes.u_xgrads);
-
-
-         BuildTListForTicks(tmp,ppsubwin->axes.u_xlabels, nbtics);
-
-         FREE(tmp); tmp = (double *) NULL;
-       }
-    }
-
-  /* y */
-  else if(strcmp(xyztick,"y_ticks")==0)
-    {
-      /* compute the c_format used for convert double to char (for labels) */
-      ChooseGoodFormat(c_format,ppsubwin->logflags[1],ppsubwin->axes.ygrads,ppsubwin->axes.nygrads);
-
-      if(ppsubwin->axes.auto_ticks[1] == TRUE)
-       {
-         nbtics = ppsubwin->axes.nygrads;
-
-         if((ticklabel=(char **)MALLOC(nbtics*sizeof(char *)))==NULL){
-           sciprint("No more place for allocating ticklabel");
-           return -1;
-         }
-
-         tmp = ReBuildTicksLog2Lin(ppsubwin->logflags[1],nbtics,ppsubwin->axes.ygrads);
-
-         for(i=0;i<nbtics;i++)
-           {  
-             char foo[100];
-
-             sprintf(foo,c_format,tmp[i]);
-
-             if((ticklabel[i]=(char *)MALLOC((strlen(foo)+1)*sizeof(char )))==NULL){
-               sciprint("No more place for allocating ticklabel");
-               return -1;
-             }
-
-             strcpy(ticklabel[i],foo);
-           }
-
-         /* construction de la tlist */
-         BuildTListForTicks(tmp,ticklabel, nbtics);
-
-          /* free ticklabel */
-          for ( i = 0 ; i < nbtics ; i++ )
-          {
-            FREE( ticklabel[i] ) ;
-          }
-         FREE(ticklabel); ticklabel = (char **) NULL;
-         FREE(tmp); tmp = (double *) NULL;
-       }
-      else /* we display the y tics specified by the user*/
-       {
-         nbtics = ppsubwin->axes.u_nygrads;
-
-         tmp = ReBuildTicksLog2Lin(ppsubwin->logflags[1],nbtics,ppsubwin->axes.u_ygrads);
-
-         BuildTListForTicks(tmp,ppsubwin->axes.u_ylabels, nbtics);
-
-         FREE(tmp); tmp = (double *) NULL;
-       }
-    }
-
-  /* z */
-  else if(strcmp(xyztick,"z_ticks")==0)
-    {
-      /*     int test_tmp = (ppsubwin->axes.auto_ticks[2] == TRUE)?ppsubwin->axes.nzgrads:ppsubwin->axes.u_nzgrads; */
-
-      /*       if(test_tmp == 0)  */
-      /*       { */
-      /*         int zero = 0; */
-      /*         BuildTListForTicks(NULL,NULL, zero); */
-
-
-      /*         return 0; */
-      /*       } */
-      /* compute the c_format used for convert double to char (for labels) */
-
-      ChooseGoodFormat(c_format,ppsubwin->logflags[2],ppsubwin->axes.zgrads,ppsubwin->axes.nzgrads);
-
-      if(ppsubwin->axes.auto_ticks[2] == TRUE)
-       {
-         nbtics = ppsubwin->axes.nzgrads;
-
-         if((ticklabel=(char **)MALLOC(nbtics*sizeof(char *)))==NULL){
-           sciprint("No more place for allocating ticklabel");
-           return -1;
-         }
-
-
-         tmp = ReBuildTicksLog2Lin(ppsubwin->logflags[2],nbtics,ppsubwin->axes.zgrads);
-
-
-         for(i=0;i<nbtics;i++)
-           {  
-             char foo[100];
-
-             sprintf(foo,c_format,tmp[i]);
-
-             if((ticklabel[i]=(char *)MALLOC((strlen(foo)+1)*sizeof(char )))==NULL){
-               sciprint("No more place for allocating ticklabel");
-               return -1;
-             }
-
-             strcpy(ticklabel[i],foo);
-           }
-
-         /* construction de la tlist */
-         BuildTListForTicks(tmp,ticklabel, nbtics);
-
-          /* free ticklabel */
-          for ( i = 0 ; i < nbtics ; i++ )
-          {
-            FREE( ticklabel[i] ) ;
-          }
-         FREE(ticklabel); ticklabel = (char **) NULL;
-         FREE(tmp); tmp = (double *) NULL;
-       }
-      else /* we display the z tics specified by the user*/
-       {
-         nbtics = ppsubwin->axes.u_nzgrads;
-
-         tmp = ReBuildTicksLog2Lin(ppsubwin->logflags[2],nbtics,ppsubwin->axes.u_zgrads);
-
-
-         BuildTListForTicks(tmp,ppsubwin->axes.u_zlabels, nbtics);
-
-         FREE(tmp); tmp = (double *) NULL;
-       }
-    }
-  else
-    {
-      sciprint("Impossible case xyztick must be equal to x_, y_ or z_tick");
-      return -1;
-    }
-
-  return 0;
-}
-/*-----------------------------------------------------------------------------------*/
-/* compute the c_format used for convert double to char (for labels) */
-int ChooseGoodFormat(char * c_format,char logflag, double *_grads,int n_grads)
-{
-  int last_index = n_grads - 1;
-
-  if(logflag == 'l')
-    {
-      ChoixFormatE(c_format,
-                  exp10(_grads[0]),
-                  exp10(_grads[last_index]),
-                  (( exp10(_grads[last_index]))-( exp10(_grads[0])))/(last_index));
-    }
-  else
-    {
-      ChoixFormatE(c_format,
-                  _grads[0],
-                  _grads[last_index],
-                  ((_grads[last_index])-(_grads[0]))/(last_index)); /* Adding F.Leray 06.05.04 */
-    }
-
-  return 0;
-
-}
-/*-----------------------------------------------------------------------------------*/
-double * ReBuildTicksLog2Lin(char logflag, int nbtics, double *grads)
-{
-  int flag_limit = 0,i;
-  double * tmp = NULL;
-
-  if ( nbtics <= 0 || ( tmp = MALLOC( nbtics * sizeof(double) ) ) == NULL )
-  {
-    return NULL ;
-  }
-
-  if(logflag=='l')
-    {
-      for(i=0;i<nbtics;i++)
-       {
-         flag_limit = 0;
-
-         /* 10^(-307) == -Inf */
-         flag_limit = flag_limit + ((grads[i])<-307)?-1:0;
-         /* 10^(+307) == +Inf */
-         flag_limit = flag_limit + ((grads[i])>307)?1:0;
-
-         if( flag_limit == -1)
-           {
-             tmp[i] = 0.;
-           }
-         else if ( flag_limit == 1)
-           {
-             tmp[i] = exp10(307);
-           }
-         else  if ( flag_limit == 0) /* general case */
-           {
-             tmp[i]=exp10(grads[i]);
-           }
-       }
-    }
-  else
-    {
-      for(i=0;i<nbtics;i++)
-       tmp[i] = grads[i];
-    }
-
-  return tmp;
-}
-/*-----------------------------------------------------------------------------------*/
-int BuildTListForTicks(double * locations, char ** labels, int nbtics)
-{
-  int un=1, trois=3,l;
-  char *variable_tlist[] = {"ticks","locations","labels"};
-
-  CreateVar(Rhs+1,"t",&trois,&un,&l);
-  CreateListVarFromPtr(Rhs+1, 1, "S", &un, &trois, variable_tlist);
-
-  CreateListVarFromPtr(Rhs+1, 2, "d", &nbtics, &un, &locations);
-  CreateListVarFromPtr(Rhs+1, 3, "S", &nbtics, &un, labels);
-
-  return 0;
-}
-/*-----------------------------------------------------------------------------------*/
-
-int sciReturnString( const char * value )
-{
-  int numRow   = 1 ;
-  int numCol   = strlen( value ) ;
-  int outIndex = 0 ;
-  CreateVar(Rhs+1,"c",&numRow,&numCol,&outIndex);
-  strncpy(cstk(outIndex),value, numCol);
-
-  return  0 ;
-}
-/*-----------------------------------------------------------------------------------*/
-
-int sciReturnInt( int value )
-{
-
-  int numRow   = 1 ;
-  int numCol   = 1 ;
-  int outIndex = 0 ;
-  CreateVar( Rhs+1, "i", &numRow, &numCol, &outIndex ) ;
-  *istk(outIndex) = value ;
-  
-  return 0 ;
-}
-
-/*-----------------------------------------------------------------------------------*/
-
-int sciReturnRowVector( double values[], int nbValues )
-{
-  int numRow   = 1        ;
-  int numCol   = nbValues ;
-  int outIndex = 0        ;
-  int i ;
-  CreateVar(Rhs+1,"d",&numRow,&numCol,&outIndex) ;
-  for ( i = 0 ; i < nbValues ; i++ )
-  {
-    stk(outIndex)[i] = values[i] ;
-  }
-  return 0 ;
-}
-
-/*-----------------------------------------------------------------------------------*/
diff --git a/scilab/modules/graphics/sci_gateway/intgset.c b/scilab/modules/graphics/sci_gateway/intgset.c
deleted file mode 100644 (file)
index c282dc4..0000000
+++ /dev/null
@@ -1,3863 +0,0 @@
-/*-----------------------------------------------------------------------------------*/
-/* Copyright (C) 1998-2000 INRIA/Enpc */
-/* Fabrice LERAY INRIA 2005 */
-/* Allan CORNET INRIA 2005 */
-/*-----------------------------------------------------------------------------------*/
-#include "intgset.h"
-/*-----------------------------------------------------------------------------------*/
-#include "bcg.h"
-#include "Graphics.h" 
-
-#include "stack-c.h"
-
-#include "CloneObjects.h"
-#include "Interaction.h"
-#include "SetProperty.h"
-#include "GetProperty.h"
-#include "InitObjects.h"
-#include "DrawObjects.h"
-
-/* Constructors should NOT be called at this level (not inside matdes.c) */
-#include "BuildObjects.h"
-#include "DestroyObjects.h"
-
-#include "intcommongraphics.h"
-
-
-#include "MALLOC.h" /* MALLOC */
-/*-----------------------------------------------------------------------------------*/
-extern sciPointObj *pfiguremdl;
-extern sciPointObj *paxesmdl;
-extern int versionflag;
-/*-----------------------------------------------------------------------------------*/
-static char error_message[256];
-/*-----------------------------------------------------------------------------------*/
-int setticks(char * xyztick, sciPointObj* psubwin, int * ptrindex, int * numrow, int * numcol);
-int setchampdata(sciPointObj *pobj, int *value, int *numrow, int *numcol, char *fname);
-int setgrayplotdata(sciPointObj *pobj, int *value, int *numrow, int *numcol, char *fname);
-int set3ddata(sciPointObj *pobj, int value[4], int numrow[4], int numcol[4], int flagc, char *fname);
-int sciSet(sciPointObj *pobj, char *marker, int *value, int *numrow, int *numcol);
-int LinearScaling2Colormap(sciPointObj* pobj);
-char ** ReBuildUserTicks( char old_logflag, char new_logflag, double * u_xgrads, int *u_nxgrads, char ** u_xlabels);
-char ** CaseLogflagN2L(int * u_nxgrads, double *u_xgrads, char ** u_xlabels);
-/*-----------------------------------------------------------------------------------*/
-/*-----------------------------------------------------------
- * sciset(choice-name,x1,x2,x3,x4,x5)
- * or   xset()
- *-----------------------------------------------------------*/
-int gset(fname,fname_len)
-     char *fname;
-     unsigned long fname_len;
-{
-  integer m1,n1,l1,m2,n2,l2,numrow3,numcol3,l3,num,cur,na,verb=0;
-  unsigned long hdl; 
-  int lw,t2;
-  BOOL vis_save = FALSE ;
-  sciPointObj *pobj;
-
-  /* F.Leray Adding some tmp variable for SCI_SURFACE / data case*/
-  integer m3tl, n3tl, l3tl;
-  int numrow[4],i;
-  int numcol[4], lxyzcol[4];
-  int ptrindex[2];
-  int flagc = -1;
-  int setStatus = 0 ; /* after the call to sciSet get the status : 0 <=> OK,          */ 
-                      /*                                          -1 <=> Error,       */
-                      /*                                           1 <=> nothing done */
-
-  /* F.Leray Init. to 0*/
-  for(i=0;i<4;i++){
-    numrow[i] = 0;
-    numcol[i] = 0;
-    lxyzcol[i] = 0;
-  }
-  ptrindex[0] = 0;
-  ptrindex[1] = 0;
-
-
-  CheckRhs(2,3);
-  CheckLhs(0,1);
-  /*  set or create a graphic window */
-  switch(VarType(1)) 
-    {
-    case 1: /* tclsci handle */
-      lw = 1 + Top - Rhs;
-      C2F(overload)(&lw,"set",3);return 0;
-      return 0;
-      break;
-    case 9: /* first is a scalar argument so it's a gset(hdl,"command",[param]) */
-      /* F.Leray; INFO: case 9 is considered for a matrix of graphic handles*/
-      CheckRhs(3,3);
-      GetRhsVar(1,"h",&m1,&n1,&l1); /* Gets the Handle passed as argument */
-      if ( *hstk(l1) != sciGetHandle(pfiguremdl) && *hstk(l1) != sciGetHandle(paxesmdl)
-          &&  *hstk(l1) != sciGetHandle(pSUBWIN_FEATURE(paxesmdl)->mon_title)
-          &&  *hstk(l1) != sciGetHandle(pSUBWIN_FEATURE(paxesmdl)->mon_x_label)
-          &&  *hstk(l1) != sciGetHandle(pSUBWIN_FEATURE(paxesmdl)->mon_y_label) /* Addings here F.Leray 10.06.04 */
-          &&  *hstk(l1) != sciGetHandle(pSUBWIN_FEATURE(paxesmdl)->mon_z_label))
-       {
-         if (m1!=1||n1!=1) { 
-           lw = 1 + Top - Rhs;
-           C2F(overload)(&lw,"set",3);return 0;
-         }
-         if (version_flag() ==0)
-           hdl = (unsigned long)*hstk(l1); /* Puts the value of the Handle to hdl */ 
-         else
-           hdl = (unsigned long)0;
-         if (hdl == (unsigned long)0 )
-           pobj = (sciPointObj *) NULL;
-         else
-           pobj = sciGetPointerFromHandle(hdl);
-       } 
-      else 
-       {
-         hdl = (unsigned long)*hstk(l1);
-         pobj = sciGetPointerFromHandle(hdl);
-       }
-
-      GetRhsVar(2,"c",&m2,&n2,&l2); /* Gets the command name */  
-      if ( *hstk(l1) != sciGetHandle(pfiguremdl) && *hstk(l1) != sciGetHandle(paxesmdl)
-          &&  *hstk(l1) != sciGetHandle(pSUBWIN_FEATURE(paxesmdl)->mon_title)
-          &&  *hstk(l1) != sciGetHandle(pSUBWIN_FEATURE(paxesmdl)->mon_x_label)
-          &&  *hstk(l1) != sciGetHandle(pSUBWIN_FEATURE(paxesmdl)->mon_y_label) 
-          &&  *hstk(l1) != sciGetHandle(pSUBWIN_FEATURE(paxesmdl)->mon_z_label))
-       if ((strcmp(cstk(l2),"old_style") !=0) 
-           &&(strcmp(cstk(l2),"default_figure") !=0) 
-           && (strcmp(cstk(l2),"default_axes") !=0) ) SciWin();
-      if (strcmp(cstk(l2),"user_data")==0) {
-       /* set pobj->user_data*/
-       int *size_ptr, data_size;
-       int **user_data_ptr,*data_ptr;
-       int delete_user_data=0;
-
-       if (VarType(3) == 1) { 
-         GetRhsVar(3,"d",&numrow3,&numcol3,&l3);
-         if (numrow3==0||numcol3==0) delete_user_data=1;
-       }
-       else if (VarType(3) == 0) delete_user_data=1;
-
-       sciGetPointerToUserData (pobj,&user_data_ptr, &size_ptr);
-
-       if (delete_user_data) {
-         FREE(*user_data_ptr);
-         *user_data_ptr=NULL;
-         *size_ptr=0;
-       }
-       else {
-         data_ptr=GetData(3);
-         data_size=GetDataSize(3)*2;
-
-         if (*user_data_ptr==NULL) {
-           if ( (*user_data_ptr=(int *) MALLOC (data_size*sizeof (int))) == NULL) {
-             strcpy(error_message,"No memory left for allocating user_data");return -1;}
-           *size_ptr=data_size;
-           memcpy(*user_data_ptr,data_ptr,data_size*sizeof (int));
-         }
-         else if (*size_ptr==data_size) {
-           memcpy(*user_data_ptr,data_ptr,data_size*sizeof (int));
-         }
-         else {
-           FREE(*user_data_ptr);
-           if ( (*user_data_ptr=(int *) MALLOC (data_size * sizeof (int))) == NULL) {
-             strcpy(error_message,"No memory left for allocating user_data");return -1;}
-           *size_ptr=data_size;
-           memcpy(*user_data_ptr,data_ptr,data_size*sizeof(int));
-
-         }
-       }
-       return 0;
-      }
-      t2=sciType(cstk(l2),pobj);
-      if (t2<0) {
-       Scierror(999,"%s: unknown property name '%s' \r\n",fname,cstk(l2));
-       return 0;} 
-      if (VarType(3) != t2)
-      { 
-       Scierror(999,"%s: uncompatible values for property type  '%s' \r\n",fname,cstk(l2));
-       return 0;
-      } 
-      if ( VarType(3) == 1 )
-      {
-        GetRhsVar(3,"d",&numrow3,&numcol3,&l3) ;
-      }
-      else if ( VarType(3) == 9 )
-      {
-        GetRhsVar(3,"h",&numrow3,&numcol3,&l3);
-      }
-      else if ( VarType(3) == 10 ) 
-      { 
-        if (    strcmp( cstk(l2), "tics_labels"  ) != 0
-             && strcmp( cstk(l2), "auto_ticks"   ) != 0
-             && strcmp( cstk(l2), "axes_visible" ) != 0
-             && strcmp( cstk(l2), "axes_reverse" ) != 0
-             && strcmp( cstk(l2), "text"         ) != 0 )
-        {
-          GetRhsVar(3,"c",&numrow3,&numcol3,&l3);
-        } 
-       else
-        {
-         GetRhsVar(3,"S",&numrow3,&numcol3,&l3);
-        }
-      }
-      break;
-    case 10:/* first is a string argument so it's a gset("command",[param]) */ 
-      CheckRhs(2,2);
-      GetRhsVar(1,"c",&m2,&n2,&l2);
-      if (strcmp(cstk(l2),"default_figure") !=0 && strcmp(cstk(l2),"default_axes") !=0 )
-       {
-         if ((strcmp(cstk(l2),"old_style") ==0) || 
-             (strcmp(cstk(l2),"current_figure") ==0)) {
-           hdl = (unsigned long)0;
-           pobj = (sciPointObj *) NULL;
-         }
-         else
-           {
-             SciWin();
-             if (version_flag() == 0 )
-               if ((strcmp(cstk(l2),"zoom_") !=0) && 
-                   (strcmp(cstk(l2),"auto_") !=0) && 
-                   (strcmp(cstk(l2),"clip_box") !=0) )   
-                 hdl = (unsigned long ) sciGetHandle(sciGetCurrentObj ()) ; 
-               else  
-                 hdl = (unsigned long ) sciGetHandle(sciGetSelectedSubWin (sciGetCurrentFigure ()));
-             else
-               hdl = (unsigned long)0;
-             if (hdl == (unsigned long)0 )
-               pobj = (sciPointObj *) NULL;
-             else
-               pobj = sciGetPointerFromHandle(hdl);
-           }
-       }
-      else
-       {
-         hdl = (unsigned long)0;
-         pobj = (sciPointObj *) NULL;
-       }
-      t2=sciType(cstk(l2),pobj);
-      if (t2<0) {
-       Scierror(999,"%s: unknown property name '%s' \r\n",fname,cstk(l2));
-       return 0;} 
-      if (VarType(2) != t2)
-       if(strcmp(cstk(l2),"current_figure") != 0 && VarType(2) !=1 ){  
-         /* F.Leray : special unique case here set("current_figure", HANDLE);*/
-         /* HANDLE type is 9 */
-         Scierror(999,"%s: uncompatible values for property type  '%s' \r\n",fname,cstk(l2));
-         return 0;
-       }
-
-      if ( VarType(2) == 1 )
-      {
-        GetRhsVar(2,"d",&numrow3,&numcol3,&l3);
-      }
-      else if ( VarType(2) == 9 )
-      {
-        GetRhsVar(2,"h",&numrow3,&numcol3,&l3);
-      }
-      else if ( VarType(2) == 10 )
-      {
-       if (   strcmp( cstk(l2), "tics_labels"  ) != 0
-           && strcmp( cstk(l2), "auto_ticks"   ) != 0
-           && strcmp( cstk(l2), "axes_visible" ) != 0
-           && strcmp( cstk(l2), "axes_reverse" ) != 0
-               && strcmp( cstk(l2), "text"      ) != 0 )
-        {
-          GetRhsVar(2,"c",&numrow3,&numcol3,&l3);
-        } 
-       else
-        {
-         GetRhsVar(2,"S",&numrow3,&numcol3,&l3);
-        }
-      }
-      break;
-    default:
-      lw = 1 + Top - Rhs;
-      C2F(overload)(&lw,"set",3);return 0;
-      break;
-    }
-
-  if ( (hdl != (unsigned long)0) ) { /* F.Leray 16.03.04*/
-    pobj = sciGetPointerFromHandle(hdl);
-    if (pobj == (sciPointObj *)NULL) {
-      Scierror(999,"%s :the handle is not or no more valid\r\n",fname);
-      return 0;
-    }
-    vis_save=sciGetVisibility(pobj); /*used not to redraw the figure is object remains invisible SS 20.04.04*/
-    if(sciGetEntityType(pobj) == SCI_SUBWIN && (strcmp(cstk(l2),"x_ticks")==0 ||
-                                               strcmp(cstk(l2),"y_ticks")==0 ||
-                                               strcmp(cstk(l2),"z_ticks")==0))
-      {
-        char * sizeNotEqual = "Ticks location and label vectors must have the same size.\r\n" ;
-       
-        if(VarType(3) != 16)
-        {
-         Scierror(999,"%s: Incorrect argument, must be a Tlist!\r\n",fname);
-         return -1;
-       }
-
-       GetRhsVar(3,"t",&m3tl,&n3tl,&l3tl);
-       GetListRhsVar(3,2,"d",&numrow[0],&numcol[0],&ptrindex[0]);
-       
-        if ( numrow[0] == 0 && numcol[0] == 0 )
-        {
-          if ( ElementType( 3, 3 ) == 1 )
-          {
-            /* labels should be an empty vector */
-            GetListRhsVar(3,3,"d",&numrow[1],&numcol[1],&ptrindex[1]);
-            if ( numrow[1] != 0 || numcol[1] != 0 )
-            {
-              Scierror(999,sizeNotEqual) ;
-              return -1 ;
-            }
-          }
-          else
-          {
-            Scierror(999,sizeNotEqual) ;
-            return -1 ;
-          }
-        }
-        else
-        {
-          /* we should have the same number of ticks and locations */
-          GetListRhsVar(3,3,"S",&numrow[1],&numcol[1],&ptrindex[1]);
-          if ( numrow[1] != numrow[0] || numcol[1] != numcol[0] )
-          {
-            Scierror(999,sizeNotEqual) ;
-            return -1 ;
-          }
-        }
-        
-        if(setticks(cstk(l2),pobj, ptrindex, numrow, numcol) != 0) return 0;
-
-      }
-    else if(strcmp(cstk(l2),"data") == 0)
-    { /* distinction for "data" treatment for champ and surface objects */
-      if((sciGetEntityType(pobj) == SCI_SEGS) && (pSEGS_FEATURE(pobj)->ptype == 1))
-      {        /* F.Leray Work here*/
-        int address[4],i;
-        for(i=0;i<4;i++) address[i] = 0;
-
-        if(VarType(3) != 16)
-        {
-          Scierror(999,"%s: Incorrect argument, must be a Tlist!\r\n",fname);
-          return -1;
-        }
-
-        GetRhsVar(3,"t",&m3tl,&n3tl,&l3tl);
-
-        if(m3tl != 5 || n3tl != 1)
-        {
-          sciprint("Tlist size must be 1x5\r\n");
-          return -1;
-        }
-
-        GetListRhsVar(3,2,"d",&numrow[0],&numcol[0],&address[0]);
-        GetListRhsVar(3,3,"d",&numrow[1],&numcol[1],&address[1]);
-        GetListRhsVar(3,4,&q