From 219b304a2439340ec3fe46b35c75f0e606c1a9c2 Mon Sep 17 00:00:00 2001 From: shankyb9 Date: Mon, 26 Jun 2017 04:10:43 -0500 Subject: CANIMXY3D and BARXY data reading functionality added --- .../jar/org.scilab.modules.action_binding.jar | Bin 10725 -> 10724 bytes modules/commons/jar/org.scilab.modules.commons.jar | Bin 49905 -> 49905 bytes .../jar/org.scilab.modules.completion.jar | Bin 6608 -> 6608 bytes modules/console/jar/org.scilab.modules.console.jar | Bin 71571 -> 71571 bytes modules/core/jar/org.scilab.modules.core.jar | Bin 10460 -> 10460 bytes .../org.scilab.modules.external_objects_java.jar | Bin 50977 -> 50977 bytes modules/graph/jar/org.scilab.modules.graph.jar | Bin 82317 -> 82317 bytes .../jar/org.scilab.modules.graphic_export.jar | Bin 34750 -> 34750 bytes .../jar/org.scilab.modules.graphic_objects.jar | Bin 322706 -> 322706 bytes modules/gui/jar/org.scilab.modules.gui.jar | Bin 938119 -> 938119 bytes .../helptools/jar/org.scilab.modules.helptools.jar | Bin 145361 -> 145361 bytes .../jar/org.scilab.modules.history_browser.jar | Bin 32296 -> 32297 bytes .../jar/org.scilab.modules.history_manager.jar | Bin 4898 -> 4898 bytes modules/jvm/jar/org.scilab.modules.jvm.jar | Bin 6259 -> 6259 bytes .../jar/org.scilab.modules.localization.jar | Bin 4814 -> 4814 bytes .../jar/org.scilab.modules.preferences.jar | Bin 94544 -> 94544 bytes .../renderer/jar/org.scilab.modules.renderer.jar | Bin 170234 -> 170234 bytes modules/scicos_blocks/macros/Sinks/BARXY_sim.bin | Bin 6544 -> 6736 bytes modules/scicos_blocks/macros/Sinks/BARXY_sim.sci | 10 ++++++---- .../scinotes/jar/org.scilab.modules.scinotes.jar | Bin 449669 -> 449669 bytes modules/types/jar/org.scilab.modules.types.jar | Bin 45806 -> 45806 bytes modules/ui_data/jar/org.scilab.modules.ui_data.jar | Bin 249958 -> 249959 bytes modules/xcos/jar/org.scilab.modules.xcos.jar | Bin 541292 -> 541292 bytes 23 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/action_binding/jar/org.scilab.modules.action_binding.jar b/modules/action_binding/jar/org.scilab.modules.action_binding.jar index 0d8713040..cca2a62b0 100755 Binary files a/modules/action_binding/jar/org.scilab.modules.action_binding.jar and b/modules/action_binding/jar/org.scilab.modules.action_binding.jar differ diff --git a/modules/commons/jar/org.scilab.modules.commons.jar b/modules/commons/jar/org.scilab.modules.commons.jar index f7e1ae0d3..723109caf 100755 Binary files a/modules/commons/jar/org.scilab.modules.commons.jar and b/modules/commons/jar/org.scilab.modules.commons.jar differ diff --git a/modules/completion/jar/org.scilab.modules.completion.jar b/modules/completion/jar/org.scilab.modules.completion.jar index 261351f54..020978476 100755 Binary files a/modules/completion/jar/org.scilab.modules.completion.jar and b/modules/completion/jar/org.scilab.modules.completion.jar differ diff --git a/modules/console/jar/org.scilab.modules.console.jar b/modules/console/jar/org.scilab.modules.console.jar index 0acf3fc84..0bfb0855c 100755 Binary files a/modules/console/jar/org.scilab.modules.console.jar and b/modules/console/jar/org.scilab.modules.console.jar differ diff --git a/modules/core/jar/org.scilab.modules.core.jar b/modules/core/jar/org.scilab.modules.core.jar index b90ff32a3..0132fee7d 100755 Binary files a/modules/core/jar/org.scilab.modules.core.jar and b/modules/core/jar/org.scilab.modules.core.jar differ diff --git a/modules/external_objects_java/jar/org.scilab.modules.external_objects_java.jar b/modules/external_objects_java/jar/org.scilab.modules.external_objects_java.jar index c576d14b1..d3890ea24 100755 Binary files a/modules/external_objects_java/jar/org.scilab.modules.external_objects_java.jar and b/modules/external_objects_java/jar/org.scilab.modules.external_objects_java.jar differ diff --git a/modules/graph/jar/org.scilab.modules.graph.jar b/modules/graph/jar/org.scilab.modules.graph.jar index 7e11887da..5dc8a215d 100755 Binary files a/modules/graph/jar/org.scilab.modules.graph.jar and b/modules/graph/jar/org.scilab.modules.graph.jar differ diff --git a/modules/graphic_export/jar/org.scilab.modules.graphic_export.jar b/modules/graphic_export/jar/org.scilab.modules.graphic_export.jar index b25c6adc2..4d90e58ad 100755 Binary files a/modules/graphic_export/jar/org.scilab.modules.graphic_export.jar and b/modules/graphic_export/jar/org.scilab.modules.graphic_export.jar differ diff --git a/modules/graphic_objects/jar/org.scilab.modules.graphic_objects.jar b/modules/graphic_objects/jar/org.scilab.modules.graphic_objects.jar index 826abf232..1403e8ce9 100755 Binary files a/modules/graphic_objects/jar/org.scilab.modules.graphic_objects.jar and b/modules/graphic_objects/jar/org.scilab.modules.graphic_objects.jar differ diff --git a/modules/gui/jar/org.scilab.modules.gui.jar b/modules/gui/jar/org.scilab.modules.gui.jar index 5d9e77369..17f4235ad 100755 Binary files a/modules/gui/jar/org.scilab.modules.gui.jar and b/modules/gui/jar/org.scilab.modules.gui.jar differ diff --git a/modules/helptools/jar/org.scilab.modules.helptools.jar b/modules/helptools/jar/org.scilab.modules.helptools.jar index 5971d8dda..0e56af6c5 100755 Binary files a/modules/helptools/jar/org.scilab.modules.helptools.jar and b/modules/helptools/jar/org.scilab.modules.helptools.jar differ diff --git a/modules/history_browser/jar/org.scilab.modules.history_browser.jar b/modules/history_browser/jar/org.scilab.modules.history_browser.jar index 9eb217c2f..27956b99a 100755 Binary files a/modules/history_browser/jar/org.scilab.modules.history_browser.jar and b/modules/history_browser/jar/org.scilab.modules.history_browser.jar differ diff --git a/modules/history_manager/jar/org.scilab.modules.history_manager.jar b/modules/history_manager/jar/org.scilab.modules.history_manager.jar index cf813b1be..455d85a8b 100755 Binary files a/modules/history_manager/jar/org.scilab.modules.history_manager.jar and b/modules/history_manager/jar/org.scilab.modules.history_manager.jar differ diff --git a/modules/jvm/jar/org.scilab.modules.jvm.jar b/modules/jvm/jar/org.scilab.modules.jvm.jar index c9e7b1f09..9eeca266c 100755 Binary files a/modules/jvm/jar/org.scilab.modules.jvm.jar and b/modules/jvm/jar/org.scilab.modules.jvm.jar differ diff --git a/modules/localization/jar/org.scilab.modules.localization.jar b/modules/localization/jar/org.scilab.modules.localization.jar index 76351e5d0..1ef7e5e8c 100755 Binary files a/modules/localization/jar/org.scilab.modules.localization.jar and b/modules/localization/jar/org.scilab.modules.localization.jar differ diff --git a/modules/preferences/jar/org.scilab.modules.preferences.jar b/modules/preferences/jar/org.scilab.modules.preferences.jar index d90ad3210..4566852aa 100755 Binary files a/modules/preferences/jar/org.scilab.modules.preferences.jar and b/modules/preferences/jar/org.scilab.modules.preferences.jar differ diff --git a/modules/renderer/jar/org.scilab.modules.renderer.jar b/modules/renderer/jar/org.scilab.modules.renderer.jar index 3221bf797..4c0647f7d 100755 Binary files a/modules/renderer/jar/org.scilab.modules.renderer.jar and b/modules/renderer/jar/org.scilab.modules.renderer.jar differ diff --git a/modules/scicos_blocks/macros/Sinks/BARXY_sim.bin b/modules/scicos_blocks/macros/Sinks/BARXY_sim.bin index 15998212e..e13210b7f 100755 Binary files a/modules/scicos_blocks/macros/Sinks/BARXY_sim.bin and b/modules/scicos_blocks/macros/Sinks/BARXY_sim.bin differ diff --git a/modules/scicos_blocks/macros/Sinks/BARXY_sim.sci b/modules/scicos_blocks/macros/Sinks/BARXY_sim.sci index f143d8880..b329b51bb 100755 --- a/modules/scicos_blocks/macros/Sinks/BARXY_sim.sci +++ b/modules/scicos_blocks/macros/Sinks/BARXY_sim.sci @@ -44,18 +44,20 @@ function block=BARXY_sim(block,flag) a = f.children; - // modified_shank + // Give block_id to BARXY block_id = 11; + // Find the process id of the running scilab instance pid = getpid(); + // Specify the filename for the common log file scilab_filename = 'scilab-log-'+ string(pid) +'.txt'; + fd = mopen(scilab_filename,'a+'); mfprintf(fd,'%d || Block Identifier %d', pid, block_id); + // Print the co-ordinates of line mfprintf(fd,' %s %s ', string(u1), string(u2)); + // Print the name of block and line thickness mfprintf(fd, ' %s %s\n', 'BARXY ',string(block.ipar)); - // content = string(pid) + ' || Block Identifier ' + string(block_id) + ' ' + string(u1) + ' ' + string(u2)+ '\n'; - // mputstr(content, fd); mclose(fd); - // a.children(1).data = [u1, u2] diff --git a/modules/scinotes/jar/org.scilab.modules.scinotes.jar b/modules/scinotes/jar/org.scilab.modules.scinotes.jar index 4f9515151..0e73cf3e4 100755 Binary files a/modules/scinotes/jar/org.scilab.modules.scinotes.jar and b/modules/scinotes/jar/org.scilab.modules.scinotes.jar differ diff --git a/modules/types/jar/org.scilab.modules.types.jar b/modules/types/jar/org.scilab.modules.types.jar index 857cad203..b783d2d21 100755 Binary files a/modules/types/jar/org.scilab.modules.types.jar and b/modules/types/jar/org.scilab.modules.types.jar differ diff --git a/modules/ui_data/jar/org.scilab.modules.ui_data.jar b/modules/ui_data/jar/org.scilab.modules.ui_data.jar index 42b5eb0af..a6d0ed6cb 100755 Binary files a/modules/ui_data/jar/org.scilab.modules.ui_data.jar and b/modules/ui_data/jar/org.scilab.modules.ui_data.jar differ diff --git a/modules/xcos/jar/org.scilab.modules.xcos.jar b/modules/xcos/jar/org.scilab.modules.xcos.jar index 53362e595..0ef11132f 100755 Binary files a/modules/xcos/jar/org.scilab.modules.xcos.jar and b/modules/xcos/jar/org.scilab.modules.xcos.jar differ -- cgit