summaryrefslogtreecommitdiffstats
path: root/scilab/modules
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2009-10-14 11:20:31 +0200
committerAllan CORNET <allan.cornet@scilab.org>2009-10-14 11:20:31 +0200
commitf46a893051039f238a082d121243cac62dd44e56 (patch)
tree952865823f394240d0574101b41710ab925d09c0 /scilab/modules
parent8d0b1876a878aa8ca2f6a68f22fb76aee3c59407 (diff)
parentcbcfbe5ea435f170357cf6653d290e5d2c2fdd7e (diff)
downloadscilab-f46a893051039f238a082d121243cac62dd44e56.zip
scilab-f46a893051039f238a082d121243cac62dd44e56.tar.gz
Merge commit 'refs/remotes/origin/master' into Xcos
Diffstat (limited to 'scilab/modules')
-rw-r--r--scilab/modules/Makefile.am41
-rw-r--r--scilab/modules/Makefile.in51
-rw-r--r--scilab/modules/graphics/help/en_US/plot3d.xml11
-rw-r--r--scilab/modules/graphics/help/pt_BR/plot3d.xml209
-rw-r--r--scilab/modules/graphics/src/c/SetProperty.c4
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_4855.tst55
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java13
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/filechooser/Juigetfile.java2
-rw-r--r--scilab/modules/optimization/tests/nonreg_tests/bug_4925.dia.ref54
-rw-r--r--scilab/modules/optimization/tests/nonreg_tests/bug_4925.tst27
-rw-r--r--scilab/modules/optimization/tests/unit_tests/optim_scilabscript.tst6
-rw-r--r--scilab/modules/output_stream/src/c/output_stream.vcproj16
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/AsteriskMarkDrawer.java29
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/CircleMarkDrawer.java26
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/CrossMarkDrawer.java18
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/DiamondMarkDrawer.java37
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/DiamondPlusMarkDrawer.java18
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/DotMarkDrawer.java9
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/FilledDiamondMarkDrawer.java18
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/MarkDrawer.java3
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/MarkDrawingStrategy.java24
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/PentagramMarkDrawer.java36
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/PlusMarkDrawer.java18
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/SquareMarkDrawer.java36
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/StarMarkDrawer.java22
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/TriangleMarkDrawer.java34
-rw-r--r--scilab/modules/scicos/Makefile.am2
-rw-r--r--scilab/modules/scicos/Makefile.in3
-rw-r--r--scilab/modules/scicos_blocks/Makefile.am2
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in3
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/Xpad.java2
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/FindAction.java7
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/OpenAction.java8
33 files changed, 600 insertions, 244 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 94c5514..a341615 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -170,34 +170,31 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
170 $(top_builddir)/modules/completion/libscicompletion.la \ 170 $(top_builddir)/modules/completion/libscicompletion.la \
171 $(top_builddir)/modules/history_manager/libscihistory_manager.la \ 171 $(top_builddir)/modules/history_manager/libscihistory_manager.la \
172 $(top_builddir)/modules/action_binding/libsciaction_binding.la \ 172 $(top_builddir)/modules/action_binding/libsciaction_binding.la \
173 $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
174 $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 173 $(top_builddir)/modules/output_stream/libscioutput_stream.la \
175 $(top_builddir)/modules/sound/libscisound.la \
176 $(top_builddir)/modules/helptools/libscihelptools.la \
177 $(top_builddir)/modules/matio/libscimatio.la \
178 $(top_builddir)/modules/randlib/libscirandlib.la \
179 $(top_builddir)/modules/optimization/libscioptimization.la \
180 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
181 $(top_builddir)/modules/symbolic/libscisymbolic.la \
182 $(top_builddir)/modules/metanet/libscimetanet.la \
183 $(top_builddir)/modules/spreadsheet/libscispreadsheet.la \
184 $(top_builddir)/modules/statistics/libscistatistics.la \
185 $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
186 $(top_builddir)/modules/interpolation/libsciinterpolation.la \
187 $(top_builddir)/modules/string/libscistring.la \ 174 $(top_builddir)/modules/string/libscistring.la \
175 $(top_builddir)/modules/fftw/libscifftw.la \
188 $(top_builddir)/modules/functions/libscifunctions.la \ 176 $(top_builddir)/modules/functions/libscifunctions.la \
189 $(top_builddir)/modules/hdf5/libscihdf5.la 177 $(top_builddir)/modules/hdf5/libscihdf5.la
190 178
191OTHER_LIBS = $(top_builddir)/modules/fftw/libscifftw.la \
192$(top_builddir)/modules/umfpack/libsciumfpack.la \
193$(top_builddir)/modules/scicos/libsciscicos.la
194
195if SCICOS
196OTHER_LIBS += $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la
197endif
198
199 179
200# Dev in progress 180# These libraries are loaded dynamically from Scilab.
181ENGINE_LIBS_DYNAMIC_LOAD = \
182 $(top_builddir)/modules/optimization/libscioptimization.la \
183 $(top_builddir)/modules/metanet/libscimetanet.la \
184 $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
185 $(top_builddir)/modules/interpolation/libsciinterpolation.la \
186 $(top_builddir)/modules/symbolic/libscisymbolic.la \
187 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
188 $(top_builddir)/modules/statistics/libscistatistics.la \
189 $(top_builddir)/modules/randlib/libscirandlib.la \
190 $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la \
191 $(top_builddir)/modules/scicos/libsciscicos.la \
192 $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
193 $(top_builddir)/modules/sound/libscisound.la \
194 $(top_builddir)/modules/spreadsheet/libscispreadsheet.la \
195 $(top_builddir)/modules/umfpack/libsciumfpack.la \
196 $(top_builddir)/modules/matio/libscimatio.la \
197 $(top_builddir)/modules/helptools/libscihelptools.la
201 198
202# Core modules 199# Core modules
203libscilab_la_LIBADD = $(ENGINE_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS) 200libscilab_la_LIBADD = $(ENGINE_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS)
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 271ea0d..2a302d5 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -59,10 +59,9 @@ host_triplet = @host@
59# javasci should be compile at the end because it needs libscilab.la 59# javasci should be compile at the end because it needs libscilab.la
60# Don't forget that the order in subdirs does matter !!! 60# Don't forget that the order in subdirs does matter !!!
61@JAVASCI_TRUE@am__append_2 = javasci 61@JAVASCI_TRUE@am__append_2 = javasci
62@SCICOS_TRUE@am__append_3 = $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la 62@GUI_TRUE@am__append_3 = $(GUI_LIBS)
63@GUI_TRUE@am__append_4 = $(GUI_LIBS) 63@GUI_FALSE@am__append_4 = $(NO_GUI_LIBS)
64@GUI_FALSE@am__append_5 = $(NO_GUI_LIBS) 64@ENABLE_STATIC_TRUE@am__append_5 = $(ALL_LIBS)
65@ENABLE_STATIC_TRUE@am__append_6 = $(ALL_LIBS)
66subdir = modules 65subdir = modules
67DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 66DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
68ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 67ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -109,16 +108,15 @@ am__base_list = \
109am__installdirs = "$(DESTDIR)$(pkglibdir)" 108am__installdirs = "$(DESTDIR)$(pkglibdir)"
110LTLIBRARIES = $(pkglib_LTLIBRARIES) 109LTLIBRARIES = $(pkglib_LTLIBRARIES)
111libscilab_cli_la_DEPENDENCIES = $(ENGINE_LIBS) $(NO_GUI_LIBS) \ 110libscilab_cli_la_DEPENDENCIES = $(ENGINE_LIBS) $(NO_GUI_LIBS) \
112 $(OTHER_LIBS) $(EXTERNAL_LIBS) 111 $(EXTERNAL_LIBS)
113am_libscilab_cli_la_OBJECTS = 112am_libscilab_cli_la_OBJECTS =
114libscilab_cli_la_OBJECTS = $(am_libscilab_cli_la_OBJECTS) 113libscilab_cli_la_OBJECTS = $(am_libscilab_cli_la_OBJECTS)
115libscilab_cli_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ 114libscilab_cli_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
116 $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ 115 $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
117 $(libscilab_cli_la_LDFLAGS) $(LDFLAGS) -o $@ 116 $(libscilab_cli_la_LDFLAGS) $(LDFLAGS) -o $@
118am__DEPENDENCIES_1 = 117am__DEPENDENCIES_1 =
119libscilab_la_DEPENDENCIES = $(ENGINE_LIBS) $(OTHER_LIBS) \ 118libscilab_la_DEPENDENCIES = $(ENGINE_LIBS) $(EXTERNAL_LIBS) \
120 $(EXTERNAL_LIBS) $(am__append_4) $(am__append_5) \ 119 $(am__append_3) $(am__append_4) $(am__DEPENDENCIES_1)
121 $(am__DEPENDENCIES_1)
122am_libscilab_la_OBJECTS = 120am_libscilab_la_OBJECTS =
123libscilab_la_OBJECTS = $(am_libscilab_la_OBJECTS) 121libscilab_la_OBJECTS = $(am_libscilab_la_OBJECTS)
124libscilab_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ 122libscilab_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -502,33 +500,38 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
502 $(top_builddir)/modules/completion/libscicompletion.la \ 500 $(top_builddir)/modules/completion/libscicompletion.la \
503 $(top_builddir)/modules/history_manager/libscihistory_manager.la \ 501 $(top_builddir)/modules/history_manager/libscihistory_manager.la \
504 $(top_builddir)/modules/action_binding/libsciaction_binding.la \ 502 $(top_builddir)/modules/action_binding/libsciaction_binding.la \
505 $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
506 $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 503 $(top_builddir)/modules/output_stream/libscioutput_stream.la \
507 $(top_builddir)/modules/sound/libscisound.la \
508 $(top_builddir)/modules/helptools/libscihelptools.la \
509 $(top_builddir)/modules/matio/libscimatio.la \
510 $(top_builddir)/modules/randlib/libscirandlib.la \
511 $(top_builddir)/modules/optimization/libscioptimization.la \
512 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
513 $(top_builddir)/modules/symbolic/libscisymbolic.la \
514 $(top_builddir)/modules/metanet/libscimetanet.la \
515 $(top_builddir)/modules/spreadsheet/libscispreadsheet.la \
516 $(top_builddir)/modules/statistics/libscistatistics.la \
517 $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
518 $(top_builddir)/modules/interpolation/libsciinterpolation.la \
519 $(top_builddir)/modules/string/libscistring.la \ 504 $(top_builddir)/modules/string/libscistring.la \
505 $(top_builddir)/modules/fftw/libscifftw.la \
520 $(top_builddir)/modules/functions/libscifunctions.la \ 506 $(top_builddir)/modules/functions/libscifunctions.la \
521 $(top_builddir)/modules/hdf5/libscihdf5.la 507 $(top_builddir)/modules/hdf5/libscihdf5.la
522 508
523OTHER_LIBS = $(top_builddir)/modules/fftw/libscifftw.la \ 509ENGINE_LIBS_DYNAMIC_LOAD = \
510 $(top_builddir)/modules/optimization/libscioptimization.la \
511 $(top_builddir)/modules/metanet/libscimetanet.la \
512 $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
513 $(top_builddir)/modules/interpolation/libsciinterpolation.la \
514 $(top_builddir)/modules/symbolic/libscisymbolic.la \
515 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
516 $(top_builddir)/modules/statistics/libscistatistics.la \
517 $(top_builddir)/modules/randlib/libscirandlib.la \
518 $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la \
519 $(top_builddir)/modules/scicos/libsciscicos.la \
520 $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
521 $(top_builddir)/modules/sound/libscisound.la \
522 $(top_builddir)/modules/spreadsheet/libscispreadsheet.la \
524 $(top_builddir)/modules/umfpack/libsciumfpack.la \ 523 $(top_builddir)/modules/umfpack/libsciumfpack.la \
525 $(top_builddir)/modules/scicos/libsciscicos.la $(am__append_3) 524 $(top_builddir)/modules/matio/libscimatio.la \
525 $(top_builddir)/modules/helptools/libscihelptools.la
526
527
528#THER_LIBS +=
526 529
527# Dev in progress 530# Dev in progress
528 531
529# Core modules 532# Core modules
530libscilab_la_LIBADD = $(ENGINE_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS) \ 533libscilab_la_LIBADD = $(ENGINE_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS) \
531 $(am__append_4) $(am__append_5) $(am__append_6) 534 $(am__append_3) $(am__append_4) $(am__append_5)
532 535
533# Core modules 536# Core modules
534libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS) 537libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS)
diff --git a/scilab/modules/graphics/help/en_US/plot3d.xml b/scilab/modules/graphics/help/en_US/plot3d.xml
index 6bc3745..8827721 100644
--- a/scilab/modules/graphics/help/en_US/plot3d.xml
+++ b/scilab/modules/graphics/help/en_US/plot3d.xml
@@ -662,6 +662,15 @@ a.view = '2d';
662 </imageobject> 662 </imageobject>
663 </mediaobject> 663 </mediaobject>
664 664
665 <para> How to set manually some ticks </para>
666
667 <programlisting role = "example"><![CDATA[
668plot3d();
669h = gca();
670h.x_ticks = tlist(['ticks','locations','labels'],[-2,-1,0,1,2],['-2','-1','0','1','2']);
671h.y_ticks = tlist(['ticks','locations','labels'],[-4,-3-2,-1,0,1,2,3,4],['-4','-3','-2','-1','0','1','2','3','4']);
672h.z_ticks = tlist(['ticks','locations','labels'],[-1,0,1],['Point 1','Point 2','Point 3']);
673 ]]></programlisting>
665 <para></para> 674 <para></para>
666 </refsection> 675 </refsection>
667 676
@@ -688,6 +697,8 @@ a.view = '2d';
688 <member><link linkend="xdel">xdel</link></member> 697 <member><link linkend="xdel">xdel</link></member>
689 698
690 <member><link linkend="delete">delete</link></member> 699 <member><link linkend="delete">delete</link></member>
700
701 <member><link linkend="axes_properties">axes_properties</link></member>
691 </simplelist> 702 </simplelist>
692 </refsection> 703 </refsection>
693 704
diff --git a/scilab/modules/graphics/help/pt_BR/plot3d.xml b/scilab/modules/graphics/help/pt_BR/plot3d.xml
index dbb42c9..cd0b640 100644
--- a/scilab/modules/graphics/help/pt_BR/plot3d.xml
+++ b/scilab/modules/graphics/help/pt_BR/plot3d.xml
@@ -478,6 +478,213 @@ TL.color = [c;c+1;c+2;c+3];
478h.data = TL; 478h.data = TL;
479h.color_flag=3; // modo de gradação interpolada 479h.color_flag=3; // modo de gradação interpolada
480 ]]></programlisting> 480 ]]></programlisting>
481
482 <para>We can use the plot3d function to plot a set of patches (triangular,
483 quadrangular, etc).</para>
484
485 <programlisting role="example"><![CDATA[
486// The plot3d function to draw patches:
487// patch(x,y,[z])
488// patch(x,y,[list(z,c)])
489// The size of x : number of points in the patches x number of patches
490// y and z have the same sizes as x
491// c:
492// - a vector of size number of patches: the color of the patches
493// - a matrix of size number of points in the patches x number of
494// patches: the color of each points of each patches
495
496// Example 1: a set of triangular patches
497
498x = [0 0;
499 0 1;
500 1 1];
501
502y = [1 1;
503 2 2;
504 2 1];
505
506z = [1 1;
507 1 1;
508 1 1];
509
510tcolor = [2 3]';
511
512subplot(2,2,1);
513plot3d(x,y,list(z,tcolor));
514xtitle('A triangle set of patches');
515
516// Example 2: a mixture of triangular and quadrangular patches
517
518xquad = [5, 0;
519 10,0;
520 15,5;
521 10,5];
522
523yquad = [15,0;
524 20,10;
525 15,15;
526 10,5];
527
528zquad = ones(4,2);
529
530xtri = [ 0,10,10, 5, 0;
531 10,20,20, 5, 0;
532 20,20,15,10,10];
533
534ytri = [ 0,10,20, 5,10;
535 10,20,20,15,20;
536 0, 0,15,10,20];
537
538ztri = zeros(3,5);
539
540subplot(2,2,3);
541plot3d(xquad,yquad,zquad);
542plot3d(xtri,ytri,ztri);
543xtitle('Mixing triangle and quadrangle set of patches');
544
545// Example 3: some rabbits
546
547rabxtri = [ 5, 5, 2.5, 7.5, 10;
548 5, 15, 5, 10, 10;
549 15, 15, 5, 10, 15];
550
551rabytri = [10, 10, 9.5, 2.5, 0;
552 20, 10, 12, 5, 5;
553 10 0 7 0 0];
554rabztri = [0,0,0,0,0;
555 0,0,0,0,0;
556 0,0,0,0,0];
557
558rabtricolor_byface = [2 2 2 2 2];
559
560rabtricolor = [2,2,2,2,2;
561 3,3,3,3,3;
562 4,4,4,4,4];
563
564rabxquad = [0, 1;
565 0, 6;
566 5,11;
567 5, 6];
568
569rabyquad = [18,23;
570 23,28;
571 23,28;
572 18,23];
573
574rabzquad = [1,1;
575 1,1;
576 1,1;
577 1,1];
578
579rabquadcolor_byface = [2 2];
580
581rabquadcolor = [2,2;
582 3,3;
583 4,4;
584 5,5];
585
586subplot(2,2,2);
587plot3d(rabxtri, rabytri, list(rabztri,rabtricolor));
588plot3d(rabxquad,rabyquad,list(rabzquad,rabquadcolor));
589h = gcf();
590h.children(1).background = 1;
591xtitle('A psychedelic rabbit set of patches');
592
593subplot(2,2,4);
594plot3d(rabxtri, rabytri, list(rabztri,rabtricolor_byface));
595plot3d(rabxquad,rabyquad,list(rabzquad,rabquadcolor_byface));
596h = gcf();
597h.children(1).background = 1;
598xtitle('A standard rabbit set of patches');
599 ]]></programlisting>
600
601 <para>The result of the preceding example:</para>
602
603 <mediaobject>
604 <imageobject>
605 <imagedata align="center" fileref="../images/plot3d_patch.png" />
606 </imageobject>
607 </mediaobject>
608
609 <para>We can also use the plot3d function to plot a set of patches using
610 vertex and faces.</para>
611
612 <programlisting role = "example"><![CDATA[
613// Vertex / Faces example: 3D example
614
615// The vertex list contains the list of unique points composing each patch
616// The points common to 2 patches are not repeated in the vertex list
617
618vertex = [0 1 1;
619 0 2 2;
620 1 2 3;
621 1 1 4];
622
623// The face list indicates which points are composing the patch.
624face = [1 2 3;
625 1 3 4];
626
627tcolor = [2 3]';
628
629// The formula used to translate the vertex / face representation into x, y, z lists
630
631xvf = matrix(vertex(face,1),size(face,1),length(vertex(face,1))/size(face,1))';
632yvf = matrix(vertex(face,2),size(face,1),length(vertex(face,1))/size(face,1))';
633zvf = matrix(vertex(face,3),size(face,1),length(vertex(face,1))/size(face,1))';
634
635scf();
636subplot(2,1,1);
637plot3d(xvf,yvf,list(zvf,tcolor));
638xtitle('A triangle set of patches - vertex / face mode - 3d');
639
640// 2D test
641// We use the 3D representation with a 0 Z values and then switch to 2D representation
642
643// Vertex / Faces example: 3D example
644
645// The vertex list contains the list of unique points composing each patch
646// The points common to 2 patches are not repeated in the vertex list
647
648vertex = [0 1;
649 0 2;
650 1 2;
651 1 1];
652
653// The face list indicates which points are composing the patch.
654face = [1 2 3;
655 1 3 4];
656
657// The formula used to translate the vertex / face representation into x, y, z lists
658
659xvf = matrix(vertex(face,1),size(face,1),length(vertex(face,1))/size(face,1))';
660yvf = matrix(vertex(face,2),size(face,1),length(vertex(face,1))/size(face,1))';
661zvf = matrix(zeros(vertex(face,2)),size(face,1),length(vertex(face,1))/size(face,1))';
662
663subplot(2,1,2);
664plot3d(xvf,yvf,list(zvf,tcolor));
665xtitle('A triangle set of patches - vertex / face mode - 2D');
666a = gca();
667a.view = '2d';
668 ]]></programlisting>
669
670 <para>The result of the preceding example:</para>
671
672 <mediaobject>
673 <imageobject>
674 <imagedata align="center" fileref="../images/plot3d_patch_vertex.png" />
675 </imageobject>
676 </mediaobject>
677
678 <para> How to set manually some ticks </para>
679
680 <programlisting role = "example"><![CDATA[
681plot3d();
682h = gca();
683h.x_ticks = tlist(['ticks','locations','labels'],[-2,-1,0,1,2],['-2','-1','0','1','2']);
684h.y_ticks = tlist(['ticks','locations','labels'],[-4,-3-2,-1,0,1,2,3,4],['-4','-3','-2','-1','0','1','2','3','4']);
685h.z_ticks = tlist(['ticks','locations','labels'],[-1,0,1],['Point 1','Point 2','Point 3']);
686 ]]></programlisting>
687 <para></para>
481 </refsection> 688 </refsection>
482 689
483 <refsection> 690 <refsection>
@@ -503,6 +710,8 @@ h.color_flag=3; // modo de gradação interpolada
503 <member><link linkend="xdel">xdel</link></member> 710 <member><link linkend="xdel">xdel</link></member>
504 711
505 <member><link linkend="delete">delete</link></member> 712 <member><link linkend="delete">delete</link></member>
713
714 <member><link linkend="axes_properties">axes_properties</link></member>
506 </simplelist> 715 </simplelist>
507 </refsection> 716 </refsection>
508 717
diff --git a/scilab/modules/graphics/src/c/SetProperty.c b/scilab/modules/graphics/src/c/SetProperty.c
index 0d2249e..167bb03 100644
--- a/scilab/modules/graphics/src/c/SetProperty.c
+++ b/scilab/modules/graphics/src/c/SetProperty.c
@@ -692,7 +692,7 @@ int sciInitMarkForeground( sciPointObj * pobj, int colorindex )
692 if (sciGetGraphicContext(pobj) != NULL) 692 if (sciGetGraphicContext(pobj) != NULL)
693 { 693 {
694 sciGetGraphicContext(pobj)->markforeground = 694 sciGetGraphicContext(pobj)->markforeground =
695 Max (0, Min (colorindex - 1, sciGetNumColors (pobj) + 1)); 695 Max (-1, Min (colorindex - 1, sciGetNumColors (pobj) + 1));
696 return 0; 696 return 0;
697 } 697 }
698 698
@@ -726,7 +726,7 @@ int sciInitMarkBackground( sciPointObj * pobj, int colorindex )
726 if (sciGetGraphicContext(pobj) != NULL) 726 if (sciGetGraphicContext(pobj) != NULL)
727 { 727 {
728 sciGetGraphicContext(pobj)->markbackground = 728 sciGetGraphicContext(pobj)->markbackground =
729 Max (0, Min (colorindex - 1, sciGetNumColors (pobj) + 1)); 729 Max (-1, Min (colorindex - 1, sciGetNumColors (pobj) + 1));
730 return 0; 730 return 0;
731 } 731 }
732 732
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_4855.tst b/scilab/modules/graphics/tests/nonreg_tests/bug_4855.tst
index 072f3c7..bd9d160 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_4855.tst
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_4855.tst
@@ -8,49 +8,22 @@
8// <-- INTERACTIVE TEST --> 8// <-- INTERACTIVE TEST -->
9// <-- TEST WITH GRAPHIC --> 9// <-- TEST WITH GRAPHIC -->
10// 10//
11// <-- Non-regression test for bug 4855 --> 11// <-- Non-regression test for bug 4929 -->
12// 12//
13// <-- Bugzilla URL --> 13// <-- Bugzilla URL -->
14// http://bugzilla.scilab.org/show_bug.cgi?id=4855 14// http://bugzilla.scilab.org/show_bug.cgi?id=4929
15// 15//
16// <-- Short Description --> 16// <-- Short Description -->
17// Use the standard error messages when setting graphics properties with bad values. 17// Add transparency to markdrawing
18 18
19// Check error messages from this settings : 19// Try this :
20// alignment 20
21// anti_aliasing 21plot(1:10,sin(1:10))
22// arc_drawing_method 22e=gce();
23// arrow_size_factor 23e.children(1).mark_mode='on'
24// arrow_size 24e.children(1).mark_style=9
25// auto_clear 25e.children(1).mark_size_unit='tabulated'
26// auto_dimensionning 26e.children(1).mark_size=4
27// auto_position 27e.children(1).mark_background=0
28// auto_resize 28
29// auto_rotation 29// and look if the marks are transparent.
30// auto_scale
31// auto_ticks
32// axes_bounds
33// axes_reverse
34// axes_size
35// axes_visible
36// background
37// bar_layout
38// bar_width
39// box
40// callbackmevent
41// callback
42// callback_type
43// cdata_mapping
44// clip_box
45// clip_state
46// closed
47// colored
48// color_flag
49// color_map
50// color_mode
51// color_range
52// cube_scaling
53// current_axes
54// current_entity
55// current_figure
56// data_bounds
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java
index c723a44..bc7ec05 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java
@@ -41,6 +41,7 @@ import org.scilab.modules.gui.events.callback.ScilabCallBack;
41import org.scilab.modules.gui.utils.ConfigManager; 41import org.scilab.modules.gui.utils.ConfigManager;
42import org.scilab.modules.gui.utils.Position; 42import org.scilab.modules.gui.utils.Position;
43import org.scilab.modules.gui.utils.Size; 43import org.scilab.modules.gui.utils.Size;
44import org.scilab.modules.localization.Messages;
44 45
45import com.artenum.rosetta.interfaces.ui.InputCommandView; 46import com.artenum.rosetta.interfaces.ui.InputCommandView;
46import com.artenum.rosetta.util.StringConstants; 47import com.artenum.rosetta.util.StringConstants;
@@ -66,42 +67,42 @@ public class SwingScilabConsole extends SciConsole implements SimpleConsole {
66 SwingScilabContextMenu menu = new SwingScilabContextMenu(); 67 SwingScilabContextMenu menu = new SwingScilabContextMenu();
67 68
68 SwingScilabMenuItem cutMenu = new SwingScilabMenuItem(); 69 SwingScilabMenuItem cutMenu = new SwingScilabMenuItem();
69 cutMenu.setText("Cut"); 70 cutMenu.setText(Messages.gettext("Cut"));
70 cutMenu.setCallback(ScilabCallBack.createCallback( 71 cutMenu.setCallback(ScilabCallBack.createCallback(
71 "org.scilab.modules.gui.bridge.CallScilabBridge.cutConsoleSelection", 72 "org.scilab.modules.gui.bridge.CallScilabBridge.cutConsoleSelection",
72 ScilabCallBack.JAVA)); 73 ScilabCallBack.JAVA));
73 cutMenu.setMnemonic('U'); 74 cutMenu.setMnemonic('U');
74 75
75 SwingScilabMenuItem copyMenu = new SwingScilabMenuItem(); 76 SwingScilabMenuItem copyMenu = new SwingScilabMenuItem();
76 copyMenu.setText("Copy"); 77 copyMenu.setText(Messages.gettext("Copy"));
77 copyMenu.setCallback(ScilabCallBack.createCallback( 78 copyMenu.setCallback(ScilabCallBack.createCallback(
78 "org.scilab.modules.gui.bridge.CallScilabBridge.copyConsoleSelection", 79 "org.scilab.modules.gui.bridge.CallScilabBridge.copyConsoleSelection",
79 ScilabCallBack.JAVA)); 80 ScilabCallBack.JAVA));
80 copyMenu.setMnemonic('C'); 81 copyMenu.setMnemonic('C');
81 82
82 SwingScilabMenuItem pasteMenu = new SwingScilabMenuItem(); 83 SwingScilabMenuItem pasteMenu = new SwingScilabMenuItem();
83 pasteMenu.setText("Paste"); 84 pasteMenu.setText(Messages.gettext("Paste"));
84 pasteMenu.setCallback(ScilabCallBack.createCallback( 85 pasteMenu.setCallback(ScilabCallBack.createCallback(
85 "org.scilab.modules.gui.bridge.CallScilabBridge.pasteClipboardIntoConsole", 86 "org.scilab.modules.gui.bridge.CallScilabBridge.pasteClipboardIntoConsole",
86 ScilabCallBack.JAVA)); 87 ScilabCallBack.JAVA));
87 pasteMenu.setMnemonic('P'); 88 pasteMenu.setMnemonic('P');
88 89
89 SwingScilabMenuItem clearHistoryMenu = new SwingScilabMenuItem(); 90 SwingScilabMenuItem clearHistoryMenu = new SwingScilabMenuItem();
90 clearHistoryMenu.setText("Clear History"); 91 clearHistoryMenu.setText(Messages.gettext("Clear History"));
91 clearHistoryMenu.setCallback(ScilabCallBack.createCallback( 92 clearHistoryMenu.setCallback(ScilabCallBack.createCallback(
92 "org.scilab.modules.gui.bridge.CallScilabBridge.clearHistory", 93 "org.scilab.modules.gui.bridge.CallScilabBridge.clearHistory",
93 ScilabCallBack.JAVA)); 94 ScilabCallBack.JAVA));
94 clearHistoryMenu.setMnemonic('H'); 95 clearHistoryMenu.setMnemonic('H');
95 96
96 SwingScilabMenuItem clearMenu = new SwingScilabMenuItem(); 97 SwingScilabMenuItem clearMenu = new SwingScilabMenuItem();
97 clearMenu.setText("Clear Console"); 98 clearMenu.setText(Messages.gettext("Clear Console"));
98 clearMenu.setCallback(ScilabCallBack.createCallback( 99 clearMenu.setCallback(ScilabCallBack.createCallback(
99 "org.scilab.modules.gui.bridge.CallScilabBridge.clear", 100 "org.scilab.modules.gui.bridge.CallScilabBridge.clear",
100 ScilabCallBack.JAVA)); 101 ScilabCallBack.JAVA));
101 clearMenu.setMnemonic('O'); 102 clearMenu.setMnemonic('O');
102 103
103 SwingScilabMenuItem selectMenu = new SwingScilabMenuItem(); 104 SwingScilabMenuItem selectMenu = new SwingScilabMenuItem();
104 selectMenu.setText("Select All"); 105 selectMenu.setText(Messages.gettext("Select All"));
105 selectMenu.setCallback(ScilabCallBack.createCallback( 106 selectMenu.setCallback(ScilabCallBack.createCallback(
106 "org.scilab.modules.gui.bridge.CallScilabBridge.selectAllConsoleContents", 107 "org.scilab.modules.gui.bridge.CallScilabBridge.selectAllConsoleContents",
107 ScilabCallBack.JAVA)); 108 ScilabCallBack.JAVA));
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/filechooser/Juigetfile.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/filechooser/Juigetfile.java
index b53c032..0eac5af 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/filechooser/Juigetfile.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/filechooser/Juigetfile.java
@@ -23,7 +23,7 @@ import org.scilab.modules.gui.bridge.filechooser.SwingScilabFileChooser;
23 */ 23 */
24public class Juigetfile { 24public class Juigetfile {
25 25
26 public static final String[] DEFAULT_MASK = {"*.bin", "*.sce", "*.sc*", "*.cos*", "*.sci",}; 26 public static final String[] DEFAULT_MASK = {"*.bin", "*.sce", "*.cos*", "*.sci", "*.sc*"};
27 public static final String DEFAULT_INITIAL_DIRECTORY = System.getProperty("user.dir"); 27 public static final String DEFAULT_INITIAL_DIRECTORY = System.getProperty("user.dir");
28 public static final String DEFAULT_BOX_TITLE_OPEN = "uigetfile"; 28 public static final String DEFAULT_BOX_TITLE_OPEN = "uigetfile";
29 public static final String DEFAULT_BOX_TITLE_SAVE = "uiputfile"; 29 public static final String DEFAULT_BOX_TITLE_SAVE = "uiputfile";
diff --git a/scilab/modules/optimization/tests/nonreg_tests/bug_4925.dia.ref b/scilab/modules/optimization/tests/nonreg_tests/bug_4925.dia.ref
new file mode 100644
index 0000000..1dd972a
--- /dev/null
+++ b/scilab/modules/optimization/tests/nonreg_tests/bug_4925.dia.ref
@@ -0,0 +1,54 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2009 - DIGITEO - Allan CORNET
4//
5// This file is distributed under the same license as the Scilab package.
6// =============================================================================
7// <-- JVM NOT MANDATORY -->
8// <-- NO CHECK REF -->
9// <-- Non-regression test for bug 4925 -->
10//
11// <-- Bugzilla URL -->
12// http://bugzilla.scilab.org/show_bug.cgi?id=4925
13//
14// <-- Short Description -->
15// this example with optim crashs 'optim' on windows
16//
17// =============================================================================
18xref=[1;2;3];
19x0=[1;-1;1];
20function [f,g,ind] = cost(x,ind)
21 f=0.5*norm(x-xref)^2;
22 g=x-xref;
23endfunction
24[f,xopt]=optim(cost,x0,imp=3)
25
26***** enters -qn code- (without bound cstr)
27dimension= 3, epsq= 0.2220446049250313E-15, verbosity level: imp= 3
28max number of iterations allowed: iter= 100
29max number of calls to costf allowed: nap= 100
30------------------------------------------------
31 iter num 1, nb calls= 1, f= 6.500
32 linear search: initial derivative=-3.606
33 step length=0.1000E-01, df=-.4261 , derivative=-3.485
34 step length=0.1000 , df=-3.611 , derivative=-2.404
35 iter num 2, nb calls= 3, f= 2.889
36 linear search: initial derivative=-2.404
37 step length= 1.000 , df=-2.889 , derivative=0.3695E-15
38 iter num 3, nb calls= 4, f=0.9861E-30
39 linear search: initial derivative=-.1380E-14
40 step length= 1.000 , df=0.4142E-29, derivative=0.3192E-14
41 step length=0.2996 , df=-.9861E-30, derivative=0.0000E+00
42 iter num 4, nb calls= 6, f=0.0000E+00
43***** leaves -qn code-, gradient norm= 0.0000000000000000E+00
44Norm of projected gradient lower than 0.0000000D+00.
45
46 xopt =
47
48 1.
49 2.
50 3.
51 f =
52
53 0.
54// =============================================================================
diff --git a/scilab/modules/optimization/tests/nonreg_tests/bug_4925.tst b/scilab/modules/optimization/tests/nonreg_tests/bug_4925.tst
new file mode 100644
index 0000000..caa259e
--- /dev/null
+++ b/scilab/modules/optimization/tests/nonreg_tests/bug_4925.tst
@@ -0,0 +1,27 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2009 - DIGITEO - Allan CORNET
4//
5// This file is distributed under the same license as the Scilab package.
6// =============================================================================
7
8// <-- JVM NOT MANDATORY -->
9// <-- NO CHECK REF -->
10
11// <-- Non-regression test for bug 4925 -->
12//
13// <-- Bugzilla URL -->
14// http://bugzilla.scilab.org/show_bug.cgi?id=4925
15//
16// <-- Short Description -->
17// this example with optim crashs 'optim' on windows (release mode)
18//
19// =============================================================================
20xref=[1;2;3];
21x0=[1;-1;1];
22function [f,g,ind] = cost(x,ind)
23 f=0.5*norm(x-xref)^2;
24 g=x-xref;
25endfunction
26[f,xopt]=optim(cost,x0,imp=3)
27// =============================================================================
diff --git a/scilab/modules/optimization/tests/unit_tests/optim_scilabscript.tst b/scilab/modules/optimization/tests/unit_tests/optim_scilabscript.tst
index c27b9bd..4083fe5 100644
--- a/scilab/modules/optimization/tests/unit_tests/optim_scilabscript.tst
+++ b/scilab/modules/optimization/tests/unit_tests/optim_scilabscript.tst
@@ -8,6 +8,12 @@
8 8
9// <-- JVM NOT MANDATORY --> 9// <-- JVM NOT MANDATORY -->
10// <-- ENGLISH IMPOSED --> 10// <-- ENGLISH IMPOSED -->
11// <-- NO CHECK REF -->
12//
13// Do not check ref, because imp option create a output messages
14// which contains lots of floating point values which may
15// be slightly different across platforms, without being bugs.
16//
11// optim_script.tst -- 17// optim_script.tst --
12// Test the optim command with the Rosenbrock test case 18// Test the optim command with the Rosenbrock test case
13// in the case where the cost function is a Scilab function. 19// in the case where the cost function is a Scilab function.
diff --git a/scilab/modules/output_stream/src/c/output_stream.vcproj b/scilab/modules/output_stream/src/c/output_stream.vcproj
index 571338e..2b2b2df 100644
--- a/scilab/modules/output_stream/src/c/output_stream.vcproj
+++ b/scilab/modules/output_stream/src/c/output_stream.vcproj
@@ -376,6 +376,22 @@
376 <File 376 <File
377 RelativePath=".\basout.c" 377 RelativePath=".\basout.c"
378 > 378 >
379 <FileConfiguration
380 Name="Release|Win32"
381 >
382 <Tool
383 Name="VCCLCompilerTool"
384 Optimization="1"
385 />
386 </FileConfiguration>
387 <FileConfiguration
388 Name="Release|x64"
389 >
390 <Tool
391 Name="VCCLCompilerTool"
392 Optimization="1"
393 />
394 </FileConfiguration>
379 </File> 395 </File>
380 <File 396 <File
381 RelativePath=".\cerro.c" 397 RelativePath=".\cerro.c"
diff --git a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/AsteriskMarkDrawer.java b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/AsteriskMarkDrawer.java
index 08122f4..893514d 100644
--- a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/AsteriskMarkDrawer.java
+++ b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/AsteriskMarkDrawer.java
@@ -39,20 +39,23 @@ public class AsteriskMarkDrawer extends MarkDrawingStrategy {
39 * @param frontColor RGB color of mark foreground 39 * @param frontColor RGB color of mark foreground
40 */ 40 */
41 public void drawMark(GL gl, double[] backColor, double[] frontColor) { 41 public void drawMark(GL gl, double[] backColor, double[] frontColor) {
42 gl.glColor3d(frontColor[0], frontColor[1], frontColor[2]); 42 if(!isFrontTransparent)
43 gl.glBegin(GL.GL_LINES); 43 {
44 // plus 44 gl.glColor3d(frontColor[0], frontColor[1], frontColor[2]);
45 gl.glVertex3d(-1.0, 0.0, 0.0); 45 gl.glBegin(GL.GL_LINES);
46 gl.glVertex3d(1.0 , 0.0, 0.0); 46 // plus
47 gl.glVertex3d(0.0 , -1.0, 0.0); 47 gl.glVertex3d(-1.0, 0.0, 0.0);
48 gl.glVertex3d(0.0 , 1.0, 0.0); 48 gl.glVertex3d(1.0 , 0.0, 0.0);
49 gl.glVertex3d(0.0 , -1.0, 0.0);
50 gl.glVertex3d(0.0 , 1.0, 0.0);
49 51
50 // cross 52 // cross
51 gl.glVertex3d(-DIAG_END, DIAG_END, 0.0); 53 gl.glVertex3d(-DIAG_END, DIAG_END, 0.0);
52 gl.glVertex3d(DIAG_END , -DIAG_END, 0.0); 54 gl.glVertex3d(DIAG_END , -DIAG_END, 0.0);
53 gl.glVertex3d(-DIAG_END, -DIAG_END, 0.0); 55 gl.glVertex3d(-DIAG_END, -DIAG_END, 0.0);
54 gl.glVertex3d(DIAG_END , DIAG_END, 0.0); 56 gl.glVertex3d(DIAG_END , DIAG_END, 0.0);
55 gl.glEnd(); 57 gl.glEnd();
58 }
56 } 59 }
57 60
58} 61}
diff --git a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/CircleMarkDrawer.java b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/CircleMarkDrawer.java
index d8813a4..cdd4c1c 100644
--- a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/CircleMarkDrawer.java
+++ b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/CircleMarkDrawer.java
@@ -40,20 +40,24 @@ public class CircleMarkDrawer extends MarkDrawingStrategy {
40 */ 40 */
41 public void drawMark(GL gl, double[] backColor, double[] frontColor) { 41 public void drawMark(GL gl, double[] backColor, double[] frontColor) {
42 // disk 42 // disk
43 gl.glColor3d(backColor[0], backColor[1], backColor[2]); 43 if(!isBackTransparent)
44 GLU glu = new GLU(); 44 {
45 glu.gluDisk(glu.gluNewQuadric(), 0.0, 1.0, NB_SLICES, 1); 45 gl.glColor3d(backColor[0], backColor[1], backColor[2]);
46 46 GLU glu = new GLU();
47 glu.gluDisk(glu.gluNewQuadric(), 0.0, 1.0, NB_SLICES, 1);
48 }
47 49
48 // circle 50 // circle
49 gl.glColor3d(frontColor[0], frontColor[1], frontColor[2]); 51 if(!isFrontTransparent)
50 gl.glBegin(GL.GL_LINE_LOOP); 52 {
51 for (int i = 0; i < NB_SLICES; i++) { 53 gl.glColor3d(frontColor[0], frontColor[1], frontColor[2]);
52 double angle = 2.0 * Math.PI * i / NB_SLICES; 54 gl.glBegin(GL.GL_LINE_LOOP);
53 gl.glVertex3d(Math.cos(angle), Math.sin(angle), 0.0); 55 for (int i = 0; i < NB_SLICES; i++) {
56 double angle = 2.0 * Math.PI * i / NB_SLICES;
57 gl.glVertex3d(Math.cos(angle), Math.sin(angle), 0.0);
58 }
59 gl.glEnd();
54 } 60 }
55 gl.glEnd();
56
57 61
58 } 62 }
59 63
diff --git a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/CrossMarkDrawer.java b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/CrossMarkDrawer.java
index dc44721..fba76b4 100644
--- a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/CrossMarkDrawer.java
+++ b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/CrossMarkDrawer.java
@@ -36,14 +36,16 @@ public class CrossMarkDrawer extends MarkDrawingStrategy {
36 * @param frontColor RGB color of mark foreground 36 * @param frontColor RGB color of mark foreground
37 */ 37 */
38 public void drawMark(GL gl, double[] backColor, double[] frontColor) { 38 public void drawMark(GL gl, double[] backColor, double[] frontColor) {
39 gl.glColor3d(frontColor[0], frontColor[1], frontColor[2]); 39 if(!isFrontTransparent)
40 gl.glBegin(GL.GL_LINES); 40 {
41 gl.glVertex3d(-1.0, 1.0, 0.0); 41 gl.glColor3d(frontColor[0], frontColor[1], frontColor[2]);
42 gl.glVertex3d(1.0 , -1.0, 0.0); 42 gl.glBegin(GL.GL_LINES);
43 gl.glVertex3d(-1.0, -1.0, 0.0); 43 gl.glVertex3d(-1.0, 1.0, 0.0);
44 gl.glVertex3d(1.0 , 1.0, 0.0); 44 gl.glVertex3d(1.0 , -1.0, 0.0);
45 gl.glEnd(); 45 gl.glVertex3d(-1.0, -1.0, 0.0);
46 46 gl.glVertex3d(1.0 , 1.0, 0.0);
47 gl.glEnd();
48 }
47 } 49 }
48 50
49} 51}
diff --git a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/DiamondMarkDrawer.java b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/DiamondMarkDrawer.java
index f745d1b..e455086 100644
--- a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/DiamondMarkDrawer.java
+++ b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/DiamondMarkDrawer.java
@@ -38,23 +38,28 @@ public class DiamondMarkDrawer extends MarkDrawingStrategy {
38 public void drawMark(GL gl, double[] backColor, double[] frontColor) { 38 public void drawMark(GL gl, double[] backColor, double[] frontColor) {
39 39
40 // inside 40 // inside
41 gl.glColor3d(backColor[0], backColor[1], backColor[2]); 41 if(!isBackTransparent)
42 gl.glBegin(GL.GL_QUADS); 42 {
43 gl.glVertex3d(-1.0, 0.0, 0.0); 43 gl.glColor3d(backColor[0], backColor[1], backColor[2]);
44 gl.glVertex3d(0.0 , 1.0, 0.0); 44 gl.glBegin(GL.GL_QUADS);
45 gl.glVertex3d(1.0 , 0.0, 0.0); 45 gl.glVertex3d(-1.0, 0.0, 0.0);
46 gl.glVertex3d(0.0 , -1.0, 0.0); 46 gl.glVertex3d(0.0 , 1.0, 0.0);
47 gl.glEnd(); 47 gl.glVertex3d(1.0 , 0.0, 0.0);
48 48 gl.glVertex3d(0.0 , -1.0, 0.0);
49 // outline 49 gl.glEnd();
50 gl.glColor3d(frontColor[0], frontColor[1], frontColor[2]); 50 }
51 gl.glBegin(GL.GL_LINE_LOOP);
52 gl.glVertex3d(-1.0, 0.0, 0.0);
53 gl.glVertex3d(0.0 , 1.0, 0.0);
54 gl.glVertex3d(1.0 , 0.0, 0.0);
55 gl.glVertex3d(0.0 , -1.0, 0.0);
56 gl.glEnd();
57 51
52 // outline
53 if(!isFrontTransparent)
54 {
55 gl.glColor3d(frontColor[0], frontColor[1], frontColor[2]);
56 gl.glBegin(GL.GL_LINE_LOOP);
57 gl.glVertex3d(-1.0, 0.0, 0.0);
58 gl.glVertex3d(0.0 , 1.0, 0.0);
59 gl.glVertex3d(1.0 , 0.0, 0.0);
60 gl.glVertex3d(0.0 , -1.0, 0.0);
61 gl.glEnd();
62 }
58 } 63 }
59 64
60} 65}
diff --git a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/DiamondPlusMarkDrawer.java b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/DiamondPlusMarkDrawer.java
index aff556f..da0df0e 100644
--- a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/DiamondPlusMarkDrawer.java
+++ b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/DiamondPlusMarkDrawer.java
@@ -41,13 +41,15 @@ public class DiamondPlusMarkDrawer extends DiamondMarkDrawer {
41 super.drawMark(gl, backColor, frontColor); 41 super.drawMark(gl, backColor, frontColor);
42 42
43 // draw cross 43 // draw cross
44 gl.glColor3d(frontColor[0], frontColor[1], frontColor[2]); 44 if(!isFrontTransparent)
45 gl.glBegin(GL.GL_LINES); 45 {
46 gl.glVertex3d(-1.0, 0.0, 0.0); 46 gl.glColor3d(frontColor[0], frontColor[1], frontColor[2]);
47 gl.glVertex3d(1.0 , 0.0, 0.0); 47 gl.glBegin(GL.GL_LINES);
48 gl.glVertex3d(0.0 , -1.0, 0.0); 48 gl.glVertex3d(-1.0, 0.0, 0.0);
49 gl.glVertex3d(0.0 , 1.0, 0.0); 49 gl.glVertex3d(1.0 , 0.0, 0.0);
50 gl.glEnd(); 50 gl.glVertex3d(0.0 , -1.0, 0.0);
51 51 gl.glVertex3d(0.0 , 1.0, 0.0);
52 gl.glEnd();
53 }
52 } 54 }
53} 55}
diff --git a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/DotMarkDrawer.java b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/DotMarkDrawer.java
index 3715ec8..b5c3c9e 100644
--- a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/DotMarkDrawer.java
+++ b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/DotMarkDrawer.java
@@ -41,8 +41,11 @@ public class DotMarkDrawer extends MarkDrawingStrategy {
41 * @param frontColor RGB color of mark foreground 41 * @param frontColor RGB color of mark foreground
42 */ 42 */
43 public void drawMark(GL gl, double[] backColor, double[] frontColor) { 43 public void drawMark(GL gl, double[] backColor, double[] frontColor) {
44 gl.glColor3d(frontColor[0], frontColor[1], frontColor[2]); 44 if(!isFrontTransparent)
45 GLU glu = new GLU(); 45 {
46 glu.gluDisk(glu.gluNewQuadric(), 0.0, 1.0, NB_SLICES, 1); 46 gl.glColor3d(frontColor[0], frontColor[1], frontColor[2]);
47 GLU glu = new GLU();
48 glu.gluDisk(glu.gluNewQuadric(), 0.0, 1.0, NB_SLICES, 1);
49 }
47 } 50 }
48} 51}
diff --git a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/FilledDiamondMarkDrawer.java b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/FilledDiamondMarkDrawer.java
index aba8dbe..b76fdc6 100644
--- a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/FilledDiamondMarkDrawer.java
+++ b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/FilledDiamondMarkDrawer.java
@@ -36,14 +36,16 @@ public class FilledDiamondMarkDrawer extends MarkDrawingStrategy {
36 * @param frontColor RGB color of mark foreground 36 * @param frontColor RGB color of mark foreground
37 */ 37 */
38 public void drawMark(GL gl, double[] backColor, double[] frontColor) { 38 public void drawMark(GL gl, double[] backColor, double[] frontColor) {
39 gl.glColor3d(frontColor[0], frontColor[1], frontColor[2]); 39 if(!isFrontTransparent)
40 gl.glBegin(GL.GL_QUADS); 40 {
41 gl.glVertex3d(-1.0, 0.0, 0.0); 41 gl.glColor3d(frontColor[0], frontColor[1], frontColor[2]);
42 gl.glVertex3d(0.0 , 1.0, 0.0); 42 gl.glBegin(GL.GL_QUADS);
43 gl.glVertex3d(1.0 , 0.0, 0.0); 43 gl.glVertex3d(-1.0, 0.0, 0.0);
44 gl.glVertex3d(0.0 , -1.0, 0.0); 44 gl.glVertex3d(0.0 , 1.0, 0.0);
45 gl.glEnd(); 45 gl.glVertex3d(1.0 , 0.0, 0.0);
46 46 gl.glVertex3d(0.0 , -1.0, 0.0);
47 gl.glEnd();
48 }
47 } 49 }
48 50
49} 51}
diff --git a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/MarkDrawer.java b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/MarkDrawer.java
index 3ba5524..eb37927 100644
--- a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/MarkDrawer.java
+++ b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/MarkDrawer.java
@@ -165,6 +165,9 @@ public class MarkDrawer extends DrawableObjectGL {
165 transform.pushPolygonsBack(gl); 165 transform.pushPolygonsBack(gl);
166 double realMarkSize = getMarkPixelSize(); 166 double realMarkSize = getMarkPixelSize();
167 gl.glScaled(realMarkSize, realMarkSize, 1.0); 167 gl.glScaled(realMarkSize, realMarkSize, 1.0);
168 //set transparency
169 drawer.setFrontTransparency(markForeground==-1);
170 drawer.setBackTransparency(markBackground==-1);
168 drawer.drawMark(gl, getColorMap().getColor(markBackground), getColorMap().getColor(markForeground)); 171 drawer.drawMark(gl, getColorMap().getColor(markBackground), getColorMap().getColor(markForeground));
169 transform.endPushPolygonsBack(gl); 172 transform.endPushPolygonsBack(gl);
170 } 173 }
diff --git a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/MarkDrawingStrategy.java b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/MarkDrawingStrategy.java
index a85ccbd..76893c9 100644
--- a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/MarkDrawingStrategy.java
+++ b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/MarkDrawingStrategy.java
@@ -61,6 +61,30 @@ public abstract class MarkDrawingStrategy {
61 MarkStyle.TRIANGLE_LEFT, 61 MarkStyle.TRIANGLE_LEFT,
62 MarkStyle.PENTAGRAM }; 62 MarkStyle.PENTAGRAM };
63 63
64 /**
65 * Transparency variables
66 */
67 protected boolean isFrontTransparent = false;
68 protected boolean isBackTransparent = false;
69
70 /**
71 * Set front transparency methode
72 * @param value is the new value of isFrontTransparent
73 */
74 public void setFrontTransparency(boolean value)
75 {
76 isFrontTransparent = value;
77 }
78
79 /**
80 * Set back transparency methode
81 * @param value is the new value of isBackTransparent
82 */
83 public void setBackTransparency(boolean value)
84 {
85 isBackTransparent = value;
86 }
87
64 /** 88 /**
65 * Default constructor 89 * Default constructor
66 */ 90 */
diff --git a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/PentagramMarkDrawer.java b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/PentagramMarkDrawer.java
index ab02124..52abb6d 100644
--- a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/PentagramMarkDrawer.java
+++ b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/PentagramMarkDrawer.java
@@ -80,25 +80,27 @@ public class PentagramMarkDrawer extends MarkDrawingStrategy {
80 public void drawMark(GL gl, double[] backColor, double[] frontColor) { 80 public void drawMark(GL gl, double[] backColor, double[] frontColor) {
81 81
82 // inside 82 // inside
83 gl.glColor3d(backColor[0], backColor[1], backColor[2]); 83 if(!isBackTransparent)
84 gl.glBegin(GL.GL_TRIANGLES); 84 {
85 for (int i = 0; i < NEEDED_TRIANGLE; i++) { 85 gl.glColor3d(backColor[0], backColor[1], backColor[2]);
86 for (int j = 0; j < NB_COORDINATES; j++) { 86 gl.glBegin(GL.GL_TRIANGLES);
87 gl.glVertex3d(VERTICES_COORDINATES[THREE_TRIANGLE[i][j]][0], VERTICES_COORDINATES[THREE_TRIANGLE[i][j]][1], 0.0); 87 for (int i = 0; i < NEEDED_TRIANGLE; i++) {
88 } 88 for (int j = 0; j < NB_COORDINATES; j++) {
89 } 89 gl.glVertex3d(VERTICES_COORDINATES[THREE_TRIANGLE[i][j]][0], VERTICES_COORDINATES[THREE_TRIANGLE[i][j]][1], 0.0);
90 90 }
91 gl.glEnd(); 91 }
92 92 gl.glEnd();
93 }
93 // outline 94 // outline
94 gl.glColor3d(frontColor[0], frontColor[1], frontColor[2]); 95 if(!isFrontTransparent)
95 gl.glBegin(GL.GL_LINE_LOOP); 96 {
96 for (int i = 0; i < NB_VERTICES; i++) { 97 gl.glColor3d(frontColor[0], frontColor[1], frontColor[2]);
97 gl.glVertex3d(VERTICES_COORDINATES[i][0], VERTICES_COORDINATES[i][1], 0.0); 98 gl.glBegin(GL.GL_LINE_LOOP);
99 for (int i = 0; i < NB_VERTICES; i++) {
100 gl.glVertex3d(VERTICES_COORDINATES[i][0], VERTICES_COORDINATES[i][1], 0.0);
101 }
102 gl.glEnd();
98 } 103 }
99 gl.glEnd();
100
101
102 } 104 }
103 105
104} 106}
diff --git a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/PlusMarkDrawer.java b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/PlusMarkDrawer.java
index 6bdb4a1..e09f2cb 100644
--- a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/PlusMarkDrawer.java
+++ b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/PlusMarkDrawer.java
@@ -36,14 +36,16 @@ public class PlusMarkDrawer extends MarkDrawingStrategy {
36 * @param frontColor RGB color of mark foreground 36 * @param frontColor RGB color of mark foreground
37 */ 37 */
38 public void drawMark(GL gl, double[] backColor, double[] frontColor) { 38 public void drawMark(GL gl, double[] backColor, double[] frontColor) {
39 gl.glColor3d(frontColor[0], frontColor[1], frontColor[2]); 39 if(!isFrontTransparent)
40 gl.glBegin(GL.GL_LINES); 40 {
41 gl.glVertex3d(-1.0, 0.0, 0.0); 41 gl.glColor3d(frontColor[0], frontColor[1], frontColor[2]);
42 gl.glVertex3d(1.0 , 0.0, 0.0); 42 gl.glBegin(GL.GL_LINES);
43 gl.glVertex3d(0.0 , -1.0, 0.0); 43 gl.glVertex3d(-1.0, 0.0, 0.0);
44 gl.glVertex3d(0.0 , 1.0, 0.0); 44 gl.glVertex3d(1.0 , 0.0, 0.0);
45 gl.glEnd(); 45 gl.glVertex3d(0.0 , -1.0, 0.0);
46 46 gl.glVertex3d(0.0 , 1.0, 0.0);
47 gl.glEnd();
48 }
47 } 49 }
48 50
49} 51}
diff --git a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/SquareMarkDrawer.java b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/SquareMarkDrawer.java
index 2bc9288..f7e2271 100644
--- a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/SquareMarkDrawer.java
+++ b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/SquareMarkDrawer.java
@@ -40,23 +40,27 @@ public class SquareMarkDrawer extends MarkDrawingStrategy {
40 public void drawMark(GL gl, double[] backColor, double[] frontColor) { 40 public void drawMark(GL gl, double[] backColor, double[] frontColor) {
41 41
42 // inside 42 // inside
43 gl.glColor3d(backColor[0], backColor[1], backColor[2]); 43 if(!isBackTransparent)
44 gl.glBegin(GL.GL_QUADS); 44 {
45 gl.glVertex3d(-1.0, 1.0, 0.0); 45 gl.glColor3d(backColor[0], backColor[1], backColor[2]);
46 gl.glVertex3d(-1.0, -1.0, 0.0); 46 gl.glBegin(GL.GL_QUADS);
47 gl.glVertex3d(1.0 , -1.0, 0.0); 47 gl.glVertex3d(-1.0, 1.0, 0.0);
48 gl.glVertex3d(1.0 , 1.0, 0.0); 48 gl.glVertex3d(-1.0, -1.0, 0.0);
49 gl.glEnd(); 49 gl.glVertex3d(1.0 , -1.0, 0.0);
50 50 gl.glVertex3d(1.0 , 1.0, 0.0);
51 gl.glEnd();
52 }
51 // outline 53 // outline
52 gl.glColor3d(frontColor[0], frontColor[1], frontColor[2]); 54 if(!isFrontTransparent)
53 gl.glBegin(GL.GL_LINE_LOOP); 55 {
54 gl.glVertex3d(-1.0, 1.0, 0.0); 56 gl.glColor3d(frontColor[0], frontColor[1], frontColor[2]);
55 gl.glVertex3d(-1.0, -1.0, 0.0); 57 gl.glBegin(GL.GL_LINE_LOOP);
56 gl.glVertex3d(1.0 , -1.0, 0.0); 58 gl.glVertex3d(-1.0, 1.0, 0.0);
57 gl.glVertex3d(1.0 , 1.0, 0.0); 59 gl.glVertex3d(-1.0, -1.0, 0.0);
58 gl.glEnd(); 60 gl.glVertex3d(1.0 , -1.0, 0.0);
59 61 gl.glVertex3d(1.0 , 1.0, 0.0);
62 gl.glEnd();
63 }
60 } 64 }
61 65
62 66
diff --git a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/StarMarkDrawer.java b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/StarMarkDrawer.java
index 9a5b3bd..9699875 100644
--- a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/StarMarkDrawer.java
+++ b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/StarMarkDrawer.java
@@ -39,17 +39,17 @@ public class StarMarkDrawer extends CircleMarkDrawer {
39 */ 39 */
40 public void drawMark(GL gl, double[] backColor, double[] frontColor) { 40 public void drawMark(GL gl, double[] backColor, double[] frontColor) {
41 super.drawMark(gl, backColor, frontColor); 41 super.drawMark(gl, backColor, frontColor);
42 42 // plus
43 gl.glColor3d(frontColor[0], frontColor[1], frontColor[2]); 43 if(!isFrontTransparent)
44 // plus 44 {
45 gl.glBegin(GL.GL_LINES); 45 gl.glColor3d(frontColor[0], frontColor[1], frontColor[2]);
46 gl.glVertex3d(-1.0, 0.0, 0.0); 46 gl.glBegin(GL.GL_LINES);
47 gl.glVertex3d(1.0 , 0.0, 0.0); 47 gl.glVertex3d(-1.0, 0.0, 0.0);
48 gl.glVertex3d(0.0 , -1.0, 0.0); 48 gl.glVertex3d(1.0 , 0.0, 0.0);
49 gl.glVertex3d(0.0 , 1.0, 0.0); 49 gl.glVertex3d(0.0 , -1.0, 0.0);
50 gl.glEnd(); 50 gl.glVertex3d(0.0 , 1.0, 0.0);
51 51 gl.glEnd();
52 52 }
53 } 53 }
54 54
55} 55}
diff --git a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/TriangleMarkDrawer.java b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/TriangleMarkDrawer.java
index 2dab89b..6d7cc89 100644
--- a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/TriangleMarkDrawer.java
+++ b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/TriangleMarkDrawer.java
@@ -46,22 +46,26 @@ public class TriangleMarkDrawer extends MarkDrawingStrategy {
46 public void drawMark(GL gl, double[] backColor, double[] frontColor) { 46 public void drawMark(GL gl, double[] backColor, double[] frontColor) {
47 47
48 // inside 48 // inside
49 gl.glColor3d(backColor[0], backColor[1], backColor[2]); 49 if(!isBackTransparent)
50 gl.glBegin(GL.GL_TRIANGLES); 50 {
51 gl.glVertex3d(UP_POINT[0], UP_POINT[1], 0.0); 51 gl.glColor3d(backColor[0], backColor[1], backColor[2]);
52 gl.glVertex3d(BOTTOM_LEFT[0], BOTTOM_LEFT[1], 0.0); 52 gl.glBegin(GL.GL_TRIANGLES);
53 gl.glVertex3d(BOTTOM_RIGHT[0], BOTTOM_RIGHT[1], 0.0); 53 gl.glVertex3d(UP_POINT[0], UP_POINT[1], 0.0);
54 gl.glEnd(); 54 gl.glVertex3d(BOTTOM_LEFT[0], BOTTOM_LEFT[1], 0.0);
55 55 gl.glVertex3d(BOTTOM_RIGHT[0], BOTTOM_RIGHT[1], 0.0);
56 // outline 56 gl.glEnd();
57 gl.glColor3d(frontColor[0], frontColor[1], frontColor[2]); 57 }
58 gl.glBegin(GL.GL_LINE_LOOP);
59 gl.glVertex3d(UP_POINT[0], UP_POINT[1], 0.0);
60 gl.glVertex3d(BOTTOM_LEFT[0], BOTTOM_LEFT[1], 0.0);
61 gl.glVertex3d(BOTTOM_RIGHT[0], BOTTOM_RIGHT[1], 0.0);
62 gl.glEnd();
63
64 58
59 // outline
60 if(!isFrontTransparent)
61 {
62 gl.glColor3d(frontColor[0], frontColor[1], frontColor[2]);
63 gl.glBegin(GL.GL_LINE_LOOP);
64 gl.glVertex3d(UP_POINT[0], UP_POINT[1], 0.0);
65 gl.glVertex3d(BOTTOM_LEFT[0], BOTTOM_LEFT[1], 0.0);
66 gl.glVertex3d(BOTTOM_RIGHT[0], BOTTOM_RIGHT[1], 0.0);
67 gl.glEnd();
68 }
65 } 69 }
66 70
67} 71}
diff --git a/scilab/modules/scicos/Makefile.am b/scilab/modules/scicos/Makefile.am
index 063cc6d..d95ff20 100644
--- a/scilab/modules/scicos/Makefile.am
+++ b/scilab/modules/scicos/Makefile.am
@@ -114,7 +114,7 @@ libsciscicos_la_SOURCES = $(SCICOS_C_SOURCES) $(SCICOS_FORTRAN_SOURCES) $(GATEWA
114CHECK_SRC= $(SCICOS_C_SOURCES) $(GATEWAY_C_SOURCES) 114CHECK_SRC= $(SCICOS_C_SOURCES) $(GATEWAY_C_SOURCES)
115INCLUDE_FLAGS = $(libsciscicos_la_CFLAGS) 115INCLUDE_FLAGS = $(libsciscicos_la_CFLAGS)
116 116
117libsciscicos_la_LIBADD = $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/mexlib/libmat.la $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/intersci/libsciintersci.la $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/time/libscitime.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/scicos/libscisundials.la $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la $(top_builddir)/modules/mexlib/libmex.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la 117libsciscicos_la_LIBADD = $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/mexlib/libmat.la $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/intersci/libsciintersci.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/time/libscitime.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/scicos/libscisundials.la $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la $(top_builddir)/modules/mexlib/libmex.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la
118 118
119#### scicos : Conf files #### 119#### scicos : Conf files ####
120libsciscicos_la_rootdir = $(mydatadir) 120libsciscicos_la_rootdir = $(mydatadir)
diff --git a/scilab/modules/scicos/Makefile.in b/scilab/modules/scicos/Makefile.in
index 1be456d..43a2fbf 100644
--- a/scilab/modules/scicos/Makefile.in
+++ b/scilab/modules/scicos/Makefile.in
@@ -126,7 +126,6 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
126@SCICOS_TRUE@ $(top_builddir)/modules/mexlib/libmat.la \ 126@SCICOS_TRUE@ $(top_builddir)/modules/mexlib/libmat.la \
127@SCICOS_TRUE@ $(top_builddir)/modules/mexlib/libmx.la \ 127@SCICOS_TRUE@ $(top_builddir)/modules/mexlib/libmx.la \
128@SCICOS_TRUE@ $(top_builddir)/modules/intersci/libsciintersci.la \ 128@SCICOS_TRUE@ $(top_builddir)/modules/intersci/libsciintersci.la \
129@SCICOS_TRUE@ $(top_builddir)/modules/graphics/libscigraphics.la \
130@SCICOS_TRUE@ $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \ 129@SCICOS_TRUE@ $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
131@SCICOS_TRUE@ $(top_builddir)/modules/time/libscitime.la \ 130@SCICOS_TRUE@ $(top_builddir)/modules/time/libscitime.la \
132@SCICOS_TRUE@ $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \ 131@SCICOS_TRUE@ $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
@@ -711,7 +710,7 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
711# For the code check (splint) 710# For the code check (splint)
712@SCICOS_TRUE@CHECK_SRC = $(SCICOS_C_SOURCES) $(GATEWAY_C_SOURCES) 711@SCICOS_TRUE@CHECK_SRC = $(SCICOS_C_SOURCES) $(GATEWAY_C_SOURCES)
713@SCICOS_TRUE@INCLUDE_FLAGS = $(libsciscicos_la_CFLAGS) 712@SCICOS_TRUE@INCLUDE_FLAGS = $(libsciscicos_la_CFLAGS)
714@SCICOS_TRUE@libsciscicos_la_LIBADD = $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/mexlib/libmat.la $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/intersci/libsciintersci.la $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/time/libscitime.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/scicos/libscisundials.la $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la $(top_builddir)/modules/mexlib/libmex.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la 713@SCICOS_TRUE@libsciscicos_la_LIBADD = $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/mexlib/libmat.la $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/intersci/libsciintersci.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/time/libscitime.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/scicos/libscisundials.la $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la $(top_builddir)/modules/mexlib/libmex.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la
715 714
716#### scicos : Conf files #### 715#### scicos : Conf files ####
717@SCICOS_TRUE@libsciscicos_la_rootdir = $(mydatadir) 716@SCICOS_TRUE@libsciscicos_la_rootdir = $(mydatadir)
diff --git a/scilab/modules/scicos_blocks/Makefile.am b/scilab/modules/scicos_blocks/Makefile.am
index 4cf7646..4f276cf 100644
--- a/scilab/modules/scicos_blocks/Makefile.am
+++ b/scilab/modules/scicos_blocks/Makefile.am
@@ -463,7 +463,7 @@ CLEANFILES=$(top_srcdir)/modules/scicos_blocks/includes/blocks.h \
463 463
464 464
465# cyclic deps $(top_builddir)/modules/scicos/libsciscicos.la 465# cyclic deps $(top_builddir)/modules/scicos/libsciscicos.la
466libsciscicos_blocks_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/renderer/libscirenderer.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 466libsciscicos_blocks_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/renderer/libscirenderer.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
467 467
468 468
469#### scicos_blocks : Conf files #### 469#### scicos_blocks : Conf files ####
diff --git a/scilab/modules/scicos_blocks/Makefile.in b/scilab/modules/scicos_blocks/Makefile.in
index 995fc71..d878415 100644
--- a/scilab/modules/scicos_blocks/Makefile.in
+++ b/scilab/modules/scicos_blocks/Makefile.in
@@ -115,7 +115,6 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
115@SCICOS_TRUE@libsciscicos_blocks_la_DEPENDENCIES = \ 115@SCICOS_TRUE@libsciscicos_blocks_la_DEPENDENCIES = \
116@SCICOS_TRUE@ $(top_builddir)/modules/core/libscicore.la \ 116@SCICOS_TRUE@ $(top_builddir)/modules/core/libscicore.la \
117@SCICOS_TRUE@ $(top_builddir)/modules/cacsd/libscicacsd.la \ 117@SCICOS_TRUE@ $(top_builddir)/modules/cacsd/libscicacsd.la \
118@SCICOS_TRUE@ $(top_builddir)/modules/graphics/libscigraphics.la \
119@SCICOS_TRUE@ $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \ 118@SCICOS_TRUE@ $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
120@SCICOS_TRUE@ $(top_builddir)/modules/renderer/libscirenderer.la \ 119@SCICOS_TRUE@ $(top_builddir)/modules/renderer/libscirenderer.la \
121@SCICOS_TRUE@ $(top_builddir)/modules/polynomials/libscipolynomials.la \ 120@SCICOS_TRUE@ $(top_builddir)/modules/polynomials/libscipolynomials.la \
@@ -1348,7 +1347,7 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
1348 1347
1349 1348
1350# cyclic deps $(top_builddir)/modules/scicos/libsciscicos.la 1349# cyclic deps $(top_builddir)/modules/scicos/libsciscicos.la
1351@SCICOS_TRUE@libsciscicos_blocks_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/renderer/libscirenderer.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 1350@SCICOS_TRUE@libsciscicos_blocks_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/renderer/libscirenderer.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
1352 1351
1353#### scicos_blocks : Conf files #### 1352#### scicos_blocks : Conf files ####
1354@SCICOS_TRUE@libsciscicos_blocks_la_rootdir = $(mydatadir) 1353@SCICOS_TRUE@libsciscicos_blocks_la_rootdir = $(mydatadir)
diff --git a/scilab/modules/xpad/src/java/org/scilab/modules/xpad/Xpad.java b/scilab/modules/xpad/src/java/org/scilab/modules/xpad/Xpad.java
index 620c37d..cb9a19f 100644
--- a/scilab/modules/xpad/src/java/org/scilab/modules/xpad/Xpad.java
+++ b/scilab/modules/xpad/src/java/org/scilab/modules/xpad/Xpad.java
@@ -488,8 +488,8 @@ public class Xpad extends SwingScilabTab implements Tab {
488 fileChooser .setAcceptAllFileFilterUsed(true); 488 fileChooser .setAcceptAllFileFilterUsed(true);
489 fileChooser .setInitialDirectory(initialDirectoryPath); 489 fileChooser .setInitialDirectory(initialDirectoryPath);
490 fileChooser .setUiDialogType(Juigetfile.SAVE_DIALOG); 490 fileChooser .setUiDialogType(Juigetfile.SAVE_DIALOG);
491 fileChooser.addChoosableFileFilter(sceFilter);
492 fileChooser.addChoosableFileFilter(scxFilter); 491 fileChooser.addChoosableFileFilter(scxFilter);
492 fileChooser.addChoosableFileFilter(sceFilter);
493 fileChooser.addChoosableFileFilter(sciFilter); 493 fileChooser.addChoosableFileFilter(sciFilter);
494 494
495 int retval = fileChooser.showSaveDialog(this); 495 int retval = fileChooser.showSaveDialog(this);
diff --git a/scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/FindAction.java b/scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/FindAction.java
index f9806bc..9f2fd1f 100644
--- a/scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/FindAction.java
+++ b/scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/FindAction.java
@@ -93,7 +93,7 @@ public final class FindAction extends DefaultAction {
93 93
94 94
95 private FindAction(Xpad editor) { 95 private FindAction(Xpad editor) {
96 super(XpadMessages.FIND_REPLACE + "...", editor); 96 super(XpadMessages.FIND_REPLACE + XpadMessages.DOTS, editor);
97 } 97 }
98 98
99 public void doAction() { 99 public void doAction() {
@@ -104,11 +104,12 @@ public final class FindAction extends DefaultAction {
104 } 104 }
105 105
106 public static MenuItem createMenu(Xpad editor) { 106 public static MenuItem createMenu(Xpad editor) {
107 return createMenu(XpadMessages.FIND_REPLACE + "...", null, new FindAction(editor), KeyStroke.getKeyStroke(KeyEvent.VK_F, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); 107 return createMenu(XpadMessages.FIND_REPLACE + XpadMessages.DOTS, null, new FindAction(editor),
108 KeyStroke.getKeyStroke(KeyEvent.VK_F, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
108 } 109 }
109 110
110 public static PushButton createButton(Xpad editor) { 111 public static PushButton createButton(Xpad editor) {
111 return createButton(XpadMessages.FIND_REPLACE + "...", "edit -find -replace.png", new FindAction(editor)); 112 return createButton(XpadMessages.FIND_REPLACE + "...", "edit-find-replace.png", new FindAction(editor));
112 } 113 }
113 114
114 115
diff --git a/scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/OpenAction.java b/scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/OpenAction.java
index 1e2aa87..892f0e7 100644
--- a/scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/OpenAction.java
+++ b/scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/OpenAction.java
@@ -56,8 +56,8 @@ public final class OpenAction extends DefaultAction {
56 if (initialDirectoryPath == null ){ 56 if (initialDirectoryPath == null ){
57 initialDirectoryPath = ConfigManager.getLastOpenedDirectory() ; 57 initialDirectoryPath = ConfigManager.getLastOpenedDirectory() ;
58 } 58 }
59 System.out.println(initialDirectoryPath); 59
60 String[] mask = new String[]{"*.sce", "*.sc*", "*.cos*", "*.sci"}; 60 String[] mask = new String[]{"*.cos*", "*.sci", "*.sce", "*.sc*"};
61 61
62 SwingScilabFileChooser fileChooser = ((SwingScilabFileChooser) ScilabFileChooser.createFileChooser().getAsSimpleFileChooser()); 62 SwingScilabFileChooser fileChooser = ((SwingScilabFileChooser) ScilabFileChooser.createFileChooser().getAsSimpleFileChooser());
63 fileChooser.setInitialDirectory(initialDirectoryPath); 63 fileChooser.setInitialDirectory(initialDirectoryPath);
@@ -70,8 +70,8 @@ public final class OpenAction extends DefaultAction {
70 File f = fileChooser.getSelectedFile(); 70 File f = fileChooser.getSelectedFile();
71 ConfigManager.saveLastOpenedDirectory(f.getPath()); 71 ConfigManager.saveLastOpenedDirectory(f.getPath());
72 ConfigXpadManager.saveToRecentOpenedFiles(f.getPath()); 72 ConfigXpadManager.saveToRecentOpenedFiles(f.getPath());
73 System.out.println("save to config finished"); 73
74 getEditor().setTitle(f.getPath() + " - Xpad"); 74 getEditor().setTitle(f.getPath() + " - " + XpadMessages.SCILAB_EDITOR);
75 getEditor().updateRecentOpenedFilesMenu(); 75 getEditor().updateRecentOpenedFilesMenu();
76 getEditor().readFile(f); 76 getEditor().readFile(f);
77 77