Xcos: fix some issues on Xcos->Scilab actions

[scilab.git] / scilab / modules / xcos / macros / xcosBlockEval.sci

diff --git a/scilab/modules/xcos/macros/xcosBlockEval.sci b/scilab/modules/xcos/macros/xcosBlockEval.sci
index c134ee7..61bfe24 100644 (file)
--- a/scilab/modules/xcos/macros/xcosBlockEval.sci
+++ b/scilab/modules/xcos/macros/xcosBlockEval.sci
@@ -1,6 +1,6 @@
-//
 // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2009-2009 - DIGITEO - Antoine ELIAS
+// Copyright (C) 2009-2009 - DIGITEO - Antoine ELIAS <antoine.elias@scilab.org>
+// Copyright (C) 2010-2010 - DIGITEO - Clément DAVID <clement.david@scilab.org>
 //
 // This file must be used under the terms of the CeCILL.
 // This source file is licensed as described in the file COPYING, which
@@ -10,36 +10,43 @@
 //
 //
 
-//hdf5FileToLoad : input block file
-//hdf5FileToSave : output block file
-//interfaceAlias : block interface function name ( ex "IN_f" )
-//hdf5ContextFile : input context file
-
+// Evaluate a block with the context input.
+//
+// @param hdf5FileToLoad input block file
+// @param hdf5FileToSave output block file
+// @param interfaceAlias block interface function ( ex IN_f )
+// @param hdf5ContextFile input context file
 function xcosBlockEval(hdf5FileToLoad, hdf5FileToSave, interfaceAlias, hdf5ContextFile)
 
-       //replace scicos_getvalue by    setvalue ( call by interfaceAlias )
-  %mprt = funcprot()
-  funcprot(0)
-  scicos_getvalue = setvalue;
-  function message(txt)
-    messagebox(['In block ' + o.gui + ': ';
-               txt;
-              'current parameter value kept'],'error','modal');
-    [str,n,line,func]=lasterror();
-    printf('do_eval: error %d - %s in %s at line %d\n', n, str, func, line); 
-  endfunction
-  %scicos_prob = %f
-  funcprot(%mprt)
-
-       import_from_hdf5(hdf5ContextFile);
-       %scicos_context = struct();
-       [%scicos_context, ierr] = script2var(context, %scicos_context)
-
-       import_from_hdf5(hdf5FileToLoad);
-
-
-  //create a structure with the new context
-  [new_scs_m, y, typ] = interfaceAlias('set', scs_m, []);
-
-       export_to_hdf5(hdf5FileToSave, "new_scs_m");
+    //replace scicos_getvalue by setvalue (call by interfaceAlias)
+    %mprt = funcprot()
+    funcprot(0)
+    scicos_getvalue = setvalue;
+    function message(txt)
+        messagebox(..
+            ['In block ' + o.gui + ': ' ; txt ; 'current parameter value kept'],..
+            'error','modal');
+        [str,n,line,func]=lasterror();
+        printf('do_eval: error %d - %s in %s at line %d\n', n, str, func, line); 
+    endfunction
+    funcprot(%mprt)
+
+    // define scicos variables
+    %scicos_prob = %f
+    %scicos_debug_gr = %f
+    needcompile = 4;
+
+    // allocate the context
+    import_from_hdf5(hdf5ContextFile);
+    %scicos_context = struct();
+    [%scicos_context, ierr] = script2var(context, %scicos_context)
+
+    // Every parameter settings is done, perform block update
+
+    import_from_hdf5(hdf5FileToLoad);
+
+    //create a structure with the new context
+    [new_scs_m, y, typ] = interfaceAlias('set', scs_m, []);
+
+    export_to_hdf5(hdf5FileToSave, "new_scs_m");
 endfunction