Xcos gateways: rewrite data2sig and sig2data to C++ 78/16178/6
Paul Bignier [Thu, 19 Mar 2015 09:26:07 +0000 (10:26 +0100)]
Change-Id: I405fe5e3e00eb928bb338c78daed9e0b69ef2994

15 files changed:
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/includes/gw_scicos.h
scilab/modules/scicos/includes/gw_scicos.hxx
scilab/modules/scicos/sci_gateway/c/sci_data2sig.c [deleted file]
scilab/modules/scicos/sci_gateway/c/sci_sig2data.c [deleted file]
scilab/modules/scicos/sci_gateway/cpp/sci_data2sig.cpp [new file with mode: 0644]
scilab/modules/scicos/sci_gateway/cpp/sci_sig2data.cpp [new file with mode: 0644]
scilab/modules/scicos/sci_gateway/scicos_gateway.xml
scilab/modules/scicos/src/c/cli/scicos-cli.vcxproj
scilab/modules/scicos/src/c/cli/scicos-cli.vcxproj.filters
scilab/modules/scicos/src/c/scicos.vcxproj
scilab/modules/scicos/src/c/scicos.vcxproj.filters
scilab/modules/scicos/tests/unit_tests/data2sig.dia.ref [new file with mode: 0644]
scilab/modules/scicos/tests/unit_tests/data2sig.tst [new file with mode: 0644]

index 67cc9e8..12ea706 100644 (file)
@@ -76,6 +76,7 @@ sci_gateway/cpp/sci_ctree3.cpp \
 sci_gateway/cpp/sci_ctree4.cpp \
 sci_gateway/cpp/sci_coserror.cpp \
 sci_gateway/cpp/sci_curblock.cpp \
+sci_gateway/cpp/sci_data2sig.cpp \
 sci_gateway/cpp/sci_duplicate.cpp \
 sci_gateway/cpp/sci_end_scicosim.cpp \
 sci_gateway/cpp/sci_haltscicos.cpp \
@@ -87,6 +88,7 @@ sci_gateway/cpp/sci_scicos_time.cpp \
 sci_gateway/cpp/sci_scicosim.cpp \
 sci_gateway/cpp/sci_set_blockerror.cpp \
 sci_gateway/cpp/sci_set_xproperty.cpp \
+sci_gateway/cpp/sci_sig2data.cpp \
 sci_gateway/cpp/sci_validvar.cpp \
 sci_gateway/cpp/sci_var2vec.cpp \
 sci_gateway/cpp/sci_vec2var.cpp
@@ -94,7 +96,6 @@ sci_gateway/cpp/sci_vec2var.cpp
 GATEWAY_C_SOURCES = \
 sci_gateway/c/gw_scicos.c \
 sci_gateway/c/sci_callblk.c \
-sci_gateway/c/sci_data2sig.c \
 sci_gateway/c/sci_diffobjs.c \
 sci_gateway/c/sci_ftree2.c \
 sci_gateway/c/sci_ftree3.c \
@@ -103,8 +104,7 @@ sci_gateway/c/sci_getblocklabel.c \
 sci_gateway/c/sci_getscicosvars.c \
 sci_gateway/c/sci_loadScicos.c \
 sci_gateway/c/sci_model2blk.c \
-sci_gateway/c/sci_sctree.c \
-sci_gateway/c/sci_sig2data.c
+sci_gateway/c/sci_sctree.c
 
 GATEWAY_FORTRAN_SOURCES = \
 sci_gateway/fortran/sci_f_tree2.f \
index d7959b7..fb874df 100644 (file)
@@ -295,6 +295,7 @@ am__libsciscicos_cli_la_SOURCES_DIST =  \
        sci_gateway/cpp/sci_ctree4.cpp \
        sci_gateway/cpp/sci_coserror.cpp \
        sci_gateway/cpp/sci_curblock.cpp \
+       sci_gateway/cpp/sci_data2sig.cpp \
        sci_gateway/cpp/sci_duplicate.cpp \
        sci_gateway/cpp/sci_end_scicosim.cpp \
        sci_gateway/cpp/sci_haltscicos.cpp \
@@ -306,17 +307,16 @@ am__libsciscicos_cli_la_SOURCES_DIST =  \
        sci_gateway/cpp/sci_scicosim.cpp \
        sci_gateway/cpp/sci_set_blockerror.cpp \
        sci_gateway/cpp/sci_set_xproperty.cpp \
+       sci_gateway/cpp/sci_sig2data.cpp \
        sci_gateway/cpp/sci_validvar.cpp \
        sci_gateway/cpp/sci_var2vec.cpp \
        sci_gateway/cpp/sci_vec2var.cpp sci_gateway/c/gw_scicos.c \
-       sci_gateway/c/sci_callblk.c sci_gateway/c/sci_data2sig.c \
-       sci_gateway/c/sci_diffobjs.c sci_gateway/c/sci_ftree2.c \
-       sci_gateway/c/sci_ftree3.c sci_gateway/c/sci_ftree4.c \
-       sci_gateway/c/sci_getblocklabel.c \
+       sci_gateway/c/sci_callblk.c sci_gateway/c/sci_diffobjs.c \
+       sci_gateway/c/sci_ftree2.c sci_gateway/c/sci_ftree3.c \
+       sci_gateway/c/sci_ftree4.c sci_gateway/c/sci_getblocklabel.c \
        sci_gateway/c/sci_getscicosvars.c \
        sci_gateway/c/sci_loadScicos.c sci_gateway/c/sci_model2blk.c \
-       sci_gateway/c/sci_sctree.c sci_gateway/c/sci_sig2data.c \
-       sci_gateway/fortran/sci_f_tree2.f \
+       sci_gateway/c/sci_sctree.c sci_gateway/fortran/sci_f_tree2.f \
        sci_gateway/fortran/sci_f_tree3.f \
        sci_gateway/fortran/sci_f_tree4.f
 am__objects_5 =  \
@@ -329,6 +329,7 @@ am__objects_5 =  \
        sci_gateway/cpp/libsciscicos_cli_la-sci_ctree4.lo \
        sci_gateway/cpp/libsciscicos_cli_la-sci_coserror.lo \
        sci_gateway/cpp/libsciscicos_cli_la-sci_curblock.lo \
+       sci_gateway/cpp/libsciscicos_cli_la-sci_data2sig.lo \
        sci_gateway/cpp/libsciscicos_cli_la-sci_duplicate.lo \
        sci_gateway/cpp/libsciscicos_cli_la-sci_end_scicosim.lo \
        sci_gateway/cpp/libsciscicos_cli_la-sci_haltscicos.lo \
@@ -340,12 +341,12 @@ am__objects_5 =  \
        sci_gateway/cpp/libsciscicos_cli_la-sci_scicosim.lo \
        sci_gateway/cpp/libsciscicos_cli_la-sci_set_blockerror.lo \
        sci_gateway/cpp/libsciscicos_cli_la-sci_set_xproperty.lo \
+       sci_gateway/cpp/libsciscicos_cli_la-sci_sig2data.lo \
        sci_gateway/cpp/libsciscicos_cli_la-sci_validvar.lo \
        sci_gateway/cpp/libsciscicos_cli_la-sci_var2vec.lo \
        sci_gateway/cpp/libsciscicos_cli_la-sci_vec2var.lo
 am__objects_6 = sci_gateway/c/libsciscicos_cli_la-gw_scicos.lo \
        sci_gateway/c/libsciscicos_cli_la-sci_callblk.lo \
-       sci_gateway/c/libsciscicos_cli_la-sci_data2sig.lo \
        sci_gateway/c/libsciscicos_cli_la-sci_diffobjs.lo \
        sci_gateway/c/libsciscicos_cli_la-sci_ftree2.lo \
        sci_gateway/c/libsciscicos_cli_la-sci_ftree3.lo \
@@ -354,8 +355,7 @@ am__objects_6 = sci_gateway/c/libsciscicos_cli_la-gw_scicos.lo \
        sci_gateway/c/libsciscicos_cli_la-sci_getscicosvars.lo \
        sci_gateway/c/libsciscicos_cli_la-sci_loadScicos.lo \
        sci_gateway/c/libsciscicos_cli_la-sci_model2blk.lo \
-       sci_gateway/c/libsciscicos_cli_la-sci_sctree.lo \
-       sci_gateway/c/libsciscicos_cli_la-sci_sig2data.lo
+       sci_gateway/c/libsciscicos_cli_la-sci_sctree.lo
 am__objects_7 = sci_gateway/fortran/sci_f_tree2.lo \
        sci_gateway/fortran/sci_f_tree3.lo \
        sci_gateway/fortran/sci_f_tree4.lo
@@ -378,6 +378,7 @@ am__libsciscicos_la_SOURCES_DIST =  \
        sci_gateway/cpp/sci_ctree4.cpp \
        sci_gateway/cpp/sci_coserror.cpp \
        sci_gateway/cpp/sci_curblock.cpp \
+       sci_gateway/cpp/sci_data2sig.cpp \
        sci_gateway/cpp/sci_duplicate.cpp \
        sci_gateway/cpp/sci_end_scicosim.cpp \
        sci_gateway/cpp/sci_haltscicos.cpp \
@@ -389,17 +390,16 @@ am__libsciscicos_la_SOURCES_DIST =  \
        sci_gateway/cpp/sci_scicosim.cpp \
        sci_gateway/cpp/sci_set_blockerror.cpp \
        sci_gateway/cpp/sci_set_xproperty.cpp \
+       sci_gateway/cpp/sci_sig2data.cpp \
        sci_gateway/cpp/sci_validvar.cpp \
        sci_gateway/cpp/sci_var2vec.cpp \
        sci_gateway/cpp/sci_vec2var.cpp sci_gateway/c/gw_scicos.c \
-       sci_gateway/c/sci_callblk.c sci_gateway/c/sci_data2sig.c \
-       sci_gateway/c/sci_diffobjs.c sci_gateway/c/sci_ftree2.c \
-       sci_gateway/c/sci_ftree3.c sci_gateway/c/sci_ftree4.c \
-       sci_gateway/c/sci_getblocklabel.c \
+       sci_gateway/c/sci_callblk.c sci_gateway/c/sci_diffobjs.c \
+       sci_gateway/c/sci_ftree2.c sci_gateway/c/sci_ftree3.c \
+       sci_gateway/c/sci_ftree4.c sci_gateway/c/sci_getblocklabel.c \
        sci_gateway/c/sci_getscicosvars.c \
        sci_gateway/c/sci_loadScicos.c sci_gateway/c/sci_model2blk.c \
-       sci_gateway/c/sci_sctree.c sci_gateway/c/sci_sig2data.c \
-       sci_gateway/fortran/sci_f_tree2.f \
+       sci_gateway/c/sci_sctree.c sci_gateway/fortran/sci_f_tree2.f \
        sci_gateway/fortran/sci_f_tree3.f \
        sci_gateway/fortran/sci_f_tree4.f
 am__objects_8 = sci_gateway/cpp/libsciscicos_la-sci_scicos_debug.lo \
@@ -411,6 +411,7 @@ am__objects_8 = sci_gateway/cpp/libsciscicos_la-sci_scicos_debug.lo \
        sci_gateway/cpp/libsciscicos_la-sci_ctree4.lo \
        sci_gateway/cpp/libsciscicos_la-sci_coserror.lo \
        sci_gateway/cpp/libsciscicos_la-sci_curblock.lo \
+       sci_gateway/cpp/libsciscicos_la-sci_data2sig.lo \
        sci_gateway/cpp/libsciscicos_la-sci_duplicate.lo \
        sci_gateway/cpp/libsciscicos_la-sci_end_scicosim.lo \
        sci_gateway/cpp/libsciscicos_la-sci_haltscicos.lo \
@@ -422,12 +423,12 @@ am__objects_8 = sci_gateway/cpp/libsciscicos_la-sci_scicos_debug.lo \
        sci_gateway/cpp/libsciscicos_la-sci_scicosim.lo \
        sci_gateway/cpp/libsciscicos_la-sci_set_blockerror.lo \
        sci_gateway/cpp/libsciscicos_la-sci_set_xproperty.lo \
+       sci_gateway/cpp/libsciscicos_la-sci_sig2data.lo \
        sci_gateway/cpp/libsciscicos_la-sci_validvar.lo \
        sci_gateway/cpp/libsciscicos_la-sci_var2vec.lo \
        sci_gateway/cpp/libsciscicos_la-sci_vec2var.lo
 am__objects_9 = sci_gateway/c/libsciscicos_la-gw_scicos.lo \
        sci_gateway/c/libsciscicos_la-sci_callblk.lo \
-       sci_gateway/c/libsciscicos_la-sci_data2sig.lo \
        sci_gateway/c/libsciscicos_la-sci_diffobjs.lo \
        sci_gateway/c/libsciscicos_la-sci_ftree2.lo \
        sci_gateway/c/libsciscicos_la-sci_ftree3.lo \
@@ -436,8 +437,7 @@ am__objects_9 = sci_gateway/c/libsciscicos_la-gw_scicos.lo \
        sci_gateway/c/libsciscicos_la-sci_getscicosvars.lo \
        sci_gateway/c/libsciscicos_la-sci_loadScicos.lo \
        sci_gateway/c/libsciscicos_la-sci_model2blk.lo \
-       sci_gateway/c/libsciscicos_la-sci_sctree.lo \
-       sci_gateway/c/libsciscicos_la-sci_sig2data.lo
+       sci_gateway/c/libsciscicos_la-sci_sctree.lo
 @XCOS_TRUE@am_libsciscicos_la_OBJECTS = $(am__objects_8) \
 @XCOS_TRUE@    $(am__objects_9) $(am__objects_7)
 libsciscicos_la_OBJECTS = $(am_libsciscicos_la_OBJECTS)
@@ -986,6 +986,7 @@ sci_gateway/cpp/sci_ctree3.cpp \
 sci_gateway/cpp/sci_ctree4.cpp \
 sci_gateway/cpp/sci_coserror.cpp \
 sci_gateway/cpp/sci_curblock.cpp \
+sci_gateway/cpp/sci_data2sig.cpp \
 sci_gateway/cpp/sci_duplicate.cpp \
 sci_gateway/cpp/sci_end_scicosim.cpp \
 sci_gateway/cpp/sci_haltscicos.cpp \
@@ -997,6 +998,7 @@ sci_gateway/cpp/sci_scicos_time.cpp \
 sci_gateway/cpp/sci_scicosim.cpp \
 sci_gateway/cpp/sci_set_blockerror.cpp \
 sci_gateway/cpp/sci_set_xproperty.cpp \
+sci_gateway/cpp/sci_sig2data.cpp \
 sci_gateway/cpp/sci_validvar.cpp \
 sci_gateway/cpp/sci_var2vec.cpp \
 sci_gateway/cpp/sci_vec2var.cpp
@@ -1004,7 +1006,6 @@ sci_gateway/cpp/sci_vec2var.cpp
 GATEWAY_C_SOURCES = \
 sci_gateway/c/gw_scicos.c \
 sci_gateway/c/sci_callblk.c \
-sci_gateway/c/sci_data2sig.c \
 sci_gateway/c/sci_diffobjs.c \
 sci_gateway/c/sci_ftree2.c \
 sci_gateway/c/sci_ftree3.c \
@@ -1013,8 +1014,7 @@ sci_gateway/c/sci_getblocklabel.c \
 sci_gateway/c/sci_getscicosvars.c \
 sci_gateway/c/sci_loadScicos.c \
 sci_gateway/c/sci_model2blk.c \
-sci_gateway/c/sci_sctree.c \
-sci_gateway/c/sci_sig2data.c
+sci_gateway/c/sci_sctree.c
 
 GATEWAY_FORTRAN_SOURCES = \
 sci_gateway/fortran/sci_f_tree2.f \
@@ -1595,6 +1595,9 @@ sci_gateway/cpp/libsciscicos_cli_la-sci_coserror.lo:  \
 sci_gateway/cpp/libsciscicos_cli_la-sci_curblock.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
+sci_gateway/cpp/libsciscicos_cli_la-sci_data2sig.lo:  \
+       sci_gateway/cpp/$(am__dirstamp) \
+       sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/cpp/libsciscicos_cli_la-sci_duplicate.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
@@ -1628,6 +1631,9 @@ sci_gateway/cpp/libsciscicos_cli_la-sci_set_blockerror.lo:  \
 sci_gateway/cpp/libsciscicos_cli_la-sci_set_xproperty.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
+sci_gateway/cpp/libsciscicos_cli_la-sci_sig2data.lo:  \
+       sci_gateway/cpp/$(am__dirstamp) \
+       sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/cpp/libsciscicos_cli_la-sci_validvar.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
@@ -1649,9 +1655,6 @@ sci_gateway/c/libsciscicos_cli_la-gw_scicos.lo:  \
 sci_gateway/c/libsciscicos_cli_la-sci_callblk.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libsciscicos_cli_la-sci_data2sig.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libsciscicos_cli_la-sci_diffobjs.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -1679,9 +1682,6 @@ sci_gateway/c/libsciscicos_cli_la-sci_model2blk.lo:  \
 sci_gateway/c/libsciscicos_cli_la-sci_sctree.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libsciscicos_cli_la-sci_sig2data.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/fortran/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/fortran
        @: > sci_gateway/fortran/$(am__dirstamp)
@@ -1727,6 +1727,9 @@ sci_gateway/cpp/libsciscicos_la-sci_coserror.lo:  \
 sci_gateway/cpp/libsciscicos_la-sci_curblock.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
+sci_gateway/cpp/libsciscicos_la-sci_data2sig.lo:  \
+       sci_gateway/cpp/$(am__dirstamp) \
+       sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/cpp/libsciscicos_la-sci_duplicate.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
@@ -1760,6 +1763,9 @@ sci_gateway/cpp/libsciscicos_la-sci_set_blockerror.lo:  \
 sci_gateway/cpp/libsciscicos_la-sci_set_xproperty.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
+sci_gateway/cpp/libsciscicos_la-sci_sig2data.lo:  \
+       sci_gateway/cpp/$(am__dirstamp) \
+       sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/cpp/libsciscicos_la-sci_validvar.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
@@ -1775,9 +1781,6 @@ sci_gateway/c/libsciscicos_la-gw_scicos.lo:  \
 sci_gateway/c/libsciscicos_la-sci_callblk.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libsciscicos_la-sci_data2sig.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libsciscicos_la-sci_diffobjs.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -1805,9 +1808,6 @@ sci_gateway/c/libsciscicos_la-sci_model2blk.lo:  \
 sci_gateway/c/libsciscicos_la-sci_sctree.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libsciscicos_la-sci_sig2data.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 
 libsciscicos.la: $(libsciscicos_la_OBJECTS) $(libsciscicos_la_DEPENDENCIES) $(EXTRA_libsciscicos_la_DEPENDENCIES) 
        $(AM_V_CXXLD)$(libsciscicos_la_LINK) $(am_libsciscicos_la_rpath) $(libsciscicos_la_OBJECTS) $(libsciscicos_la_LIBADD) $(LIBS)
@@ -2009,7 +2009,6 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-gw_scicos.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_callblk.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_data2sig.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_diffobjs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_ftree2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_ftree3.Plo@am__quote@
@@ -2019,10 +2018,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_loadScicos.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_model2blk.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_sctree.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_sig2data.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_la-gw_scicos.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_callblk.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_data2sig.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_diffobjs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_ftree2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_ftree3.Plo@am__quote@
@@ -2032,13 +2029,13 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_loadScicos.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_model2blk.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_sctree.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_sig2data.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_buildouttb.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_coserror.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_ctree2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_ctree3.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_ctree4.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_curblock.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_data2sig.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_duplicate.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_end_scicosim.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_haltscicos.Plo@am__quote@
@@ -2053,6 +2050,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_scicosim.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_set_blockerror.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_set_xproperty.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_sig2data.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_validvar.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_var2vec.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_vec2var.Plo@am__quote@
@@ -2062,6 +2060,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_ctree3.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_ctree4.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_curblock.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_data2sig.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_duplicate.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_end_scicosim.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_haltscicos.Plo@am__quote@
@@ -2076,6 +2075,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_scicosim.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_set_blockerror.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_set_xproperty.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_sig2data.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_validvar.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_var2vec.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_vec2var.Plo@am__quote@
@@ -2293,13 +2293,6 @@ sci_gateway/c/libsciscicos_cli_la-sci_callblk.lo: sci_gateway/c/sci_callblk.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciscicos_cli_la-sci_callblk.lo `test -f 'sci_gateway/c/sci_callblk.c' || echo '$(srcdir)/'`sci_gateway/c/sci_callblk.c
 
-sci_gateway/c/libsciscicos_cli_la-sci_data2sig.lo: sci_gateway/c/sci_data2sig.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciscicos_cli_la-sci_data2sig.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_data2sig.Tpo -c -o sci_gateway/c/libsciscicos_cli_la-sci_data2sig.lo `test -f 'sci_gateway/c/sci_data2sig.c' || echo '$(srcdir)/'`sci_gateway/c/sci_data2sig.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_data2sig.Tpo sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_data2sig.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/sci_data2sig.c' object='sci_gateway/c/libsciscicos_cli_la-sci_data2sig.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciscicos_cli_la-sci_data2sig.lo `test -f 'sci_gateway/c/sci_data2sig.c' || echo '$(srcdir)/'`sci_gateway/c/sci_data2sig.c
-
 sci_gateway/c/libsciscicos_cli_la-sci_diffobjs.lo: sci_gateway/c/sci_diffobjs.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciscicos_cli_la-sci_diffobjs.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_diffobjs.Tpo -c -o sci_gateway/c/libsciscicos_cli_la-sci_diffobjs.lo `test -f 'sci_gateway/c/sci_diffobjs.c' || echo '$(srcdir)/'`sci_gateway/c/sci_diffobjs.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_diffobjs.Tpo sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_diffobjs.Plo
@@ -2363,13 +2356,6 @@ sci_gateway/c/libsciscicos_cli_la-sci_sctree.lo: sci_gateway/c/sci_sctree.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciscicos_cli_la-sci_sctree.lo `test -f 'sci_gateway/c/sci_sctree.c' || echo '$(srcdir)/'`sci_gateway/c/sci_sctree.c
 
-sci_gateway/c/libsciscicos_cli_la-sci_sig2data.lo: sci_gateway/c/sci_sig2data.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciscicos_cli_la-sci_sig2data.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_sig2data.Tpo -c -o sci_gateway/c/libsciscicos_cli_la-sci_sig2data.lo `test -f 'sci_gateway/c/sci_sig2data.c' || echo '$(srcdir)/'`sci_gateway/c/sci_sig2data.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_sig2data.Tpo sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_sig2data.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/sci_sig2data.c' object='sci_gateway/c/libsciscicos_cli_la-sci_sig2data.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciscicos_cli_la-sci_sig2data.lo `test -f 'sci_gateway/c/sci_sig2data.c' || echo '$(srcdir)/'`sci_gateway/c/sci_sig2data.c
-
 sci_gateway/c/libsciscicos_la-gw_scicos.lo: sci_gateway/c/gw_scicos.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciscicos_la-gw_scicos.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciscicos_la-gw_scicos.Tpo -c -o sci_gateway/c/libsciscicos_la-gw_scicos.lo `test -f 'sci_gateway/c/gw_scicos.c' || echo '$(srcdir)/'`sci_gateway/c/gw_scicos.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciscicos_la-gw_scicos.Tpo sci_gateway/c/$(DEPDIR)/libsciscicos_la-gw_scicos.Plo
@@ -2384,13 +2370,6 @@ sci_gateway/c/libsciscicos_la-sci_callblk.lo: sci_gateway/c/sci_callblk.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciscicos_la-sci_callblk.lo `test -f 'sci_gateway/c/sci_callblk.c' || echo '$(srcdir)/'`sci_gateway/c/sci_callblk.c
 
-sci_gateway/c/libsciscicos_la-sci_data2sig.lo: sci_gateway/c/sci_data2sig.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciscicos_la-sci_data2sig.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_data2sig.Tpo -c -o sci_gateway/c/libsciscicos_la-sci_data2sig.lo `test -f 'sci_gateway/c/sci_data2sig.c' || echo '$(srcdir)/'`sci_gateway/c/sci_data2sig.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_data2sig.Tpo sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_data2sig.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/sci_data2sig.c' object='sci_gateway/c/libsciscicos_la-sci_data2sig.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciscicos_la-sci_data2sig.lo `test -f 'sci_gateway/c/sci_data2sig.c' || echo '$(srcdir)/'`sci_gateway/c/sci_data2sig.c
-
 sci_gateway/c/libsciscicos_la-sci_diffobjs.lo: sci_gateway/c/sci_diffobjs.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciscicos_la-sci_diffobjs.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_diffobjs.Tpo -c -o sci_gateway/c/libsciscicos_la-sci_diffobjs.lo `test -f 'sci_gateway/c/sci_diffobjs.c' || echo '$(srcdir)/'`sci_gateway/c/sci_diffobjs.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_diffobjs.Tpo sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_diffobjs.Plo
@@ -2454,13 +2433,6 @@ sci_gateway/c/libsciscicos_la-sci_sctree.lo: sci_gateway/c/sci_sctree.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciscicos_la-sci_sctree.lo `test -f 'sci_gateway/c/sci_sctree.c' || echo '$(srcdir)/'`sci_gateway/c/sci_sctree.c
 
-sci_gateway/c/libsciscicos_la-sci_sig2data.lo: sci_gateway/c/sci_sig2data.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciscicos_la-sci_sig2data.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_sig2data.Tpo -c -o sci_gateway/c/libsciscicos_la-sci_sig2data.lo `test -f 'sci_gateway/c/sci_sig2data.c' || echo '$(srcdir)/'`sci_gateway/c/sci_sig2data.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_sig2data.Tpo sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_sig2data.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/sci_sig2data.c' object='sci_gateway/c/libsciscicos_la-sci_sig2data.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciscicos_la-sci_sig2data.lo `test -f 'sci_gateway/c/sci_sig2data.c' || echo '$(srcdir)/'`sci_gateway/c/sci_sig2data.c
-
 src/scicos_sundials/src/cvode/libscisundials_la-cvode.lo: src/scicos_sundials/src/cvode/cvode.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisundials_la_CFLAGS) $(CFLAGS) -MT src/scicos_sundials/src/cvode/libscisundials_la-cvode.lo -MD -MP -MF src/scicos_sundials/src/cvode/$(DEPDIR)/libscisundials_la-cvode.Tpo -c -o src/scicos_sundials/src/cvode/libscisundials_la-cvode.lo `test -f 'src/scicos_sundials/src/cvode/cvode.c' || echo '$(srcdir)/'`src/scicos_sundials/src/cvode/cvode.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/scicos_sundials/src/cvode/$(DEPDIR)/libscisundials_la-cvode.Tpo src/scicos_sundials/src/cvode/$(DEPDIR)/libscisundials_la-cvode.Plo
@@ -2821,6 +2793,13 @@ sci_gateway/cpp/libsciscicos_cli_la-sci_curblock.lo: sci_gateway/cpp/sci_curbloc
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libsciscicos_cli_la-sci_curblock.lo `test -f 'sci_gateway/cpp/sci_curblock.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_curblock.cpp
 
+sci_gateway/cpp/libsciscicos_cli_la-sci_data2sig.lo: sci_gateway/cpp/sci_data2sig.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libsciscicos_cli_la-sci_data2sig.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_data2sig.Tpo -c -o sci_gateway/cpp/libsciscicos_cli_la-sci_data2sig.lo `test -f 'sci_gateway/cpp/sci_data2sig.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_data2sig.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_data2sig.Tpo sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_data2sig.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_data2sig.cpp' object='sci_gateway/cpp/libsciscicos_cli_la-sci_data2sig.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libsciscicos_cli_la-sci_data2sig.lo `test -f 'sci_gateway/cpp/sci_data2sig.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_data2sig.cpp
+
 sci_gateway/cpp/libsciscicos_cli_la-sci_duplicate.lo: sci_gateway/cpp/sci_duplicate.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libsciscicos_cli_la-sci_duplicate.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_duplicate.Tpo -c -o sci_gateway/cpp/libsciscicos_cli_la-sci_duplicate.lo `test -f 'sci_gateway/cpp/sci_duplicate.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_duplicate.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_duplicate.Tpo sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_duplicate.Plo
@@ -2898,6 +2877,13 @@ sci_gateway/cpp/libsciscicos_cli_la-sci_set_xproperty.lo: sci_gateway/cpp/sci_se
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libsciscicos_cli_la-sci_set_xproperty.lo `test -f 'sci_gateway/cpp/sci_set_xproperty.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_set_xproperty.cpp
 
+sci_gateway/cpp/libsciscicos_cli_la-sci_sig2data.lo: sci_gateway/cpp/sci_sig2data.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libsciscicos_cli_la-sci_sig2data.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_sig2data.Tpo -c -o sci_gateway/cpp/libsciscicos_cli_la-sci_sig2data.lo `test -f 'sci_gateway/cpp/sci_sig2data.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_sig2data.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_sig2data.Tpo sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_sig2data.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_sig2data.cpp' object='sci_gateway/cpp/libsciscicos_cli_la-sci_sig2data.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libsciscicos_cli_la-sci_sig2data.lo `test -f 'sci_gateway/cpp/sci_sig2data.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_sig2data.cpp
+
 sci_gateway/cpp/libsciscicos_cli_la-sci_validvar.lo: sci_gateway/cpp/sci_validvar.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libsciscicos_cli_la-sci_validvar.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_validvar.Tpo -c -o sci_gateway/cpp/libsciscicos_cli_la-sci_validvar.lo `test -f 'sci_gateway/cpp/sci_validvar.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_validvar.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_validvar.Tpo sci_gateway/cpp/$(DEPDIR)/libsciscicos_cli_la-sci_validvar.Plo
@@ -2982,6 +2968,13 @@ sci_gateway/cpp/libsciscicos_la-sci_curblock.lo: sci_gateway/cpp/sci_curblock.cp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libsciscicos_la-sci_curblock.lo `test -f 'sci_gateway/cpp/sci_curblock.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_curblock.cpp
 
+sci_gateway/cpp/libsciscicos_la-sci_data2sig.lo: sci_gateway/cpp/sci_data2sig.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libsciscicos_la-sci_data2sig.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_data2sig.Tpo -c -o sci_gateway/cpp/libsciscicos_la-sci_data2sig.lo `test -f 'sci_gateway/cpp/sci_data2sig.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_data2sig.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_data2sig.Tpo sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_data2sig.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_data2sig.cpp' object='sci_gateway/cpp/libsciscicos_la-sci_data2sig.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libsciscicos_la-sci_data2sig.lo `test -f 'sci_gateway/cpp/sci_data2sig.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_data2sig.cpp
+
 sci_gateway/cpp/libsciscicos_la-sci_duplicate.lo: sci_gateway/cpp/sci_duplicate.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libsciscicos_la-sci_duplicate.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_duplicate.Tpo -c -o sci_gateway/cpp/libsciscicos_la-sci_duplicate.lo `test -f 'sci_gateway/cpp/sci_duplicate.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_duplicate.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_duplicate.Tpo sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_duplicate.Plo
@@ -3059,6 +3052,13 @@ sci_gateway/cpp/libsciscicos_la-sci_set_xproperty.lo: sci_gateway/cpp/sci_set_xp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libsciscicos_la-sci_set_xproperty.lo `test -f 'sci_gateway/cpp/sci_set_xproperty.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_set_xproperty.cpp
 
+sci_gateway/cpp/libsciscicos_la-sci_sig2data.lo: sci_gateway/cpp/sci_sig2data.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libsciscicos_la-sci_sig2data.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_sig2data.Tpo -c -o sci_gateway/cpp/libsciscicos_la-sci_sig2data.lo `test -f 'sci_gateway/cpp/sci_sig2data.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_sig2data.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_sig2data.Tpo sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_sig2data.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_sig2data.cpp' object='sci_gateway/cpp/libsciscicos_la-sci_sig2data.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libsciscicos_la-sci_sig2data.lo `test -f 'sci_gateway/cpp/sci_sig2data.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_sig2data.cpp
+
 sci_gateway/cpp/libsciscicos_la-sci_validvar.lo: sci_gateway/cpp/sci_validvar.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libsciscicos_la-sci_validvar.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_validvar.Tpo -c -o sci_gateway/cpp/libsciscicos_la-sci_validvar.lo `test -f 'sci_gateway/cpp/sci_validvar.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_validvar.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_validvar.Tpo sci_gateway/cpp/$(DEPDIR)/libsciscicos_la-sci_validvar.Plo
index eb9c1d2..3eb412b 100644 (file)
@@ -42,8 +42,6 @@ SCICOS_IMPEXP int sci_diffobjs(char *fname, void* pvApiCtx);
 SCICOS_IMPEXP int sci_getscicosvars(char *fname, void* pvApiCtx);
 
 /* it was in a separate gateway */
-SCICOS_IMPEXP int sci_data2sig(char *fname, void* pvApiCtx);
-SCICOS_IMPEXP int sci_sig2data(char *fname, void* pvApiCtx);
 SCICOS_IMPEXP int sci_model2blk(char *fname, void* pvApiCtx);
 SCICOS_IMPEXP int sci_callblk(char *fname, void* pvApiCtx);
 
index ab059ee..aed7a2c 100644 (file)
@@ -22,6 +22,7 @@ CPP_GATEWAY_PROTOTYPE_EXPORT(sci_ctree3, SCICOS_IMPEXP);
 CPP_GATEWAY_PROTOTYPE_EXPORT(sci_ctree4, SCICOS_IMPEXP);
 CPP_GATEWAY_PROTOTYPE_EXPORT(sci_coserror, SCICOS_IMPEXP);
 CPP_GATEWAY_PROTOTYPE_EXPORT(sci_curblock, SCICOS_IMPEXP);
+CPP_GATEWAY_PROTOTYPE_EXPORT(sci_data2sig, SCICOS_IMPEXP);
 CPP_GATEWAY_PROTOTYPE_EXPORT(sci_duplicate, SCICOS_IMPEXP);
 CPP_GATEWAY_PROTOTYPE_EXPORT(sci_end_scicosim, SCICOS_IMPEXP);
 CPP_GATEWAY_PROTOTYPE_EXPORT(sci_haltscicos, SCICOS_IMPEXP);
@@ -36,6 +37,7 @@ CPP_GATEWAY_PROTOTYPE_EXPORT(sci_scicos_time, SCICOS_IMPEXP);
 CPP_GATEWAY_PROTOTYPE_EXPORT(sci_scicosim, SCICOS_IMPEXP);
 CPP_GATEWAY_PROTOTYPE_EXPORT(sci_set_blockerror, SCICOS_IMPEXP);
 CPP_GATEWAY_PROTOTYPE_EXPORT(sci_set_xproperty, SCICOS_IMPEXP);
+CPP_GATEWAY_PROTOTYPE_EXPORT(sci_sig2data, SCICOS_IMPEXP);
 CPP_GATEWAY_PROTOTYPE_EXPORT(sci_validvar, SCICOS_IMPEXP);
 CPP_GATEWAY_PROTOTYPE_EXPORT(sci_var2vec, SCICOS_IMPEXP);
 CPP_GATEWAY_PROTOTYPE_EXPORT(sci_vec2var, SCICOS_IMPEXP);
diff --git a/scilab/modules/scicos/sci_gateway/c/sci_data2sig.c b/scilab/modules/scicos/sci_gateway/c/sci_data2sig.c
deleted file mode 100644 (file)
index d80e43e..0000000
+++ /dev/null
@@ -1,447 +0,0 @@
-/*  Scicos
-*
-*  Copyright (C) INRIA -
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*
-* See the file ./license.txt
-*/
-/*--------------------------------------------------------------------------*/
-#include <stdio.h>
-#include "gw_scicos.h"
-#include "stack-c.h"
-#include "Scierror.h"
-#include "localization.h"
-#include "sci_malloc.h"
-/*--------------------------------------------------------------------------*/
-extern int *listentry(int *header, int i);
-extern void str2sci(char** x, int n, int m);
-extern int C2F(mkmlist)();
-/*--------------------------------------------------------------------------*/
-/* B=data2sig(A[,step])
-*
-* Put data in a 'scicos' signal structure.
-* If A is a vector, then it will be understand
-* as a scalar that evolves along time.
-* If A is a matrix, then it will be understand
-* as a vector that evolves along time.
-* If A is an hypermatrix, then it will be understand
-* as a matrix that evolves along time.
-*
-* Usage :
-* -->a(:,:,4)=([7 8 9;10 11 12]);
-* -->b=data2sig(a,0.1)
-* b  =
-*   values: [2x3x4 hypermat]
-*   time: [4x1 constant]
-* -->b.time
-* ans  =
-*    0.
-*    0.1.
-*    0.2.
-*    0.3.
-*
-* Inputs
-*   A    : vector,matrix or hypermatrix(with 3 dimensions)
-*          of real/complex or integers numbers,
-*
-*   step : an optional argument that gives the time step
-*          for the output time field.
-*          If not given, then the time step is 1.
-*
-* Output
-*   B    : a scilab structure that defines a signal :
-*          B.values :  A input,
-*          B.time   :  the samples time in the form of
-*                      a columun vector. The size of that
-*                      vector is given by the A input.
-*
-* initial rev 08/11/07, Alan
-*
-*/
-/*--------------------------------------------------------------------------*/
-int sci_data2sig(char *fname, void* pvApiCtx)
-{
-    //int m1 = 0, n1 = 0, it = 0;
-    //int p1 = 0;
-    //int *il1 = NULL;
-    //int m1h = 0, n1h = 0;
-    //int *ilh1 = NULL;
-    //int m2h = 0, n2h = 0;
-    //int *ilh2 = NULL;
-    //int *ilh3 = NULL;
-    //int m2 = 0, n2 = 0, it2 = 0;
-    //int *il2 = NULL;
-    //int il = 0, l = 0;
-    //int l_tmp = 0;
-
-    //int i = 0, j = 0, TopSave = 0;
-
-    //char *str_stlst[] = {"st", "dims", "values", "time"};
-    //char *str_hmlst[] = {"hm", "dims", "entries"};
-
-    //double step_time = 1;
-
-    //int  ismat = 0;
-
-    //CheckRhs(1, 2);
-    //CheckLhs(1, 1);
-
-    //il1 = (int *) GetData(1);
-    //m1  = il1[1];
-    //n1  = il1[2];
-    //it  = il1[3];
-    //if ((il1[0] != 1) && (il1[0] != 8))
-    //{
-    //    if (il1[0] == 17)
-    //    {
-    //        ilh1 = (int *) (listentry(il1, 1));
-    //        m1h  = ilh1[1];
-    //        n1h  = ilh1[2];
-    //        if ((ilh1[m1h * n1h + 5] != 17) || (ilh1[m1h * n1h + 6] != 22))
-    //        {
-    //            Scierror(888, _("%s : First argument must be a matrix or an hypermatrix\nof real, complex or integer numbers.\n"), fname);
-    //            return 0;
-    //        }
-    //        ilh2 = (int *) (listentry(il1, 2));
-    //        m2h  = ilh2[1];
-    //        n2h  = ilh2[2];
-    //        if (n2h != 3)
-    //        {
-    //            Scierror(888, _("%s : Only hypermatrix with 3 dimensions is allowed.\n"), fname);
-    //            return 0;
-    //        }
-    //        m1     = ilh2[4];
-    //        n1     = ilh2[5];
-    //        p1     = ilh2[6];
-    //        ilh3   = (int *) (listentry(il1, 3));
-    //        if ((ilh3[0] != 1) && (ilh3[0] != 8))
-    //        {
-    //            Scierror(888, _("%s : First argument must be a matrix or an hypermatrix\nof real, complex or integer numbers.\n"), fname);
-    //            return 0;
-    //        }
-    //        it     = ilh3[3];
-    //    }
-    //    else
-    //    {
-    //        Scierror(888, _("%s : First argument must be a matrix or an hypermatrix\nof real, complex or integer numbers.\n"), fname);
-    //        return 0;
-    //    }
-    //}
-
-    //if (Rhs == 2)
-    //{
-    //    il2 = (int *) GetData(2);
-    //    m2  = il2[1];
-    //    n2  = il2[2];
-    //    it2 = il2[3];
-    //    if ((m2 * n2) != 1)
-    //    {
-    //        Scierror(888, _("%s : Second argument must be a scalar.\n"), fname);
-    //        return 0;
-    //    }
-    //    if ((il2[0] != 1) || (it2 != 0))
-    //    {
-    //        Scierror(888, _("%s : Second argument must be a real.\n"), fname);
-    //        return 0;
-    //    }
-    //    step_time = *((double *) &il2[4]);
-    //}
-
-    //TopSave = Top;
-
-    //str2sci(str_stlst, 1, 4);
-
-    //Top           = Top + 1;
-    //il            = iadr(*Lstk(Top));
-    //l             = sadr(il + 4);
-    //*istk(il)     = 8;
-    //*istk(il + 1)   = 1;
-    //*istk(il + 2)   = 2;
-    //*istk(il + 3)   = 4;
-    //*istk(il + 4)   = 1;
-    //*istk(il + 5)   = 1;
-    //*Lstk(Top + 1)  = l + 1;
-
-    //if ((m1 != 1) && (n1 != 1))
-    //{
-    //    ismat = 1;
-    //}
-
-    //switch (il1[0])
-    //{
-    //    case 1 :
-    //    {
-    //        Top            = Top + 1;
-    //        il             = iadr(*Lstk(Top));
-    //        l              = sadr(il + 4);
-    //        *istk(il)      = 1;
-    //        if (ismat)
-    //        {
-    //            *istk(il + 1)  = m1;
-    //            *istk(il + 2)  = n1;
-    //        }
-    //        else
-    //        {
-    //            *istk(il + 1)  = n1 * m1;
-    //            *istk(il + 2)  = 1;
-    //        }
-    //        *istk(il + 3)    = it;
-    //        if (it == 0)
-    //        {
-    //            for (i = 0; i < (m1 * n1); i++)
-    //            {
-    //                stk(l)[i]  = *((double *)(&il1[4]) + i);
-    //            }
-    //            *Lstk(Top + 1) = l + n1 * m1;
-    //        }
-    //        else if (it == 1)
-    //        {
-    //            for (i = 0; i < (2 * m1 * n1); i++)
-    //            {
-    //                stk(l)[i]  = *((double *)(&il1[4]) + i);
-    //            }
-    //            *Lstk(Top + 1) = l + 2 * n1 * m1;
-    //        }
-    //        break;
-    //    }
-
-    //    case 8 :
-    //    {
-    //        Top            = Top + 1;
-    //        il             = iadr(*Lstk(Top));
-    //        l              = sadr(il + 4);
-    //        *istk(il)      = 8;
-    //        if (ismat)
-    //        {
-    //            *istk(il + 1)  = m1;
-    //            *istk(il + 2)  = n1;
-    //        }
-    //        else
-    //        {
-    //            *istk(il + 1)  = m1 * n1;
-    //            *istk(il + 2)  = 1;
-    //        }
-    //        *istk(il + 3)    = it;
-    //        if (it == 4)
-    //        {
-    //            for (i = 0; i < (m1 * n1); i++)
-    //            {
-    //                *((long *)(istk(il + 4)) + i)  = *((long *)(&il1[4]) + i);
-    //            }
-    //            *Lstk(Top + 1) = l + (int)(ceil((n1 * m1) / 2) + 1);
-    //        }
-    //        else if (it == 2)
-    //        {
-    //            for (i = 0; i < (m1 * n1); i++)
-    //            {
-    //                *((short *)(istk(il + 4)) + i)  = *((short *)(&il1[4]) + i);
-    //            }
-    //            *Lstk(Top + 1) = l + (int)(ceil((n1 * m1) / 4) + 1);
-    //        }
-    //        else if (it == 1)
-    //        {
-    //            for (i = 0; i < (m1 * n1); i++)
-    //            {
-    //                *((char *)(istk(il + 4)) + i)  = *((char *)(&il1[4]) + i);
-    //            }
-    //            *Lstk(Top + 1) = l + (int)(ceil((n1 * m1) / 8) + 1);
-    //        }
-    //        else if (it == 14)
-    //        {
-    //            for (i = 0; i < (m1 * n1); i++)
-    //            {
-    //                *((unsigned long *)(istk(il + 4)) + i)  = *((unsigned long *)(&il1[4]) + i);
-    //            }
-    //            *Lstk(Top + 1) = l + (int)(ceil((n1 * m1) / 2) + 1);
-    //        }
-    //        else if (it == 12)
-    //        {
-    //            for (i = 0; i < (m1 * n1); i++)
-    //            {
-    //                *((unsigned short *)(istk(il + 4)) + i)  = *((unsigned short *)(&il1[4]) + i);
-    //            }
-    //            *Lstk(Top + 1) = l + (int)(ceil((n1 * m1) / 4) + 1);
-    //        }
-    //        else if (it == 11)
-    //        {
-    //            for (i = 0; i < (m1 * n1); i++)
-    //            {
-    //                *((unsigned char *)(istk(il + 4)) + i)  = *((unsigned char *)(&il1[4]) + i);
-    //            }
-    //            *Lstk(Top + 1) = l + (int)(ceil((n1 * m1) / 8) + 1);
-    //        }
-    //        break;
-    //    }
-
-    //    case 17 :
-    //    {
-    //        str2sci(str_hmlst, 1, 3);
-
-    //        Top           = Top + 1;
-    //        il            = iadr(*Lstk(Top));
-    //        l             = sadr(il + 4);
-    //        *istk(il)     = 8;
-    //        *istk(il + 1)   = 1;
-    //        *istk(il + 2)   = n2h;
-    //        *istk(il + 3)   = 4;
-    //        for (i = 0; i < (n2h); i++)
-    //        {
-    //            *((long *)(istk(il + 4)) + i)  = *((long *)(&ilh2[4]) + i);
-    //        }
-    //        *Lstk(Top + 1) = l + (int)(ceil((n2h) / 2) + 1);
-
-    //        switch (ilh3[0])
-    //        {
-    //            case 1 :
-    //            {
-    //                Top            = Top + 1;
-    //                il             = iadr(*Lstk(Top));
-    //                l              = sadr(il + 4);
-    //                *istk(il)      = 1;
-    //                *istk(il + 1)    = m1 * n1 * p1;
-    //                *istk(il + 2)    = 1;
-    //                *istk(il + 3)    = it;
-    //                if (it == 0)
-    //                {
-    //                    for (i = 0; i < (m1 * n1 * p1); i++)
-    //                    {
-    //                        stk(l)[i]  = *((double *)(&ilh3[4]) + i);
-    //                    }
-    //                    *Lstk(Top + 1) = l + n1 * m1 * p1;
-    //                }
-    //                else if (it == 1)
-    //                {
-    //                    for (i = 0; i < (2 * m1 * n1 * p1); i++)
-    //                    {
-    //                        stk(l)[i] = *((double *)(&ilh3[4]) + i);
-    //                    }
-    //                    *Lstk(Top + 1) = l + 2 * n1 * m1 * p1;
-    //                }
-    //                break;
-    //            }
-    //            case 8 :
-    //            {
-    //                Top            = Top + 1;
-    //                il             = iadr(*Lstk(Top));
-    //                l              = sadr(il + 4);
-    //                *istk(il)      = 8;
-    //                *istk(il + 1)    = m1 * n1 * p1;
-    //                *istk(il + 2)    = 1;
-    //                *istk(il + 3)    = it;
-    //                if (it == 4)
-    //                {
-    //                    for (i = 0; i < (m1 * n1 * p1); i++)
-    //                    {
-    //                        *((long *)(istk(il + 4)) + i)  = *((long *)(&ilh3[4]) + i);
-    //                    }
-    //                    *Lstk(Top + 1) = l + (int)(ceil((n1 * m1 * p1) / 2) + 1);
-    //                }
-    //                else if (it == 2)
-    //                {
-    //                    for (i = 0; i < (m1 * n1 * p1); i++)
-    //                    {
-    //                        *((short *)(istk(il + 4)) + i)  = *((short *)(&ilh3[4]) + i);
-    //                    }
-    //                    *Lstk(Top + 1) = l + (int)(ceil((n1 * m1 * p1) / 4) + 1);
-    //                }
-    //                else if (it == 1)
-    //                {
-    //                    for (i = 0; i < (m1 * n1 * p1); i++)
-    //                    {
-    //                        *((char *)(istk(il + 4)) + i)  = *((char *)(&ilh3[4]) + i);
-    //                    }
-    //                    *Lstk(Top + 1) = l + (int)(ceil((n1 * m1 * p1) / 8) + 1);
-    //                }
-    //                else if (it == 14)
-    //                {
-    //                    for (i = 0; i < (m1 * n1 * p1); i++)
-    //                    {
-    //                        *((unsigned long *)(istk(il + 4)) + i)  = *((unsigned long *)(&ilh3[4]) + i);
-    //                    }
-    //                    *Lstk(Top + 1) = l + (int)(ceil((n1 * m1 * p1) / 2) + 1);
-    //                }
-    //                else if (it == 12)
-    //                {
-    //                    for (i = 0; i < (m1 * n1 * p1); i++)
-    //                    {
-    //                        *((unsigned short *)(istk(il + 4)) + i)  = *((unsigned short *)(&ilh3[4]) + i);
-    //                    }
-    //                    *Lstk(Top + 1) = l + (int)(ceil((n1 * m1 * p1) / 4) + 1);
-    //                }
-    //                else if (it == 11)
-    //                {
-    //                    for (i = 0; i < (m1 * n1 * p1); i++)
-    //                    {
-    //                        *((unsigned char *)(istk(il + 4)) + i)  = *((unsigned char *)(&ilh3[4]) + i);
-    //                    }
-    //                    *Lstk(Top + 1) = l + (int)(ceil((n1 * m1 * p1) / 8) + 1);
-    //                }
-    //                break;
-    //            }
-    //        }
-    //        C2F(mkmlist)((i = 3, &i));
-    //        break;
-    //    }
-    //}
-
-    //Top           = Top + 1;
-    //il            = iadr(*Lstk(Top));
-    //l             = sadr(il + 4);
-    //*istk(il)     = 1;
-    //if (il1[0] == 17)
-    //{
-    //    *istk(il + 1)   = p1;
-    //}
-    //else
-    //{
-    //    if (ismat)
-    //    {
-    //        *istk(il + 1) = m1;
-    //    }
-    //    else
-    //    {
-    //        *istk(il + 1) = n1 * m1;
-    //    }
-    //}
-    //*istk(il + 2)   = 1;
-    //*istk(il + 3)   = 0;
-    //for (i = 0; i < (*istk(il + 1)); i++)
-    //{
-    //    stk(l)[i]  = (double) i * step_time;
-    //}
-    //*Lstk(Top + 1) = l + *istk(il + 1);
-
-    //C2F(mkmlist)((i = 4, &i));
-
-    //Top = TopSave;
-
-    //i = 4;
-    //j = 1;
-    //if (Rhs == 2)
-    //{
-    //    CreateVar(3, MATRIX_ORIENTED_TYPED_LIST_DATATYPE, &i, &j, &l_tmp);
-    //    LhsVar(1) = 3;
-    //}
-    //else
-    //{
-    //    CreateVar(2, MATRIX_ORIENTED_TYPED_LIST_DATATYPE, &i, &j, &l_tmp);
-    //    LhsVar(1) = 2;
-    //}
-
-    //PutLhsVar();
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/scicos/sci_gateway/c/sci_sig2data.c b/scilab/modules/scicos/sci_gateway/c/sci_sig2data.c
deleted file mode 100644 (file)
index 791bf23..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-/*  Scicos
-*
-*  Copyright (C) INRIA -
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*
-* See the file ./license.txt
-*/
-/*--------------------------------------------------------------------------*/
-#include <stdio.h>
-#include "gw_scicos.h"
-#include "stack-c.h"
-#include "Scierror.h"
-#include "localization.h"
-#include "sci_malloc.h"
-#include "copyvarfromlistentry.h"
-/*--------------------------------------------------------------------------*/
-extern int *listentry(int *header, int i);
-/*--------------------------------------------------------------------------*/
-/* [x[,t]]=sig2data(B)
-*
-* Extract data from a 'scicos' signal structure.
-*  x will be the field B.values
-*  t will be the field B.time
-*
-* Usage :
-* -->a(:,:,4)=([7 8 9;10 11 12]);
-* -->b=data2sig(a,0.1)
-* b  =
-*   values: [2x3x4 hypermat]
-*   time: [4x1 constant]
-* -->b.time
-* ans  =
-*    0.
-*    0.1.
-*    0.2.
-*    0.3.
-*
-* -->[x,t]=sig2data(b)
-* t  =
-*  0.
-*   0.1
-*   0.2
-*   0.3
-* x  =
-* (:,:,1)
-*
-*  0.    0.    0.
-*  0.    0.    0.
-*
-* Inputs
-*   B    : a scilab structure that defines a signal :
-*          B.values :  B data,
-*          B.time   :  the samples time in the form of
-*                      a columun vector.
-*
-* Outputs
-*   x    : the field B.values
-*   t    : the field B.time
-*
-* initial rev 08/11/07, Alan
-*
-*/
-int sci_sig2data(char *fname, void* pvApiCtx)
-{
-    //int m1 = 0, n1 = 0;
-    //int *il1 = NULL;
-    //int m1h = 0, n1h = 0;
-    //int *ilh1 = NULL;
-    //int ierr = 0;
-
-    //CheckRhs(1, 1);
-    //CheckLhs(1, 2);
-
-    //il1 = (int *) GetData(1);
-    //m1  = il1[1];
-    //n1  = il1[2];
-
-    //if (il1[0] != sci_mlist)
-    //{
-    //    Scierror(888, _("%s : First argument must be a structure.\n"), fname);
-    //    return 0;
-    //}
-
-    //ilh1 = (int *) (listentry(il1, 1));
-    //m1h  = ilh1[1];
-    //n1h  = ilh1[2];
-    //if ((ilh1[m1h * n1h + 5] != 28) || (ilh1[m1h * n1h + 6] != 29))
-    //{
-    //    Scierror(888, _("%s : First argument must be a structure.\n"), fname);
-    //    return 0;
-    //}
-
-    //if ((n1h != 4) || \
-    //        (ilh1[m1h * n1h + 11] != 31) || \
-    //        (ilh1[m1h * n1h + 12] != 10) || \
-    //        (ilh1[m1h * n1h + 13] != 21) || \
-    //        (ilh1[m1h * n1h + 14] != 30) || \
-    //        (ilh1[m1h * n1h + 15] != 14) || \
-    //        (ilh1[m1h * n1h + 16] != 28) || \
-    //        (ilh1[m1h * n1h + 17] != 29) || \
-    //        (ilh1[m1h * n1h + 18] != 18) || \
-    //        (ilh1[m1h * n1h + 19] != 22) || \
-    //        (ilh1[m1h * n1h + 20] != 14))
-    //{
-    //    Scierror(888, _("%s : First argument must be a scicos signal structure.\n"), fname);
-    //    return 0;
-    //}
-
-    //ierr = CopyVarFromlistentry(Top - Rhs + 2, il1, 3);
-    //LhsVar(1) = 2;
-
-    //if (Lhs == 2)
-    //{
-    //    ierr = CopyVarFromlistentry(Top - Rhs + 3, il1, 4);
-    //    LhsVar(2) = 3;
-    //}
-
-    //PutLhsVar();
-
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/scicos/sci_gateway/cpp/sci_data2sig.cpp b/scilab/modules/scicos/sci_gateway/cpp/sci_data2sig.cpp
new file mode 100644 (file)
index 0000000..c949be6
--- /dev/null
@@ -0,0 +1,212 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2015 - Scilab Enterprises - Paul Bignier
+ *
+ *  This file must be used under the terms of the CeCILL.
+ *  This source file is licensed as described in the file COPYING, which
+ *  you should have received as part of this distribution.  The terms
+ *  are also available at
+ *  http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
+ *
+ */
+
+#include <string>
+
+#include "gw_scicos.hxx"
+
+#include "types.hxx"
+#include "internal.hxx"
+#include "double.hxx"
+#include "int.hxx"
+#include "struct.hxx"
+#include "function.hxx"
+
+extern "C"
+{
+#include "localization.h"
+#include "Scierror.h"
+}
+
+/*--------------------------------------------------------------------------*/
+/* B=data2sig(A[,step])
+*
+* Put data in a 'scicos' signal structure.
+* If A is a vector, then it will be understand
+* as a scalar that evolves along time.
+* If A is a matrix, then it will be understand
+* as a vector that evolves along time.
+* If A is an hypermatrix, then it will be understand
+* as a matrix that evolves along time.
+*
+* Usage :
+* -->a(:,:,4)=([7 8 9;10 11 12]);
+* -->b=data2sig(a,0.1)
+* b  =
+*   values: [2x3x4 hypermat]
+*   time: [4x1 constant]
+* -->b.time
+* ans  =
+*    0.
+*    0.1.
+*    0.2.
+*    0.3.
+*
+* Inputs
+*   A    : vector,matrix or hypermatrix(with 3 dimensions)
+*          of real/complex or integers numbers,
+*
+*   step : an optional argument that gives the time step
+*          for the output time field.
+*          If not given, then the time step is 1.
+*
+* Output
+*   B    : a scilab structure that defines a signal :
+*          B.values :  A input,
+*          B.time   :  the samples time in the form of
+*                      a columun vector. The size of that
+*                      vector is given by the A input.
+*
+* initial rev 08/11/07, Alan
+*
+*/
+/*--------------------------------------------------------------------------*/
+
+static const std::string funname = "data2sig";
+
+static const std::wstring Values(L"values");
+static const std::wstring Time(L"time");
+
+types::Function::ReturnValue sci_data2sig(types::typed_list &in, int _iRetCount, types::typed_list &out)
+{
+    if (in.size() != 1 && in.size() != 2)
+    {
+        Scierror(77, _("%s: Wrong number of input argument(s): %d to %d expected.\n"), funname.data(), 1, 2);
+        return types::Function::Error;
+    }
+
+    if (_iRetCount > 1)
+    {
+        Scierror(78, _("%s: Wrong number of output argument(s): %d expected.\n"), funname.data(), 1);
+        return types::Function::Error;
+    }
+
+    // Preparing the output
+    types::Struct* B = new types::Struct(1, 1);
+
+    // Add 'B' fields
+    B->addField(Values);
+    B->addField(Time);
+
+
+    // Values
+    // Extracting input #1 and its last dimension
+    int  iDims;
+    int* pDims;
+    types::InternalType* A;
+    switch (in[0]->getType())
+    {
+        case types::InternalType::ScilabDouble :
+        {
+            A = in[0]->getAs<types::Double>();
+            iDims = A->getAs<types::Double>()->getDims();
+            pDims = A->getAs<types::Double>()->getDimsArray();
+            break;
+        }
+        case types::InternalType::ScilabInt8 :
+        {
+            A = in[0]->getAs<types::Int8>();
+            iDims = A->getAs<types::Int8>()->getDims();
+            pDims = A->getAs<types::Int8>()->getDimsArray();
+            break;
+        }
+        case types::InternalType::ScilabUInt8 :
+        {
+            A = in[0]->getAs<types::UInt8>();
+            iDims = A->getAs<types::UInt8>()->getDims();
+            pDims = A->getAs<types::UInt8>()->getDimsArray();
+            break;
+        }
+        case types::InternalType::ScilabInt16 :
+        {
+            A = in[0]->getAs<types::Int16>();
+            iDims = A->getAs<types::Int16>()->getDims();
+            pDims = A->getAs<types::Int16>()->getDimsArray();
+            break;
+        }
+        case types::InternalType::ScilabUInt16 :
+        {
+            A = in[0]->getAs<types::UInt16>();
+            iDims = A->getAs<types::UInt16>()->getDims();
+            pDims = A->getAs<types::UInt16>()->getDimsArray();
+            break;
+        }
+        case types::InternalType::ScilabInt32 :
+        {
+            A = in[0]->getAs<types::Int32>();
+            iDims = A->getAs<types::Int32>()->getDims();
+            pDims = A->getAs<types::Int32>()->getDimsArray();
+            break;
+        }
+        case types::InternalType::ScilabUInt32 :
+        {
+            A = in[0]->getAs<types::UInt32>();
+            iDims = A->getAs<types::UInt32>()->getDims();
+            pDims = A->getAs<types::UInt32>()->getDimsArray();
+            break;
+        }
+        default :
+        {
+            Scierror(999, _("%s: Wrong type for input argument #%d : A real, complex or integer matrix expected.\n"), funname.data(), 1);
+            B->killMe();
+            return types::Function::Error;
+        }
+    }
+    if (iDims > 3)
+    {
+        Scierror(888, _("%s: Wrong size for intput argument #%d: Only hypermatrices with 3 dimensions are allowed.\n"), funname.data(), 1);
+        B->killMe();
+        return types::Function::Error;
+    }
+    // The 'time' vector will have as many lines as the last dimension of 'A'
+    const int lastDim = pDims[iDims - 1];
+    B->get(0)->set(Values, A);
+
+
+    // Time
+    double defaultStep = 1;
+    if (in.size() == 2)
+    {
+        // Retrieve input #2 if it is given
+        if (!in[1]->isDouble())
+        {
+            Scierror(999, _("%s: Wrong type for input argument #%d : A real expected.\n"), funname.data(), 2);
+            B->killMe();
+            return types::Function::Error;
+        }
+        types::Double* step = in[1]->getAs<types::Double>();
+        if (!step->isScalar())
+        {
+            Scierror(999, _("%s: Wrong size for input argument #%d : A scalar expected.\n"), funname.data(), 2);
+            B->killMe();
+            return types::Function::Error;
+        }
+        if (step->isComplex())
+        {
+            Scierror(999, _("%s: Wrong value for input argument #%d : A real value expected.\n"), funname.data(), 2);
+            B->killMe();
+            return types::Function::Error;
+        }
+        defaultStep = step->get(0);
+    }
+
+    types::Double* timeValues = new types::Double(lastDim, 1);
+    for (int i = 0; i < lastDim; ++i)
+    {
+        timeValues->set(i, i * defaultStep);
+    }
+    B->get(0)->set(Time, timeValues);
+
+
+    out.push_back(B);
+    return types::Function::OK;
+}
diff --git a/scilab/modules/scicos/sci_gateway/cpp/sci_sig2data.cpp b/scilab/modules/scicos/sci_gateway/cpp/sci_sig2data.cpp
new file mode 100644 (file)
index 0000000..1ff69ac
--- /dev/null
@@ -0,0 +1,134 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2015 - Scilab Enterprises - Paul Bignier
+ *
+ *  This file must be used under the terms of the CeCILL.
+ *  This source file is licensed as described in the file COPYING, which
+ *  you should have received as part of this distribution.  The terms
+ *  are also available at
+ *  http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
+ *
+ */
+
+#include <string>
+
+#include "gw_scicos.hxx"
+
+#include "types.hxx"
+#include "internal.hxx"
+#include "string.hxx"
+#include "struct.hxx"
+#include "function.hxx"
+
+extern "C"
+{
+#include "localization.h"
+#include "Scierror.h"
+}
+
+/*--------------------------------------------------------------------------*/
+/* [x[,t]]=sig2data(B)
+*
+* Extract data from a 'scicos' signal structure.
+*  x will be the field B.values
+*  t will be the field B.time
+*
+* Usage :
+* -->a(:,:,4)=([7 8 9;10 11 12]);
+* -->b=data2sig(a,0.1)
+* b  =
+*   values: [2x3x4 hypermat]
+*   time: [4x1 constant]
+* -->b.time
+* ans  =
+*    0.
+*    0.1.
+*    0.2.
+*    0.3.
+*
+* -->[x,t]=sig2data(b)
+* t  =
+*  0.
+*   0.1
+*   0.2
+*   0.3
+* x  =
+* (:,:,1)
+*
+*  0.    0.    0.
+*  0.    0.    0.
+*
+* Inputs
+*   B    : a scilab structure that defines a signal :
+*          B.values :  B data,
+*          B.time   :  the samples time in the form of
+*                      a columun vector.
+*
+* Outputs
+*   x    : the field B.values
+*   t    : the field B.time
+*
+* initial rev 08/11/07, Alan
+*
+*/
+/*--------------------------------------------------------------------------*/
+
+static const std::string funname = "sig2data";
+
+static const std::wstring Values(L"values");
+static const std::wstring Time(L"time");
+
+types::Function::ReturnValue sci_sig2data(types::typed_list &in, int _iRetCount, types::typed_list &out)
+{
+    if (in.size() != 1)
+    {
+        Scierror(77, _("%s: Wrong number of input argument(s): %d expected.\n"), funname.data(), 1);
+        return types::Function::Error;
+    }
+
+    if (_iRetCount > 2)
+    {
+        Scierror(78, _("%s: Wrong number of output argument(s): %d to %d expected.\n"), funname.data(), 1, 2);
+        return types::Function::Error;
+    }
+
+    if (!in[0]->isStruct())
+    {
+        Scierror(999, _("%s: Wrong type for input argument #%d : A struct expected.\n"), funname.data(), 1);
+        return types::Function::Error;
+    }
+    types::Struct* B = in[0]->getAs<types::Struct>();
+
+    if (B->getSize() != 1)
+    {
+        Scierror(999, _("%s: Wrong size for input argument #%d : A single struct expected.\n"), funname.data(), 1);
+        return types::Function::Error;
+    }
+    types::String* fields = B->get(0)->getFieldNames();
+    if (fields->getSize() != 2)
+    {
+        Scierror(999, _("%s: Wrong fields for input argument #%d : \"%s\" and \"%s\" expected.\n"), funname.data(), 1, "values", "time");
+        return types::Function::Error;
+    }
+    if (fields->get(0) != Values)
+    {
+        Scierror(999, _("%s: Wrong fields for input argument #%d : \"%s\" and \"%s\" expected.\n"), funname.data(), 1, "values", "time");
+        return types::Function::Error;
+    }
+    if (fields->get(1) != Time)
+    {
+        Scierror(999, _("%s: Wrong fields for input argument #%d : \"%s\" and \"%s\" expected.\n"), funname.data(), 1, "values", "time");
+        return types::Function::Error;
+    }
+
+    // Values
+    types::InternalType* A = B->get(0)->get(Values);
+    types::InternalType* timeValues = B->get(0)->get(Time);
+
+    out.push_back(A);
+    if (_iRetCount == 2)
+    {
+        out.push_back(timeValues);
+    }
+    return types::Function::OK;
+}
index fc3081c..f28a0c1 100644 (file)
@@ -26,8 +26,6 @@
     <gateway type="0" name="sci_tree4" function="sci_tree4"/>
     <gateway type="0" name="sci_diffobjs" function="diffobjs"/>
     <gateway type="0" name="sci_getscicosvars" function="getscicosvars"/>
-    <gateway type="0" name="sci_data2sig" function="data2sig"/>
-    <gateway type="0" name="sci_sig2data" function="sig2data"/>
     <gateway type="0" name="sci_model2blk" function="model2blk"/>
     <gateway type="0" name="sci_callblk" function="callblk"/>
     <gateway type="0" name="sci_loadScicos" function="loadScicos"/>
@@ -38,6 +36,7 @@
     <gateway type="1" name="sci_ctree4" function="ctree4"/>
     <gateway type="1" name="sci_coserror" function="coserror"/>
     <gateway type="1" name="sci_curblock" function="curblock"/>
+    <gateway type="1" name="sci_data2sig" function="data2sig"/>
     <gateway type="1" name="sci_duplicate" function="duplicate"/>
     <gateway type="1" name="sci_end_scicosim" function="end_scicosim"/>
     <gateway type="1" name="sci_haltscicos" function="sci_haltscicos"/>
@@ -52,6 +51,7 @@
     <gateway type="1" name="sci_scicosim" function="scicosim"/>
     <gateway type="1" name="sci_set_blockerror" function="set_blockerror"/>
     <gateway type="1" name="sci_set_xproperty" function="set_xproperty"/>
+    <gateway type="1" name="sci_sig2data" function="sig2data"/>
     <gateway type="1" name="sci_validvar" function="validvar"/>
     <gateway type="1" name="sci_var2vec" function="var2vec"/>
     <gateway type="1" name="sci_vec2var" function="vec2var"/>
index ae51ad6..d5480ba 100644 (file)
@@ -260,6 +260,7 @@ lib /DEF:"$(ProjectDir)../differential_equations_f_Import.def" /SUBSYSTEM:WINDOW
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_ctree4.cpp" />
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_coserror.cpp" />
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_curblock.cpp" />
+    <ClCompile Include="..\..\..\sci_gateway\cpp\sci_data2sig.cpp" />
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_duplicate.cpp" />
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_end_scicosim.cpp" />
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_haltscicos.cpp" />
@@ -271,6 +272,7 @@ lib /DEF:"$(ProjectDir)../differential_equations_f_Import.def" /SUBSYSTEM:WINDOW
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_scicos_time.cpp" />
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_set_blockerror.cpp" />
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_set_xproperty.cpp" />
+    <ClCompile Include="..\..\..\sci_gateway\cpp\sci_sig2data.cpp" />
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_var2vec.cpp" />
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_vec2var.cpp" />
     <ClCompile Include="..\..\..\sci_gateway\c\sci_loadScicos.c" />
@@ -289,7 +291,6 @@ lib /DEF:"$(ProjectDir)../differential_equations_f_Import.def" /SUBSYSTEM:WINDOW
     <ClCompile Include="..\MlistGetFieldNumber.c" />
     <ClCompile Include="..\lsodar.c" />
     <ClCompile Include="..\..\..\sci_gateway\c\sci_callblk.c" />
-    <ClCompile Include="..\..\..\sci_gateway\c\sci_data2sig.c" />
     <ClCompile Include="..\..\..\sci_gateway\c\sci_diffobjs.c" />
     <ClCompile Include="..\..\..\sci_gateway\c\sci_ftree2.c" />
     <ClCompile Include="..\..\..\sci_gateway\c\sci_ftree3.c" />
@@ -298,7 +299,6 @@ lib /DEF:"$(ProjectDir)../differential_equations_f_Import.def" /SUBSYSTEM:WINDOW
     <ClCompile Include="..\..\..\sci_gateway\c\sci_getscicosvars.c" />
     <ClCompile Include="..\..\..\sci_gateway\c\sci_model2blk.c" />
     <ClCompile Include="..\..\..\sci_gateway\c\sci_sctree.c" />
-    <ClCompile Include="..\..\..\sci_gateway\c\sci_sig2data.c" />
     <ClCompile Include="..\sciblk2.c" />
     <ClCompile Include="..\sciblk4.c" />
     <ClCompile Include="..\scicos.c" />
index 7438eb1..be7d979 100644 (file)
@@ -53,9 +53,6 @@
     <ClCompile Include="..\..\..\sci_gateway\c\sci_callblk.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\sci_gateway\c\sci_data2sig.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\sci_gateway\c\sci_diffobjs.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -80,9 +77,6 @@
     <ClCompile Include="..\..\..\sci_gateway\c\sci_sctree.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\sci_gateway\c\sci_sig2data.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\sciblk2.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_scicos_debug_count.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\sci_gateway\cpp\sci_data2sig.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_duplicate.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_set_xproperty.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\sci_gateway\cpp\sci_sig2data.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_var2vec.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
index 9100713..1fb4e8a 100644 (file)
@@ -254,6 +254,7 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
     <ClCompile Include="..\..\sci_gateway\cpp\sci_ctree2.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_ctree3.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_ctree4.cpp" />
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_data2sig.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_duplicate.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_end_scicosim.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_coserror.cpp" />
@@ -270,6 +271,7 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
     <ClCompile Include="..\..\sci_gateway\cpp\sci_scicos_time.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_set_blockerror.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_set_xproperty.cpp" />
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_sig2data.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_validvar.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_var2vec.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_vec2var.cpp" />
@@ -303,7 +305,6 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
     <ClCompile Include="lsodar.c" />
     <ClCompile Include="ddaskr.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_callblk.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_data2sig.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_diffobjs.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_ftree2.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_ftree3.c" />
@@ -313,7 +314,6 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
     <ClCompile Include="..\..\sci_gateway\c\sci_loadScicos.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_model2blk.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_sctree.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_sig2data.c" />
     <ClCompile Include="sciblk2.c" />
     <ClCompile Include="sciblk4.c" />
     <ClCompile Include="scicos.c" />
index 808c1c2..80870df 100644 (file)
@@ -71,9 +71,6 @@
     <ClCompile Include="..\..\sci_gateway\c\sci_callblk.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_data2sig.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\sci_gateway\c\sci_diffobjs.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\sci_gateway\c\sci_sctree.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_sig2data.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="sciblk2.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\sci_gateway\cpp\sci_ctree4.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_data2sig.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\sci_gateway\cpp\sci_duplicate.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\sci_gateway\cpp\sci_set_xproperty.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_sig2data.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\sci_gateway\cpp\sci_scicosim.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/scilab/modules/scicos/tests/unit_tests/data2sig.dia.ref b/scilab/modules/scicos/tests/unit_tests/data2sig.dia.ref
new file mode 100644 (file)
index 0000000..686598d
--- /dev/null
@@ -0,0 +1,32 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2015 - Scilab Enterprises - Paul Bignier
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- CLI SHELL MODE -->
+// Double
+a(:, :, 4) = [7 8 9; 10 11 12];
+res = data2sig(a, 0.1);
+resRef.values = a;
+resRef.time = (0:0.1:0.3)';
+assert_checkequal(res, resRef);
+// Int8
+a_int = int8(a);
+res_int = data2sig(a_int, 0.1);
+resRef_int.values = a_int;
+resRef_int.time = (0:0.1:0.3)';
+assert_checkequal(res_int, resRef_int);
+//---------------------------------------
+// sig2data
+[data, time] = sig2data(res);
+assert_checkequal(data, a);
+assert_checkequal(time, resRef.time);
+[data_int, time] = sig2data(res_int);
+assert_checkequal(data_int, a_int);
+assert_checkequal(time, resRef.time);
+refMsg = msprintf(_("%s: Wrong size for input argument #%d : A single struct expected.\n"), "sig2data", 1);
+assert_checkerror("sig2data(struct())", refMsg);
+refMsg = msprintf(_("%s: Wrong fields for input argument #%d : ""%s"" and ""%s"" expected.\n"), "sig2data", 1, "values", "time");
+assert_checkerror("sig2data(struct(""values"", 1))", refMsg);
diff --git a/scilab/modules/scicos/tests/unit_tests/data2sig.tst b/scilab/modules/scicos/tests/unit_tests/data2sig.tst
new file mode 100644 (file)
index 0000000..daef718
--- /dev/null
@@ -0,0 +1,47 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2015 - Scilab Enterprises - Paul Bignier
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- CLI SHELL MODE -->
+
+// Double
+a(:, :, 4) = [7 8 9; 10 11 12];
+res = data2sig(a, 0.1);
+
+resRef.values = a;
+resRef.time = (0:0.1:0.3)';
+
+assert_checkequal(res, resRef);
+
+
+// Int8
+a_int = int8(a);
+res_int = data2sig(a_int, 0.1);
+
+resRef_int.values = a_int;
+resRef_int.time = (0:0.1:0.3)';
+
+assert_checkequal(res_int, resRef_int);
+
+
+//---------------------------------------
+// sig2data
+
+[data, time] = sig2data(res);
+
+assert_checkequal(data, a);
+assert_checkequal(time, resRef.time);
+
+[data_int, time] = sig2data(res_int);
+
+assert_checkequal(data_int, a_int);
+assert_checkequal(time, resRef.time);
+
+refMsg = msprintf(_("%s: Wrong size for input argument #%d : A single struct expected.\n"), "sig2data", 1);
+assert_checkerror("sig2data(struct())", refMsg);
+
+refMsg = msprintf(_("%s: Wrong fields for input argument #%d : ""%s"" and ""%s"" expected.\n"), "sig2data", 1, "values", "time");
+assert_checkerror("sig2data(struct(""values"", 1))", refMsg);