Xcos: reintroduce a private xcosDiagramToScilab 27/17327/5
authorClément DAVID <clement.david@scilab-enterprises.com>
Tue, 13 Oct 2015 14:25:57 +0000 (16:25 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Wed, 21 Oct 2015 15:09:27 +0000 (17:09 +0200)
commit5eb1b0affb1c3a304a38b735d9c122f648d45cca
tree23197d481a4e417785143bedf0e50e9f3bff9a6a
parentd15bff8c6fc27b334e5e3e03c1009b0f7069617d
Xcos: reintroduce a private xcosDiagramToScilab

importXcosDiagram use this helper to decode files using the Java
implementation. The rationale behind : `importXcosDiagram` is a public
function that manage all supported file types whereas `xcosDiagramToScilab`
is an helper used to call the Java implemented decoders.

NOTE: This commit also slightly improve the decoding of XCOS and ZCOS
diagrams.

Change-Id: I3f7329194e728e60bce8b47033b28b77969a9002
27 files changed:
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/macros/importXcosDiagram.sci
scilab/modules/xcos/sci_gateway/cpp/sci_xcosDiagramToScilab.cpp [new file with mode: 0644]
scilab/modules/xcos/sci_gateway/xcos_gateway.xml
scilab/modules/xcos/src/c/xcos.vcxproj
scilab/modules/xcos/src/c/xcos.vcxproj.filters
scilab/modules/xcos/src/java/org/scilab/modules/xcos/JavaControllerJNI.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/VectorOfBool.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/VectorOfDouble.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/VectorOfInt.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/VectorOfScicosID.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/VectorOfString.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/model/XcosCellFactory.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/sax/CustomHandler.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/sax/HandledElement.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/sax/LinkHandler.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/sax/PortHandler.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/sax/RawDataHandler.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/sax/SAXHandler.java
scilab/modules/xcos/src/jni/JavaController.i
scilab/modules/xcos/src/jni/JavaController_wrap.cxx
scilab/modules/xcos/src/jni/Xcos.cpp
scilab/modules/xcos/src/jni/Xcos.giws.xml
scilab/modules/xcos/src/jni/Xcos.hxx
scilab/modules/xcos/tests/nonreg_tests/bug_7537.tst