* Bug #15024 fixed : Xcos labels were not preserved . 00/19200/6
authorClément DAVID <clement.david@esi-group.com>
Fri, 17 Mar 2017 05:54:44 +0000 (06:54 +0100)
committerClément DAVID <clement.david@esi-group.com>
Thu, 6 Apr 2017 07:29:07 +0000 (09:29 +0200)
commitf3ceb6ca42c4d35e7da324439d59d768c44db2e7
treea89b61c875f945ea42fa4dab9e357e960ce398fa
parentdbe34d30883ed5f036c344fa4822a7ff81284f5b
* Bug #15024 fixed : Xcos labels were not preserved .

This commit upgrade the Xcos metamodel for BLOCK and LINK labels. An
owned ANNOTATION is associated as an HTML label and allow each label to be
move-able on the user-interface and a DESCRIPTION field is available
for oneliner (eg. Scilab variable compatible).

XMI serialization has been updated accordingly.
ZCOS format upgrade (backward compatible) the Scilab 5 encoding (as an mxCell).

NOTE: PORT label is still a string

Change-Id: I65f2d628e5359b7b5bdaf093b053d201177057f5
29 files changed:
scilab/CHANGES.md
scilab/modules/scicos/includes/Controller.hxx
scilab/modules/scicos/includes/XMIResource.hxx
scilab/modules/scicos/src/cpp/Controller.cpp
scilab/modules/scicos/src/cpp/Model_getObjectProperties.cpp
scilab/modules/scicos/src/cpp/Model_setObjectProperties.cpp
scilab/modules/scicos/src/cpp/XMIResource_load.cpp
scilab/modules/scicos/src/cpp/XMIResource_save.cpp
scilab/modules/scicos/src/cpp/model/Block.hxx
scilab/modules/scicos/src/cpp/model/Link.hxx
scilab/modules/scicos/src/cpp/view_scilab/LinkAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/ModelAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/ParamsAdapter.cpp
scilab/modules/xcos/model/Xcos.genmodel
scilab/modules/xcos/model/xcos.ecore
scilab/modules/xcos/src/java/org/scilab/modules/xcos/JavaController.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/EditFormatAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/RecentFileAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/model/XcosCell.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/BlockHandler.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/sax/JGraphXHandler.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/writer/BlockWriter.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/writer/LinkWriter.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/writer/ScilabWriter.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosMessages.java
scilab/modules/xcos/tests/nonreg_tests/bug_15024.tst [new file with mode: 0644]
scilab/modules/xcos/tests/nonreg_tests/bug_15024.zcos [new file with mode: 0644]