From d84f42ed7c67732af1697987d06bea3be9f14fae Mon Sep 17 00:00:00 2001 From: shankyb9 Date: Sat, 3 Jun 2017 18:19:24 +0000 Subject: Changing CSCOPE and CMSCOPE for multiple graphs --- .../scicos_blocks/.libs/libsciscicos_blocks-algo.a | Bin 3710320 -> 3710360 bytes .../.libs/libsciscicos_blocks-cli.lai | 0 .../.libs/libsciscicos_blocks-cli.so.5.5.2 | Bin 1666088 -> 1666088 bytes .../scicos_blocks/.libs/libsciscicos_blocks.lai | 0 .../.libs/libsciscicos_blocks.so.5.5.2 | Bin 1816464 -> 1816464 bytes modules/scicos_blocks/Makefile | 0 modules/scicos_blocks/libsciscicos_blocks-algo.la | 0 modules/scicos_blocks/libsciscicos_blocks-cli.la | 0 modules/scicos_blocks/libsciscicos_blocks.la | 0 .../.deps/libsciscicos_blocks_algo_la-cmscope.Plo | 0 .../c/.deps/libsciscicos_blocks_algo_la-cscope.Plo | 0 .../c/.libs/libsciscicos_blocks_algo_la-cmscope.o | Bin 58392 -> 58424 bytes .../c/.libs/libsciscicos_blocks_algo_la-cscope.o | Bin 52168 -> 52176 bytes modules/scicos_blocks/src/c/cmscope.c | 2 +- modules/scicos_blocks/src/c/cscope.c | 2 +- .../src/c/libsciscicos_blocks_algo_la-cmscope.lo | 0 .../src/c/libsciscicos_blocks_algo_la-cscope.lo | 0 17 files changed, 2 insertions(+), 2 deletions(-) mode change 100755 => 100644 modules/scicos_blocks/.libs/libsciscicos_blocks-algo.a mode change 100755 => 100644 modules/scicos_blocks/.libs/libsciscicos_blocks-cli.lai mode change 100755 => 100644 modules/scicos_blocks/.libs/libsciscicos_blocks.lai mode change 100755 => 100644 modules/scicos_blocks/Makefile mode change 100755 => 100644 modules/scicos_blocks/libsciscicos_blocks-algo.la mode change 100755 => 100644 modules/scicos_blocks/libsciscicos_blocks-cli.la mode change 100755 => 100644 modules/scicos_blocks/libsciscicos_blocks.la mode change 100755 => 100644 modules/scicos_blocks/src/c/.deps/libsciscicos_blocks_algo_la-cmscope.Plo mode change 100755 => 100644 modules/scicos_blocks/src/c/.deps/libsciscicos_blocks_algo_la-cscope.Plo mode change 100755 => 100644 modules/scicos_blocks/src/c/.libs/libsciscicos_blocks_algo_la-cmscope.o mode change 100755 => 100644 modules/scicos_blocks/src/c/.libs/libsciscicos_blocks_algo_la-cscope.o mode change 100755 => 100644 modules/scicos_blocks/src/c/libsciscicos_blocks_algo_la-cmscope.lo mode change 100755 => 100644 modules/scicos_blocks/src/c/libsciscicos_blocks_algo_la-cscope.lo (limited to 'modules/scicos_blocks') diff --git a/modules/scicos_blocks/.libs/libsciscicos_blocks-algo.a b/modules/scicos_blocks/.libs/libsciscicos_blocks-algo.a old mode 100755 new mode 100644 index a83040df7..a6a8143f8 Binary files a/modules/scicos_blocks/.libs/libsciscicos_blocks-algo.a and b/modules/scicos_blocks/.libs/libsciscicos_blocks-algo.a differ diff --git a/modules/scicos_blocks/.libs/libsciscicos_blocks-cli.lai b/modules/scicos_blocks/.libs/libsciscicos_blocks-cli.lai old mode 100755 new mode 100644 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 index 8a650fc98..198fbdba0 100755 Binary files a/modules/scicos_blocks/.libs/libsciscicos_blocks-cli.so.5.5.2 and b/modules/scicos_blocks/.libs/libsciscicos_blocks-cli.so.5.5.2 differ diff --git a/modules/scicos_blocks/.libs/libsciscicos_blocks.lai b/modules/scicos_blocks/.libs/libsciscicos_blocks.lai old mode 100755 new mode 100644 diff --git a/modules/scicos_blocks/.libs/libsciscicos_blocks.so.5.5.2 b/modules/scicos_blocks/.libs/libsciscicos_blocks.so.5.5.2 index db78a36be..4f356f7f7 100755 Binary files a/modules/scicos_blocks/.libs/libsciscicos_blocks.so.5.5.2 and b/modules/scicos_blocks/.libs/libsciscicos_blocks.so.5.5.2 differ diff --git a/modules/scicos_blocks/Makefile b/modules/scicos_blocks/Makefile old mode 100755 new mode 100644 diff --git a/modules/scicos_blocks/libsciscicos_blocks-algo.la b/modules/scicos_blocks/libsciscicos_blocks-algo.la old mode 100755 new mode 100644 diff --git a/modules/scicos_blocks/libsciscicos_blocks-cli.la b/modules/scicos_blocks/libsciscicos_blocks-cli.la old mode 100755 new mode 100644 diff --git a/modules/scicos_blocks/libsciscicos_blocks.la b/modules/scicos_blocks/libsciscicos_blocks.la old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 index 640f34a44..ccf491ad9 Binary files a/modules/scicos_blocks/src/c/.libs/libsciscicos_blocks_algo_la-cmscope.o and b/modules/scicos_blocks/src/c/.libs/libsciscicos_blocks_algo_la-cmscope.o differ 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 old mode 100755 new mode 100644 index 958fb17f8..c25bca568 Binary files a/modules/scicos_blocks/src/c/.libs/libsciscicos_blocks_algo_la-cscope.o and b/modules/scicos_blocks/src/c/.libs/libsciscicos_blocks_algo_la-cscope.o differ 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 -- cgit