Fix Xcos verbose messages and solver states. 60/12560/2
Bruno JOFRET [Tue, 17 Sep 2013 08:58:58 +0000 (10:58 +0200)]
Change-Id: Idbddee87efb5ac8aa47bc97c798755bb9fab6296

scilab/modules/scicos/macros/scicos_scicos/c_pass2.sci
scilab/modules/scicos/macros/scicos_scicos/compile_modelica.sci

index 62d1fe5..ef67929 100644 (file)
@@ -197,7 +197,7 @@ function cpr=c_pass2(bllst,connectmat,clkconnect,cor,corinv,flag)
         warning(_("Diagram contains implicit blocks, compiling for implicit Solver."))
         %scicos_solver=100
     end
-    if %scicos_solver==100 then xc0=[xc0;xcd0],end
+    if or(%scicos_solver==[100, 101, 102]) then xc0=[xc0;xcd0],end
     state=scicos_state()
     state.x=xc0
     state.z=xd0
index 40087cf..b0feda7 100644 (file)
@@ -129,7 +129,7 @@ function [ok,name,nipar,nrpar,nopar,nz,nx,nx_der,nx_ns,nin,nout,nm,ng,dep_u]=com
     msprintf(_("Generated files path: %s"),outpath)
     ""];
 
-    if getscilabmode() == "STD" then
+    if getscilabmode() <> "NWNI" then
         messagebox(txt, "info");
     else
         disp(txt);