diff options
author | shankyb9 | 2017-06-03 18:19:24 +0000 |
---|---|---|
committer | shankyb9 | 2017-06-03 18:19:24 +0000 |
commit | d84f42ed7c67732af1697987d06bea3be9f14fae (patch) | |
tree | 5fd6fd7fe44aba9a8639b2a583423da730238e7b /modules/scicos_blocks | |
parent | 0345245e860375a32c9a437c4a9d9cae807134e9 (diff) | |
download | scilab_for_xcos_on_cloud-d84f42ed7c67732af1697987d06bea3be9f14fae.tar.gz scilab_for_xcos_on_cloud-d84f42ed7c67732af1697987d06bea3be9f14fae.tar.bz2 scilab_for_xcos_on_cloud-d84f42ed7c67732af1697987d06bea3be9f14fae.zip |
Changing CSCOPE and CMSCOPE for multiple graphs
Diffstat (limited to 'modules/scicos_blocks')
17 files changed, 2 insertions, 2 deletions
diff --git a/modules/scicos_blocks/.libs/libsciscicos_blocks-algo.a b/modules/scicos_blocks/.libs/libsciscicos_blocks-algo.a Binary files differindex a83040df7..a6a8143f8 100755..100644 --- a/modules/scicos_blocks/.libs/libsciscicos_blocks-algo.a +++ b/modules/scicos_blocks/.libs/libsciscicos_blocks-algo.a diff --git a/modules/scicos_blocks/.libs/libsciscicos_blocks-cli.lai b/modules/scicos_blocks/.libs/libsciscicos_blocks-cli.lai index ef21ce019..ef21ce019 100755..100644 --- a/modules/scicos_blocks/.libs/libsciscicos_blocks-cli.lai +++ b/modules/scicos_blocks/.libs/libsciscicos_blocks-cli.lai diff --git a/modules/scicos_blocks/.libs/libsciscicos_blocks-cli.so.5.5.2 b/modules/scicos_blocks/.libs/libsciscicos_blocks-cli.so.5.5.2 Binary files differindex 8a650fc98..198fbdba0 100755 --- a/modules/scicos_blocks/.libs/libsciscicos_blocks-cli.so.5.5.2 +++ b/modules/scicos_blocks/.libs/libsciscicos_blocks-cli.so.5.5.2 diff --git a/modules/scicos_blocks/.libs/libsciscicos_blocks.lai b/modules/scicos_blocks/.libs/libsciscicos_blocks.lai index b8b769148..b8b769148 100755..100644 --- a/modules/scicos_blocks/.libs/libsciscicos_blocks.lai +++ b/modules/scicos_blocks/.libs/libsciscicos_blocks.lai diff --git a/modules/scicos_blocks/.libs/libsciscicos_blocks.so.5.5.2 b/modules/scicos_blocks/.libs/libsciscicos_blocks.so.5.5.2 Binary files differindex db78a36be..4f356f7f7 100755 --- a/modules/scicos_blocks/.libs/libsciscicos_blocks.so.5.5.2 +++ b/modules/scicos_blocks/.libs/libsciscicos_blocks.so.5.5.2 diff --git a/modules/scicos_blocks/Makefile b/modules/scicos_blocks/Makefile index 2271d97a5..2271d97a5 100755..100644 --- a/modules/scicos_blocks/Makefile +++ b/modules/scicos_blocks/Makefile diff --git a/modules/scicos_blocks/libsciscicos_blocks-algo.la b/modules/scicos_blocks/libsciscicos_blocks-algo.la index 00e8fbac7..00e8fbac7 100755..100644 --- a/modules/scicos_blocks/libsciscicos_blocks-algo.la +++ b/modules/scicos_blocks/libsciscicos_blocks-algo.la diff --git a/modules/scicos_blocks/libsciscicos_blocks-cli.la b/modules/scicos_blocks/libsciscicos_blocks-cli.la index d61c79d6e..d61c79d6e 100755..100644 --- a/modules/scicos_blocks/libsciscicos_blocks-cli.la +++ b/modules/scicos_blocks/libsciscicos_blocks-cli.la diff --git a/modules/scicos_blocks/libsciscicos_blocks.la b/modules/scicos_blocks/libsciscicos_blocks.la index 2aab1ccee..2aab1ccee 100755..100644 --- a/modules/scicos_blocks/libsciscicos_blocks.la +++ b/modules/scicos_blocks/libsciscicos_blocks.la diff --git a/modules/scicos_blocks/src/c/.deps/libsciscicos_blocks_algo_la-cmscope.Plo b/modules/scicos_blocks/src/c/.deps/libsciscicos_blocks_algo_la-cmscope.Plo index bdd1b7221..bdd1b7221 100755..100644 --- a/modules/scicos_blocks/src/c/.deps/libsciscicos_blocks_algo_la-cmscope.Plo +++ b/modules/scicos_blocks/src/c/.deps/libsciscicos_blocks_algo_la-cmscope.Plo diff --git a/modules/scicos_blocks/src/c/.deps/libsciscicos_blocks_algo_la-cscope.Plo b/modules/scicos_blocks/src/c/.deps/libsciscicos_blocks_algo_la-cscope.Plo index 98ef1a8f1..98ef1a8f1 100755..100644 --- a/modules/scicos_blocks/src/c/.deps/libsciscicos_blocks_algo_la-cscope.Plo +++ b/modules/scicos_blocks/src/c/.deps/libsciscicos_blocks_algo_la-cscope.Plo diff --git a/modules/scicos_blocks/src/c/.libs/libsciscicos_blocks_algo_la-cmscope.o b/modules/scicos_blocks/src/c/.libs/libsciscicos_blocks_algo_la-cmscope.o Binary files differindex 640f34a44..ccf491ad9 100755..100644 --- a/modules/scicos_blocks/src/c/.libs/libsciscicos_blocks_algo_la-cmscope.o +++ b/modules/scicos_blocks/src/c/.libs/libsciscicos_blocks_algo_la-cmscope.o diff --git a/modules/scicos_blocks/src/c/.libs/libsciscicos_blocks_algo_la-cscope.o b/modules/scicos_blocks/src/c/.libs/libsciscicos_blocks_algo_la-cscope.o Binary files differindex 958fb17f8..c25bca568 100755..100644 --- a/modules/scicos_blocks/src/c/.libs/libsciscicos_blocks_algo_la-cscope.o +++ b/modules/scicos_blocks/src/c/.libs/libsciscicos_blocks_algo_la-cscope.o diff --git a/modules/scicos_blocks/src/c/cmscope.c b/modules/scicos_blocks/src/c/cmscope.c index aaf871b00..109752dae 100755 --- a/modules/scicos_blocks/src/c/cmscope.c +++ b/modules/scicos_blocks/src/c/cmscope.c @@ -274,7 +274,7 @@ SCICOS_BLOCKS_IMPEXP void cmscope(scicos_block * block, scicos_flag flag) double y = u[j]; double z = 0; - fprintf(filePointer, "%d || %d | %d | %d || %f %f %f\n", processId, iFigureUID, iAxeUID, iPolylineUID, time, y, z); + fprintf(filePointer, "%d || %d | %d | %d || %f %f %f %d\n", processId, iFigureUID, iAxeUID, iPolylineUID, time, y, z,block->nin); result = pushData(block, i, j); if (result == FALSE) diff --git a/modules/scicos_blocks/src/c/cscope.c b/modules/scicos_blocks/src/c/cscope.c index 84d076a21..8bbfa53ca 100755 --- a/modules/scicos_blocks/src/c/cscope.c +++ b/modules/scicos_blocks/src/c/cscope.c @@ -263,7 +263,7 @@ SCICOS_BLOCKS_IMPEXP void cscope(scicos_block * block, scicos_flag flag) double y = u[i]; double z = 0; - fprintf(filePointer, "%d || %d | %d | %d || %f %f %f\n", processId, iFigureUID, iAxeUID, iPolylineUID, time, y, z); + fprintf(filePointer, "%d || %d | %d | %d || %f %f %f %d\n", processId, iFigureUID, iAxeUID, iPolylineUID, time, y, z,1); // modified_shank : 1 to indicate 1 graph in output result = pushData(block, 0, i); if (result == FALSE) diff --git a/modules/scicos_blocks/src/c/libsciscicos_blocks_algo_la-cmscope.lo b/modules/scicos_blocks/src/c/libsciscicos_blocks_algo_la-cmscope.lo index 4f058b648..4f058b648 100755..100644 --- a/modules/scicos_blocks/src/c/libsciscicos_blocks_algo_la-cmscope.lo +++ b/modules/scicos_blocks/src/c/libsciscicos_blocks_algo_la-cmscope.lo diff --git a/modules/scicos_blocks/src/c/libsciscicos_blocks_algo_la-cscope.lo b/modules/scicos_blocks/src/c/libsciscicos_blocks_algo_la-cscope.lo index 9920350cb..9920350cb 100755..100644 --- a/modules/scicos_blocks/src/c/libsciscicos_blocks_algo_la-cscope.lo +++ b/modules/scicos_blocks/src/c/libsciscicos_blocks_algo_la-cscope.lo |