summaryrefslogtreecommitdiffstats
path: root/scilab
diff options
context:
space:
mode:
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>2015-03-13 11:52:47 +0100
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>2015-03-13 11:52:47 +0100
commit4e5fde2de1520cdec08c99cc99b2a3ddd955c2c1 (patch)
tree908a3ba1aa168124432ee31cd2ded517d7f4bdfc /scilab
parente9516e982420029d6a5a0080cf35793ff4fa68ff (diff)
parenta337d144271aa0fc3737071de9dfea3c8fbcc8dc (diff)
downloadscilab-4e5fde2de1520cdec08c99cc99b2a3ddd955c2c1.zip
scilab-4e5fde2de1520cdec08c99cc99b2a3ddd955c2c1.tar.gz
Merge remote-tracking branch 'origin/master' into YaSp
Conflicts: scilab/configure scilab/modules/graphic_objects/Makefile.am scilab/modules/graphic_objects/Makefile.in scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/ObjectData.java scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/ObjectDataJNI.java scilab/modules/graphics/src/c/getHandleProperty/get_triangles_property.c scilab/modules/statistics/macros/st_deviation.sci scilab/modules/xml/src/cpp/VariableScope.cpp scilab/modules/xml/src/cpp/VariableScope.hxx scilab/modules/xml/src/cpp/XMLDocument.cpp Change-Id: Ic4c2565536094b03e3bbd6b14bf6954e57fe1576
Diffstat (limited to 'scilab')
-rw-r--r--scilab/CHANGES_5.5.X22
-rwxr-xr-xscilab/bin/scilab7
-rwxr-xr-xscilab/configure250
-rw-r--r--scilab/configure.ac2
-rw-r--r--scilab/m4/java-thirdparty.m453
-rw-r--r--scilab/modules/elementary_functions/macros/logm.sci2
-rw-r--r--scilab/modules/elementary_functions/tests/nonreg_tests/bug_13608.dia.ref21
-rw-r--r--scilab/modules/elementary_functions/tests/nonreg_tests/bug_13608.tst24
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_4495.dia.ref15
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_4495.tst15
-rw-r--r--scilab/modules/genetic_algorithms/tests/nonreg_tests/bug_10560.tst4
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java23
-rw-r--r--scilab/modules/graphic_objects/Makefile.am6
-rw-r--r--scilab/modules/graphic_objects/Makefile.in56
-rw-r--r--scilab/modules/graphic_objects/includes/DataModel.hxx4
-rw-r--r--scilab/modules/graphic_objects/includes/DataProperties.hxx19
-rw-r--r--scilab/modules/graphic_objects/includes/DecompositionUtils.hxx21
-rw-r--r--scilab/modules/graphic_objects/includes/MeshData.hxx (renamed from scilab/modules/graphic_objects/includes/TriangleMeshData.hxx)36
-rw-r--r--scilab/modules/graphic_objects/includes/MeshFecData.hxx (renamed from scilab/modules/graphic_objects/includes/TriangleMeshFecData.hxx)22
-rw-r--r--scilab/modules/graphic_objects/includes/MeshFecDataDecomposer.hxx (renamed from scilab/modules/graphic_objects/includes/TriangleMeshFecDataDecomposer.hxx)35
-rwxr-xr-xscilab/modules/graphic_objects/includes/graphicObjectProperties.h669
-rw-r--r--scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj6
-rw-r--r--scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj.filters18
-rw-r--r--scilab/modules/graphic_objects/src/cpp/DataLoader.cpp18
-rw-r--r--scilab/modules/graphic_objects/src/cpp/DecompositionUtils.cpp29
-rw-r--r--scilab/modules/graphic_objects/src/cpp/MeshData.cpp (renamed from scilab/modules/graphic_objects/src/cpp/TriangleMeshData.cpp)86
-rw-r--r--scilab/modules/graphic_objects/src/cpp/MeshFecData.cpp212
-rw-r--r--scilab/modules/graphic_objects/src/cpp/MeshFecDataDecomposer.cpp (renamed from scilab/modules/graphic_objects/src/cpp/TriangleMeshFecDataDecomposer.cpp)155
-rw-r--r--scilab/modules/graphic_objects/src/cpp/TriangleMeshFecData.cpp213
-rw-r--r--scilab/modules/graphic_objects/src/cpp/dataModel.cpp2
-rw-r--r--scilab/modules/graphic_objects/src/cpp/getGraphicObjectProperty.cpp6
-rw-r--r--scilab/modules/graphic_objects/src/cpp/setGraphicObjectProperty.cpp3
-rw-r--r--scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/ObjectData.java8
-rw-r--r--scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/ObjectDataJNI.java5
-rwxr-xr-xscilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObjectProperties.java669
-rw-r--r--scilab/modules/graphic_objects/src/jni/ObjectData.i40
-rw-r--r--scilab/modules/graphic_objects/src/jni/ObjectData_wrap.c71
-rwxr-xr-xscilab/modules/graphic_objects/src/scripts/propertiesMap.properties3
-rw-r--r--scilab/modules/graphics/help/en_US/2d_plot/fec.xml68
-rw-r--r--scilab/modules/graphics/help/en_US/2d_plot/fec_properties.xml10
-rw-r--r--scilab/modules/graphics/help/en_US/xsetm.xml72
-rw-r--r--scilab/modules/graphics/help/fr_FR/2d_plot/fec.xml82
-rw-r--r--scilab/modules/graphics/help/fr_FR/xsetm.xml59
-rw-r--r--scilab/modules/graphics/help/ja_JP/xsetm.xml160
-rw-r--r--scilab/modules/graphics/help/pt_BR/xsetm.xml51
-rw-r--r--scilab/modules/graphics/includes/BuildObjects.h2
-rw-r--r--scilab/modules/graphics/includes/sciCall.h2
-rw-r--r--scilab/modules/graphics/macros/%_xget.sci2
-rw-r--r--scilab/modules/graphics/macros/%_xset.sci2
-rw-r--r--scilab/modules/graphics/macros/xsetm.sci14
-rw-r--r--scilab/modules/graphics/sci_gateway/c/sci_fec.c8
-rw-r--r--scilab/modules/graphics/src/c/BuildObjects.c14
-rw-r--r--scilab/modules/graphics/src/c/FeC.c4
-rw-r--r--scilab/modules/graphics/src/c/Fec.h2
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_triangles_property.c24
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/set_tight_limits_property.c9
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/set_triangles_property.c13
-rw-r--r--scilab/modules/graphics/src/c/sciCall.c3
-rw-r--r--scilab/modules/graphics/tests/unit_tests/fec.dia.ref86
-rw-r--r--scilab/modules/graphics/tests/unit_tests/fec.tst85
-rw-r--r--scilab/modules/gui/help/en_US/uigetfile.xml7
-rw-r--r--scilab/modules/gui/help/ja_JP/uigetfile.xml7
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java4
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/frame/SwingScilabFrame.java26
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/label/SwingScilabLabel.java6
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/menubar/SwingScilabMenuBar.java16
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/toolbar/SwingScilabToolBar.java19
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/editor/EditorEventListener.java2
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/editor/GEDPicker.java24
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/menubar/ScilabMenuBar.java2
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/menubar/SimpleMenuBar.java12
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/toolbar/ScilabToolBar.java4
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/toolbar/SimpleToolBar.java12
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/utils/SciFileFilter.java2
-rw-r--r--scilab/modules/helptools/data/configuration/scilab_macros.txt4
-rw-r--r--scilab/modules/helptools/etc/images_md5.txt1
-rw-r--r--scilab/modules/helptools/images/fec_5.pngbin0 -> 7812 bytes
-rw-r--r--scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java16
-rw-r--r--scilab/modules/statistics/help/en_US/central_tendency/mean.xml2
-rw-r--r--scilab/modules/statistics/help/en_US/descriptive_statistics/st_deviation.xml117
-rw-r--r--scilab/modules/statistics/help/en_US/measures_shape/cmoment.xml2
-rw-r--r--scilab/modules/statistics/help/en_US/regression/regress.xml83
-rw-r--r--scilab/modules/statistics/help/en_US/summaries/nfreq.xml87
-rw-r--r--scilab/modules/statistics/help/fr_FR/descriptive_statistics/median.xml2
-rw-r--r--scilab/modules/statistics/help/fr_FR/descriptive_statistics/st_deviation.xml115
-rw-r--r--scilab/modules/statistics/help/ja_JP/central_tendency/mean.xml2
-rw-r--r--scilab/modules/statistics/help/ja_JP/descriptive_statistics/st_deviation.xml100
-rw-r--r--scilab/modules/statistics/help/ja_JP/measures_shape/cmoment.xml2
-rw-r--r--scilab/modules/statistics/help/ja_JP/regression/regress.xml67
-rw-r--r--scilab/modules/statistics/help/ja_JP/summaries/nfreq.xml74
-rw-r--r--scilab/modules/statistics/locales/statistics.pot22
-rw-r--r--scilab/modules/statistics/macros/nfreq.sci33
-rw-r--r--scilab/modules/statistics/macros/regress.sci41
-rw-r--r--scilab/modules/statistics/macros/st_deviation.sci46
-rw-r--r--scilab/modules/statistics/src/dcdflib/cdfnor.f12
-rw-r--r--scilab/modules/statistics/tests/nonreg_tests/bug_13681.dia.ref23
-rw-r--r--scilab/modules/statistics/tests/nonreg_tests/bug_13681.tst25
-rw-r--r--scilab/modules/umfpack/tests/unit_tests/utm300.dia.ref15
-rw-r--r--scilab/modules/umfpack/tests/unit_tests/utm300.tst16
-rw-r--r--scilab/modules/xml/src/cpp/VariableScope.cpp47
-rw-r--r--scilab/modules/xml/src/cpp/VariableScope.hxx2
-rw-r--r--scilab/modules/xml/src/cpp/XMLDocument.cpp706
-rw-r--r--scilab/modules/xml/src/cpp/XMLDocument.hxx1
-rw-r--r--scilab/modules/xml/src/cpp/XMLElement.cpp9
-rw-r--r--scilab/modules/xml/src/cpp/XMLElement.hxx1
-rw-r--r--scilab/modules/xml/src/cpp/XMLObject.cpp12
-rw-r--r--scilab/modules/xml/src/cpp/XMLObject.hxx26
-rw-r--r--scilab/modules/xml/tests/unit_tests/xmlRemove.dia.ref20
-rw-r--r--scilab/modules/xml/tests/unit_tests/xmlRemove.tst21
109 files changed, 2641 insertions, 2876 deletions
diff --git a/scilab/CHANGES_5.5.X b/scilab/CHANGES_5.5.X
index 9382546..7113062 100644
--- a/scilab/CHANGES_5.5.X
+++ b/scilab/CHANGES_5.5.X
@@ -24,6 +24,14 @@ Removed Functions
24 24
25* chart removed. Please use nicholschart instead. 25* chart removed. Please use nicholschart instead.
26 26
27* nfreq removed. Please use tabul instead.
28
29* regress removed. Please use reglin instead.
30
31* st_deviation removed. Please use stdev instead.
32
33* xsetm removed. Please use ged instead.
34
27 35
28Compilation 36Compilation
29=========== 37===========
@@ -31,6 +39,12 @@ Compilation
31* Required version of JOGL updated to 2.2.4 (See bugs #12788 & #13586). 39* Required version of JOGL updated to 2.2.4 (See bugs #12788 & #13586).
32 40
33 41
42Graphics Evolutions
43===================
44
45* fec function can now plot meshes based on any convex polygon type (not only triangles).
46
47
34Scilab Bug Fixes 48Scilab Bug Fixes
35================ 49================
36 50
@@ -38,12 +52,16 @@ Scilab Bug Fixes
38 52
39* Bug #12842 fixed - Scilab could not be launched on some platforms (ATOMS internal library loading problem). 53* Bug #12842 fixed - Scilab could not be launched on some platforms (ATOMS internal library loading problem).
40 54
55* Bug #13372 fixed - xsetm should have been removed in Scilab 5.5.0.
56
41* Bug #13549 fixed - Slider uicontrols triggered three callbacks instead of one. 57* Bug #13549 fixed - Slider uicontrols triggered three callbacks instead of one.
42 58
43* Bug #13586 fixed - Scilab compilation failed with recent versions of JoGL package. 59* Bug #13586 fixed - Scilab compilation failed with recent versions of JoGL package.
44 60
45* Bug #13605 fixed - harmean returned an inverted result when called with parameters "r" or "c". 61* Bug #13605 fixed - harmean returned an inverted result when called with parameters "r" or "c".
46 62
63* Bug #13608 fixed - logm produced an error with complex values.
64
47* Bug #13673 fixed - Anti-aliasing of xpoly marks did not render correctly. 65* Bug #13673 fixed - Anti-aliasing of xpoly marks did not render correctly.
48 66
49* Bug #13674 fixed - User .wgetrc configuration file is now by-passed when ATOMS does not use a proxy. 67* Bug #13674 fixed - User .wgetrc configuration file is now by-passed when ATOMS does not use a proxy.
@@ -52,6 +70,8 @@ Scilab Bug Fixes
52 70
53* Bug #13677 fixed - Indentation of examples in assert_checkerror help page was wrong. 71* Bug #13677 fixed - Indentation of examples in assert_checkerror help page was wrong.
54 72
73* Bug #13681 fixed - Calling cdfnor to get the X vector sometimes produced a vector with some NaN values.
74
55* Bug #13690 fixed - tight_limits property can now manage X, Y and Z axis separately. 75* Bug #13690 fixed - tight_limits property can now manage X, Y and Z axis separately.
56 76
57* Bug #13692 fixed - group returned an error for a discrete dynamical system with a specified sample time. 77* Bug #13692 fixed - group returned an error for a discrete dynamical system with a specified sample time.
@@ -64,6 +84,8 @@ Scilab Bug Fixes
64 84
65* Bug #13725 fixed - Polyline was not correctly filled with big values. 85* Bug #13725 fixed - Polyline was not correctly filled with big values.
66 86
87* Bug #13731 fixed - xmlDelete could be very slow.
88
67* Bug #13741 fixed - Impossible to print an invisible figure under Windows. 89* Bug #13741 fixed - Impossible to print an invisible figure under Windows.
68 90
69* Bug #13742 fixed - Figure was not well printed when there is a xstring with latex. 91* Bug #13742 fixed - Figure was not well printed when there is a xstring with latex.
diff --git a/scilab/bin/scilab b/scilab/bin/scilab
index ea63041..7a1f577 100755
--- a/scilab/bin/scilab
+++ b/scilab/bin/scilab
@@ -644,6 +644,13 @@ if test $IS_SCILAB_BINARY -eq 1; then
644 esac 644 esac
645 645
646else 646else
647 # Scilab compiled using prerequirements
648 if test -d $curdir/../usr; then
649 TCL_LIBRARY="$SCI/usr/lib/tcl8.5"
650 TK_LIBRARY="$SCI/usr/lib/tk8.5"
651 export TCL_LIBRARY
652 export TK_LIBRARY
653 fi
647 PATH="$SCI:$SCI/bin:$PATH" 654 PATH="$SCI:$SCI/bin:$PATH"
648fi 655fi
649 656
diff --git a/scilab/configure b/scilab/configure
index 1dd46aa..a191df6 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -14842,6 +14842,168 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jogl2 used
14842 JOGL2=$PACKAGE_JAR_FILE 14842 JOGL2=$PACKAGE_JAR_FILE
14843 14843
14844 14844
14845
14846 { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (Specification-Version 2.2) of jogl2" >&5
14847$as_echo_n "checking minimal version (Specification-Version 2.2) of jogl2... " >&6; }
14848 export JARFILE=$JOGL2;
14849 if test "x" == "x"; then
14850
14851 cat << \EOF > conftest.java
14852// #line 14852 "configure"
14853import java.util.regex.Pattern;
14854
14855import java.io.IOException;
14856import java.util.jar.JarFile;
14857
14858public class conftest {
14859 public static void main(String[] argv) {
14860 String minVersion="2.2";
14861 try {
14862 String version = new JarFile(System.getenv("JARFILE")).getManifest().getMainAttributes().getValue("Specification-Version");
14863 System.out.println(version);
14864 if (compare(minVersion, version) > 0) {
14865 System.exit(-1);
14866 }
14867 } catch (IOException e) {
14868 System.err.println(e.getMessage());
14869 System.exit(1);
14870 }
14871 }
14872
14873 private static int compare(String v1, String v2) {
14874 String s1 = normalisedVersion(v1);
14875 String s2 = normalisedVersion(v2);
14876 return s1.compareTo(s2);
14877 }
14878
14879 private static String normalisedVersion(String version) {
14880 return normalisedVersion(version, ".", 4);
14881 }
14882
14883 private static String normalisedVersion(String version, String sep, int maxWidth) {
14884 String[] split = Pattern.compile(sep, Pattern.LITERAL).split(version);
14885 StringBuilder sb = new StringBuilder();
14886 for (String s : split) {
14887 sb.append(String.format("%" + maxWidth + 's', s));
14888 }
14889 return sb.toString();
14890 }
14891}
14892EOF
14893
14894 CLASSPATH=$ac_java_classpath
14895 export CLASSPATH
14896 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
14897 if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
14898 if test ""yes"" = "no"; then
14899 echo "yes" >&5
14900 echo "yes"
14901 else
14902 cmd="$JAVA conftest"
14903 if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
14904 echo "yes" >&5
14905 echo "yes"
14906 else
14907 echo "configure: failed program was:" >&5
14908 cat conftest.java >&5
14909 if test -s conftest.java.output; then
14910 STDOUT=`cat conftest.java.output`
14911 fi
14912 echo "configure: CLASSPATH was $CLASSPATH" >&5
14913 as_fn_error $? "Wrong version of jogl2. Expected at least 2.2. Found $STDOUT" "$LINENO" 5
14914 fi
14915 fi
14916 if test -f conftest.java.output; then
14917 rm conftest.java.output
14918 fi
14919 else
14920 echo "configure: failed program was:" >&5
14921 cat conftest.java >&5
14922 echo "configure: CLASSPATH was $CLASSPATH" >&5
14923 as_fn_error $? "Wrong version of jogl2. Expected at least 2.2. Found $STDOUT" "$LINENO" 5
14924 fi
14925
14926 else
14927
14928 cat << \EOF > conftest.java
14929// #line 14929 "configure"
14930import java.util.regex.Pattern;
14931
14932import java.io.IOException;
14933import java.util.jar.JarFile;
14934
14935public class conftest {
14936 public static void main(String[] argv) {
14937 String minVersion="2.2";
14938 try {
14939 String version = new JarFile(System.getenv("JARFILE")).getManifest().getMainAttributes().getValue("Specification-Version");
14940 System.out.println("Specification-Version" + ": " + version);
14941 if (compare(minVersion, version) != 0) {
14942 System.exit(-1);
14943 }
14944 } catch (IOException e) {
14945 System.err.println(e.getMessage());
14946 System.exit(1);
14947 }
14948 }
14949
14950 private static int compare(String v1, String v2) {
14951 String s1 = normalisedVersion(v1);
14952 String s2 = normalisedVersion(v2);
14953 return s1.compareTo(s2);
14954 }
14955
14956 private static String normalisedVersion(String version) {
14957 return normalisedVersion(version, ".", 4);
14958 }
14959
14960 private static String normalisedVersion(String version, String sep, int maxWidth) {
14961 String[] split = Pattern.compile(sep, Pattern.LITERAL).split(version);
14962 StringBuilder sb = new StringBuilder();
14963 for (String s : split) {
14964 sb.append(String.format("%" + maxWidth + 's', s));
14965 }
14966 return sb.toString();
14967 }
14968}
14969EOF
14970
14971 CLASSPATH=$ac_java_classpath
14972 export CLASSPATH
14973 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
14974 if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
14975 if test ""yes"" = "no"; then
14976 echo "yes" >&5
14977 echo "yes"
14978 else
14979 cmd="$JAVA conftest"
14980 if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
14981 echo "yes" >&5
14982 echo "yes"
14983 else
14984 echo "configure: failed program was:" >&5
14985 cat conftest.java >&5
14986 if test -s conftest.java.output; then
14987 STDOUT=`cat conftest.java.output`
14988 fi
14989 echo "configure: CLASSPATH was $CLASSPATH" >&5
14990 as_fn_error $? "Wrong version of jogl2. Expected exact version Specification-Version. Found $STDOUT" "$LINENO" 5
14991 fi
14992 fi
14993 if test -f conftest.java.output; then
14994 rm conftest.java.output
14995 fi
14996 else
14997 echo "configure: failed program was:" >&5
14998 cat conftest.java >&5
14999 echo "configure: CLASSPATH was $CLASSPATH" >&5
15000 as_fn_error $? "Wrong version of jogl2. Expected exact version Specification-Version. Found $STDOUT" "$LINENO" 5
15001 fi
15002
15003 fi
15004 unset JARFILE
15005
15006
14845 if test "$MACOSX" = 1; then 15007 if test "$MACOSX" = 1; then
14846 echo "Check of the presence of libjogl.jnilib and libjogl_awt.jnilib disabled under Mac OS X" 15008 echo "Check of the presence of libjogl.jnilib and libjogl_awt.jnilib disabled under Mac OS X"
14847 else 15009 else
@@ -14966,7 +15128,7 @@ $as_echo_n "checking gluegen2-rt... " >&6; }
14966 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15128 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14967 15129
14968 cat << \EOF > conftest.java 15130 cat << \EOF > conftest.java
14969// #line 14969 "configure" 15131// #line 15131 "configure"
14970import java.util.regex.Pattern; 15132import java.util.regex.Pattern;
14971 15133
14972import jogamp.common.os.MachineDescriptionRuntime; 15134import jogamp.common.os.MachineDescriptionRuntime;
@@ -15140,7 +15302,7 @@ $as_echo_n "checking jhall... " >&6; }
15140 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15302 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15141 15303
15142 cat << \EOF > conftest.java 15304 cat << \EOF > conftest.java
15143// #line 15143 "configure" 15305// #line 15305 "configure"
15144import java.util.regex.Pattern; 15306import java.util.regex.Pattern;
15145 15307
15146import javax.help.JHelp; 15308import javax.help.JHelp;
@@ -15255,7 +15417,7 @@ $as_echo_n "checking javahelp2... " >&6; }
15255 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15417 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15256 15418
15257 cat << \EOF > conftest.java 15419 cat << \EOF > conftest.java
15258// #line 15258 "configure" 15420// #line 15420 "configure"
15259import java.util.regex.Pattern; 15421import java.util.regex.Pattern;
15260 15422
15261import javax.help.JHelp; 15423import javax.help.JHelp;
@@ -15373,7 +15535,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
15373 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15535 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15374 15536
15375 cat << \EOF > conftest.java 15537 cat << \EOF > conftest.java
15376// #line 15376 "configure" 15538// #line 15538 "configure"
15377import java.util.regex.Pattern; 15539import java.util.regex.Pattern;
15378 15540
15379import com.artenum.rosetta.interfaces.core.ConsoleConfiguration; 15541import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
@@ -15487,7 +15649,7 @@ $as_echo_n "checking jrosetta-api... " >&6; }
15487 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15649 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15488 15650
15489 cat << \EOF > conftest.java 15651 cat << \EOF > conftest.java
15490// #line 15490 "configure" 15652// #line 15652 "configure"
15491import java.util.regex.Pattern; 15653import java.util.regex.Pattern;
15492 15654
15493import com.artenum.rosetta.interfaces.core.ConsoleConfiguration; 15655import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
@@ -15605,7 +15767,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
15605 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15767 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15606 15768
15607 cat << \EOF > conftest.java 15769 cat << \EOF > conftest.java
15608// #line 15608 "configure" 15770// #line 15770 "configure"
15609import java.util.regex.Pattern; 15771import java.util.regex.Pattern;
15610 15772
15611import com.artenum.rosetta.core.action.AbstractConsoleAction; 15773import com.artenum.rosetta.core.action.AbstractConsoleAction;
@@ -15711,7 +15873,7 @@ $as_echo_n "checking minimal version (1.0.4) of jrosetta-engine... " >&6; }
15711 if test "x" == "x"; then 15873 if test "x" == "x"; then
15712 15874
15713 cat << \EOF > conftest.java 15875 cat << \EOF > conftest.java
15714// #line 15714 "configure" 15876// #line 15876 "configure"
15715import java.util.regex.Pattern; 15877import java.util.regex.Pattern;
15716 15878
15717import com.artenum.rosetta.util.ConfigurationBuilder; 15879import com.artenum.rosetta.util.ConfigurationBuilder;
@@ -15783,7 +15945,7 @@ EOF
15783 else 15945 else
15784 15946
15785 cat << \EOF > conftest.java 15947 cat << \EOF > conftest.java
15786// #line 15786 "configure" 15948// #line 15948 "configure"
15787import java.util.regex.Pattern; 15949import java.util.regex.Pattern;
15788 15950
15789import com.artenum.rosetta.util.ConfigurationBuilder; 15951import com.artenum.rosetta.util.ConfigurationBuilder;
@@ -15876,7 +16038,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
15876 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 16038 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15877 16039
15878 cat << \EOF > conftest.java 16040 cat << \EOF > conftest.java
15879// #line 15879 "configure" 16041// #line 16041 "configure"
15880import java.util.regex.Pattern; 16042import java.util.regex.Pattern;
15881 16043
15882import net.sourceforge.jeuclid.LayoutContext; 16044import net.sourceforge.jeuclid.LayoutContext;
@@ -15995,7 +16157,7 @@ $as_echo_n "checking fop... " >&6; }
15995 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 16157 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15996 16158
15997 cat << \EOF > conftest.java 16159 cat << \EOF > conftest.java
15998// #line 15998 "configure" 16160// #line 16160 "configure"
15999import java.util.regex.Pattern; 16161import java.util.regex.Pattern;
16000 16162
16001import org.apache.fop.pdf.PDFInfo; 16163import org.apache.fop.pdf.PDFInfo;
@@ -16119,7 +16281,7 @@ $as_echo_n "checking freehep-graphics2d... " >&6; }
16119 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 16281 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
16120 16282
16121 cat << \EOF > conftest.java 16283 cat << \EOF > conftest.java
16122// #line 16122 "configure" 16284// #line 16284 "configure"
16123import java.util.regex.Pattern; 16285import java.util.regex.Pattern;
16124 16286
16125import org.freehep.graphics2d.VectorGraphics; 16287import org.freehep.graphics2d.VectorGraphics;
@@ -16236,7 +16398,7 @@ $as_echo_n "checking freehep-graphicsio-emf... " >&6; }
16236 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 16398 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
16237 16399
16238 cat << \EOF > conftest.java 16400 cat << \EOF > conftest.java
16239// #line 16239 "configure" 16401// #line 16401 "configure"
16240import java.util.regex.Pattern; 16402import java.util.regex.Pattern;
16241 16403
16242import org.freehep.graphicsio.emf.EMFGraphics2D; 16404import org.freehep.graphicsio.emf.EMFGraphics2D;
@@ -16353,7 +16515,7 @@ $as_echo_n "checking freehep-graphicsio... " >&6; }
16353 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 16515 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
16354 16516
16355 cat << \EOF > conftest.java 16517 cat << \EOF > conftest.java
16356// #line 16356 "configure" 16518// #line 16518 "configure"
16357import java.util.regex.Pattern; 16519import java.util.regex.Pattern;
16358 16520
16359import org.freehep.graphicsio.VectorGraphicsIO; 16521import org.freehep.graphicsio.VectorGraphicsIO;
@@ -16470,7 +16632,7 @@ $as_echo_n "checking freehep-io... " >&6; }
16470 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 16632 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
16471 16633
16472 cat << \EOF > conftest.java 16634 cat << \EOF > conftest.java
16473// #line 16473 "configure" 16635// #line 16635 "configure"
16474import java.util.regex.Pattern; 16636import java.util.regex.Pattern;
16475 16637
16476import org.freehep.util.io.XMLSequence; 16638import org.freehep.util.io.XMLSequence;
@@ -16587,7 +16749,7 @@ $as_echo_n "checking freehep-util... " >&6; }
16587 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 16749 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
16588 16750
16589 cat << \EOF > conftest.java 16751 cat << \EOF > conftest.java
16590// #line 16590 "configure" 16752// #line 16752 "configure"
16591import java.util.regex.Pattern; 16753import java.util.regex.Pattern;
16592 16754
16593import org.freehep.util.StringUtilities; 16755import org.freehep.util.StringUtilities;
@@ -16705,7 +16867,7 @@ $as_echo_n "checking batik-all... " >&6; }
16705 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 16867 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
16706 16868
16707 cat << \EOF > conftest.java 16869 cat << \EOF > conftest.java
16708// #line 16708 "configure" 16870// #line 16870 "configure"
16709import java.util.regex.Pattern; 16871import java.util.regex.Pattern;
16710 16872
16711import org.apache.batik.parser.Parser; 16873import org.apache.batik.parser.Parser;
@@ -16822,7 +16984,7 @@ $as_echo_n "checking batik... " >&6; }
16822 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 16984 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
16823 16985
16824 cat << \EOF > conftest.java 16986 cat << \EOF > conftest.java
16825// #line 16825 "configure" 16987// #line 16987 "configure"
16826import java.util.regex.Pattern; 16988import java.util.regex.Pattern;
16827 16989
16828import org.apache.batik.parser.Parser; 16990import org.apache.batik.parser.Parser;
@@ -16929,7 +17091,7 @@ $as_echo_n "checking minimal version (1.7) of batik... " >&6; }
16929 if test "x" == "x"; then 17091 if test "x" == "x"; then
16930 17092
16931 cat << \EOF > conftest.java 17093 cat << \EOF > conftest.java
16932// #line 16932 "configure" 17094// #line 17094 "configure"
16933import java.util.regex.Pattern; 17095import java.util.regex.Pattern;
16934 17096
16935import org.apache.batik.Version; 17097import org.apache.batik.Version;
@@ -17001,7 +17163,7 @@ EOF
17001 else 17163 else
17002 17164
17003 cat << \EOF > conftest.java 17165 cat << \EOF > conftest.java
17004// #line 17004 "configure" 17166// #line 17166 "configure"
17005import java.util.regex.Pattern; 17167import java.util.regex.Pattern;
17006 17168
17007import org.apache.batik.Version; 17169import org.apache.batik.Version;
@@ -17092,7 +17254,7 @@ $as_echo_n "checking commons-io... " >&6; }
17092 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 17254 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
17093 17255
17094 cat << \EOF > conftest.java 17256 cat << \EOF > conftest.java
17095// #line 17095 "configure" 17257// #line 17257 "configure"
17096import java.util.regex.Pattern; 17258import java.util.regex.Pattern;
17097 17259
17098import org.apache.commons.io.output.CountingOutputStream; 17260import org.apache.commons.io.output.CountingOutputStream;
@@ -17209,7 +17371,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
17209 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 17371 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
17210 17372
17211 cat << \EOF > conftest.java 17373 cat << \EOF > conftest.java
17212// #line 17212 "configure" 17374// #line 17374 "configure"
17213import java.util.regex.Pattern; 17375import java.util.regex.Pattern;
17214 17376
17215import org.apache.xmlgraphics.util.Service; 17377import org.apache.xmlgraphics.util.Service;
@@ -17326,7 +17488,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
17326 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 17488 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
17327 17489
17328 cat << \EOF > conftest.java 17490 cat << \EOF > conftest.java
17329// #line 17329 "configure" 17491// #line 17491 "configure"
17330import java.util.regex.Pattern; 17492import java.util.regex.Pattern;
17331 17493
17332import org.apache.avalon.framework.configuration.ConfigurationException; 17494import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -17443,7 +17605,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
17443 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 17605 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
17444 17606
17445 cat << \EOF > conftest.java 17607 cat << \EOF > conftest.java
17446// #line 17446 "configure" 17608// #line 17608 "configure"
17447import java.util.regex.Pattern; 17609import java.util.regex.Pattern;
17448 17610
17449import org.w3c.dom.svg.SVGDocument; 17611import org.w3c.dom.svg.SVGDocument;
@@ -17560,7 +17722,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
17560 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 17722 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
17561 17723
17562 cat << \EOF > conftest.java 17724 cat << \EOF > conftest.java
17563// #line 17563 "configure" 17725// #line 17725 "configure"
17564import java.util.regex.Pattern; 17726import java.util.regex.Pattern;
17565 17727
17566import org.w3c.dom.svg.SVGDocument; 17728import org.w3c.dom.svg.SVGDocument;
@@ -17681,7 +17843,7 @@ $as_echo_n "checking commons-logging... " >&6; }
17681 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 17843 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
17682 17844
17683 cat << \EOF > conftest.java 17845 cat << \EOF > conftest.java
17684// #line 17684 "configure" 17846// #line 17846 "configure"
17685import java.util.regex.Pattern; 17847import java.util.regex.Pattern;
17686 17848
17687import org.apache.commons.logging.LogFactory; 17849import org.apache.commons.logging.LogFactory;
@@ -17798,7 +17960,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
17798 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 17960 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
17799 17961
17800 cat << \EOF > conftest.java 17962 cat << \EOF > conftest.java
17801// #line 17801 "configure" 17963// #line 17963 "configure"
17802import java.util.regex.Pattern; 17964import java.util.regex.Pattern;
17803 17965
17804import org.scilab.forge.jlatexmath.TeXFormula; 17966import org.scilab.forge.jlatexmath.TeXFormula;
@@ -17905,7 +18067,7 @@ $as_echo_n "checking minimal version (1.0.3) of jlatexmath... " >&6; }
17905 if test "x" == "x"; then 18067 if test "x" == "x"; then
17906 18068
17907 cat << \EOF > conftest.java 18069 cat << \EOF > conftest.java
17908// #line 17908 "configure" 18070// #line 18070 "configure"
17909import java.util.regex.Pattern; 18071import java.util.regex.Pattern;
17910 18072
17911import org.scilab.forge.jlatexmath.TeXFormula; 18073import org.scilab.forge.jlatexmath.TeXFormula;
@@ -17977,7 +18139,7 @@ EOF
17977 else 18139 else
17978 18140
17979 cat << \EOF > conftest.java 18141 cat << \EOF > conftest.java
17980// #line 17980 "configure" 18142// #line 18142 "configure"
17981import java.util.regex.Pattern; 18143import java.util.regex.Pattern;
17982 18144
17983import org.scilab.forge.jlatexmath.TeXFormula; 18145import org.scilab.forge.jlatexmath.TeXFormula;
@@ -18068,7 +18230,7 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
18068 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 18230 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
18069 18231
18070 cat << \EOF > conftest.java 18232 cat << \EOF > conftest.java
18071// #line 18071 "configure" 18233// #line 18233 "configure"
18072import java.util.regex.Pattern; 18234import java.util.regex.Pattern;
18073 18235
18074import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj; 18236import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
@@ -18191,7 +18353,7 @@ $as_echo_n "checking checkstyle... " >&6; }
18191 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 18353 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
18192 18354
18193 cat << \EOF > conftest.java 18355 cat << \EOF > conftest.java
18194// #line 18194 "configure" 18356// #line 18356 "configure"
18195import java.util.regex.Pattern; 18357import java.util.regex.Pattern;
18196 18358
18197import com.puppycrawl.tools.checkstyle.CheckStyleTask; 18359import com.puppycrawl.tools.checkstyle.CheckStyleTask;
@@ -18308,7 +18470,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
18308 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 18470 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
18309 18471
18310 cat << \EOF > conftest.java 18472 cat << \EOF > conftest.java
18311// #line 18311 "configure" 18473// #line 18473 "configure"
18312import java.util.regex.Pattern; 18474import java.util.regex.Pattern;
18313 18475
18314import org.apache.commons.beanutils.Converter; 18476import org.apache.commons.beanutils.Converter;
@@ -18425,7 +18587,7 @@ $as_echo_n "checking antlr... " >&6; }
18425 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 18587 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
18426 18588
18427 cat << \EOF > conftest.java 18589 cat << \EOF > conftest.java
18428// #line 18428 "configure" 18590// #line 18590 "configure"
18429import java.util.regex.Pattern; 18591import java.util.regex.Pattern;
18430 18592
18431import antlr.TokenStreamException; 18593import antlr.TokenStreamException;
@@ -18542,7 +18704,7 @@ $as_echo_n "checking junit4... " >&6; }
18542 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 18704 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
18543 18705
18544 cat << \EOF > conftest.java 18706 cat << \EOF > conftest.java
18545// #line 18545 "configure" 18707// #line 18707 "configure"
18546import java.util.regex.Pattern; 18708import java.util.regex.Pattern;
18547 18709
18548import org.junit.Assert; 18710import org.junit.Assert;
@@ -18656,7 +18818,7 @@ $as_echo_n "checking junit... " >&6; }
18656 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 18818 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
18657 18819
18658 cat << \EOF > conftest.java 18820 cat << \EOF > conftest.java
18659// #line 18659 "configure" 18821// #line 18821 "configure"
18660import java.util.regex.Pattern; 18822import java.util.regex.Pattern;
18661 18823
18662import org.junit.Assert; 18824import org.junit.Assert;
@@ -18777,7 +18939,7 @@ $as_echo_n "checking cobertura... " >&6; }
18777 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 18939 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
18778 18940
18779 cat << \EOF > conftest.java 18941 cat << \EOF > conftest.java
18780// #line 18780 "configure" 18942// #line 18942 "configure"
18781import java.util.regex.Pattern; 18943import java.util.regex.Pattern;
18782 18944
18783import net.sourceforge.cobertura.merge.Main; 18945import net.sourceforge.cobertura.merge.Main;
@@ -18894,7 +19056,7 @@ $as_echo_n "checking asm3... " >&6; }
18894 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 19056 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
18895 19057
18896 cat << \EOF > conftest.java 19058 cat << \EOF > conftest.java
18897// #line 18897 "configure" 19059// #line 19059 "configure"
18898import java.util.regex.Pattern; 19060import java.util.regex.Pattern;
18899 19061
18900import org.objectweb.asm.Type; 19062import org.objectweb.asm.Type;
@@ -19008,7 +19170,7 @@ $as_echo_n "checking asm... " >&6; }
19008 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 19170 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
19009 19171
19010 cat << \EOF > conftest.java 19172 cat << \EOF > conftest.java
19011// #line 19011 "configure" 19173// #line 19173 "configure"
19012import java.util.regex.Pattern; 19174import java.util.regex.Pattern;
19013 19175
19014import org.objectweb.asm.Type; 19176import org.objectweb.asm.Type;
@@ -19125,7 +19287,7 @@ $as_echo_n "checking ecj... " >&6; }
19125 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 19287 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
19126 19288
19127 cat << \EOF > conftest.java 19289 cat << \EOF > conftest.java
19128// #line 19128 "configure" 19290// #line 19290 "configure"
19129import java.util.regex.Pattern; 19291import java.util.regex.Pattern;
19130 19292
19131import org.eclipse.jdt.core.compiler.batch.BatchCompiler; 19293import org.eclipse.jdt.core.compiler.batch.BatchCompiler;
@@ -23382,7 +23544,7 @@ CHK_EIGEN_MINOR=0
23382{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if Eigen is version $CHK_EIGEN_WORLD.$CHK_EIGEN_MAJOR.$CHK_EIGEN_MINOR or later" >&5 23544{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if Eigen is version $CHK_EIGEN_WORLD.$CHK_EIGEN_MAJOR.$CHK_EIGEN_MINOR or later" >&5
23383$as_echo_n "checking if Eigen is version $CHK_EIGEN_WORLD.$CHK_EIGEN_MAJOR.$CHK_EIGEN_MINOR or later... " >&6; } 23545$as_echo_n "checking if Eigen is version $CHK_EIGEN_WORLD.$CHK_EIGEN_MAJOR.$CHK_EIGEN_MINOR or later... " >&6; }
23384cat > conftest.$ac_ext <<EOF 23546cat > conftest.$ac_ext <<EOF
23385#line 23385 "configure" 23547#line 23547 "configure"
23386#include "confdefs.h" 23548#include "confdefs.h"
23387 23549
23388#include "$PATH_TO_EIGEN/Eigen/Sparse" 23550#include "$PATH_TO_EIGEN/Eigen/Sparse"
@@ -27973,7 +28135,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
27973{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5 28135{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
27974$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; } 28136$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
27975cat > conftest.$ac_ext <<EOF 28137cat > conftest.$ac_ext <<EOF
27976#line 27976 "configure" 28138#line 28138 "configure"
27977#include "confdefs.h" 28139#include "confdefs.h"
27978 28140
27979#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME" 28141#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -28284,7 +28446,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
28284$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; } 28446$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
28285 28447
28286cat > conftest.$ac_ext <<EOF 28448cat > conftest.$ac_ext <<EOF
28287#line 28287 "configure" 28449#line 28449 "configure"
28288#include "confdefs.h" 28450#include "confdefs.h"
28289 28451
28290#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME" 28452#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -28873,7 +29035,7 @@ $as_echo_n "checking saxon9he... " >&6; }
28873 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 29035 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
28874 29036
28875 cat << \EOF > conftest.java 29037 cat << \EOF > conftest.java
28876// #line 28876 "configure" 29038// #line 29038 "configure"
28877import java.util.regex.Pattern; 29039import java.util.regex.Pattern;
28878 29040
28879import net.sf.saxon.Version; 29041import net.sf.saxon.Version;
@@ -28988,7 +29150,7 @@ $as_echo_n "checking saxon... " >&6; }
28988 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 29150 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
28989 29151
28990 cat << \EOF > conftest.java 29152 cat << \EOF > conftest.java
28991// #line 28991 "configure" 29153// #line 29153 "configure"
28992import java.util.regex.Pattern; 29154import java.util.regex.Pattern;
28993 29155
28994import net.sf.saxon.Version; 29156import net.sf.saxon.Version;
@@ -29104,7 +29266,7 @@ $as_echo_n "checking saxon... " >&6; }
29104 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 29266 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
29105 29267
29106 cat << \EOF > conftest.java 29268 cat << \EOF > conftest.java
29107// #line 29107 "configure" 29269// #line 29269 "configure"
29108import java.util.regex.Pattern; 29270import java.util.regex.Pattern;
29109 29271
29110import com.icl.saxon.Loader; 29272import com.icl.saxon.Loader;
diff --git a/scilab/configure.ac b/scilab/configure.ac
index c0681cc..f402f07 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -953,6 +953,8 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
953 JOGL2=$PACKAGE_JAR_FILE 953 JOGL2=$PACKAGE_JAR_FILE
954 AC_SUBST(JOGL2) 954 AC_SUBST(JOGL2)
955 955
956 AC_JAVA_CHECK_VERSION_MANIFEST([jogl2],$JOGL2,[2.2],[Specification-Version])
957
956 if test "$MACOSX" = 1; then 958 if test "$MACOSX" = 1; then
957 echo "Check of the presence of libjogl.jnilib and libjogl_awt.jnilib disabled under Mac OS X" 959 echo "Check of the presence of libjogl.jnilib and libjogl_awt.jnilib disabled under Mac OS X"
958 else 960 else
diff --git a/scilab/m4/java-thirdparty.m4 b/scilab/m4/java-thirdparty.m4
index 0be3011..399d5e9 100644
--- a/scilab/m4/java-thirdparty.m4
+++ b/scilab/m4/java-thirdparty.m4
@@ -1,6 +1,7 @@
1dnl 1dnl
2dnl Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 2dnl Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3dnl Copyright (C) DIGITEO - 2010 - Sylvestre Ledru 3dnl Copyright (C) DIGITEO - 2010 - Sylvestre Ledru
4dnl Copyright (C) Scilab Enterprises - 2015 - Clement David
4dnl 5dnl
5dnl This file must be used under the terms of the CeCILL. 6dnl This file must be used under the terms of the CeCILL.
6dnl This source file is licensed as described in the file COPYING, which 7dnl This source file is licensed as described in the file COPYING, which
@@ -53,3 +54,55 @@ AC_DEFUN([AC_JAVA_CHECK_VERSION_PACKAGE], [
53 fi 54 fi
54 ac_java_classpath=$saved_ac_java_classpath 55 ac_java_classpath=$saved_ac_java_classpath
55]) 56])
57
58#------------------------------------------------------------------------
59# AC_JAVA_CHECK_VERSION_MANIFEST(NAME, JAR, MIN_VERSION, [PRE_PROCESSING], [GREATER_OR_EQUALS])
60#
61# Check if the minimal version of a software/package is available or not.
62# Note that since java does not provide an universal mechanism to detect
63# the version of a package, we assume that the "Specification-Version" of
64# the MANIFEST.MF is correct.
65#
66# Arguments:
67# 1. The name of the package (only used in the display of feedbacks)
68# 2. The name of the jar files used to build against
69# 3. What is the minimal version expected
70# 4. Manifest attribute name
71# 5. Specify if we want the exact version or greater. (equals or greater by
72# default).
73#
74#------------------------------------------------------------------------
75
76AC_DEFUN([AC_JAVA_CHECK_VERSION_MANIFEST], [
77 AC_MSG_CHECKING([minimal version ($4 $3) of $1])
78 export JARFILE=$2;
79 if test "x$5" == "x"; then
80 AC_JAVA_TRY_COMPILE([import java.io.IOException;
81import java.util.jar.JarFile;], [String minVersion="$3";
82 try {
83 String version = new JarFile(System.getenv("JARFILE")).getManifest().getMainAttributes().getValue("$4");
84 System.out.println(version);
85 if (compare(minVersion, version) > 0) {
86 System.exit(-1);
87 }
88 } catch (IOException e) {
89 System.err.println(e.getMessage());
90 System.exit(1);
91 } ], "yes", echo "yes" , AC_MSG_ERROR([Wrong version of $1. Expected at least $3. Found $STDOUT]))
92 else
93 AC_JAVA_TRY_COMPILE([import java.io.IOException;
94import java.util.jar.JarFile;], [String minVersion="$3";
95 try {
96 String version = new JarFile(System.getenv("JARFILE")).getManifest().getMainAttributes().getValue("$4");
97 System.out.println("$4" + ": " + version);
98 if (compare(minVersion, version) != 0) {
99 System.exit(-1);
100 }
101 } catch (IOException e) {
102 System.err.println(e.getMessage());
103 System.exit(1);
104 } ], "yes", echo "yes" , AC_MSG_ERROR([Wrong version of $1. Expected exact version $4. Found $STDOUT]))
105 fi
106 unset JARFILE
107])
108
diff --git a/scilab/modules/elementary_functions/macros/logm.sci b/scilab/modules/elementary_functions/macros/logm.sci
index 25f14b8..071c4ed 100644
--- a/scilab/modules/elementary_functions/macros/logm.sci
+++ b/scilab/modules/elementary_functions/macros/logm.sci
@@ -46,7 +46,7 @@ function x=logm(a)
46 end 46 end
47 x = u * diag(w1) * u'; 47 x = u * diag(w1) * u';
48 if r then 48 if r then
49 if and(s >= 0) then 49 if and(real(s) >= 0) then
50 x = real(x); 50 x = real(x);
51 end 51 end
52 end 52 end
diff --git a/scilab/modules/elementary_functions/tests/nonreg_tests/bug_13608.dia.ref b/scilab/modules/elementary_functions/tests/nonreg_tests/bug_13608.dia.ref
new file mode 100644
index 0000000..7074f2d
--- /dev/null
+++ b/scilab/modules/elementary_functions/tests/nonreg_tests/bug_13608.dia.ref
@@ -0,0 +1,21 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2014 - Scilab Enterprises - Vladislav TRUBKIN
4//
5// This file is distributed under the same license as the Scilab package.
6// =============================================================================
7// <-- Non-regression test for bug 13608 -->
8//
9// <-- Bugzilla URL -->
10// http://bugzilla.scilab.org/show_bug.cgi?id=13608
11//
12// <-- Short Description -->
13// There was an error with complex values.
14value = [0.1+0*%i, 0+0*%i; 0+0*%i, 0.2+0*%i];
15refValue = [-2.3025851, 0; 0, -1.6094379];
16assert_checkalmostequal(refValue, logm(value));
17value = [-0.1-0*%i, 1-0*%i; 0+0*%i, -0.2+0*%i];
18refValue = [-2.3025851 + 3.1415927*%i, -6.9314718; 0, -1.6094379 + 3.1415927*%i];
19assert_checkalmostequal(refValue, logm(value));
20a = [-0.9+%i 0+0*%i; 0+0*%i -0.1-%i];
21assert_checktrue(and(clean(expm(logm(a))-a)==0));
diff --git a/scilab/modules/elementary_functions/tests/nonreg_tests/bug_13608.tst b/scilab/modules/elementary_functions/tests/nonreg_tests/bug_13608.tst
new file mode 100644
index 0000000..b62ff05
--- /dev/null
+++ b/scilab/modules/elementary_functions/tests/nonreg_tests/bug_13608.tst
@@ -0,0 +1,24 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2014 - Scilab Enterprises - Vladislav TRUBKIN
4//
5// This file is distributed under the same license as the Scilab package.
6// =============================================================================
7// <-- Non-regression test for bug 13608 -->
8//
9// <-- Bugzilla URL -->
10// http://bugzilla.scilab.org/show_bug.cgi?id=13608
11//
12// <-- Short Description -->
13// There was an error with complex values.
14
15value = [0.1+0*%i, 0+0*%i; 0+0*%i, 0.2+0*%i];
16refValue = [-2.3025851, 0; 0, -1.6094379];
17assert_checkalmostequal(refValue, logm(value));
18
19value = [-0.1-0*%i, 1-0*%i; 0+0*%i, -0.2+0*%i];
20refValue = [-2.3025851 + 3.1415927*%i, -6.9314718; 0, -1.6094379 + 3.1415927*%i];
21assert_checkalmostequal(refValue, logm(value));
22
23a = [-0.9+%i 0+0*%i; 0+0*%i -0.1-%i];
24assert_checktrue(and(clean(expm(logm(a))-a)==0));
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_4495.dia.ref b/scilab/modules/functions/tests/nonreg_tests/bug_4495.dia.ref
index 63435de..649d5ac 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_4495.dia.ref
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_4495.dia.ref
@@ -14,23 +14,24 @@
14// exec does not check second and third input arguments. 14// exec does not check second and third input arguments.
15// ============================================================================= 15// =============================================================================
16function mytestfunc() 16function mytestfunc()
17 disp('mytestfunc: called ok'); 17 disp("mytestfunc: called ok");
18endfunction 18endfunction
19// ============================================================================= 19// =============================================================================
20exec(mytestfunc); 20exec(mytestfunc);
21 21
22 mytestfunc: called ok 22 mytestfunc: called ok
23// ============================================================================= 23// =============================================================================
24mputl('a=1;b=2;',TMPDIR+'/myscript'); 24mputl("a=1;b=2;",TMPDIR+"/myscript");
25ierr = execstr("exec(TMPDIR+''/myscript'',''toto'',''tata'');","errcatch"); 25ierr = execstr("exec(TMPDIR+''/myscript'',''toto'',''tata'');","errcatch");
26if ierr <> 999 then bugmes();quit;end 26if ierr <> 999 then bugmes();quit;end
27// ============================================================================= 27// =============================================================================
28exec(TMPDIR+'/myscript'); 28exec(TMPDIR+"/myscript");
29// ============================================================================= 29// =============================================================================
30exec(TMPDIR+'/myscript','errcatch'); 30exec(TMPDIR+"/myscript","errcatch");
31exec(TMPDIR+'/myscript',-1); 31exec(TMPDIR+"/myscript",-1);
32exec(TMPDIR+'/myscript','errcatch',-1); 32exec(TMPDIR+"/myscript","errcatch",-1);
33exec(TMPDIR+'/myscript',-1,'errcatch'); 33ierr = execstr("exec(TMPDIR+''/myscript'',-1,''blabla'');","errcatch");
34if ierr <> 999 then bugmes();quit;end
34// ============================================================================= 35// =============================================================================
35ierr = execstr("exec(TMPDIR+''/myscript'',0,''blabla'');","errcatch"); 36ierr = execstr("exec(TMPDIR+''/myscript'',0,''blabla'');","errcatch");
36if ierr <> 999 then bugmes();quit;end 37if ierr <> 999 then bugmes();quit;end
diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_4495.tst b/scilab/modules/functions/tests/nonreg_tests/bug_4495.tst
index feae602..dfb8294 100644
--- a/scilab/modules/functions/tests/nonreg_tests/bug_4495.tst
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_4495.tst
@@ -16,21 +16,22 @@
16// exec does not check second and third input arguments. 16// exec does not check second and third input arguments.
17// ============================================================================= 17// =============================================================================
18function mytestfunc() 18function mytestfunc()
19 disp('mytestfunc: called ok'); 19 disp("mytestfunc: called ok");
20endfunction 20endfunction
21// ============================================================================= 21// =============================================================================
22exec(mytestfunc); 22exec(mytestfunc);
23// ============================================================================= 23// =============================================================================
24mputl('a=1;b=2;',TMPDIR+'/myscript'); 24mputl("a=1;b=2;",TMPDIR+"/myscript");
25ierr = execstr("exec(TMPDIR+''/myscript'',''toto'',''tata'');","errcatch"); 25ierr = execstr("exec(TMPDIR+''/myscript'',''toto'',''tata'');","errcatch");
26if ierr <> 999 then pause,end 26if ierr <> 999 then pause,end
27// ============================================================================= 27// =============================================================================
28exec(TMPDIR+'/myscript'); 28exec(TMPDIR+"/myscript");
29// ============================================================================= 29// =============================================================================
30exec(TMPDIR+'/myscript','errcatch'); 30exec(TMPDIR+"/myscript","errcatch");
31exec(TMPDIR+'/myscript',-1); 31exec(TMPDIR+"/myscript",-1);
32exec(TMPDIR+'/myscript','errcatch',-1); 32exec(TMPDIR+"/myscript","errcatch",-1);
33exec(TMPDIR+'/myscript',-1,'errcatch'); 33ierr = execstr("exec(TMPDIR+''/myscript'',-1,''blabla'');","errcatch");
34if ierr <> 999 then pause,end
34// ============================================================================= 35// =============================================================================
35ierr = execstr("exec(TMPDIR+''/myscript'',0,''blabla'');","errcatch"); 36ierr = execstr("exec(TMPDIR+''/myscript'',0,''blabla'');","errcatch");
36if ierr <> 999 then pause,end 37if ierr <> 999 then pause,end
diff --git a/scilab/modules/genetic_algorithms/tests/nonreg_tests/bug_10560.tst b/scilab/modules/genetic_algorithms/tests/nonreg_tests/bug_10560.tst
index 1e95641..e2c4e7c 100644
--- a/scilab/modules/genetic_algorithms/tests/nonreg_tests/bug_10560.tst
+++ b/scilab/modules/genetic_algorithms/tests/nonreg_tests/bug_10560.tst
@@ -5,7 +5,7 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7// 7//
8// <-- NO CHECK REF --> 8// <-- NO CHECK REF -->
9// 9//
10// <-- Non-regression test for bug 10560 --> 10// <-- Non-regression test for bug 10560 -->
11// 11//
@@ -15,5 +15,5 @@
15// <-- Short Description --> 15// <-- Short Description -->
16// genetic algorithms demos failed 16// genetic algorithms demos failed
17 17
18ierr = exec('SCI/modules/genetic_algorithms/demos/GAdemo.sce', -1, 'errcatch'); 18ierr = exec("SCI/modules/genetic_algorithms/demos/GAdemo.sce", "errcatch", -1);
19assert_checkequal(ierr, 0); \ No newline at end of file 19assert_checkequal(ierr, 0); \ No newline at end of file
diff --git a/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java b/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
index bf38ca1..138dfed 100644
--- a/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
+++ b/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
@@ -364,9 +364,8 @@ public class Export {
364 } 364 }
365 365
366 if (joglCanvas != null) { 366 if (joglCanvas != null) {
367 BufferedImage image = joglCanvas.getImage();
368 //joglCanvas.destroy();
369 PNGExporter exporter = (PNGExporter) getExporter(type); 367 PNGExporter exporter = (PNGExporter) getExporter(type);
368 BufferedImage image = joglCanvas.getImage(exporter.isAlphaChannelSupported());
370 exporter.setImage(file, image, params); 369 exporter.setImage(file, image, params);
371 exporter.write(); 370 exporter.write();
372 exporter.dispose(); 371 exporter.dispose();
@@ -541,6 +540,11 @@ public class Export {
541 g2d.dispose(); 540 g2d.dispose();
542 } 541 }
543 } 542 }
543
544 public boolean isAlphaChannelSupported() {
545 return true;
546 }
547
544 } 548 }
545 549
546 /** 550 /**
@@ -554,6 +558,11 @@ public class Export {
554 public void write() throws IOException { 558 public void write() throws IOException {
555 ExportBitmap.writeFile(image, "gif", file); 559 ExportBitmap.writeFile(image, "gif", file);
556 } 560 }
561
562 public boolean isAlphaChannelSupported() {
563 return false;
564 }
565
557 } 566 }
558 567
559 /** 568 /**
@@ -577,6 +586,11 @@ public class Export {
577 public void write() throws IOException { 586 public void write() throws IOException {
578 ExportBitmap.writeFile(image, "bmp", file); 587 ExportBitmap.writeFile(image, "bmp", file);
579 } 588 }
589
590 public boolean isAlphaChannelSupported() {
591 return false;
592 }
593
580 } 594 }
581 595
582 /** 596 /**
@@ -594,6 +608,11 @@ public class Export {
594 ExportBitmap.writeJPEG(image, params.compressionQuality, file); 608 ExportBitmap.writeJPEG(image, params.compressionQuality, file);
595 } 609 }
596 } 610 }
611
612 public boolean isAlphaChannelSupported() {
613 return false;
614 }
615
597 } 616 }
598 617
599 /** 618 /**
diff --git a/scilab/modules/graphic_objects/Makefile.am b/scilab/modules/graphic_objects/Makefile.am
index 864adea..66ac267 100644
--- a/scilab/modules/graphic_objects/Makefile.am
+++ b/scilab/modules/graphic_objects/Makefile.am
@@ -56,8 +56,8 @@ GRAPHIC_OBJECTS_CXX_SOURCES = \
56 src/cpp/NgonGridData.cpp \ 56 src/cpp/NgonGridData.cpp \
57 src/cpp/NgonGridMatplotData.cpp \ 57 src/cpp/NgonGridMatplotData.cpp \
58 src/cpp/NgonPolylineData.cpp \ 58 src/cpp/NgonPolylineData.cpp \
59 src/cpp/TriangleMeshData.cpp \ 59 src/cpp/MeshData.cpp \
60 src/cpp/TriangleMeshFecData.cpp \ 60 src/cpp/MeshFecData.cpp \
61 src/cpp/ColorComputer.cpp \ 61 src/cpp/ColorComputer.cpp \
62 src/cpp/DecompositionUtils.cpp \ 62 src/cpp/DecompositionUtils.cpp \
63 src/cpp/Fac3DColorComputer.cpp \ 63 src/cpp/Fac3DColorComputer.cpp \
@@ -68,7 +68,7 @@ GRAPHIC_OBJECTS_CXX_SOURCES = \
68 src/cpp/NgonGridMatplotDataDecomposer.cpp \ 68 src/cpp/NgonGridMatplotDataDecomposer.cpp \
69 src/cpp/Plot3DDecomposer.cpp \ 69 src/cpp/Plot3DDecomposer.cpp \
70 src/cpp/PolylineDecomposer.cpp \ 70 src/cpp/PolylineDecomposer.cpp \
71 src/cpp/TriangleMeshFecDataDecomposer.cpp \ 71 src/cpp/MeshFecDataDecomposer.cpp \
72 src/cpp/Triangulator.cpp \ 72 src/cpp/Triangulator.cpp \
73 src/cpp/ScilabView.cpp \ 73 src/cpp/ScilabView.cpp \
74 src/cpp/FigureList.cpp \ 74 src/cpp/FigureList.cpp \
diff --git a/scilab/modules/graphic_objects/Makefile.in b/scilab/modules/graphic_objects/Makefile.in
index aafdfa3..6b6a86f 100644
--- a/scilab/modules/graphic_objects/Makefile.in
+++ b/scilab/modules/graphic_objects/Makefile.in
@@ -208,8 +208,8 @@ am__objects_4 = \
208 src/cpp/libscigraphic_objects_la-NgonGridData.lo \ 208 src/cpp/libscigraphic_objects_la-NgonGridData.lo \
209 src/cpp/libscigraphic_objects_la-NgonGridMatplotData.lo \ 209 src/cpp/libscigraphic_objects_la-NgonGridMatplotData.lo \
210 src/cpp/libscigraphic_objects_la-NgonPolylineData.lo \ 210 src/cpp/libscigraphic_objects_la-NgonPolylineData.lo \
211 src/cpp/libscigraphic_objects_la-TriangleMeshData.lo \ 211 src/cpp/libscigraphic_objects_la-MeshData.lo \
212 src/cpp/libscigraphic_objects_la-TriangleMeshFecData.lo \ 212 src/cpp/libscigraphic_objects_la-MeshFecData.lo \
213 src/cpp/libscigraphic_objects_la-ColorComputer.lo \ 213 src/cpp/libscigraphic_objects_la-ColorComputer.lo \
214 src/cpp/libscigraphic_objects_la-DecompositionUtils.lo \ 214 src/cpp/libscigraphic_objects_la-DecompositionUtils.lo \
215 src/cpp/libscigraphic_objects_la-Fac3DColorComputer.lo \ 215 src/cpp/libscigraphic_objects_la-Fac3DColorComputer.lo \
@@ -220,7 +220,7 @@ am__objects_4 = \
220 src/cpp/libscigraphic_objects_la-NgonGridMatplotDataDecomposer.lo \ 220 src/cpp/libscigraphic_objects_la-NgonGridMatplotDataDecomposer.lo \
221 src/cpp/libscigraphic_objects_la-Plot3DDecomposer.lo \ 221 src/cpp/libscigraphic_objects_la-Plot3DDecomposer.lo \
222 src/cpp/libscigraphic_objects_la-PolylineDecomposer.lo \ 222 src/cpp/libscigraphic_objects_la-PolylineDecomposer.lo \
223 src/cpp/libscigraphic_objects_la-TriangleMeshFecDataDecomposer.lo \ 223 src/cpp/libscigraphic_objects_la-MeshFecDataDecomposer.lo \
224 src/cpp/libscigraphic_objects_la-Triangulator.lo \ 224 src/cpp/libscigraphic_objects_la-Triangulator.lo \
225 src/cpp/libscigraphic_objects_la-ScilabView.lo \ 225 src/cpp/libscigraphic_objects_la-ScilabView.lo \
226 src/cpp/libscigraphic_objects_la-FigureList.lo \ 226 src/cpp/libscigraphic_objects_la-FigureList.lo \
@@ -728,8 +728,8 @@ GRAPHIC_OBJECTS_CXX_SOURCES = \
728 src/cpp/NgonGridData.cpp \ 728 src/cpp/NgonGridData.cpp \
729 src/cpp/NgonGridMatplotData.cpp \ 729 src/cpp/NgonGridMatplotData.cpp \
730 src/cpp/NgonPolylineData.cpp \ 730 src/cpp/NgonPolylineData.cpp \
731 src/cpp/TriangleMeshData.cpp \ 731 src/cpp/MeshData.cpp \
732 src/cpp/TriangleMeshFecData.cpp \ 732 src/cpp/MeshFecData.cpp \
733 src/cpp/ColorComputer.cpp \ 733 src/cpp/ColorComputer.cpp \
734 src/cpp/DecompositionUtils.cpp \ 734 src/cpp/DecompositionUtils.cpp \
735 src/cpp/Fac3DColorComputer.cpp \ 735 src/cpp/Fac3DColorComputer.cpp \
@@ -740,7 +740,7 @@ GRAPHIC_OBJECTS_CXX_SOURCES = \
740 src/cpp/NgonGridMatplotDataDecomposer.cpp \ 740 src/cpp/NgonGridMatplotDataDecomposer.cpp \
741 src/cpp/Plot3DDecomposer.cpp \ 741 src/cpp/Plot3DDecomposer.cpp \
742 src/cpp/PolylineDecomposer.cpp \ 742 src/cpp/PolylineDecomposer.cpp \
743 src/cpp/TriangleMeshFecDataDecomposer.cpp \ 743 src/cpp/MeshFecDataDecomposer.cpp \
744 src/cpp/Triangulator.cpp \ 744 src/cpp/Triangulator.cpp \
745 src/cpp/ScilabView.cpp \ 745 src/cpp/ScilabView.cpp \
746 src/cpp/FigureList.cpp \ 746 src/cpp/FigureList.cpp \
@@ -959,9 +959,9 @@ src/cpp/libscigraphic_objects_la-NgonGridMatplotData.lo: \
959 src/cpp/$(am__dirstamp) src/cpp/$(DEPDIR)/$(am__dirstamp) 959 src/cpp/$(am__dirstamp) src/cpp/$(DEPDIR)/$(am__dirstamp)
960src/cpp/libscigraphic_objects_la-NgonPolylineData.lo: \ 960src/cpp/libscigraphic_objects_la-NgonPolylineData.lo: \
961 src/cpp/$(am__dirstamp) src/cpp/$(DEPDIR)/$(am__dirstamp) 961 src/cpp/$(am__dirstamp) src/cpp/$(DEPDIR)/$(am__dirstamp)
962src/cpp/libscigraphic_objects_la-TriangleMeshData.lo: \ 962src/cpp/libscigraphic_objects_la-MeshData.lo: src/cpp/$(am__dirstamp) \
963 src/cpp/$(am__dirstamp) src/cpp/$(DEPDIR)/$(am__dirstamp) 963 src/cpp/$(DEPDIR)/$(am__dirstamp)
964src/cpp/libscigraphic_objects_la-TriangleMeshFecData.lo: \ 964src/cpp/libscigraphic_objects_la-MeshFecData.lo: \
965 src/cpp/$(am__dirstamp) src/cpp/$(DEPDIR)/$(am__dirstamp) 965 src/cpp/$(am__dirstamp) src/cpp/$(DEPDIR)/$(am__dirstamp)
966src/cpp/libscigraphic_objects_la-ColorComputer.lo: \ 966src/cpp/libscigraphic_objects_la-ColorComputer.lo: \
967 src/cpp/$(am__dirstamp) src/cpp/$(DEPDIR)/$(am__dirstamp) 967 src/cpp/$(am__dirstamp) src/cpp/$(DEPDIR)/$(am__dirstamp)
@@ -983,7 +983,7 @@ src/cpp/libscigraphic_objects_la-Plot3DDecomposer.lo: \
983 src/cpp/$(am__dirstamp) src/cpp/$(DEPDIR)/$(am__dirstamp) 983 src/cpp/$(am__dirstamp) src/cpp/$(DEPDIR)/$(am__dirstamp)
984src/cpp/libscigraphic_objects_la-PolylineDecomposer.lo: \ 984src/cpp/libscigraphic_objects_la-PolylineDecomposer.lo: \
985 src/cpp/$(am__dirstamp) src/cpp/$(DEPDIR)/$(am__dirstamp) 985 src/cpp/$(am__dirstamp) src/cpp/$(DEPDIR)/$(am__dirstamp)
986src/cpp/libscigraphic_objects_la-TriangleMeshFecDataDecomposer.lo: \ 986src/cpp/libscigraphic_objects_la-MeshFecDataDecomposer.lo: \
987 src/cpp/$(am__dirstamp) src/cpp/$(DEPDIR)/$(am__dirstamp) 987 src/cpp/$(am__dirstamp) src/cpp/$(DEPDIR)/$(am__dirstamp)
988src/cpp/libscigraphic_objects_la-Triangulator.lo: \ 988src/cpp/libscigraphic_objects_la-Triangulator.lo: \
989 src/cpp/$(am__dirstamp) src/cpp/$(DEPDIR)/$(am__dirstamp) 989 src/cpp/$(am__dirstamp) src/cpp/$(DEPDIR)/$(am__dirstamp)
@@ -1041,6 +1041,9 @@ distclean-compile:
1041@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-FigureModel.Plo@am__quote@ 1041@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-FigureModel.Plo@am__quote@
1042@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-HandleManagement.Plo@am__quote@ 1042@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-HandleManagement.Plo@am__quote@
1043@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-MatPlotDecomposer.Plo@am__quote@ 1043@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-MatPlotDecomposer.Plo@am__quote@
1044@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-MeshData.Plo@am__quote@
1045@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-MeshFecData.Plo@am__quote@
1046@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-MeshFecDataDecomposer.Plo@am__quote@
1044@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-NgonData.Plo@am__quote@ 1047@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-NgonData.Plo@am__quote@
1045@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-NgonGeneralData.Plo@am__quote@ 1048@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-NgonGeneralData.Plo@am__quote@
1046@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-NgonGridData.Plo@am__quote@ 1049@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-NgonGridData.Plo@am__quote@
@@ -1054,9 +1057,6 @@ distclean-compile:
1054@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-PolylineDecomposer.Plo@am__quote@ 1057@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-PolylineDecomposer.Plo@am__quote@
1055@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-ScilabView.Plo@am__quote@ 1058@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-ScilabView.Plo@am__quote@
1056@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-Texture.Plo@am__quote@ 1059@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-Texture.Plo@am__quote@
1057@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-TriangleMeshData.Plo@am__quote@
1058@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-TriangleMeshFecData.Plo@am__quote@
1059@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-TriangleMeshFecDataDecomposer.Plo@am__quote@
1060@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-Triangulator.Plo@am__quote@ 1060@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-Triangulator.Plo@am__quote@
1061@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-createGraphicObject.Plo@am__quote@ 1061@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-createGraphicObject.Plo@am__quote@
1062@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-createObjectData.Plo@am__quote@ 1062@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphic_objects_la-createObjectData.Plo@am__quote@
@@ -1278,19 +1278,19 @@ src/cpp/libscigraphic_objects_la-NgonPolylineData.lo: src/cpp/NgonPolylineData.c
1278@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1278@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1279@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/cpp/libscigraphic_objects_la-NgonPolylineData.lo `test -f 'src/cpp/NgonPolylineData.cpp' || echo '$(srcdir)/'`src/cpp/NgonPolylineData.cpp 1279@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/cpp/libscigraphic_objects_la-NgonPolylineData.lo `test -f 'src/cpp/NgonPolylineData.cpp' || echo '$(srcdir)/'`src/cpp/NgonPolylineData.cpp
1280 1280
1281src/cpp/libscigraphic_objects_la-TriangleMeshData.lo: src/cpp/TriangleMeshData.cpp 1281src/cpp/libscigraphic_objects_la-MeshData.lo: src/cpp/MeshData.cpp
1282@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/cpp/libscigraphic_objects_la-TriangleMeshData.lo -MD -MP -MF src/cpp/$(DEPDIR)/libscigraphic_objects_la-TriangleMeshData.Tpo -c -o src/cpp/libscigraphic_objects_la-TriangleMeshData.lo `test -f 'src/cpp/TriangleMeshData.cpp' || echo '$(srcdir)/'`src/cpp/TriangleMeshData.cpp 1282@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/cpp/libscigraphic_objects_la-MeshData.lo -MD -MP -MF src/cpp/$(DEPDIR)/libscigraphic_objects_la-MeshData.Tpo -c -o src/cpp/libscigraphic_objects_la-MeshData.lo `test -f 'src/cpp/MeshData.cpp' || echo '$(srcdir)/'`src/cpp/MeshData.cpp
1283@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/cpp/$(DEPDIR)/libscigraphic_objects_la-TriangleMeshData.Tpo src/cpp/$(DEPDIR)/libscigraphic_objects_la-TriangleMeshData.Plo 1283@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/cpp/$(DEPDIR)/libscigraphic_objects_la-MeshData.Tpo src/cpp/$(DEPDIR)/libscigraphic_objects_la-MeshData.Plo
1284@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='src/cpp/TriangleMeshData.cpp' object='src/cpp/libscigraphic_objects_la-TriangleMeshData.lo' libtool=yes @AMDEPBACKSLASH@ 1284@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='src/cpp/MeshData.cpp' object='src/cpp/libscigraphic_objects_la-MeshData.lo' libtool=yes @AMDEPBACKSLASH@
1285@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1285@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1286@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/cpp/libscigraphic_objects_la-TriangleMeshData.lo `test -f 'src/cpp/TriangleMeshData.cpp' || echo '$(srcdir)/'`src/cpp/TriangleMeshData.cpp 1286@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/cpp/libscigraphic_objects_la-MeshData.lo `test -f 'src/cpp/MeshData.cpp' || echo '$(srcdir)/'`src/cpp/MeshData.cpp
1287 1287
1288src/cpp/libscigraphic_objects_la-TriangleMeshFecData.lo: src/cpp/TriangleMeshFecData.cpp 1288src/cpp/libscigraphic_objects_la-MeshFecData.lo: src/cpp/MeshFecData.cpp
1289@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/cpp/libscigraphic_objects_la-TriangleMeshFecData.lo -MD -MP -MF src/cpp/$(DEPDIR)/libscigraphic_objects_la-TriangleMeshFecData.Tpo -c -o src/cpp/libscigraphic_objects_la-TriangleMeshFecData.lo `test -f 'src/cpp/TriangleMeshFecData.cpp' || echo '$(srcdir)/'`src/cpp/TriangleMeshFecData.cpp 1289@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/cpp/libscigraphic_objects_la-MeshFecData.lo -MD -MP -MF src/cpp/$(DEPDIR)/libscigraphic_objects_la-MeshFecData.Tpo -c -o src/cpp/libscigraphic_objects_la-MeshFecData.lo `test -f 'src/cpp/MeshFecData.cpp' || echo '$(srcdir)/'`src/cpp/MeshFecData.cpp
1290@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/cpp/$(DEPDIR)/libscigraphic_objects_la-TriangleMeshFecData.Tpo src/cpp/$(DEPDIR)/libscigraphic_objects_la-TriangleMeshFecData.Plo 1290@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/cpp/$(DEPDIR)/libscigraphic_objects_la-MeshFecData.Tpo src/cpp/$(DEPDIR)/libscigraphic_objects_la-MeshFecData.Plo
1291@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='src/cpp/TriangleMeshFecData.cpp' object='src/cpp/libscigraphic_objects_la-TriangleMeshFecData.lo' libtool=yes @AMDEPBACKSLASH@ 1291@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='src/cpp/MeshFecData.cpp' object='src/cpp/libscigraphic_objects_la-MeshFecData.lo' libtool=yes @AMDEPBACKSLASH@
1292@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1292@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1293@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/cpp/libscigraphic_objects_la-TriangleMeshFecData.lo `test -f 'src/cpp/TriangleMeshFecData.cpp' || echo '$(srcdir)/'`src/cpp/TriangleMeshFecData.cpp 1293@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/cpp/libscigraphic_objects_la-MeshFecData.lo `test -f 'src/cpp/MeshFecData.cpp' || echo '$(srcdir)/'`src/cpp/MeshFecData.cpp
1294 1294
1295src/cpp/libscigraphic_objects_la-ColorComputer.lo: src/cpp/ColorComputer.cpp 1295src/cpp/libscigraphic_objects_la-ColorComputer.lo: src/cpp/ColorComputer.cpp
1296@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/cpp/libscigraphic_objects_la-ColorComputer.lo -MD -MP -MF src/cpp/$(DEPDIR)/libscigraphic_objects_la-ColorComputer.Tpo -c -o src/cpp/libscigraphic_objects_la-ColorComputer.lo `test -f 'src/cpp/ColorComputer.cpp' || echo '$(srcdir)/'`src/cpp/ColorComputer.cpp 1296@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/cpp/libscigraphic_objects_la-ColorComputer.lo -MD -MP -MF src/cpp/$(DEPDIR)/libscigraphic_objects_la-ColorComputer.Tpo -c -o src/cpp/libscigraphic_objects_la-ColorComputer.lo `test -f 'src/cpp/ColorComputer.cpp' || echo '$(srcdir)/'`src/cpp/ColorComputer.cpp
@@ -1362,12 +1362,12 @@ src/cpp/libscigraphic_objects_la-PolylineDecomposer.lo: src/cpp/PolylineDecompos
1362@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1362@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1363@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/cpp/libscigraphic_objects_la-PolylineDecomposer.lo `test -f 'src/cpp/PolylineDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/PolylineDecomposer.cpp 1363@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/cpp/libscigraphic_objects_la-PolylineDecomposer.lo `test -f 'src/cpp/PolylineDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/PolylineDecomposer.cpp
1364 1364
1365src/cpp/libscigraphic_objects_la-TriangleMeshFecDataDecomposer.lo: src/cpp/TriangleMeshFecDataDecomposer.cpp 1365src/cpp/libscigraphic_objects_la-MeshFecDataDecomposer.lo: src/cpp/MeshFecDataDecomposer.cpp
1366@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/cpp/libscigraphic_objects_la-TriangleMeshFecDataDecomposer.lo -MD -MP -MF src/cpp/$(DEPDIR)/libscigraphic_objects_la-TriangleMeshFecDataDecomposer.Tpo -c -o src/cpp/libscigraphic_objects_la-TriangleMeshFecDataDecomposer.lo `test -f 'src/cpp/TriangleMeshFecDataDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/TriangleMeshFecDataDecomposer.cpp 1366@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/cpp/libscigraphic_objects_la-MeshFecDataDecomposer.lo -MD -MP -MF src/cpp/$(DEPDIR)/libscigraphic_objects_la-MeshFecDataDecomposer.Tpo -c -o src/cpp/libscigraphic_objects_la-MeshFecDataDecomposer.lo `test -f 'src/cpp/MeshFecDataDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/MeshFecDataDecomposer.cpp
1367@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/cpp/$(DEPDIR)/libscigraphic_objects_la-TriangleMeshFecDataDecomposer.Tpo src/cpp/$(DEPDIR)/libscigraphic_objects_la-TriangleMeshFecDataDecomposer.Plo 1367@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/cpp/$(DEPDIR)/libscigraphic_objects_la-MeshFecDataDecomposer.Tpo src/cpp/$(DEPDIR)/libscigraphic_objects_la-MeshFecDataDecomposer.Plo
1368@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='src/cpp/TriangleMeshFecDataDecomposer.cpp' object='src/cpp/libscigraphic_objects_la-TriangleMeshFecDataDecomposer.lo' libtool=yes @AMDEPBACKSLASH@ 1368@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='src/cpp/MeshFecDataDecomposer.cpp' object='src/cpp/libscigraphic_objects_la-MeshFecDataDecomposer.lo' libtool=yes @AMDEPBACKSLASH@
1369@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1369@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1370@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/cpp/libscigraphic_objects_la-TriangleMeshFecDataDecomposer.lo `test -f 'src/cpp/TriangleMeshFecDataDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/TriangleMeshFecDataDecomposer.cpp 1370@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/cpp/libscigraphic_objects_la-MeshFecDataDecomposer.lo `test -f 'src/cpp/MeshFecDataDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/MeshFecDataDecomposer.cpp
1371 1371
1372src/cpp/libscigraphic_objects_la-Triangulator.lo: src/cpp/Triangulator.cpp 1372src/cpp/libscigraphic_objects_la-Triangulator.lo: src/cpp/Triangulator.cpp
1373@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/cpp/libscigraphic_objects_la-Triangulator.lo -MD -MP -MF src/cpp/$(DEPDIR)/libscigraphic_objects_la-Triangulator.Tpo -c -o src/cpp/libscigraphic_objects_la-Triangulator.lo `test -f 'src/cpp/Triangulator.cpp' || echo '$(srcdir)/'`src/cpp/Triangulator.cpp 1373@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/cpp/libscigraphic_objects_la-Triangulator.lo -MD -MP -MF src/cpp/$(DEPDIR)/libscigraphic_objects_la-Triangulator.Tpo -c -o src/cpp/libscigraphic_objects_la-Triangulator.lo `test -f 'src/cpp/Triangulator.cpp' || echo '$(srcdir)/'`src/cpp/Triangulator.cpp
diff --git a/scilab/modules/graphic_objects/includes/DataModel.hxx b/scilab/modules/graphic_objects/includes/DataModel.hxx
index aab17a5..a5f9b13 100644
--- a/scilab/modules/graphic_objects/includes/DataModel.hxx
+++ b/scilab/modules/graphic_objects/includes/DataModel.hxx
@@ -22,8 +22,8 @@
22#include "NgonGridData.hxx" 22#include "NgonGridData.hxx"
23#include "NgonGridMatplotData.hxx" 23#include "NgonGridMatplotData.hxx"
24#include "NgonPolylineData.hxx" 24#include "NgonPolylineData.hxx"
25#include "TriangleMeshData.hxx" 25#include "MeshData.hxx"
26#include "TriangleMeshFecData.hxx" 26#include "MeshFecData.hxx"
27 27
28#include "graphicObjectProperties.h" 28#include "graphicObjectProperties.h"
29 29
diff --git a/scilab/modules/graphic_objects/includes/DataProperties.hxx b/scilab/modules/graphic_objects/includes/DataProperties.hxx
index 6fccfad..a037232 100644
--- a/scilab/modules/graphic_objects/includes/DataProperties.hxx
+++ b/scilab/modules/graphic_objects/includes/DataProperties.hxx
@@ -44,17 +44,18 @@
44#define INDICES 18 44#define INDICES 18
45#define VALUES 19 45#define VALUES 19
46 46
47#define FEC_TRIANGLES 20 47#define FEC_ELEMENTS 20
48#define NUM_VERTICES_BY_ELEM 21
48 49
49#define NUM_X 21 50#define NUM_X 22
50#define NUM_Y 22 51#define NUM_Y 23
51#define NUM_Z 23 52#define NUM_Z 24
52#define GRID_SIZE 24 53#define GRID_SIZE 25
53#define X_DIMENSIONS 25 54#define X_DIMENSIONS 26
54#define Y_DIMENSIONS 26 55#define Y_DIMENSIONS 27
55 56
56#define COLORS 27 57#define COLORS 28
57#define NUM_COLORS 28 58#define NUM_COLORS 29
58 59
59#define MATPLOT_BOUNDS 30 60#define MATPLOT_BOUNDS 30
60#define MATPLOT_TYPE 31 61#define MATPLOT_TYPE 31
diff --git a/scilab/modules/graphic_objects/includes/DecompositionUtils.hxx b/scilab/modules/graphic_objects/includes/DecompositionUtils.hxx
index f96a48f..387428a 100644
--- a/scilab/modules/graphic_objects/includes/DecompositionUtils.hxx
+++ b/scilab/modules/graphic_objects/includes/DecompositionUtils.hxx
@@ -87,6 +87,15 @@ public :
87 static int isValid(double x, double y, double z); 87 static int isValid(double x, double y, double z);
88 88
89 /** 89 /**
90 * Tests whether a point is valid.
91 * The point is valid if none of its coordinates is infinite or a NaN.
92 * @param[in] the point's x-coordinate.
93 * @param[in] the point's y-coordinate.
94 * @return 1 if the point is valid, 0 if it is not.
95 */
96 static int isValid(double x, double y);
97
98 /**
90 * Returns the base-10 logarithm of the input value. 99 * Returns the base-10 logarithm of the input value.
91 * @param[in] the input value. 100 * @param[in] the input value.
92 * @return the base-10 logarithm of the input value. 101 * @return the base-10 logarithm of the input value.
@@ -107,6 +116,18 @@ public :
107 * determined as not valid. 116 * determined as not valid.
108 * @param[in] the point's x-coordinate. 117 * @param[in] the point's x-coordinate.
109 * @param[in] the point's y-coordinate. 118 * @param[in] the point's y-coordinate.
119 * @param[in] the bit mask specifying for which coordinates the logarithmic scale is used.
120 * @return 1 if the point is valid, 0 if it is not.
121 */
122 static int isLogValid(double x, double y, int logMask);
123
124 /**
125 * Determines if a point is valid in logarithmic scale.
126 * It checks whether any of its coordinates is strictly less than 0 (if the
127 * logarithmic scale applies). In the event of the former, the point is
128 * determined as not valid.
129 * @param[in] the point's x-coordinate.
130 * @param[in] the point's y-coordinate.
110 * @param[in] the point's z-coordinate. 131 * @param[in] the point's z-coordinate.
111 * @param[in] the bit mask specifying for which coordinates the logarithmic scale is used. 132 * @param[in] the bit mask specifying for which coordinates the logarithmic scale is used.
112 * @return 1 if the point is valid, 0 if it is not. 133 * @return 1 if the point is valid, 0 if it is not.
diff --git a/scilab/modules/graphic_objects/includes/TriangleMeshData.hxx b/scilab/modules/graphic_objects/includes/MeshData.hxx
index 3c1e88b..b50c8dc 100644
--- a/scilab/modules/graphic_objects/includes/TriangleMeshData.hxx
+++ b/scilab/modules/graphic_objects/includes/MeshData.hxx
@@ -10,8 +10,8 @@
10 * 10 *
11 */ 11 */
12 12
13#ifndef TRIANGLE_MESH_DATA_HXX 13#ifndef MESH_DATA_HXX
14#define TRIANGLE_MESH_DATA_HXX 14#define MESH_DATA_HXX
15 15
16#include "Data3D.hxx" 16#include "Data3D.hxx"
17 17
@@ -20,10 +20,10 @@ extern "C" {
20} 20}
21 21
22/** 22/**
23 * Triangle mesh data class 23 * Mesh data class
24 */ 24 */
25 25
26class TriangleMeshData: public Data3D 26class MeshData: public Data3D
27{ 27{
28 28
29protected: 29protected:
@@ -34,8 +34,8 @@ protected:
34 */ 34 */
35 double* vertices; 35 double* vertices;
36 36
37 /** Triangle indices array 37 /** Element indices array
38 * Contiguous (v0, v1, v2) triplets 38 * Contiguous (v0, v1, v2, ...) triplets
39 */ 39 */
40 unsigned int* indices; 40 unsigned int* indices;
41 41
@@ -49,25 +49,27 @@ protected:
49 /** Number of vertices */ 49 /** Number of vertices */
50 unsigned int numberVertices; 50 unsigned int numberVertices;
51 51
52 /** Number of triangles */ 52 /** Number of elements */
53 unsigned int numberTriangles; 53 unsigned int numberElements;
54
55 unsigned int numberVerticesByElem;
54 56
55public: 57public:
56 /** 58 /**
57 * Constructor 59 * Constructor
58 */ 60 */
59 TriangleMeshData(void); 61 MeshData(void);
60 62
61 /** 63 /**
62 * Constructor 64 * Constructor
63 * To be implemented 65 * To be implemented
64 */ 66 */
65 TriangleMeshData(unsigned int numberVertices, unsigned int numberTriangles); 67 MeshData(unsigned int numberVertices, unsigned int numberElements, unsigned int numberVerticesByElem = 3);
66 68
67 /** 69 /**
68 * Destructor 70 * Destructor
69 */ 71 */
70 virtual ~TriangleMeshData(); 72 virtual ~MeshData();
71 73
72 /** 74 /**
73 * Returns the identifier associated to a property name 75 * Returns the identifier associated to a property name
@@ -107,7 +109,7 @@ public:
107 int setNumVertices(unsigned int numVertices); 109 int setNumVertices(unsigned int numVertices);
108 110
109 /** 111 /**
110 * Returns the number of index triplets (number of triangles) 112 * Returns the number of index triplets (number of elements)
111 * @return the number of index triplets 113 * @return the number of index triplets
112 */ 114 */
113 unsigned int getNumIndices(); 115 unsigned int getNumIndices();
@@ -126,13 +128,13 @@ public:
126 void setVertices(double const* vertices, unsigned int numElements); 128 void setVertices(double const* vertices, unsigned int numElements);
127 129
128 /** 130 /**
129 * Returns the array of triangle indices 131 * Returns the array of indices
130 * @return a pointer to the array of triangle indices 132 * @return a pointer to the array indices
131 */ 133 */
132 unsigned int* getIndices(void); 134 unsigned int* getIndices(void);
133 135
134 /** 136 /**
135 * Sets the number of index triplets (number of triangles) 137 * Sets the number of index triplets
136 * Resizes the array of indices if required 138 * Resizes the array of indices if required
137 * @param[in] numIndices the number of index triplets to set 139 * @param[in] numIndices the number of index triplets to set
138 * @return 1 if the number of index triplets has been successfully set, 0 otherwise (failed allocation) 140 * @return 1 if the number of index triplets has been successfully set, 0 otherwise (failed allocation)
@@ -186,9 +188,9 @@ public:
186 void resetCoordinates(void); 188 void resetCoordinates(void);
187 189
188 /** 190 /**
189 * Converts a triangle vertex index as seen by Scilab to an internal format triangle vertex index 191 * Converts a vertex index as seen by Scilab to an internal format vertex index
190 * @param[in] scilabIndex the Scilab index to convert 192 * @param[in] scilabIndex the Scilab index to convert
191 * @return the internal format triangle vertex index 193 * @return the internal format vertex index
192 */ 194 */
193 static unsigned int scilabIndexToIndex(unsigned int scilabIndex); 195 static unsigned int scilabIndexToIndex(unsigned int scilabIndex);
194}; 196};
diff --git a/scilab/modules/graphic_objects/includes/TriangleMeshFecData.hxx b/scilab/modules/graphic_objects/includes/MeshFecData.hxx
index 92c3a3b..715174e 100644
--- a/scilab/modules/graphic_objects/includes/TriangleMeshFecData.hxx
+++ b/scilab/modules/graphic_objects/includes/MeshFecData.hxx
@@ -10,11 +10,11 @@
10 * 10 *
11 */ 11 */
12 12
13#ifndef TRIANGLE_MESH_FEC_DATA_HXX 13#ifndef MESH_FEC_DATA_HXX
14#define TRIANGLE_MESH_FEC_DATA_HXX 14#define MESH_FEC_DATA_HXX
15 15
16#include "Data3D.hxx" 16#include "Data3D.hxx"
17#include "TriangleMeshData.hxx" 17#include "MeshData.hxx"
18 18
19extern "C" { 19extern "C" {
20#include "BOOL.h" 20#include "BOOL.h"
@@ -24,7 +24,7 @@ extern "C" {
24 * Fec triangle mesh data class 24 * Fec triangle mesh data class
25 */ 25 */
26 26
27class TriangleMeshFecData: public TriangleMeshData 27class MeshFecData: public MeshData
28{ 28{
29 29
30private: 30private:
@@ -42,18 +42,18 @@ public:
42 /** 42 /**
43 * Constructor 43 * Constructor
44 */ 44 */
45 TriangleMeshFecData(void); 45 MeshFecData(void);
46 46
47 /** 47 /**
48 * Constructor 48 * Constructor
49 * To be implemented 49 * To be implemented
50 */ 50 */
51 TriangleMeshFecData(unsigned int numberVertices, unsigned int numberTriangles); 51 MeshFecData(unsigned int numberVertices, unsigned int numberTriangles, unsigned int numberVerticesByElem = 3);
52 52
53 /** 53 /**
54 * Destructor 54 * Destructor
55 */ 55 */
56 virtual ~TriangleMeshFecData(); 56 virtual ~MeshFecData();
57 57
58 /** 58 /**
59 * Returns the identifier associated to a property name 59 * Returns the identifier associated to a property name
@@ -79,13 +79,13 @@ public:
79 void getDataProperty(int property, void **_pvData); 79 void getDataProperty(int property, void **_pvData);
80 80
81 /** 81 /**
82 * Returns the number of index triplets (number of triangles) 82 * Returns the number of index triplets
83 * @return the number of index triplets 83 * @return the number of index triplets
84 */ 84 */
85 unsigned int getNumIndices(); 85 unsigned int getNumIndices();
86 86
87 /** 87 /**
88 * Sets the number of number of index triplets (number of triangles) 88 * Sets the number of number of index triplets
89 * Resizes the arrays of indices and fec triangle values if required 89 * Resizes the arrays of indices and fec triangle values if required
90 * @param[in] numIndices the number of index triplets to set 90 * @param[in] numIndices the number of index triplets to set
91 * @return 1 if the number of index triplets has been successfully set, 0 otherwise (failed allocation) 91 * @return 1 if the number of index triplets has been successfully set, 0 otherwise (failed allocation)
@@ -97,13 +97,13 @@ public:
97 * @param[in] a pointer to the array of fec triangles values 97 * @param[in] a pointer to the array of fec triangles values
98 * @param[in] numElements the number of triangles to set 98 * @param[in] numElements the number of triangles to set
99 */ 99 */
100 void setFecTriangles(double const* data, int numElements); 100 void setFecElements(double const* data, int numElements);
101 101
102 /** 102 /**
103 * Returns the array of fec triangle values 103 * Returns the array of fec triangle values
104 * @return a pointer to the array of fec triangle values 104 * @return a pointer to the array of fec triangle values
105 */ 105 */
106 double* getFecTriangles(void); 106 double* getFecElements(void);
107}; 107};
108 108
109#endif 109#endif
diff --git a/scilab/modules/graphic_objects/includes/TriangleMeshFecDataDecomposer.hxx b/scilab/modules/graphic_objects/includes/MeshFecDataDecomposer.hxx
index aec7865..6303eb6 100644
--- a/scilab/modules/graphic_objects/includes/TriangleMeshFecDataDecomposer.hxx
+++ b/scilab/modules/graphic_objects/includes/MeshFecDataDecomposer.hxx
@@ -10,8 +10,8 @@
10 * 10 *
11 */ 11 */
12 12
13#ifndef TRIANGLEMESHFECDATA_DECOMPOSER_HXX 13#ifndef MESHFECDATA_DECOMPOSER_HXX
14#define TRIANGLEMESHFECDATA_DECOMPOSER_HXX 14#define MESHFECDATA_DECOMPOSER_HXX
15 15
16/** 16/**
17 * TriangleMeshFecData decomposer class 17 * TriangleMeshFecData decomposer class
@@ -20,7 +20,7 @@
20 * It only has static member functions since it stores no actual state. 20 * It only has static member functions since it stores no actual state.
21 */ 21 */
22 22
23class TriangleMeshFecDataDecomposer 23class MeshFecDataDecomposer
24{ 24{
25 25
26private : 26private :
@@ -46,6 +46,16 @@ private :
46 static int areFaceVerticesValid(double* coordinates, int v0, int v1, int v2, int logMask); 46 static int areFaceVerticesValid(double* coordinates, int v0, int v1, int v2, int logMask);
47 47
48 /** 48 /**
49 * Determines whether a face's vertices are valid or not.
50 * @param[in] the coordinates array.
51 * @param[in] the first vertex index.
52 * @param[in] the second vertex index.
53 * @param[in] a flag specifying whether logarithmic coordinates are used.
54 * @return 1 if the face is valid, 0 if it is not.
55 */
56 static int areSegmentVerticesValid(double* coordinates, int v0, int v1, int logMask);
57
58 /**
49 * Determines whether a face's vertex values are valid or not. 59 * Determines whether a face's vertex values are valid or not.
50 * @param[in] the values array. 60 * @param[in] the values array.
51 * @param[in] the first vertex index. 61 * @param[in] the first vertex index.
@@ -56,6 +66,15 @@ private :
56 static int areFaceValuesValid(double* values, int v0, int v1, int v2); 66 static int areFaceValuesValid(double* values, int v0, int v1, int v2);
57 67
58 /** 68 /**
69 * Determines whether a face's vertex values are valid or not.
70 * @param[in] the values array.
71 * @param[in] the first vertex index.
72 * @param[in] the second vertex index.
73 * @return 1 if all face values are valid, 0 if not.
74 */
75 static int areSegmentValuesValid(double* values, int v0, int v1);
76
77 /**
59 * Determines whether all the vertex indices making up a face are valid. 78 * Determines whether all the vertex indices making up a face are valid.
60 * To be valid, an index must belong to the interval [0, numVertices-1] 79 * To be valid, an index must belong to the interval [0, numVertices-1]
61 * @param[in] the number of vertices giving the largest valid vertex index. 80 * @param[in] the number of vertices giving the largest valid vertex index.
@@ -67,6 +86,16 @@ private :
67 static int areFaceIndicesValid(int numVertices, int v0, int v1, int v2); 86 static int areFaceIndicesValid(int numVertices, int v0, int v1, int v2);
68 87
69 /** 88 /**
89 * Determines whether all the vertex indices making up a face are valid.
90 * To be valid, an index must belong to the interval [0, numVertices-1]
91 * @param[in] the number of vertices giving the largest valid vertex index.
92 * @param[in] the first vertex index.
93 * @param[in] the second vertex index.
94 * @return 1 if all indices are valid, 0 if not.
95 */
96 static int areSegmentIndicesValid(int numVertices, int v0, int v1);
97
98 /**
70 * Returns the coordinates of a single vertex. 99 * Returns the coordinates of a single vertex.
71 * @param[in] the coordinates array. 100 * @param[in] the coordinates array.
72 * @param[in] the vertex index. 101 * @param[in] the vertex index.
diff --git a/scilab/modules/graphic_objects/includes/graphicObjectProperties.h b/scilab/modules/graphic_objects/includes/graphicObjectProperties.h
index d04a7e2..63f71de 100755
--- a/scilab/modules/graphic_objects/includes/graphicObjectProperties.h
+++ b/scilab/modules/graphic_objects/includes/graphicObjectProperties.h
@@ -79,339 +79,340 @@
79#define __GO_DATA_MODEL_NUM_INDICES__ 56 79#define __GO_DATA_MODEL_NUM_INDICES__ 56
80#define __GO_DATA_MODEL_INDICES__ 57 80#define __GO_DATA_MODEL_INDICES__ 57
81#define __GO_DATA_MODEL_VALUES__ 58 81#define __GO_DATA_MODEL_VALUES__ 58
82#define __GO_DATA_MODEL_FEC_TRIANGLES__ 59 82#define __GO_DATA_MODEL_NUM_VERTICES_BY_ELEM__ 59
83#define __GO_DATA_MODEL_NUM_X__ 60 83#define __GO_DATA_MODEL_FEC_ELEMENTS__ 60
84#define __GO_DATA_MODEL_NUM_Y__ 61 84#define __GO_DATA_MODEL_NUM_X__ 61
85#define __GO_DATA_MODEL_NUM_Z__ 62 85#define __GO_DATA_MODEL_NUM_Y__ 62
86#define __GO_DATA_MODEL_GRID_SIZE__ 63 86#define __GO_DATA_MODEL_NUM_Z__ 63
87#define __GO_DATA_MODEL_X_DIMENSIONS__ 64 87#define __GO_DATA_MODEL_GRID_SIZE__ 64
88#define __GO_DATA_MODEL_Y_DIMENSIONS__ 65 88#define __GO_DATA_MODEL_X_DIMENSIONS__ 65
89#define __GO_MATPLOT_TRANSLATE__ 66 89#define __GO_DATA_MODEL_Y_DIMENSIONS__ 66
90#define __GO_MATPLOT_SCALE__ 67 90#define __GO_MATPLOT_TRANSLATE__ 67
91#define __GO_DATA_MODEL_MATPLOT_BOUNDS__ 68 91#define __GO_MATPLOT_SCALE__ 68
92#define __GO_DATA_MODEL_MATPLOT_TYPE__ 69 92#define __GO_DATA_MODEL_MATPLOT_BOUNDS__ 69
93#define __GO_DATA_MODEL_MATPLOT_GL_TYPE__ 70 93#define __GO_DATA_MODEL_MATPLOT_TYPE__ 70
94#define __GO_DATA_MODEL_MATPLOT_DATA_INFOS__ 71 94#define __GO_DATA_MODEL_MATPLOT_GL_TYPE__ 71
95#define __GO_DATA_MODEL_MATPLOT_DATA_TYPE__ 72 95#define __GO_DATA_MODEL_MATPLOT_DATA_INFOS__ 72
96#define __GO_DATA_MODEL_MATPLOT_DATA_ORDER__ 73 96#define __GO_DATA_MODEL_MATPLOT_DATA_TYPE__ 73
97#define __GO_DATA_MODEL_MATPLOT_IMAGE_TYPE__ 74 97#define __GO_DATA_MODEL_MATPLOT_DATA_ORDER__ 74
98#define __GO_DATA_MODEL_MATPLOT_IMAGE_DATA__ 75 98#define __GO_DATA_MODEL_MATPLOT_IMAGE_TYPE__ 75
99#define __GO_DATA_MODEL_MATPLOT_IMAGE_DATASIZE__ 76 99#define __GO_DATA_MODEL_MATPLOT_IMAGE_DATA__ 76
100#define __GO_REFERENCED__ 77 100#define __GO_DATA_MODEL_MATPLOT_IMAGE_DATASIZE__ 77
101#define __GO_VALID__ 78 101#define __GO_REFERENCED__ 78
102#define __GO_POSITION__ 79 102#define __GO_VALID__ 79
103#define __GO_SIZE__ 80 103#define __GO_POSITION__ 80
104#define __GO_CANVAS__ 81 104#define __GO_SIZE__ 81
105#define __GO_AUTORESIZE__ 82 105#define __GO_CANVAS__ 82
106#define __GO_VIEWPORT__ 83 106#define __GO_AUTORESIZE__ 83
107#define __GO_AXES_SIZE__ 84 107#define __GO_VIEWPORT__ 84
108#define __GO_FIGURE_NAME__ 85 108#define __GO_AXES_SIZE__ 85
109#define __GO_NAME__ 86 109#define __GO_FIGURE_NAME__ 86
110#define __GO_ID__ 87 110#define __GO_NAME__ 87
111#define __GO_INFO_MESSAGE__ 88 111#define __GO_ID__ 88
112#define __GO_COLORMAP__ 89 112#define __GO_INFO_MESSAGE__ 89
113#define __GO_COLORMAP_SIZE__ 90 113#define __GO_COLORMAP__ 90
114#define __GO_RENDERING_MODE__ 91 114#define __GO_COLORMAP_SIZE__ 91
115#define __GO_PIXEL_DRAWING_MODE__ 92 115#define __GO_RENDERING_MODE__ 92
116#define __GO_ANTIALIASING__ 93 116#define __GO_PIXEL_DRAWING_MODE__ 93
117#define __GO_IMMEDIATE_DRAWING__ 94 117#define __GO_ANTIALIASING__ 94
118#define __GO_BACKGROUND__ 95 118#define __GO_IMMEDIATE_DRAWING__ 95
119#define __GO_EVENTHANDLER__ 96 119#define __GO_BACKGROUND__ 96
120#define __GO_EVENTHANDLER_NAME__ 97 120#define __GO_EVENTHANDLER__ 97
121#define __GO_EVENTHANDLER_ENABLE__ 98 121#define __GO_EVENTHANDLER_NAME__ 98
122#define __GO_TAG__ 99 122#define __GO_EVENTHANDLER_ENABLE__ 99
123#define __GO_ROTATION_TYPE__ 100 123#define __GO_TAG__ 100
124#define __GO_RESIZEFCN__ 101 124#define __GO_ROTATION_TYPE__ 101
125#define __GO_CLOSEREQUESTFCN__ 102 125#define __GO_RESIZEFCN__ 102
126#define __GO_DEFAULT_AXES__ 103 126#define __GO_CLOSEREQUESTFCN__ 103
127#define __GO_UPPER_LEFT_POINT__ 104 127#define __GO_DEFAULT_AXES__ 104
128#define __GO_WIDTH__ 105 128#define __GO_UPPER_LEFT_POINT__ 105
129#define __GO_HEIGHT__ 106 129#define __GO_WIDTH__ 106
130#define __GO_START_ANGLE__ 107 130#define __GO_HEIGHT__ 107
131#define __GO_END_ANGLE__ 108 131#define __GO_START_ANGLE__ 108
132#define __GO_ARC_DRAWING_METHOD__ 109 132#define __GO_END_ANGLE__ 109
133#define __GO_X_AXIS_VISIBLE__ 110 133#define __GO_ARC_DRAWING_METHOD__ 110
134#define __GO_X_AXIS_REVERSE__ 111 134#define __GO_X_AXIS_VISIBLE__ 111
135#define __GO_X_AXIS_GRID_COLOR__ 112 135#define __GO_X_AXIS_REVERSE__ 112
136#define __GO_X_AXIS_GRID_THICKNESS__ 113 136#define __GO_X_AXIS_GRID_COLOR__ 113
137#define __GO_X_AXIS_GRID_STYLE__ 114 137#define __GO_X_AXIS_GRID_THICKNESS__ 114
138#define __GO_X_AXIS_LABEL__ 115 138#define __GO_X_AXIS_GRID_STYLE__ 115
139#define __GO_X_AXIS_LOCATION__ 116 139#define __GO_X_AXIS_LABEL__ 116
140#define __GO_X_AXIS_LOG_FLAG__ 117 140#define __GO_X_AXIS_LOCATION__ 117
141#define __GO_X_AXIS_TICKS__ 118 141#define __GO_X_AXIS_LOG_FLAG__ 118
142#define __GO_X_AXIS_FORMAT__ 119 142#define __GO_X_AXIS_TICKS__ 119
143#define __GO_X_AXIS_ST_FACTORS__ 120 143#define __GO_X_AXIS_FORMAT__ 120
144#define __GO_X_AXIS_AUTO_TICKS__ 121 144#define __GO_X_AXIS_ST_FACTORS__ 121
145#define __GO_X_AXIS_NUMBER_TICKS__ 122 145#define __GO_X_AXIS_AUTO_TICKS__ 122
146#define __GO_X_AXIS_TICKS_LOCATIONS__ 123 146#define __GO_X_AXIS_NUMBER_TICKS__ 123
147#define __GO_X_AXIS_TICKS_LABELS__ 124 147#define __GO_X_AXIS_TICKS_LOCATIONS__ 124
148#define __GO_X_AXIS_SUBTICKS__ 125 148#define __GO_X_AXIS_TICKS_LABELS__ 125
149#define __GO_Y_AXIS_VISIBLE__ 126 149#define __GO_X_AXIS_SUBTICKS__ 126
150#define __GO_Y_AXIS_REVERSE__ 127 150#define __GO_Y_AXIS_VISIBLE__ 127
151#define __GO_Y_AXIS_GRID_COLOR__ 128 151#define __GO_Y_AXIS_REVERSE__ 128
152#define __GO_Y_AXIS_GRID_THICKNESS__ 129 152#define __GO_Y_AXIS_GRID_COLOR__ 129
153#define __GO_Y_AXIS_GRID_STYLE__ 130 153#define __GO_Y_AXIS_GRID_THICKNESS__ 130
154#define __GO_Y_AXIS_LABEL__ 131 154#define __GO_Y_AXIS_GRID_STYLE__ 131
155#define __GO_Y_AXIS_LOCATION__ 132 155#define __GO_Y_AXIS_LABEL__ 132
156#define __GO_Y_AXIS_LOG_FLAG__ 133 156#define __GO_Y_AXIS_LOCATION__ 133
157#define __GO_Y_AXIS_TICKS__ 134 157#define __GO_Y_AXIS_LOG_FLAG__ 134
158#define __GO_Y_AXIS_FORMAT__ 135 158#define __GO_Y_AXIS_TICKS__ 135
159#define __GO_Y_AXIS_ST_FACTORS__ 136 159#define __GO_Y_AXIS_FORMAT__ 136
160#define __GO_Y_AXIS_AUTO_TICKS__ 137 160#define __GO_Y_AXIS_ST_FACTORS__ 137
161#define __GO_Y_AXIS_NUMBER_TICKS__ 138 161#define __GO_Y_AXIS_AUTO_TICKS__ 138
162#define __GO_Y_AXIS_TICKS_LOCATIONS__ 139 162#define __GO_Y_AXIS_NUMBER_TICKS__ 139
163#define __GO_Y_AXIS_TICKS_LABELS__ 140 163#define __GO_Y_AXIS_TICKS_LOCATIONS__ 140
164#define __GO_Y_AXIS_SUBTICKS__ 141 164#define __GO_Y_AXIS_TICKS_LABELS__ 141
165#define __GO_Z_AXIS_VISIBLE__ 142 165#define __GO_Y_AXIS_SUBTICKS__ 142
166#define __GO_Z_AXIS_REVERSE__ 143 166#define __GO_Z_AXIS_VISIBLE__ 143
167#define __GO_Z_AXIS_GRID_COLOR__ 144 167#define __GO_Z_AXIS_REVERSE__ 144
168#define __GO_Z_AXIS_GRID_THICKNESS__ 145 168#define __GO_Z_AXIS_GRID_COLOR__ 145
169#define __GO_Z_AXIS_GRID_STYLE__ 146 169#define __GO_Z_AXIS_GRID_THICKNESS__ 146
170#define __GO_Z_AXIS_LABEL__ 147 170#define __GO_Z_AXIS_GRID_STYLE__ 147
171#define __GO_Z_AXIS_LOCATION__ 148 171#define __GO_Z_AXIS_LABEL__ 148
172#define __GO_Z_AXIS_LOG_FLAG__ 149 172#define __GO_Z_AXIS_LOCATION__ 149
173#define __GO_Z_AXIS_TICKS__ 150 173#define __GO_Z_AXIS_LOG_FLAG__ 150
174#define __GO_Z_AXIS_FORMAT__ 151 174#define __GO_Z_AXIS_TICKS__ 151
175#define __GO_Z_AXIS_ST_FACTORS__ 152 175#define __GO_Z_AXIS_FORMAT__ 152
176#define __GO_Z_AXIS_AUTO_TICKS__ 153 176#define __GO_Z_AXIS_ST_FACTORS__ 153
177#define __GO_Z_AXIS_NUMBER_TICKS__ 154 177#define __GO_Z_AXIS_AUTO_TICKS__ 154
178#define __GO_Z_AXIS_TICKS_LOCATIONS__ 155 178#define __GO_Z_AXIS_NUMBER_TICKS__ 155
179#define __GO_Z_AXIS_TICKS_LABELS__ 156 179#define __GO_Z_AXIS_TICKS_LOCATIONS__ 156
180#define __GO_Z_AXIS_SUBTICKS__ 157 180#define __GO_Z_AXIS_TICKS_LABELS__ 157
181#define __GO_AUTO_SUBTICKS__ 158 181#define __GO_Z_AXIS_SUBTICKS__ 158
182#define __GO_GRID_POSITION__ 159 182#define __GO_AUTO_SUBTICKS__ 159
183#define __GO_TITLE__ 160 183#define __GO_GRID_POSITION__ 160
184#define __GO_AUTO_CLEAR__ 161 184#define __GO_TITLE__ 161
185#define __GO_FILLED__ 162 185#define __GO_AUTO_CLEAR__ 162
186#define __GO_CAMERA__ 163 186#define __GO_FILLED__ 163
187#define __GO_VIEW__ 164 187#define __GO_CAMERA__ 164
188#define __GO_ISOVIEW__ 165 188#define __GO_VIEW__ 165
189#define __GO_CUBE_SCALING__ 166 189#define __GO_ISOVIEW__ 166
190#define __GO_ROTATION_ANGLES__ 167 190#define __GO_CUBE_SCALING__ 167
191#define __GO_ROTATION_ANGLES_3D__ 168 191#define __GO_ROTATION_ANGLES__ 168
192#define __GO_BOX_TYPE__ 169 192#define __GO_ROTATION_ANGLES_3D__ 169
193#define __GO_HIDDEN_AXIS_COLOR__ 170 193#define __GO_BOX_TYPE__ 170
194#define __GO_X_TIGHT_LIMITS__ 171 194#define __GO_HIDDEN_AXIS_COLOR__ 171
195#define __GO_Y_TIGHT_LIMITS__ 172 195#define __GO_X_TIGHT_LIMITS__ 172
196#define __GO_Z_TIGHT_LIMITS__ 173 196#define __GO_Y_TIGHT_LIMITS__ 173
197#define __GO_DATA_BOUNDS__ 174 197#define __GO_Z_TIGHT_LIMITS__ 174
198#define __GO_REAL_DATA_BOUNDS__ 175 198#define __GO_DATA_BOUNDS__ 175
199#define __GO_ZOOM_ENABLED__ 176 199#define __GO_REAL_DATA_BOUNDS__ 176
200#define __GO_ZOOM_BOX__ 177 200#define __GO_ZOOM_ENABLED__ 177
201#define __GO_AUTO_SCALE__ 178 201#define __GO_ZOOM_BOX__ 178
202#define __GO_FIRST_PLOT__ 179 202#define __GO_AUTO_SCALE__ 179
203#define __GO_MARGINS__ 180 203#define __GO_FIRST_PLOT__ 180
204#define __GO_AUTO_MARGINS__ 181 204#define __GO_MARGINS__ 181
205#define __GO_AXES_BOUNDS__ 182 205#define __GO_AUTO_MARGINS__ 182
206#define __GO_CLIP_PROPERTY__ 183 206#define __GO_AXES_BOUNDS__ 183
207#define __GO_CLIP_STATE__ 184 207#define __GO_CLIP_PROPERTY__ 184
208#define __GO_CLIP_BOX__ 185 208#define __GO_CLIP_STATE__ 185
209#define __GO_CLIP_BOX_SET__ 186 209#define __GO_CLIP_BOX__ 186
210#define __GO_LINE__ 187 210#define __GO_CLIP_BOX_SET__ 187
211#define __GO_LINE_MODE__ 188 211#define __GO_LINE__ 188
212#define __GO_LINE_STYLE__ 189 212#define __GO_LINE_MODE__ 189
213#define __GO_LINE_THICKNESS__ 190 213#define __GO_LINE_STYLE__ 190
214#define __GO_LINE_COLOR__ 191 214#define __GO_LINE_THICKNESS__ 191
215#define __GO_FILL_MODE__ 192 215#define __GO_LINE_COLOR__ 192
216#define __GO_MARK__ 193 216#define __GO_FILL_MODE__ 193
217#define __GO_MARK_MODE__ 194 217#define __GO_MARK__ 194
218#define __GO_MARK_STYLE__ 195 218#define __GO_MARK_MODE__ 195
219#define __GO_MARK_SIZE_UNIT__ 196 219#define __GO_MARK_STYLE__ 196
220#define __GO_MARK_SIZE__ 197 220#define __GO_MARK_SIZE_UNIT__ 197
221#define __GO_MARK_FOREGROUND__ 198 221#define __GO_MARK_SIZE__ 198
222#define __GO_MARK_BACKGROUND__ 199 222#define __GO_MARK_FOREGROUND__ 199
223#define __GO_MARK_OFFSET__ 200 223#define __GO_MARK_BACKGROUND__ 200
224#define __GO_MARK_STRIDE__ 201 224#define __GO_MARK_OFFSET__ 201
225#define __GO_SELECTED__ 202 225#define __GO_MARK_STRIDE__ 202
226#define __GO_TICKS_DIRECTION__ 203 226#define __GO_SELECTED__ 203
227#define __GO_X_NUMBER_TICKS__ 204 227#define __GO_TICKS_DIRECTION__ 204
228#define __GO_Y_NUMBER_TICKS__ 205 228#define __GO_X_NUMBER_TICKS__ 205
229#define __GO_X_TICKS_COORDS__ 206 229#define __GO_Y_NUMBER_TICKS__ 206
230#define __GO_Y_TICKS_COORDS__ 207 230#define __GO_X_TICKS_COORDS__ 207
231#define __GO_TICKS_COLOR__ 208 231#define __GO_Y_TICKS_COORDS__ 208
232#define __GO_TICKS_SEGMENT__ 209 232#define __GO_TICKS_COLOR__ 209
233#define __GO_TICKS_STYLE__ 210 233#define __GO_TICKS_SEGMENT__ 210
234#define __GO_SUBTICKS__ 211 234#define __GO_TICKS_STYLE__ 211
235#define __GO_NUMBER_TICKS_LABELS__ 212 235#define __GO_SUBTICKS__ 212
236#define __GO_TICKS_LABELS__ 213 236#define __GO_NUMBER_TICKS_LABELS__ 213
237#define __GO_FORMATN__ 214 237#define __GO_TICKS_LABELS__ 214
238#define __GO_FONT__ 215 238#define __GO_FORMATN__ 215
239#define __GO_FONT_STYLE__ 216 239#define __GO_FONT__ 216
240#define __GO_FONT_SIZE__ 217 240#define __GO_FONT_STYLE__ 217
241#define __GO_FONT_COLOR__ 218 241#define __GO_FONT_SIZE__ 218
242#define __GO_FONT_FRACTIONAL__ 219 242#define __GO_FONT_COLOR__ 219
243#define __GO_Z_BOUNDS__ 220 243#define __GO_FONT_FRACTIONAL__ 220
244#define __GO_OUTSIDE_COLOR__ 221 244#define __GO_Z_BOUNDS__ 221
245#define __GO_COLOR_RANGE__ 222 245#define __GO_OUTSIDE_COLOR__ 222
246#define __GO_DATA_MAPPING__ 223 246#define __GO_COLOR_RANGE__ 223
247#define __GO_FONT_ANGLE__ 224 247#define __GO_DATA_MAPPING__ 224
248#define __GO_AUTO_POSITION__ 225 248#define __GO_FONT_ANGLE__ 225
249#define __GO_CORNERS__ 226 249#define __GO_AUTO_POSITION__ 226
250#define __GO_AUTO_ROTATION__ 227 250#define __GO_CORNERS__ 227
251#define __GO_LINKS__ 228 251#define __GO_AUTO_ROTATION__ 228
252#define __GO_LINKS_COUNT__ 229 252#define __GO_LINKS__ 229
253#define __GO_LEGEND_LOCATION__ 230 253#define __GO_LINKS_COUNT__ 230
254#define __GO_MARKS_COUNT__ 231 254#define __GO_LEGEND_LOCATION__ 231
255#define __GO_LINE_WIDTH__ 232 255#define __GO_MARKS_COUNT__ 232
256#define __GO_CLOSED__ 233 256#define __GO_LINE_WIDTH__ 233
257#define __GO_ARROW_SIZE_FACTOR__ 234 257#define __GO_CLOSED__ 234
258#define __GO_POLYLINE_STYLE__ 235 258#define __GO_ARROW_SIZE_FACTOR__ 235
259#define __GO_INTERP_COLOR_VECTOR__ 236 259#define __GO_POLYLINE_STYLE__ 236
260#define __GO_INTERP_COLOR_VECTOR_SET__ 237 260#define __GO_INTERP_COLOR_VECTOR__ 237
261#define __GO_INTERP_COLOR_MODE__ 238 261#define __GO_INTERP_COLOR_VECTOR_SET__ 238
262#define __GO_X_SHIFT__ 239 262#define __GO_INTERP_COLOR_MODE__ 239
263#define __GO_Y_SHIFT__ 240 263#define __GO_X_SHIFT__ 240
264#define __GO_Z_SHIFT__ 241 264#define __GO_Y_SHIFT__ 241
265#define __GO_BAR_WIDTH__ 242 265#define __GO_Z_SHIFT__ 242
266#define __GO_SURFACE_MODE__ 243 266#define __GO_BAR_WIDTH__ 243
267#define __GO_COLOR_MODE__ 244 267#define __GO_SURFACE_MODE__ 244
268#define __GO_COLOR_FLAG__ 245 268#define __GO_COLOR_MODE__ 245
269#define __GO_ALIGNMENT__ 246 269#define __GO_COLOR_FLAG__ 246
270#define __GO_BOX__ 247 270#define __GO_ALIGNMENT__ 247
271#define __GO_TEXT_BOX__ 248 271#define __GO_BOX__ 248
272#define __GO_TEXT_BOX_MODE__ 249 272#define __GO_TEXT_BOX__ 249
273#define __GO_AUTO_DIMENSIONING__ 250 273#define __GO_TEXT_BOX_MODE__ 250
274#define __GO_FORMATTED_TEXT__ 251 274#define __GO_AUTO_DIMENSIONING__ 251
275#define __GO_TEXT_ARRAY_DIMENSIONS__ 252 275#define __GO_FORMATTED_TEXT__ 252
276#define __GO_TEXT_STRINGS__ 253 276#define __GO_TEXT_ARRAY_DIMENSIONS__ 253
277#define __GO_BASE__ 254 277#define __GO_TEXT_STRINGS__ 254
278#define __GO_BASE_X__ 255 278#define __GO_BASE__ 255
279#define __GO_BASE_Y__ 256 279#define __GO_BASE_X__ 256
280#define __GO_BASE_Z__ 257 280#define __GO_BASE_Y__ 257
281#define __GO_DIRECTION__ 258 281#define __GO_BASE_Z__ 258
282#define __GO_DIRECTION_X__ 259 282#define __GO_DIRECTION__ 259
283#define __GO_DIRECTION_Y__ 260 283#define __GO_DIRECTION_X__ 260
284#define __GO_DIRECTION_Z__ 261 284#define __GO_DIRECTION_Y__ 261
285#define __GO_ARROW_SIZE__ 262 285#define __GO_DIRECTION_Z__ 262
286#define __GO_SEGS_COLORS__ 263 286#define __GO_ARROW_SIZE__ 263
287#define __GO_COLORED__ 264 287#define __GO_SEGS_COLORS__ 264
288#define __GO_ARROWS__ 265 288#define __GO_COLORED__ 265
289#define __GO_NUMBER_ARROWS__ 266 289#define __GO_ARROWS__ 266
290#define __GO_CHAMP_DIMENSIONS__ 267 290#define __GO_NUMBER_ARROWS__ 267
291#define __GO_BOUNDING_BOX__ 268 291#define __GO_CHAMP_DIMENSIONS__ 268
292#define __GO_MAX_LENGTH__ 269 292#define __GO_BOUNDING_BOX__ 269
293#define __GO_MAX_USABLE_LENGTH__ 270 293#define __GO_MAX_LENGTH__ 270
294#define __GO_HIDDEN_COLOR__ 271 294#define __GO_MAX_USABLE_LENGTH__ 271
295#define __GO_STYLE__ 272 295#define __GO_HIDDEN_COLOR__ 272
296#define __GO_UI_CHECKBOX__ 273 296#define __GO_STYLE__ 273
297#define __GO_UI_EDIT__ 274 297#define __GO_UI_CHECKBOX__ 274
298#define __GO_UI_SPINNER__ 275 298#define __GO_UI_EDIT__ 275
299#define __GO_UI_FRAME__ 276 299#define __GO_UI_SPINNER__ 276
300#define __GO_UI_FRAME_SCROLLABLE__ 277 300#define __GO_UI_FRAME__ 277
301#define __GO_UI_IMAGE__ 278 301#define __GO_UI_FRAME_SCROLLABLE__ 278
302#define __GO_UI_LISTBOX__ 279 302#define __GO_UI_IMAGE__ 279
303#define __GO_UI_POPUPMENU__ 280 303#define __GO_UI_LISTBOX__ 280
304#define __GO_UI_PUSHBUTTON__ 281 304#define __GO_UI_POPUPMENU__ 281
305#define __GO_UI_RADIOBUTTON__ 282 305#define __GO_UI_PUSHBUTTON__ 282
306#define __GO_UI_SLIDER__ 283 306#define __GO_UI_RADIOBUTTON__ 283
307#define __GO_UI_TABLE__ 284 307#define __GO_UI_SLIDER__ 284
308#define __GO_UI_TEXT__ 285 308#define __GO_UI_TABLE__ 285
309#define __GO_UI_LAYER__ 286 309#define __GO_UI_TEXT__ 286
310#define __GO_UI_BACKGROUNDCOLOR__ 287 310#define __GO_UI_LAYER__ 287
311#define __GO_UI_ENABLE__ 288 311#define __GO_UI_BACKGROUNDCOLOR__ 288
312#define __GO_UI_FONTANGLE__ 289 312#define __GO_UI_ENABLE__ 289
313#define __GO_UI_FONTNAME__ 290 313#define __GO_UI_FONTANGLE__ 290
314#define __GO_UI_FONTSIZE__ 291 314#define __GO_UI_FONTNAME__ 291
315#define __GO_UI_FONTUNITS__ 292 315#define __GO_UI_FONTSIZE__ 292
316#define __GO_UI_FONTWEIGHT__ 293 316#define __GO_UI_FONTUNITS__ 293
317#define __GO_UI_FOREGROUNDCOLOR__ 294 317#define __GO_UI_FONTWEIGHT__ 294
318#define __GO_UI_HORIZONTALALIGNMENT__ 295 318#define __GO_UI_FOREGROUNDCOLOR__ 295
319#define __GO_UI_LISTBOXTOP__ 296 319#define __GO_UI_HORIZONTALALIGNMENT__ 296
320#define __GO_UI_LISTBOXTOP_SIZE__ 297 320#define __GO_UI_LISTBOXTOP__ 297
321#define __GO_UI_MAX__ 298 321#define __GO_UI_LISTBOXTOP_SIZE__ 298
322#define __GO_UI_MIN__ 299 322#define __GO_UI_MAX__ 299
323#define __GO_UI_RELIEF__ 300 323#define __GO_UI_MIN__ 300
324#define __GO_UI_STRING__ 301 324#define __GO_UI_RELIEF__ 301
325#define __GO_UI_TAB_STRING__ 302 325#define __GO_UI_STRING__ 302
326#define __GO_UI_STRING_SIZE__ 303 326#define __GO_UI_TAB_STRING__ 303
327#define __GO_UI_STRING_COLNB__ 304 327#define __GO_UI_STRING_SIZE__ 304
328#define __GO_UI_TOOLTIPSTRING__ 305 328#define __GO_UI_STRING_COLNB__ 305
329#define __GO_UI_TOOLTIPSTRING_SIZE__ 306 329#define __GO_UI_TOOLTIPSTRING__ 306
330#define __GO_UI_SLIDERSTEP__ 307 330#define __GO_UI_TOOLTIPSTRING_SIZE__ 307
331#define __GO_UI_UNITS__ 308 331#define __GO_UI_SLIDERSTEP__ 308
332#define __GO_UI_VALUE__ 309 332#define __GO_UI_UNITS__ 309
333#define __GO_UI_TAB_VALUE__ 310 333#define __GO_UI_VALUE__ 310
334#define __GO_UI_VALUE_SIZE__ 311 334#define __GO_UI_TAB_VALUE__ 311
335#define __GO_UI_VERTICALALIGNMENT__ 312 335#define __GO_UI_VALUE_SIZE__ 312
336#define __GO_UIPARENTMENU__ 313 336#define __GO_UI_VERTICALALIGNMENT__ 313
337#define __GO_UICHILDMENU__ 314 337#define __GO_UIPARENTMENU__ 314
338#define __GO_UICHECKEDMENU__ 315 338#define __GO_UICHILDMENU__ 315
339#define __GO_UI_CHECKED__ 316 339#define __GO_UICHECKEDMENU__ 316
340#define __GO_UI_LABEL__ 317 340#define __GO_UI_CHECKED__ 317
341#define __GO_UI_MNEMONIC__ 318 341#define __GO_UI_LABEL__ 318
342#define __GO_UI_ACCELERATOR__ 319 342#define __GO_UI_MNEMONIC__ 319
343#define __GO_UI_SEPARATOR__ 320 343#define __GO_UI_ACCELERATOR__ 320
344#define __GO_UI_ICON__ 321 344#define __GO_UI_SEPARATOR__ 321
345#define __GO_CONSOLE__ 322 345#define __GO_UI_ICON__ 322
346#define __GO_SHOWHIDDENHANDLES__ 323 346#define __GO_CONSOLE__ 323
347#define __GO_SHOWHIDDENPROPERTIES__ 324 347#define __GO_SHOWHIDDENHANDLES__ 324
348#define __GO_USEDEPRECATEDLF__ 325 348#define __GO_SHOWHIDDENPROPERTIES__ 325
349#define __GO_WAITBAR__ 326 349#define __GO_USEDEPRECATEDLF__ 326
350#define __GO_PROGRESSIONBAR__ 327 350#define __GO_WAITBAR__ 327
351#define __GO_UI_MESSAGE__ 328 351#define __GO_PROGRESSIONBAR__ 328
352#define __GO_UI_MESSAGE_SIZE__ 329 352#define __GO_UI_MESSAGE__ 329
353#define __GO_DATATIP__ 330 353#define __GO_UI_MESSAGE_SIZE__ 330
354#define __GO_DATATIP_DATA__ 331 354#define __GO_DATATIP__ 331
355#define __GO_DATATIP_ORIENTATION__ 332 355#define __GO_DATATIP_DATA__ 332
356#define __GO_DATATIP_3COMPONENT__ 333 356#define __GO_DATATIP_ORIENTATION__ 333
357#define __GO_DATATIP_AUTOORIENTATION__ 334 357#define __GO_DATATIP_3COMPONENT__ 334
358#define __GO_DATATIP_INTERP_MODE__ 335 358#define __GO_DATATIP_AUTOORIENTATION__ 335
359#define __GO_DATATIP_DISPLAY_FNC__ 336 359#define __GO_DATATIP_INTERP_MODE__ 336
360#define __GO_DATATIP_BOX_MODE__ 337 360#define __GO_DATATIP_DISPLAY_FNC__ 337
361#define __GO_DATATIP_LABEL_MODE__ 338 361#define __GO_DATATIP_BOX_MODE__ 338
362#define __GO_DATATIP_MARK__ 339 362#define __GO_DATATIP_LABEL_MODE__ 339
363#define __GO_AMBIENTCOLOR__ 340 363#define __GO_DATATIP_MARK__ 340
364#define __GO_DIFFUSECOLOR__ 341 364#define __GO_AMBIENTCOLOR__ 341
365#define __GO_SPECULARCOLOR__ 342 365#define __GO_DIFFUSECOLOR__ 342
366#define __GO_COLOR_MATERIAL__ 343 366#define __GO_SPECULARCOLOR__ 343
367#define __GO_MATERIAL_SHININESS__ 344 367#define __GO_COLOR_MATERIAL__ 344
368#define __GO_LIGHT__ 345 368#define __GO_MATERIAL_SHININESS__ 345
369#define __GO_LIGHT_TYPE__ 346 369#define __GO_LIGHT__ 346
370#define __GO_DATATIPS__ 347 370#define __GO_LIGHT_TYPE__ 347
371#define __GO_DATATIPS_COUNT__ 348 371#define __GO_DATATIPS__ 348
372#define __GO_DATATIP_INDEXES__ 349 372#define __GO_DATATIPS_COUNT__ 349
373#define __GO_DATA_MODEL_DISPLAY_FUNCTION__ 350 373#define __GO_DATATIP_INDEXES__ 350
374#define __GO_DATA_MODEL_DISPLAY_FUNCTION_SIZE__ 351 374#define __GO_DATA_MODEL_DISPLAY_FUNCTION__ 351
375#define __GO_RESIZE__ 352 375#define __GO_DATA_MODEL_DISPLAY_FUNCTION_SIZE__ 352
376#define __GO_TOOLBAR__ 353 376#define __GO_RESIZE__ 353
377#define __GO_TOOLBAR_VISIBLE__ 354 377#define __GO_TOOLBAR__ 354
378#define __GO_MENUBAR__ 355 378#define __GO_TOOLBAR_VISIBLE__ 355
379#define __GO_MENUBAR_VISIBLE__ 356 379#define __GO_MENUBAR__ 356
380#define __GO_INFOBAR_VISIBLE__ 357 380#define __GO_MENUBAR_VISIBLE__ 357
381#define __GO_DOCKABLE__ 358 381#define __GO_INFOBAR_VISIBLE__ 358
382#define __GO_LAYOUT__ 359 382#define __GO_DOCKABLE__ 359
383#define __GO_LAYOUT_SET__ 360 383#define __GO_LAYOUT__ 360
384#define __GO_UI_TAB__ 361 384#define __GO_LAYOUT_SET__ 361
385#define __GO_UI_GRIDBAG_GRID__ 362 385#define __GO_UI_TAB__ 362
386#define __GO_UI_GRIDBAG_WEIGHT__ 363 386#define __GO_UI_GRIDBAG_GRID__ 363
387#define __GO_UI_GRIDBAG_FILL__ 364 387#define __GO_UI_GRIDBAG_WEIGHT__ 364
388#define __GO_UI_GRIDBAG_ANCHOR__ 365 388#define __GO_UI_GRIDBAG_FILL__ 365
389#define __GO_UI_GRIDBAG_PADDING__ 366 389#define __GO_UI_GRIDBAG_ANCHOR__ 366
390#define __GO_UI_GRIDBAG_PREFERREDSIZE__ 367 390#define __GO_UI_GRIDBAG_PADDING__ 367
391#define __GO_UI_GRID_GRID__ 368 391#define __GO_UI_GRIDBAG_PREFERREDSIZE__ 368
392#define __GO_UI_GRID_PADDING__ 369 392#define __GO_UI_GRID_GRID__ 369
393#define __GO_UI_BORDER_POSITION__ 370 393#define __GO_UI_GRID_PADDING__ 370
394#define __GO_UI_BORDER_PREFERREDSIZE__ 371 394#define __GO_UI_BORDER_POSITION__ 371
395#define __GO_GRID_OPT_GRID__ 372 395#define __GO_UI_BORDER_PREFERREDSIZE__ 372
396#define __GO_GRID_OPT_PADDING__ 373 396#define __GO_GRID_OPT_GRID__ 373
397#define __GO_BORDER_OPT_PADDING__ 374 397#define __GO_GRID_OPT_PADDING__ 374
398#define __GO_UI_FRAME_BORDER__ 375 398#define __GO_BORDER_OPT_PADDING__ 375
399#define __GO_UI_FRAME_BORDER_COLOR__ 376 399#define __GO_UI_FRAME_BORDER__ 376
400#define __GO_UI_FRAME_BORDER_HIGHLIGHT_IN__ 377 400#define __GO_UI_FRAME_BORDER_COLOR__ 377
401#define __GO_UI_FRAME_BORDER_HIGHLIGHT_OUT__ 378 401#define __GO_UI_FRAME_BORDER_HIGHLIGHT_IN__ 378
402#define __GO_UI_FRAME_BORDER_IN_BORDER__ 379 402#define __GO_UI_FRAME_BORDER_HIGHLIGHT_OUT__ 379
403#define __GO_UI_FRAME_BORDER_JUSTIFICATION__ 380 403#define __GO_UI_FRAME_BORDER_IN_BORDER__ 380
404#define __GO_UI_FRAME_BORDER_OUT_BORDER__ 381 404#define __GO_UI_FRAME_BORDER_JUSTIFICATION__ 381
405#define __GO_UI_FRAME_BORDER_ROUNDED__ 382 405#define __GO_UI_FRAME_BORDER_OUT_BORDER__ 382
406#define __GO_UI_FRAME_BORDER_SHADOW_IN__ 383 406#define __GO_UI_FRAME_BORDER_ROUNDED__ 383
407#define __GO_UI_FRAME_BORDER_SHADOW_OUT__ 384 407#define __GO_UI_FRAME_BORDER_SHADOW_IN__ 384
408#define __GO_UI_FRAME_BORDER_TITLE__ 385 408#define __GO_UI_FRAME_BORDER_SHADOW_OUT__ 385
409#define __GO_UI_FRAME_BORDER_POSITION__ 386 409#define __GO_UI_FRAME_BORDER_TITLE__ 386
410#define __GO_UI_FRAME_BORDER_STYLE__ 387 410#define __GO_UI_FRAME_BORDER_POSITION__ 387
411#define __GO_UI_GROUP_NAME__ 388 411#define __GO_UI_FRAME_BORDER_STYLE__ 388
412#define __GO_UI_TITLE_POSITION__ 389 412#define __GO_UI_GROUP_NAME__ 389
413#define __GO_UI_TITLE_SCROLL__ 390 413#define __GO_UI_TITLE_POSITION__ 390
414#define __GO_UI_FRAME_BORDER_TYPE__ 391 414#define __GO_UI_TITLE_SCROLL__ 391
415#define __GO_UI_SCROLLABLE__ 392 415#define __GO_UI_FRAME_BORDER_TYPE__ 392
416#define __GO_UI_SCROLLABLE__ 393
416 417
417#endif /* !__GRAPHIC_OBJECT_PROPERTIES_H__ */ 418#endif /* !__GRAPHIC_OBJECT_PROPERTIES_H__ */
diff --git a/scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj b/scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj
index 5b34077..5e6e9b3 100644
--- a/scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj
+++ b/scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj
@@ -250,6 +250,9 @@
250 <ClCompile Include="..\cpp\getConsoleIdentifier.cpp" /> 250 <ClCompile Include="..\cpp\getConsoleIdentifier.cpp" />
251 <ClCompile Include="..\cpp\HandleManagement.cpp" /> 251 <ClCompile Include="..\cpp\HandleManagement.cpp" />
252 <ClCompile Include="..\cpp\MatPlotDecomposer.cpp" /> 252 <ClCompile Include="..\cpp\MatPlotDecomposer.cpp" />
253 <ClCompile Include="..\cpp\MeshData.cpp" />
254 <ClCompile Include="..\cpp\MeshFecData.cpp" />
255 <ClCompile Include="..\cpp\MeshFecDataDecomposer.cpp" />
253 <ClCompile Include="..\cpp\NgonGridMatplotDataDecomposer.cpp" /> 256 <ClCompile Include="..\cpp\NgonGridMatplotDataDecomposer.cpp" />
254 <ClCompile Include="..\cpp\NormalGenerator.cpp" /> 257 <ClCompile Include="..\cpp\NormalGenerator.cpp" />
255 <ClCompile Include="..\cpp\ScilabView.cpp" /> 258 <ClCompile Include="..\cpp\ScilabView.cpp" />
@@ -282,9 +285,6 @@
282 <ClCompile Include="..\cpp\Plot3DDecomposer.cpp" /> 285 <ClCompile Include="..\cpp\Plot3DDecomposer.cpp" />
283 <ClCompile Include="..\cpp\PolylineDecomposer.cpp" /> 286 <ClCompile Include="..\cpp\PolylineDecomposer.cpp" />
284 <ClCompile Include="..\cpp\setGraphicObjectProperty.cpp" /> 287 <ClCompile Include="..\cpp\setGraphicObjectProperty.cpp" />
285 <ClCompile Include="..\cpp\TriangleMeshData.cpp" />
286 <ClCompile Include="..\cpp\TriangleMeshFecData.cpp" />
287 <ClCompile Include="..\cpp\TriangleMeshFecDataDecomposer.cpp" />
288 <ClCompile Include="..\jni\SurfaceData_wrap.c" /> 288 <ClCompile Include="..\jni\SurfaceData_wrap.c" />
289 <ClCompile Include="..\cpp\createObjectData.cpp" /> 289 <ClCompile Include="..\cpp\createObjectData.cpp" />
290 <ClCompile Include="..\cpp\pickSurface.cpp" /> 290 <ClCompile Include="..\cpp\pickSurface.cpp" />
diff --git a/scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj.filters b/scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj.filters
index 01a1cf7..c28a919 100644
--- a/scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj.filters
+++ b/scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj.filters
@@ -92,15 +92,6 @@
92 <ClCompile Include="..\cpp\setGraphicObjectProperty.cpp"> 92 <ClCompile Include="..\cpp\setGraphicObjectProperty.cpp">
93 <Filter>Source Files</Filter> 93 <Filter>Source Files</Filter>
94 </ClCompile> 94 </ClCompile>
95 <ClCompile Include="..\cpp\TriangleMeshData.cpp">
96 <Filter>Source Files</Filter>
97 </ClCompile>
98 <ClCompile Include="..\cpp\TriangleMeshFecData.cpp">
99 <Filter>Source Files</Filter>
100 </ClCompile>
101 <ClCompile Include="..\cpp\TriangleMeshFecDataDecomposer.cpp">
102 <Filter>Source Files</Filter>
103 </ClCompile>
104 <ClCompile Include="..\cpp\NgonGridMatplotDataDecomposer.cpp"> 95 <ClCompile Include="..\cpp\NgonGridMatplotDataDecomposer.cpp">
105 <Filter>Source Files</Filter> 96 <Filter>Source Files</Filter>
106 </ClCompile> 97 </ClCompile>
@@ -167,6 +158,15 @@
167 <ClCompile Include="..\jni\CallXmlLoader.cpp"> 158 <ClCompile Include="..\jni\CallXmlLoader.cpp">
168 <Filter>Source Files</Filter> 159 <Filter>Source Files</Filter>
169 </ClCompile> 160 </ClCompile>
161 <ClCompile Include="..\cpp\MeshData.cpp">
162 <Filter>Source Files</Filter>
163 </ClCompile>
164 <ClCompile Include="..\cpp\MeshFecData.cpp">
165 <Filter>Source Files</Filter>
166 </ClCompile>
167 <ClCompile Include="..\cpp\MeshFecDataDecomposer.cpp">
168 <Filter>Source Files</Filter>
169 </ClCompile>
170 </ItemGroup> 170 </ItemGroup>
171 <ItemGroup> 171 <ItemGroup>
172 <ClInclude Include="..\jni\CallGraphicController.hxx"> 172 <ClInclude Include="..\jni\CallGraphicController.hxx">
diff --git a/scilab/modules/graphic_objects/src/cpp/DataLoader.cpp b/scilab/modules/graphic_objects/src/cpp/DataLoader.cpp
index f9071aa..0debb60 100644
--- a/scilab/modules/graphic_objects/src/cpp/DataLoader.cpp
+++ b/scilab/modules/graphic_objects/src/cpp/DataLoader.cpp
@@ -22,7 +22,7 @@
22#include "NgonGridMatplotDataDecomposer.hxx" 22#include "NgonGridMatplotDataDecomposer.hxx"
23#include "Plot3DDecomposer.hxx" 23#include "Plot3DDecomposer.hxx"
24#include "PolylineDecomposer.hxx" 24#include "PolylineDecomposer.hxx"
25#include "TriangleMeshFecDataDecomposer.hxx" 25#include "MeshFecDataDecomposer.hxx"
26#include "NormalGenerator.hxx" 26#include "NormalGenerator.hxx"
27 27
28extern "C" 28extern "C"
@@ -103,7 +103,7 @@ int getDataSize(int id)
103 case __GO_FAC3D__ : 103 case __GO_FAC3D__ :
104 return Fac3DDecomposer::getDataSize(id); 104 return Fac3DDecomposer::getDataSize(id);
105 case __GO_FEC__ : 105 case __GO_FEC__ :
106 return TriangleMeshFecDataDecomposer::getDataSize(id); 106 return MeshFecDataDecomposer::getDataSize(id);
107 case __GO_GRAYPLOT__ : 107 case __GO_GRAYPLOT__ :
108 return NgonGridGrayplotDataDecomposer::getDataSize(id); 108 return NgonGridGrayplotDataDecomposer::getDataSize(id);
109 case __GO_MATPLOT__ : 109 case __GO_MATPLOT__ :
@@ -131,7 +131,7 @@ void fillVertices(int id, float* buffer, int bufferLength, int elementsSize, int
131 Fac3DDecomposer::fillVertices(id, buffer, bufferLength, elementsSize, coordinateMask, scale, translation, logMask); 131 Fac3DDecomposer::fillVertices(id, buffer, bufferLength, elementsSize, coordinateMask, scale, translation, logMask);
132 break; 132 break;
133 case __GO_FEC__ : 133 case __GO_FEC__ :
134 TriangleMeshFecDataDecomposer::fillVertices(id, buffer, bufferLength, elementsSize, coordinateMask, scale, translation, logMask); 134 MeshFecDataDecomposer::fillVertices(id, buffer, bufferLength, elementsSize, coordinateMask, scale, translation, logMask);
135 break; 135 break;
136 case __GO_GRAYPLOT__ : 136 case __GO_GRAYPLOT__ :
137 NgonGridGrayplotDataDecomposer::fillVertices(id, buffer, bufferLength, elementsSize, coordinateMask, scale, translation, logMask); 137 NgonGridGrayplotDataDecomposer::fillVertices(id, buffer, bufferLength, elementsSize, coordinateMask, scale, translation, logMask);
@@ -204,7 +204,7 @@ void fillTextureCoordinates(int id, float* BUFF, int bufferLength)
204 Fac3DDecomposer::fillTextureCoordinates(id, BUFF, bufferLength); 204 Fac3DDecomposer::fillTextureCoordinates(id, BUFF, bufferLength);
205 break; 205 break;
206 case __GO_FEC__ : 206 case __GO_FEC__ :
207 TriangleMeshFecDataDecomposer::fillTextureCoordinates(id, BUFF, bufferLength); 207 MeshFecDataDecomposer::fillTextureCoordinates(id, BUFF, bufferLength);
208 break; 208 break;
209 case __GO_POLYLINE__ : 209 case __GO_POLYLINE__ :
210 PolylineDecomposer::fillTextureCoordinates(id, BUFF, bufferLength); 210 PolylineDecomposer::fillTextureCoordinates(id, BUFF, bufferLength);
@@ -222,7 +222,7 @@ void fillColors(int id, float* BUFF, int bufferLength, int elementsSize)
222 switch (iType) 222 switch (iType)
223 { 223 {
224 case __GO_FEC__ : 224 case __GO_FEC__ :
225 TriangleMeshFecDataDecomposer::fillColors(id, BUFF, bufferLength, elementsSize); 225 MeshFecDataDecomposer::fillColors(id, BUFF, bufferLength, elementsSize);
226 break; 226 break;
227 case __GO_GRAYPLOT__ : 227 case __GO_GRAYPLOT__ :
228 NgonGridGrayplotDataDecomposer::fillColors(id, BUFF, bufferLength, elementsSize); 228 NgonGridGrayplotDataDecomposer::fillColors(id, BUFF, bufferLength, elementsSize);
@@ -252,7 +252,7 @@ int getIndicesSize(int id)
252 case __GO_FAC3D__ : 252 case __GO_FAC3D__ :
253 return Fac3DDecomposer::getIndicesSize(id); 253 return Fac3DDecomposer::getIndicesSize(id);
254 case __GO_FEC__ : 254 case __GO_FEC__ :
255 return TriangleMeshFecDataDecomposer::getIndicesSize(id); 255 return MeshFecDataDecomposer::getIndicesSize(id);
256 case __GO_GRAYPLOT__ : 256 case __GO_GRAYPLOT__ :
257 return NgonGridGrayplotDataDecomposer::getIndicesSize(id); 257 return NgonGridGrayplotDataDecomposer::getIndicesSize(id);
258 case __GO_MATPLOT__ : 258 case __GO_MATPLOT__ :
@@ -279,7 +279,7 @@ int fillIndices(int id, int* buffer, int bufferLength, int logMask)
279 case __GO_FAC3D__ : 279 case __GO_FAC3D__ :
280 return Fac3DDecomposer::fillIndices(id, buffer, bufferLength, logMask); 280 return Fac3DDecomposer::fillIndices(id, buffer, bufferLength, logMask);
281 case __GO_FEC__ : 281 case __GO_FEC__ :
282 return TriangleMeshFecDataDecomposer::fillIndices(id, buffer, bufferLength, logMask); 282 return MeshFecDataDecomposer::fillIndices(id, buffer, bufferLength, logMask);
283 case __GO_GRAYPLOT__ : 283 case __GO_GRAYPLOT__ :
284 return NgonGridGrayplotDataDecomposer::fillIndices(id, buffer, bufferLength, logMask); 284 return NgonGridGrayplotDataDecomposer::fillIndices(id, buffer, bufferLength, logMask);
285 case __GO_MATPLOT__ : 285 case __GO_MATPLOT__ :
@@ -305,7 +305,7 @@ int getWireIndicesSize(int id)
305 case __GO_FAC3D__ : 305 case __GO_FAC3D__ :
306 return Fac3DDecomposer::getWireIndicesSize(id); 306 return Fac3DDecomposer::getWireIndicesSize(id);
307 case __GO_FEC__ : 307 case __GO_FEC__ :
308 return TriangleMeshFecDataDecomposer::getWireIndicesSize(id); 308 return MeshFecDataDecomposer::getWireIndicesSize(id);
309 case __GO_PLOT3D__ : 309 case __GO_PLOT3D__ :
310 return Plot3DDecomposer::getWireIndicesSize(id); 310 return Plot3DDecomposer::getWireIndicesSize(id);
311 case __GO_POLYLINE__ : 311 case __GO_POLYLINE__ :
@@ -327,7 +327,7 @@ int fillWireIndices(int id, int* buffer, int bufferLength, int logMask)
327 case __GO_FAC3D__ : 327 case __GO_FAC3D__ :
328 return Fac3DDecomposer::fillWireIndices(id, buffer, bufferLength, logMask); 328 return Fac3DDecomposer::fillWireIndices(id, buffer, bufferLength, logMask);
329 case __GO_FEC__ : 329 case __GO_FEC__ :
330 return TriangleMeshFecDataDecomposer::fillWireIndices(id, buffer, bufferLength, logMask); 330 return MeshFecDataDecomposer::fillWireIndices(id, buffer, bufferLength, logMask);
331 case __GO_PLOT3D__ : 331 case __GO_PLOT3D__ :
332 return Plot3DDecomposer::fillWireIndices(id, buffer, bufferLength, logMask); 332 return Plot3DDecomposer::fillWireIndices(id, buffer, bufferLength, logMask);
333 case __GO_POLYLINE__ : 333 case __GO_POLYLINE__ :
diff --git a/scilab/modules/graphic_objects/src/cpp/DecompositionUtils.cpp b/scilab/modules/graphic_objects/src/cpp/DecompositionUtils.cpp
index ca041c6..5c0e3c0 100644
--- a/scilab/modules/graphic_objects/src/cpp/DecompositionUtils.cpp
+++ b/scilab/modules/graphic_objects/src/cpp/DecompositionUtils.cpp
@@ -74,6 +74,18 @@ int DecompositionUtils::isValid(double x, double y, double z)
74 } 74 }
75} 75}
76 76
77int DecompositionUtils::isValid(double x, double y)
78{
79 if (isnan(x) || isnan(y) || isinf(x) || isinf(y))
80 {
81 return 0;
82 }
83 else
84 {
85 return 1;
86 }
87}
88
77double DecompositionUtils::getLog10Value(double value) 89double DecompositionUtils::getLog10Value(double value)
78{ 90{
79 return log10(value); 91 return log10(value);
@@ -113,6 +125,23 @@ int DecompositionUtils::isLogValid(double x, double y, double z, int logMask)
113 return valid; 125 return valid;
114} 126}
115 127
128int DecompositionUtils::isLogValid(double x, double y, int logMask)
129{
130 int valid = 1;
131
132 if (logMask & 0x1)
133 {
134 valid &= (x > 0.0);
135 }
136
137 if (logMask & 0x2)
138 {
139 valid &= (y > 0.0);
140 }
141
142 return valid;
143}
144
116double DecompositionUtils::getMaxDoubleValue(void) 145double DecompositionUtils::getMaxDoubleValue(void)
117{ 146{
118 return DBL_MAX; 147 return DBL_MAX;
diff --git a/scilab/modules/graphic_objects/src/cpp/TriangleMeshData.cpp b/scilab/modules/graphic_objects/src/cpp/MeshData.cpp
index 64ec89a..7be7128 100644
--- a/scilab/modules/graphic_objects/src/cpp/TriangleMeshData.cpp
+++ b/scilab/modules/graphic_objects/src/cpp/MeshData.cpp
@@ -10,7 +10,7 @@
10 * 10 *
11 */ 11 */
12 12
13#include "TriangleMeshData.hxx" 13#include "MeshData.hxx"
14#include "DataProperties.hxx" 14#include "DataProperties.hxx"
15 15
16extern "C" { 16extern "C" {
@@ -20,29 +20,30 @@ extern "C" {
20#include "graphicObjectProperties.h" 20#include "graphicObjectProperties.h"
21} 21}
22 22
23TriangleMeshData::TriangleMeshData(void) 23MeshData::MeshData(void)
24{ 24{
25 vertices = NULL; 25 vertices = NULL;
26 indices = NULL; 26 indices = NULL;
27 values = NULL; 27 values = NULL;
28 28
29 numberVertices = 0; 29 numberVertices = 0;
30 numberTriangles = 0; 30 numberElements = 0;
31 numberVerticesByElem = 3;
31} 32}
32 33
33/* To be correctly implemented */ 34/* To be correctly implemented */
34TriangleMeshData::TriangleMeshData(unsigned int numberVertices, unsigned int numberTriangles) 35MeshData::MeshData(unsigned int numberVertices, unsigned int numberElements, unsigned int numberVerticesByElem)
35{ 36{
36 vertices = new double[3 * numberVertices]; 37 vertices = new double[numberVerticesByElem * numberVertices];
37 38 indices = new unsigned int[numberVerticesByElem * numberElements];
38 indices = new unsigned int[3 * numberTriangles];
39 39
40 this->numberVertices = numberVertices; 40 this->numberVertices = numberVertices;
41 this->numberTriangles = numberTriangles; 41 this->numberElements = numberElements;
42 this->numberVerticesByElem = numberVerticesByElem;
42} 43}
43 44
44/* To be correctly implemented */ 45/* To be correctly implemented */
45TriangleMeshData::~TriangleMeshData(void) 46MeshData::~MeshData(void)
46{ 47{
47 if (numberVertices > 0) 48 if (numberVertices > 0)
48 { 49 {
@@ -50,14 +51,14 @@ TriangleMeshData::~TriangleMeshData(void)
50 delete [] values; 51 delete [] values;
51 } 52 }
52 53
53 if (numberTriangles > 0) 54 if (numberElements > 0)
54 { 55 {
55 delete [] indices; 56 delete [] indices;
56 } 57 }
57 58
58} 59}
59 60
60int TriangleMeshData::getPropertyFromName(int propertyName) 61int MeshData::getPropertyFromName(int propertyName)
61{ 62{
62 switch (propertyName) 63 switch (propertyName)
63 { 64 {
@@ -77,6 +78,8 @@ int TriangleMeshData::getPropertyFromName(int propertyName)
77 return INDICES; 78 return INDICES;
78 case __GO_DATA_MODEL_VALUES__ : 79 case __GO_DATA_MODEL_VALUES__ :
79 return VALUES; 80 return VALUES;
81 case __GO_DATA_MODEL_NUM_VERTICES_BY_ELEM__ :
82 return NUM_VERTICES_BY_ELEM;
80 default : 83 default :
81 return Data3D::getPropertyFromName(propertyName); 84 return Data3D::getPropertyFromName(propertyName);
82 } 85 }
@@ -84,7 +87,7 @@ int TriangleMeshData::getPropertyFromName(int propertyName)
84} 87}
85 88
86 89
87int TriangleMeshData::setDataProperty(int property, void const* value, int numElements) 90int MeshData::setDataProperty(int property, void const* value, int numElements)
88{ 91{
89 switch (property) 92 switch (property)
90 { 93 {
@@ -110,6 +113,9 @@ int TriangleMeshData::setDataProperty(int property, void const* value, int numEl
110 case VALUES : 113 case VALUES :
111 setValues((double const*) value, numElements); 114 setValues((double const*) value, numElements);
112 break; 115 break;
116 case NUM_VERTICES_BY_ELEM :
117 numberVerticesByElem = *((unsigned int const*) value);
118 break;
113 default : 119 default :
114 return Data3D::setDataProperty(property, value, numElements); 120 return Data3D::setDataProperty(property, value, numElements);
115 } 121 }
@@ -117,7 +123,7 @@ int TriangleMeshData::setDataProperty(int property, void const* value, int numEl
117 return 1; 123 return 1;
118} 124}
119 125
120void TriangleMeshData::getDataProperty(int property, void **_pvData) 126void MeshData::getDataProperty(int property, void **_pvData)
121{ 127{
122 switch (property) 128 switch (property)
123 { 129 {
@@ -136,12 +142,15 @@ void TriangleMeshData::getDataProperty(int property, void **_pvData)
136 case VALUES : 142 case VALUES :
137 *_pvData = getValues(); 143 *_pvData = getValues();
138 break; 144 break;
145 case NUM_VERTICES_BY_ELEM :
146 ((int *) *_pvData)[0] = numberVerticesByElem;
147 break;
139 default : 148 default :
140 Data3D::getDataProperty(property, _pvData); 149 Data3D::getDataProperty(property, _pvData);
141 } 150 }
142} 151}
143 152
144unsigned int TriangleMeshData::getNumVertices(void) 153unsigned int MeshData::getNumVertices(void)
145{ 154{
146 return numberVertices; 155 return numberVertices;
147} 156}
@@ -150,7 +159,7 @@ unsigned int TriangleMeshData::getNumVertices(void)
150 * Values are considered as being specified per-vertex for now 159 * Values are considered as being specified per-vertex for now
151 * To be corrected 160 * To be corrected
152 */ 161 */
153int TriangleMeshData::setNumVertices(unsigned int numVertices) 162int MeshData::setNumVertices(unsigned int numVertices)
154{ 163{
155 int result = 1; 164 int result = 1;
156 165
@@ -223,22 +232,22 @@ int TriangleMeshData::setNumVertices(unsigned int numVertices)
223 return result; 232 return result;
224} 233}
225 234
226unsigned int TriangleMeshData::getNumIndices(void) 235unsigned int MeshData::getNumIndices(void)
227{ 236{
228 return numberTriangles; 237 return numberElements;
229} 238}
230 239
231int TriangleMeshData::setNumIndices(unsigned int numIndices) 240int MeshData::setNumIndices(unsigned int numIndices)
232{ 241{
233 int result = 1; 242 int result = 1;
234 243
235 if (numIndices != this->numberTriangles) 244 if (numIndices != this->numberElements)
236 { 245 {
237 unsigned int* newIndices = NULL; 246 unsigned int* newIndices = NULL;
238 247
239 try 248 try
240 { 249 {
241 newIndices = new unsigned int[3 * numIndices]; 250 newIndices = new unsigned int[numberVerticesByElem * numIndices];
242 } 251 }
243 catch (const std::exception& e) 252 catch (const std::exception& e)
244 { 253 {
@@ -248,14 +257,14 @@ int TriangleMeshData::setNumIndices(unsigned int numIndices)
248 257
249 if (result) 258 if (result)
250 { 259 {
251 if (this->numberTriangles > 0) 260 if (this->numberElements > 0)
252 { 261 {
253 delete [] indices; 262 delete [] indices;
254 } 263 }
255 264
256 indices = newIndices; 265 indices = newIndices;
257 266
258 this->numberTriangles = numIndices; 267 this->numberElements = numIndices;
259 } 268 }
260 else 269 else
261 { 270 {
@@ -271,12 +280,12 @@ int TriangleMeshData::setNumIndices(unsigned int numIndices)
271 return result; 280 return result;
272} 281}
273 282
274double* TriangleMeshData::getVertices(void) 283double* MeshData::getVertices(void)
275{ 284{
276 return vertices; 285 return vertices;
277} 286}
278 287
279void TriangleMeshData::setVertices(double const* vertices, unsigned int numElements) 288void MeshData::setVertices(double const* vertices, unsigned int numElements)
280{ 289{
281 if (numElements <= numberVertices) 290 if (numElements <= numberVertices)
282 { 291 {
@@ -284,20 +293,20 @@ void TriangleMeshData::setVertices(double const* vertices, unsigned int numEleme
284 } 293 }
285} 294}
286 295
287unsigned int* TriangleMeshData::getIndices(void) 296unsigned int* MeshData::getIndices(void)
288{ 297{
289 return indices; 298 return indices;
290} 299}
291 300
292void TriangleMeshData::setIndices(unsigned int const* indices, unsigned int numElements) 301void MeshData::setIndices(unsigned int const* indices, unsigned int numElements)
293{ 302{
294 if (numElements <= numberTriangles) 303 if (numElements <= numberElements)
295 { 304 {
296 memcpy(this->indices, indices, numElements * 3 * sizeof(unsigned int)); 305 memcpy(this->indices, indices, numElements * numberVerticesByElem * sizeof(unsigned int));
297 } 306 }
298} 307}
299 308
300void TriangleMeshData::setDataX(double const* data, unsigned int numElements) 309void MeshData::setDataX(double const* data, unsigned int numElements)
301{ 310{
302 if (numElements <= numberVertices) 311 if (numElements <= numberVertices)
303 { 312 {
@@ -308,7 +317,7 @@ void TriangleMeshData::setDataX(double const* data, unsigned int numElements)
308 } 317 }
309} 318}
310 319
311void TriangleMeshData::setDataY(double const* data, unsigned int numElements) 320void MeshData::setDataY(double const* data, unsigned int numElements)
312{ 321{
313 if (numElements <= numberVertices) 322 if (numElements <= numberVertices)
314 { 323 {
@@ -319,7 +328,7 @@ void TriangleMeshData::setDataY(double const* data, unsigned int numElements)
319 } 328 }
320} 329}
321 330
322void TriangleMeshData::setDataZ(double const* data, unsigned int numElements) 331void MeshData::setDataZ(double const* data, unsigned int numElements)
323{ 332{
324 if (numElements <= numberVertices) 333 if (numElements <= numberVertices)
325 { 334 {
@@ -330,7 +339,7 @@ void TriangleMeshData::setDataZ(double const* data, unsigned int numElements)
330 } 339 }
331} 340}
332 341
333void TriangleMeshData::setValues(double const* data, unsigned int numElements) 342void MeshData::setValues(double const* data, unsigned int numElements)
334{ 343{
335 if (numElements <= numberVertices) 344 if (numElements <= numberVertices)
336 { 345 {
@@ -338,23 +347,18 @@ void TriangleMeshData::setValues(double const* data, unsigned int numElements)
338 } 347 }
339} 348}
340 349
341double* TriangleMeshData::getValues(void) 350double* MeshData::getValues(void)
342{ 351{
343 return values; 352 return values;
344} 353}
345 354
346unsigned int TriangleMeshData::scilabIndexToIndex(unsigned int scilabIndex) 355unsigned int MeshData::scilabIndexToIndex(unsigned int scilabIndex)
347{ 356{
348 return (scilabIndex - 1); 357 return (scilabIndex - 1);
349} 358}
350 359
351void TriangleMeshData::resetCoordinates(void) 360void MeshData::resetCoordinates(void)
352{ 361{
353 for (unsigned int i = 0; i < numberVertices; i++) 362 memset(vertices, 0, numberVertices * 3 * sizeof(double));
354 {
355 vertices[3 * i] = 0.0;
356 vertices[3 * i + 1] = 0.0;
357 vertices[3 * i + 2] = 0.0;
358 }
359} 363}
360 364
diff --git a/scilab/modules/graphic_objects/src/cpp/MeshFecData.cpp b/scilab/modules/graphic_objects/src/cpp/MeshFecData.cpp
new file mode 100644
index 0000000..7a98ade
--- /dev/null
+++ b/scilab/modules/graphic_objects/src/cpp/MeshFecData.cpp
@@ -0,0 +1,212 @@
1/*
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) 2010 - DIGITEO - Manuel Juliachs
4 *
5 * This file must be used under the terms of the CeCILL.
6 * This source file is licensed as described in the file COPYING, which
7 * you should have received as part of this distribution. The terms
8 * are also available at
9 * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
10 *
11 */
12
13#include "MeshFecData.hxx"
14#include "MeshData.hxx"
15#include "DataProperties.hxx"
16
17extern "C" {
18#include <string.h>
19#include "BOOL.h"
20
21#include "graphicObjectProperties.h"
22}
23
24MeshFecData::MeshFecData(void)
25{
26 vertices = NULL;
27 indices = NULL;
28 values = NULL;
29 fecValues = NULL;
30
31 numberVertices = 0;
32 numberElements = 0;
33 numberVerticesByElem = 3;
34}
35
36MeshFecData::MeshFecData(unsigned int numberVertices, unsigned int numberElements, unsigned int numberVerticesByElem)
37{
38 vertices = new double[numberVerticesByElem * numberVertices];
39 indices = new unsigned int[numberVerticesByElem * numberElements];
40 fecValues = new double[(numberVerticesByElem + 2) * numberElements];
41
42 this->numberVerticesByElem = numberVerticesByElem;
43 this->numberVertices = numberVertices;
44 this->numberElements = numberElements;
45}
46
47MeshFecData::~MeshFecData(void)
48{
49 if (numberVertices > 0)
50 {
51 delete [] vertices;
52 delete [] values;
53 }
54
55 if (numberElements > 0)
56 {
57 delete [] indices;
58 delete [] fecValues;
59 }
60
61 numberVertices = 0;
62 numberElements = 0;
63}
64
65int MeshFecData::getPropertyFromName(int propertyName)
66{
67 switch (propertyName)
68 {
69 case __GO_DATA_MODEL_NUM_INDICES__ :
70 return NUM_INDICES;
71 case __GO_DATA_MODEL_FEC_ELEMENTS__ :
72 return FEC_ELEMENTS;
73 default :
74 return MeshData::getPropertyFromName(propertyName);
75 }
76}
77
78
79int MeshFecData::setDataProperty(int property, void const* value, int numElements)
80{
81 if (property == NUM_INDICES)
82 {
83 return setNumIndices(*((unsigned int const*) value));
84 }
85 else if (property == FEC_ELEMENTS)
86 {
87 setFecElements((double const*) value, numElements);
88 }
89 else
90 {
91 return MeshData::setDataProperty(property, value, numElements);
92 }
93
94 return 1;
95}
96
97void MeshFecData::getDataProperty(int property, void **_pvData)
98{
99 if (property == NUM_INDICES)
100 {
101 ((int *) *_pvData)[0] = getNumIndices();
102 }
103 else if (property == FEC_ELEMENTS)
104 {
105 *_pvData = getFecElements();
106 }
107 else
108 {
109 MeshData::getDataProperty(property, _pvData);
110 }
111
112}
113
114unsigned int MeshFecData::getNumIndices(void)
115{
116 return numberElements;
117}
118
119int MeshFecData::setNumIndices(unsigned int numIndices)
120{
121 int result = 1;
122 if (numIndices != this->numberElements)
123 {
124 unsigned int* newIndices = NULL;
125 double* newFecValues = NULL;
126
127 try
128 {
129 newIndices = new unsigned int[numberVerticesByElem * numIndices];
130 }
131 catch (const std::exception& e)
132 {
133 e.what();
134 result = 0;
135 }
136
137 try
138 {
139 newFecValues = new double[(numberVerticesByElem + 2) * numIndices];
140 }
141 catch (const std::exception& e)
142 {
143 e.what();
144 result = 0;
145 }
146
147
148 if (result)
149 {
150 if (this->numberElements > 0)
151 {
152 delete [] indices;
153 delete [] fecValues;
154 }
155
156 indices = newIndices;
157 fecValues = newFecValues;
158
159 this->numberElements = numIndices;
160 }
161 else
162 {
163 /* Failed allocation, nothing is set */
164 if (newIndices != NULL)
165 {
166 delete [] newIndices;
167 }
168
169 if (newFecValues != NULL)
170 {
171 delete [] newFecValues;
172 }
173 }
174
175 }
176
177 return result;
178}
179
180void MeshFecData::setFecElements(double const* data, int numElements)
181{
182 if ((unsigned int)numElements > numberElements)
183 {
184 return;
185 }
186
187 for (int i = 0; i < numElements; i++)
188 {
189 for (unsigned j = 0; j < numberVerticesByElem; ++j)
190 {
191 indices[numberVerticesByElem * i + j] = scilabIndexToIndex((unsigned int) data[(j + 1) * numElements + i]);
192 }
193
194 /* Element number */
195 fecValues[i] = data[i];
196
197 /* Element vertices */
198 for (unsigned int j = 1; j <= numberVerticesByElem; ++j)
199 {
200 fecValues[j * numElements + i] = data[j * numElements + i];
201 }
202
203 /* Flag */
204 fecValues[(numberVerticesByElem + 1) * numElements + i] = data[(numberVerticesByElem + 1) * numElements + i];
205 }
206}
207
208double* MeshFecData::getFecElements(void)
209{
210 return fecValues;
211}
212
diff --git a/scilab/modules/graphic_objects/src/cpp/TriangleMeshFecDataDecomposer.cpp b/scilab/modules/graphic_objects/src/cpp/MeshFecDataDecomposer.cpp
index 72bf98e..f482bf6 100644
--- a/scilab/modules/graphic_objects/src/cpp/TriangleMeshFecDataDecomposer.cpp
+++ b/scilab/modules/graphic_objects/src/cpp/MeshFecDataDecomposer.cpp
@@ -12,7 +12,9 @@
12 12
13#include "ColorComputer.hxx" 13#include "ColorComputer.hxx"
14#include "DecompositionUtils.hxx" 14#include "DecompositionUtils.hxx"
15#include "TriangleMeshFecDataDecomposer.hxx" 15#include "MeshFecDataDecomposer.hxx"
16
17#include <iostream>
16 18
17extern "C" 19extern "C"
18{ 20{
@@ -23,7 +25,7 @@ extern "C"
23#include "graphicObjectProperties.h" 25#include "graphicObjectProperties.h"
24} 26}
25 27
26int TriangleMeshFecDataDecomposer::getDataSize(int id) 28int MeshFecDataDecomposer::getDataSize(int id)
27{ 29{
28 int numVertices = 0; 30 int numVertices = 0;
29 int* piNumVertices = &numVertices; 31 int* piNumVertices = &numVertices;
@@ -33,7 +35,7 @@ int TriangleMeshFecDataDecomposer::getDataSize(int id)
33 return numVertices; 35 return numVertices;
34} 36}
35 37
36void TriangleMeshFecDataDecomposer::fillVertices(int id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask) 38void MeshFecDataDecomposer::fillVertices(int id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask)
37{ 39{
38 double* coordinates = NULL; 40 double* coordinates = NULL;
39 41
@@ -83,7 +85,7 @@ void TriangleMeshFecDataDecomposer::fillVertices(int id, float* buffer, int buff
83 85
84} 86}
85 87
86void TriangleMeshFecDataDecomposer::fillTextureCoordinates(int id, float* buffer, int bufferLength) 88void MeshFecDataDecomposer::fillTextureCoordinates(int id, float* buffer, int bufferLength)
87{ 89{
88 int parentFigure = 0; 90 int parentFigure = 0;
89 int * piParentFigure = &parentFigure; 91 int * piParentFigure = &parentFigure;
@@ -173,7 +175,7 @@ void TriangleMeshFecDataDecomposer::fillTextureCoordinates(int id, float* buffer
173 } 175 }
174} 176}
175 177
176void TriangleMeshFecDataDecomposer::fillColors(int id, float* buffer, int bufferLength, int elementsSize) 178void MeshFecDataDecomposer::fillColors(int id, float* buffer, int bufferLength, int elementsSize)
177{ 179{
178 int parent = 0; 180 int parent = 0;
179 int parentFigure = 0; 181 int parentFigure = 0;
@@ -328,7 +330,7 @@ void TriangleMeshFecDataDecomposer::fillColors(int id, float* buffer, int buffer
328 releaseGraphicObjectProperty(__GO_COLORMAP__, colormap, jni_double_vector, colormapSize); 330 releaseGraphicObjectProperty(__GO_COLORMAP__, colormap, jni_double_vector, colormapSize);
329} 331}
330 332
331void TriangleMeshFecDataDecomposer::computeMinMaxValues(double* values, int numValues, double* valueMin, double* valueMax) 333void MeshFecDataDecomposer::computeMinMaxValues(double* values, int numValues, double* valueMin, double* valueMax)
332{ 334{
333 double maxDouble = DecompositionUtils::getMaxDoubleValue(); 335 double maxDouble = DecompositionUtils::getMaxDoubleValue();
334 double tmpValueMin = maxDouble; 336 double tmpValueMin = maxDouble;
@@ -354,17 +356,20 @@ void TriangleMeshFecDataDecomposer::computeMinMaxValues(double* values, int numV
354 *valueMax = tmpValueMax; 356 *valueMax = tmpValueMax;
355} 357}
356 358
357int TriangleMeshFecDataDecomposer::getIndicesSize(int id) 359int MeshFecDataDecomposer::getIndicesSize(int id)
358{ 360{
359 int numIndices = 0; 361 int numIndices = 0;
360 int* piNumIndices = &numIndices; 362 int* piNumIndices = &numIndices;
363 int nVertex = 0;
364 int* piNVertex = &nVertex;
361 365
362 getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_INDICES__, jni_int, (void**) &piNumIndices); 366 getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_INDICES__, jni_int, (void**) &piNumIndices);
367 getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_VERTICES_BY_ELEM__, jni_int, (void**) &piNVertex);
363 368
364 return 3 * numIndices; 369 return 3 * (nVertex - 2) * numIndices;
365} 370}
366 371
367int TriangleMeshFecDataDecomposer::fillIndices(int id, int* buffer, int bufferLength, int logMask) 372int MeshFecDataDecomposer::fillIndices(int id, int* buffer, int bufferLength, int logMask)
368{ 373{
369 double* coordinates = NULL; 374 double* coordinates = NULL;
370 double* values = NULL; 375 double* values = NULL;
@@ -373,6 +378,8 @@ int TriangleMeshFecDataDecomposer::fillIndices(int id, int* buffer, int bufferLe
373 int* piNumIndices = &numIndices; 378 int* piNumIndices = &numIndices;
374 int numVertices = 0; 379 int numVertices = 0;
375 int* piNumVertices = &numVertices; 380 int* piNumVertices = &numVertices;
381 int nVertex = 0;
382 int* piNVertex = &nVertex;
376 383
377 int* triangleIndices = NULL; 384 int* triangleIndices = NULL;
378 385
@@ -383,6 +390,7 @@ int TriangleMeshFecDataDecomposer::fillIndices(int id, int* buffer, int bufferLe
383 390
384 getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_INDICES__, jni_int, (void**) &piNumIndices); 391 getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_INDICES__, jni_int, (void**) &piNumIndices);
385 getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_VERTICES__, jni_int, (void**) &piNumVertices); 392 getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_VERTICES__, jni_int, (void**) &piNumVertices);
393 getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_VERTICES_BY_ELEM__, jni_int, (void**) &piNVertex);
386 394
387 getGraphicObjectProperty(id, __GO_DATA_MODEL_COORDINATES__, jni_double_vector, (void**) &coordinates); 395 getGraphicObjectProperty(id, __GO_DATA_MODEL_COORDINATES__, jni_double_vector, (void**) &coordinates);
388 getGraphicObjectProperty(id, __GO_DATA_MODEL_VALUES__, jni_double_vector, (void**) &values); 396 getGraphicObjectProperty(id, __GO_DATA_MODEL_VALUES__, jni_double_vector, (void**) &values);
@@ -397,27 +405,28 @@ int TriangleMeshFecDataDecomposer::fillIndices(int id, int* buffer, int bufferLe
397 405
398 for (int i = 0; i < numIndices; i++) 406 for (int i = 0; i < numIndices; i++)
399 { 407 {
400 v0 = triangleIndices[3 * i]; 408 v0 = triangleIndices[nVertex * i];
401 v1 = triangleIndices[3 * i + 1]; 409 for (unsigned int j = 1; j < nVertex - 1; ++j)
402 v2 = triangleIndices[3 * i + 2]; 410 {
403 411 v1 = triangleIndices[nVertex * i + j];
404 if (areFaceIndicesValid(numVertices, v0, v1, v2) && 412 v2 = triangleIndices[nVertex * i + j + 1];
413
414 if (areFaceIndicesValid(numVertices, v0, v1, v2) &&
405 areFaceVerticesValid(coordinates, v0, v1, v2, logMask) && 415 areFaceVerticesValid(coordinates, v0, v1, v2, logMask) &&
406 areFaceValuesValid(values, v0, v1, v2)) 416 areFaceValuesValid(values, v0, v1, v2))
407 { 417 {
408 buffer[bufferOffset] = v0; 418 buffer[bufferOffset] = v0;
409 buffer[bufferOffset + 1] = v1; 419 buffer[bufferOffset + 1] = v1;
410 buffer[bufferOffset + 2] = v2; 420 buffer[bufferOffset + 2] = v2;
411 421 bufferOffset += 3;
412 bufferOffset += 3; 422 }
413 } 423 }
414
415 } 424 }
416 425
417 return bufferOffset; 426 return bufferOffset;
418} 427}
419 428
420int TriangleMeshFecDataDecomposer::areFaceVerticesValid(double* coordinates, int v0, int v1, int v2, int logMask) 429int MeshFecDataDecomposer::areFaceVerticesValid(double* coordinates, int v0, int v1, int v2, int logMask)
421{ 430{
422 double vertex0[3]; 431 double vertex0[3];
423 double vertex1[3]; 432 double vertex1[3];
@@ -440,7 +449,26 @@ int TriangleMeshFecDataDecomposer::areFaceVerticesValid(double* coordinates, int
440 return 0; 449 return 0;
441} 450}
442 451
443int TriangleMeshFecDataDecomposer::areFaceValuesValid(double* values, int v0, int v1, int v2) 452int MeshFecDataDecomposer::areSegmentVerticesValid(double* coordinates, int v0, int v1, int logMask)
453{
454 double vertex0[3];
455 double vertex1[3];
456
457 getVertexCoordinates(coordinates, v0, vertex0);
458 getVertexCoordinates(coordinates, v1, vertex1);
459
460 if (DecompositionUtils::isValid(vertex0[0], vertex0[1], vertex0[2]) &&
461 DecompositionUtils::isLogValid(vertex0[0], vertex0[1], vertex0[2], logMask) &&
462 DecompositionUtils::isValid(vertex1[0], vertex1[1], vertex1[2]) &&
463 DecompositionUtils::isLogValid(vertex1[0], vertex1[1], vertex1[2], logMask))
464 {
465 return 1;
466 }
467
468 return 0;
469}
470
471int MeshFecDataDecomposer::areFaceValuesValid(double* values, int v0, int v1, int v2)
444{ 472{
445 if (DecompositionUtils::isValid(values[v0], values[v1], values[v2])) 473 if (DecompositionUtils::isValid(values[v0], values[v1], values[v2]))
446 { 474 {
@@ -450,7 +478,17 @@ int TriangleMeshFecDataDecomposer::areFaceValuesValid(double* values, int v0, in
450 return 0; 478 return 0;
451} 479}
452 480
453int TriangleMeshFecDataDecomposer::areFaceIndicesValid(int numVertices, int v0, int v1, int v2) 481int MeshFecDataDecomposer::areSegmentValuesValid(double* values, int v0, int v1)
482{
483 if (DecompositionUtils::isValid(values[v0], values[v1]))
484 {
485 return 1;
486 }
487
488 return 0;
489}
490
491int MeshFecDataDecomposer::areFaceIndicesValid(int numVertices, int v0, int v1, int v2)
454{ 492{
455 if (v0 < 0 || v0 >= numVertices || v1 < 0 || v1 >= numVertices || v2 < 0 || v2 >= numVertices) 493 if (v0 < 0 || v0 >= numVertices || v1 < 0 || v1 >= numVertices || v2 < 0 || v2 >= numVertices)
456 { 494 {
@@ -460,27 +498,41 @@ int TriangleMeshFecDataDecomposer::areFaceIndicesValid(int numVertices, int v0,
460 return 1; 498 return 1;
461} 499}
462 500
463void TriangleMeshFecDataDecomposer::getVertexCoordinates(double* coordinates, int index, double* vertexCoordinates) 501int MeshFecDataDecomposer::areSegmentIndicesValid(int numVertices, int v0, int v1)
502{
503 if (v0 < 0 || v0 >= numVertices || v1 < 0 || v1 >= numVertices)
504 {
505 return 0;
506 }
507
508 return 1;
509}
510
511
512void MeshFecDataDecomposer::getVertexCoordinates(double* coordinates, int index, double* vertexCoordinates)
464{ 513{
465 vertexCoordinates[0] = coordinates[3 * index]; 514 vertexCoordinates[0] = coordinates[3 * index];
466 vertexCoordinates[1] = coordinates[3 * index + 1]; 515 vertexCoordinates[1] = coordinates[3 * index + 1];
467 vertexCoordinates[2] = coordinates[3 * index + 2]; 516 vertexCoordinates[2] = coordinates[3 * index + 2];
468} 517}
469 518
470int TriangleMeshFecDataDecomposer::getWireIndicesSize(int id) 519int MeshFecDataDecomposer::getWireIndicesSize(int id)
471{ 520{
472 int numTriangles = 0; 521 int numTriangles = 0;
473 int* piNumTriangles = &numTriangles; 522 int* piNumTriangles = &numTriangles;
523 int nVertex = 0;
524 int* piNVertex = &nVertex;
474 525
475 getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_INDICES__, jni_int, (void**) &piNumTriangles); 526 getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_INDICES__, jni_int, (void**) &piNumTriangles);
527 getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_VERTICES_BY_ELEM__, jni_int, (void**) &piNVertex);
476 528
477 return 6 * numTriangles; 529 return 2 * nVertex * numTriangles;
478} 530}
479 531
480/* 532/*
481 * To do: output shared edges once instead of twice (once per adjacent face). 533 * To do: output shared edges once instead of twice (once per adjacent face).
482 */ 534 */
483int TriangleMeshFecDataDecomposer::fillWireIndices(int id, int* buffer, int bufferLength, int logMask) 535int MeshFecDataDecomposer::fillWireIndices(int id, int* buffer, int bufferLength, int logMask)
484{ 536{
485 double* coordinates = NULL; 537 double* coordinates = NULL;
486 double* values = NULL; 538 double* values = NULL;
@@ -490,6 +542,8 @@ int TriangleMeshFecDataDecomposer::fillWireIndices(int id, int* buffer, int buff
490 int numIndices = 0; 542 int numIndices = 0;
491 int* piNumIndices = &numIndices; 543 int* piNumIndices = &numIndices;
492 int* triangleIndices = NULL; 544 int* triangleIndices = NULL;
545 int nVertex = 0;
546 int* piNVertex = &nVertex;
493 547
494 int v0 = 0; 548 int v0 = 0;
495 int v1 = 0; 549 int v1 = 0;
@@ -501,6 +555,7 @@ int TriangleMeshFecDataDecomposer::fillWireIndices(int id, int* buffer, int buff
501 getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_VERTICES__, jni_int, (void**) &piNumVertices); 555 getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_VERTICES__, jni_int, (void**) &piNumVertices);
502 getGraphicObjectProperty(id, __GO_DATA_MODEL_COORDINATES__, jni_double_vector, (void**) &coordinates); 556 getGraphicObjectProperty(id, __GO_DATA_MODEL_COORDINATES__, jni_double_vector, (void**) &coordinates);
503 getGraphicObjectProperty(id, __GO_DATA_MODEL_VALUES__, jni_double_vector, (void**) &values); 557 getGraphicObjectProperty(id, __GO_DATA_MODEL_VALUES__, jni_double_vector, (void**) &values);
558 getGraphicObjectProperty(id, __GO_DATA_MODEL_NUM_VERTICES_BY_ELEM__, jni_int, (void**) &piNVertex);
504 559
505 /* 0 segments */ 560 /* 0 segments */
506 if (numIndices == 0 || numVertices < 3) 561 if (numIndices == 0 || numVertices < 3)
@@ -512,24 +567,30 @@ int TriangleMeshFecDataDecomposer::fillWireIndices(int id, int* buffer, int buff
512 567
513 for (int i = 0; i < numIndices; i++) 568 for (int i = 0; i < numIndices; i++)
514 { 569 {
515 v0 = triangleIndices[3 * i]; 570 for (unsigned int j = 0; j < nVertex - 1; ++j)
516 v1 = triangleIndices[3 * i + 1]; 571 {
517 v2 = triangleIndices[3 * i + 2]; 572 v0 = triangleIndices[nVertex * i + j];
518 573 v1 = triangleIndices[nVertex * i + j + 1];
519 if (areFaceIndicesValid(numVertices, v0, v1, v2) && 574 if (areSegmentIndicesValid(numVertices, v0, v1) &&
520 areFaceVerticesValid(coordinates, v0, v1, v2, logMask) && 575 areSegmentVerticesValid(coordinates, v0, v1, logMask) &&
521 areFaceValuesValid(values, v0, v1, v2)) 576 areSegmentValuesValid(values, v0, v1))
522 { 577 {
523 buffer[bufferOffset] = v0; 578 buffer[bufferOffset] = v0;
524 buffer[bufferOffset + 1] = v1; 579 buffer[bufferOffset + 1] = v1;
525 buffer[bufferOffset + 2] = v1; 580 bufferOffset += 2;
526 buffer[bufferOffset + 3] = v2; 581 }
527 buffer[bufferOffset + 4] = v2; 582 }
528 buffer[bufferOffset + 5] = v0; 583
529 584 v0 = triangleIndices[nVertex * i + nVertex - 1];
530 bufferOffset += 6; 585 v1 = triangleIndices[nVertex * i];
531 } 586 if (areSegmentIndicesValid(numVertices, v0, v1) &&
532 587 areSegmentVerticesValid(coordinates, v0, v1, logMask) &&
588 areSegmentValuesValid(values, v0, v1))
589 {
590 buffer[bufferOffset] = v0;
591 buffer[bufferOffset + 1] = v1;
592 bufferOffset += 2;
593 }
533 } 594 }
534 595
535 return bufferOffset; 596 return bufferOffset;
diff --git a/scilab/modules/graphic_objects/src/cpp/TriangleMeshFecData.cpp b/scilab/modules/graphic_objects/src/cpp/TriangleMeshFecData.cpp
deleted file mode 100644
index 55b8ca5..0000000
--- a/scilab/modules/graphic_objects/src/cpp/TriangleMeshFecData.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
1/*
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) 2010 - DIGITEO - Manuel Juliachs
4 *
5 * This file must be used under the terms of the CeCILL.
6 * This source file is licensed as described in the file COPYING, which
7 * you should have received as part of this distribution. The terms
8 * are also available at
9 * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
10 *
11 */
12
13#include "TriangleMeshFecData.hxx"
14#include "TriangleMeshData.hxx"
15#include "DataProperties.hxx"
16
17extern "C" {
18#include <string.h>
19#include "BOOL.h"
20
21#include "graphicObjectProperties.h"
22}
23
24TriangleMeshFecData::TriangleMeshFecData(void)
25{
26 vertices = NULL;
27 indices = NULL;
28 values = NULL;
29 fecValues = NULL;
30
31 numberVertices = 0;
32 numberTriangles = 0;
33}
34
35/* To be correctly implemented */
36TriangleMeshFecData::TriangleMeshFecData(unsigned int numberVertices, unsigned int numberTriangles)
37{
38 vertices = new double[3 * numberVertices];
39
40 indices = new unsigned int[3 * numberTriangles];
41
42 fecValues = new double[5 * numberTriangles];
43
44 this->numberVertices = numberVertices;
45 this->numberTriangles = numberTriangles;
46}
47
48/* To be correctly implemented */
49TriangleMeshFecData::~TriangleMeshFecData(void)
50{
51 if (numberVertices > 0)
52 {
53 delete [] vertices;
54 delete [] values;
55 }
56
57 if (numberTriangles > 0)
58 {
59 delete [] indices;
60 delete [] fecValues;
61 }
62
63 numberVertices = 0;
64 numberTriangles = 0;
65}
66
67int TriangleMeshFecData::getPropertyFromName(int propertyName)
68{
69 switch (propertyName)
70 {
71 case __GO_DATA_MODEL_NUM_INDICES__ :
72 return NUM_INDICES;
73 case __GO_DATA_MODEL_FEC_TRIANGLES__ :
74 return FEC_TRIANGLES;
75 default :