Xcos MVC: give default values to scs_m.props.options tlist for backward compatibility

 * Now the scicos tests that displayed a "Wrong diagram version" popup pass
 * Regenerated all the tests that had minor differences

Change-Id: I0044c64692397bc648f17a650307b3355ea99f1d

diff --git a/scilab/modules/scicos/src/cpp/view_scilab/ParamsAdapter.cpp b/scilab/modules/scicos/src/cpp/view_scilab/ParamsAdapter.cpp
index 001fc13..3f3f969 100644 (file)
--- a/scilab/modules/scicos/src/cpp/view_scilab/ParamsAdapter.cpp
+++ b/scilab/modules/scicos/src/cpp/view_scilab/ParamsAdapter.cpp
@@ -16,6 +16,7 @@
 
 #include "double.hxx"
 #include "string.hxx"
+#include "bool.hxx"
 #include "list.hxx"
 #include "tlist.hxx"
 
@@ -36,6 +37,11 @@ namespace
 {
 
 const std::wstring scsopt(L"scsopt");
+const std::wstring ThreeD(L"3D");
+const std::wstring Background(L"Background");
+const std::wstring Link(L"Link");
+const std::wstring ID(L"ID");
+const std::wstring Cmap(L"Cmap");
 
 struct dummy_property
 {
@@ -272,11 +278,56 @@ struct options
 
     static types::InternalType* get(const ParamsAdapter& /*adaptor*/, const Controller& /*controller*/)
     {
-        // Return a dummy 'scsopt'-typed tlist.
-        types::String* header = new types::String(scsopt.c_str());
+        // Return a default 'scsopt'-typed tlist.
+        types::String* header = new types::String(1, 6);
+        header->set(0, scsopt.c_str());
+        header->set(1, ThreeD.c_str());
+        header->set(2, Background.c_str());
+        header->set(3, Link.c_str());
+        header->set(4, ID.c_str());
+        header->set(5, Cmap.c_str());
 
         types::TList* Scsopt = new types::TList();
         Scsopt->append(header);
+
+        types::List* ThreeDField = new types::List();
+        types::Bool* ThreeD1 = new types::Bool(1);
+        ThreeDField->append(ThreeD1);
+        types::Double* ThreeD2 = new types::Double(33);
+        ThreeDField->append(ThreeD2);
+        Scsopt->append(ThreeDField);
+
+        types::Double* BackgroundField = new types::Double(1, 2);
+        BackgroundField->set(0, 8);
+        BackgroundField->set(1, 1);
+        Scsopt->append(BackgroundField);
+
+        types::Double* LinkField = new types::Double(1, 2);
+        LinkField->set(0, 1);
+        LinkField->set(1, 5);
+        Scsopt->append(LinkField);
+
+        types::List* IDField = new types::List();
+        types::Double* ID1 = new types::Double(1, 4);
+        ID1->set(0, 4);
+        ID1->set(1, 1);
+        ID1->set(2, 10);
+        ID1->set(3, 1);
+        IDField->append(ID1);
+        types::Double* ID2 = new types::Double(1, 4);
+        ID2->set(0, 4);
+        ID2->set(1, 1);
+        ID2->set(2, 2);
+        ID2->set(3, 1);
+        IDField->append(ID2);
+        Scsopt->append(IDField);
+
+        types::Double* CmapField = new types::Double(1, 3);
+        CmapField->set(0, 0.8);
+        CmapField->set(1, 0.8);
+        CmapField->set(2, 0.8);
+        Scsopt->append(CmapField);
+
         return Scsopt;
     }
 

diff --git a/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Bouncing.unix.dia.ref b/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Bouncing.unix.dia.ref
index 87515f0..7ea50f6 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Bouncing.unix.dia.ref
+++ b/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Bouncing.unix.dia.ref
@@ -21,7 +21,6 @@ funcprot(prot);
 Info = scicos_simulate(scs_m, list());
 --------------------------------------------\
  Main Modelica : TMPDIR/Bouncing_im.mo
-
  Flat Modelica : TMPDIR/Bouncing_imf.mo
  Simulation C code :TMPDIR/Bouncing_im.c
 // Modify solver + run DDaskr + save results

diff --git a/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Hydraulics.unix.dia.ref b/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Hydraulics.unix.dia.ref
index db407da..5755907 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Hydraulics.unix.dia.ref
+++ b/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Hydraulics.unix.dia.ref
@@ -23,7 +23,6 @@ scs_m.props.tol(6) = 102;       // Solver
 scicos_simulate(scs_m);   // DDaskr
 --------------------------------------------\
  Main Modelica : TMPDIR/Hydraulics_im.mo
-
  Flat Modelica : TMPDIR/Hydraulics_imf.mo
  Simulation C code :TMPDIR/Hydraulics_im.c
 ddaskrval = res.values;         // Results
@@ -32,7 +31,6 @@ scs_m.props.tol(6) = 100;      // Solver
 scicos_simulate(scs_m);  // IDA
 --------------------------------------------\
  Main Modelica : TMPDIR/Hydraulics_im.mo
-
  Flat Modelica : TMPDIR/Hydraulics_imf.mo
  Simulation C code :TMPDIR/Hydraulics_im.c
 idaval = res.values;           // Results

diff --git a/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Platform.unix.dia.ref b/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Platform.unix.dia.ref
index bf74b28..cd05c0d 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Platform.unix.dia.ref
+++ b/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Platform.unix.dia.ref
@@ -41,22 +41,18 @@ for i=1:2  // 'max step size' = 10^-i, precision
 end
 --------------------------------------------\
  Main Modelica : TMPDIR/Platform_im.mo
-
  Flat Modelica : TMPDIR/Platform_imf.mo
  Simulation C code :TMPDIR/Platform_im.c
 --------------------------------------------\
  Main Modelica : TMPDIR/Platform_im.mo
-
  Flat Modelica : TMPDIR/Platform_imf.mo
  Simulation C code :TMPDIR/Platform_im.c
 --------------------------------------------\
  Main Modelica : TMPDIR/Platform_im.mo
-
  Flat Modelica : TMPDIR/Platform_imf.mo
  Simulation C code :TMPDIR/Platform_im.c
 --------------------------------------------\
  Main Modelica : TMPDIR/Platform_im.mo
-
  Flat Modelica : TMPDIR/Platform_imf.mo
  Simulation C code :TMPDIR/Platform_im.c
 funcprot(prot);

diff --git a/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_RLC.unix.dia.ref b/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_RLC.unix.dia.ref
index 0dbd545..4c34ba1 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_RLC.unix.dia.ref
+++ b/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_RLC.unix.dia.ref
@@ -41,21 +41,17 @@ for i=2:3
 end
 --------------------------------------------\
  Main Modelica : TMPDIR/RLC_im.mo
-
  Flat Modelica : TMPDIR/RLC_imf.mo
  Simulation C code :TMPDIR/RLC_im.c
 --------------------------------------------\
  Main Modelica : TMPDIR/RLC_im.mo
-
  Flat Modelica : TMPDIR/RLC_imf.mo
  Simulation C code :TMPDIR/RLC_im.c
 --------------------------------------------\
  Main Modelica : TMPDIR/RLC_im.mo
-
  Flat Modelica : TMPDIR/RLC_imf.mo
  Simulation C code :TMPDIR/RLC_im.c
 --------------------------------------------\
  Main Modelica : TMPDIR/RLC_im.mo
-
  Flat Modelica : TMPDIR/RLC_imf.mo
  Simulation C code :TMPDIR/RLC_im.c

diff --git a/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Bouncing.unix.dia.ref b/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Bouncing.unix.dia.ref
index d2a8788..e547aa8 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Bouncing.unix.dia.ref
+++ b/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Bouncing.unix.dia.ref
@@ -21,7 +21,6 @@ funcprot(prot);
 Info = scicos_simulate(scs_m, list());
 --------------------------------------------\
  Main Modelica : TMPDIR/Bouncing_im.mo
-
  Flat Modelica : TMPDIR/Bouncing_imf.mo
  Simulation C code :TMPDIR/Bouncing_im.c
 // Modify solver + run DDaskr + save results

diff --git a/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Hydraulics.unix.dia.ref b/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Hydraulics.unix.dia.ref
index d0280bd..f7576b1 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Hydraulics.unix.dia.ref
+++ b/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Hydraulics.unix.dia.ref
@@ -23,7 +23,6 @@ scs_m.props.tol(6) = 101;       // Solver
 scicos_simulate(scs_m);   // DDaskr
 --------------------------------------------\
  Main Modelica : TMPDIR/Hydraulics_im.mo
-
  Flat Modelica : TMPDIR/Hydraulics_imf.mo
  Simulation C code :TMPDIR/Hydraulics_im.c
 ddaskrval = res.values;         // Results
@@ -32,7 +31,6 @@ scs_m.props.tol(6) = 100;       // Solver
 scicos_simulate(scs_m);   // IDA
 --------------------------------------------\
  Main Modelica : TMPDIR/Hydraulics_im.mo
-
  Flat Modelica : TMPDIR/Hydraulics_imf.mo
  Simulation C code :TMPDIR/Hydraulics_im.c
 idaval = res.values;            // Results

diff --git a/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Platform.unix.dia.ref b/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Platform.unix.dia.ref
index 0ac675b..26f1fef 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Platform.unix.dia.ref
+++ b/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Platform.unix.dia.ref
@@ -41,32 +41,26 @@ for i=1:3  // 'max step size' = 10^-i, precision
 end
 --------------------------------------------\
  Main Modelica : TMPDIR/Platform_im.mo
-
  Flat Modelica : TMPDIR/Platform_imf.mo
  Simulation C code :TMPDIR/Platform_im.c
 --------------------------------------------\
  Main Modelica : TMPDIR/Platform_im.mo
-
  Flat Modelica : TMPDIR/Platform_imf.mo
  Simulation C code :TMPDIR/Platform_im.c
 --------------------------------------------\
  Main Modelica : TMPDIR/Platform_im.mo
-
  Flat Modelica : TMPDIR/Platform_imf.mo
  Simulation C code :TMPDIR/Platform_im.c
 --------------------------------------------\
  Main Modelica : TMPDIR/Platform_im.mo
-
  Flat Modelica : TMPDIR/Platform_imf.mo
  Simulation C code :TMPDIR/Platform_im.c
 --------------------------------------------\
  Main Modelica : TMPDIR/Platform_im.mo
-
  Flat Modelica : TMPDIR/Platform_imf.mo
  Simulation C code :TMPDIR/Platform_im.c
 --------------------------------------------\
  Main Modelica : TMPDIR/Platform_im.mo
-
  Flat Modelica : TMPDIR/Platform_imf.mo
  Simulation C code :TMPDIR/Platform_im.c
 funcprot(prot);

diff --git a/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_RLC.unix.dia.ref b/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_RLC.unix.dia.ref
index f53a199..8e4c579 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_RLC.unix.dia.ref
+++ b/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_RLC.unix.dia.ref
@@ -41,21 +41,17 @@ for i=2:3
 end
 --------------------------------------------\
  Main Modelica : TMPDIR/RLC_im.mo
-
  Flat Modelica : TMPDIR/RLC_imf.mo
  Simulation C code :TMPDIR/RLC_im.c
 --------------------------------------------\
  Main Modelica : TMPDIR/RLC_im.mo
-
  Flat Modelica : TMPDIR/RLC_imf.mo
  Simulation C code :TMPDIR/RLC_im.c
 --------------------------------------------\
  Main Modelica : TMPDIR/RLC_im.mo
-
  Flat Modelica : TMPDIR/RLC_imf.mo
  Simulation C code :TMPDIR/RLC_im.c
 --------------------------------------------\
  Main Modelica : TMPDIR/RLC_im.mo
-
  Flat Modelica : TMPDIR/RLC_imf.mo
  Simulation C code :TMPDIR/RLC_im.c

diff --git a/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Bouncing.unix.dia.ref b/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Bouncing.unix.dia.ref
index 1e44ae8..f880d87 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Bouncing.unix.dia.ref
+++ b/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Bouncing.unix.dia.ref
@@ -50,7 +50,6 @@ scs_m.props.context = "per = 0.5"; // Period, to get more varied results
 scicos_simulate(scs_m);   // IDA
 --------------------------------------------\
  Main Modelica : TMPDIR/Bouncing_im.mo
-
  Flat Modelica : TMPDIR/Bouncing_imf.mo
  Simulation C code :TMPDIR/Bouncing_im.c
 assert_checkalmostequal(res.values(1:26), IDA_val_ref, [], 1d-7);

diff --git a/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Hydraulics.unix.dia.ref b/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Hydraulics.unix.dia.ref
index 36870ca..60be117 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Hydraulics.unix.dia.ref
+++ b/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Hydraulics.unix.dia.ref
@@ -92,7 +92,6 @@ scs_m.props.context = "per = 0.05"; // Period, to get more varied results
 scicos_simulate(scs_m);   // IDA
 --------------------------------------------\
  Main Modelica : TMPDIR/Hydraulics_im.mo
-
  Flat Modelica : TMPDIR/Hydraulics_imf.mo
  Simulation C code :TMPDIR/Hydraulics_im.c
 assert_checkalmostequal(res.values($-67:$, :), IDA_val_ref, [], 1d-7);

diff --git a/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Platform.unix.dia.ref b/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Platform.unix.dia.ref
index c3ef03e..a318191 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Platform.unix.dia.ref
+++ b/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Platform.unix.dia.ref
@@ -19,52 +19,51 @@ function messagebox(msg, msg_title)
 endfunction
 funcprot(prot);
 IDA_val_ref = [ 11.
-                11.
-                11.
-                7.1057377
-                4.2276434
-                3.7837192
-                2.9538128
-                5.8771057
-                6.3928885
-                7.7794415
-                8.7234525
-                8.1656745
-                5.4692996
-                4.119467
-                3.98566
-                4.5880334
-                6.2619705
-                7.460788
-                8.0411235
-                7.0316339
-                5.9103864
-                5.0870516
-                4.8350387
-                5.2736793
-                6.0991627
-                6.8411039
-                7.22751
-                6.791484
-                6.0262625
-                5.4580017
-                5.3754978
-                5.5876889
-                6.078075
-                6.5118764
-                6.6403792
-                6.4498018
-                6.0902532
-                5.7053277
-                5.6308887
-                5.8353956 ];
+11.
+11.
+7.1057377
+4.2276434
+3.7837192
+2.9538128
+5.8771057
+6.3928885
+7.7794415
+8.7234525
+8.1656745
+5.4692996
+4.119467
+3.98566
+4.5880334
+6.2619705
+7.460788
+8.0411235
+7.0316339
+5.9103864
+5.0870516
+4.8350387
+5.2736793
+6.0991627
+6.8411039
+7.22751
+6.791484
+6.0262625
+5.4580017
+5.3754978
+5.5876889
+6.078075
+6.5118764
+6.6403792
+6.4498018
+6.0902532
+5.7053277
+5.6308887
+5.8353956 ];
 IDA_time_ref = (0:.5:19.5)';
 scs_m.props.tol(6) = 100; // Solver
 scs_m.props.context = "per = 0.5"; // Period, to get more varied results
 scicos_simulate(scs_m);   // IDA
 --------------------------------------------\
  Main Modelica : TMPDIR/Platform_im.mo
-
  Flat Modelica : TMPDIR/Platform_imf.mo
  Simulation C code :TMPDIR/Platform_im.c
 assert_checkalmostequal(res.values, IDA_val_ref, [], 1d-6);

diff --git a/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_RLC.unix.dia.ref b/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_RLC.unix.dia.ref
index 1a82145..539c193 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_RLC.unix.dia.ref
+++ b/scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_RLC.unix.dia.ref
@@ -19,43 +19,42 @@ function messagebox(msg, msg_title)
 endfunction
 funcprot(prot);
 IDA_val_ref = [
-  -0.0019611
-  -0.0015823
-  -0.0011972
-  -0.0008074
-  -0.0004144
-  -0.0000198
-   0.0003750
-   0.0007682
-   0.0011584
-   0.0015440
-   0.0019236
-   0.0022955
-   0.0026584
-   0.0030108
-   0.0033513
-   0.0036786
-   0.0039914
-   0.0042884
-   0.0045685
-   0.0048305
-   0.0050736
-   0.0052965
-   0.0054986
-   0.0056790
-   0.0058369
-   0.0059719
-   0.0060832
-   0.0061706
-   0.0062336
-   0.0062720 ];
+-0.0019611
+-0.0015823
+-0.0011972
+-0.0008074
+-0.0004144
+-0.0000198
+0.0003750
+0.0007682
+0.0011584
+0.0015440
+0.0019236
+0.0022955
+0.0026584
+0.0030108
+0.0033513
+0.0036786
+0.0039914
+0.0042884
+0.0045685
+0.0048305
+0.0050736
+0.0052965
+0.0054986
+0.0056790
+0.0058369
+0.0059719
+0.0060832
+0.0061706
+0.0062336
+0.0062720 ];
 IDA_time_ref = (1.7:.01:1.99)';
 scs_m.props.tol(6) = 101; // Solver
 scs_m.props.context = "L = .0001; per = 0.01;"; // Period, to get more varied results
 scicos_simulate(scs_m);   // IDA
 --------------------------------------------\
  Main Modelica : TMPDIR/RLC_im.mo
-
  Flat Modelica : TMPDIR/RLC_imf.mo
  Simulation C code :TMPDIR/RLC_im.c
 assert_checkalmostequal(res.values, IDA_val_ref, [], 1d-7);

diff --git a/scilab/modules/scicos/tests/unit_tests/model/Deep_cloning.dia.ref b/scilab/modules/scicos/tests/unit_tests/model/Deep_cloning.dia.ref
index bdbb360..6fa1529 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/model/Deep_cloning.dia.ref
+++ b/scilab/modules/scicos/tests/unit_tests/model/Deep_cloning.dia.ref
@@ -355,7 +355,7 @@ tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
 tf = 100000
 context = []
 void1 = []
-options = tlist("scsopt")
+options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])
 void2 = []
 void3 = []
 doc = list()
@@ -545,7 +545,7 @@ tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
 tf = 100000
 context = []
 void1 = []
-options = tlist("scsopt")
+options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])
 void2 = []
 void3 = []
 doc = list()
@@ -696,6 +696,9 @@ objectDeleted( 17 , BLOCK )
 objectDeleted( 20 , LINK )
 objectDeleted( 15 , BLOCK )
 objectDeleted( 14 , DIAGRAM )
+// Relaunch Xcos librairy
+loadXcosLibs();
+scicos_log("TRACE");
 // Try with two "BIGSOM_f" blocks connected together
 // The SuperBlock, containing a Block and a Link
 sb = scicos_block();
@@ -1314,7 +1317,7 @@ tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
 tf = 100000
 context = []
 void1 = []
-options = tlist("scsopt")
+options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])
 void2 = []
 void3 = []
 doc = list()
@@ -1615,7 +1618,7 @@ tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
 tf = 100000
 context = []
 void1 = []
-options = tlist("scsopt")
+options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])
 void2 = []
 void3 = []
 doc = list()
@@ -1923,7 +1926,7 @@ tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
 tf = 100000
 context = []
 void1 = []
-options = tlist("scsopt")
+options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])
 void2 = []
 void3 = []
 doc = list()
@@ -2288,6 +2291,9 @@ objectDeleted( 65 , BLOCK )
 objectDeleted( 69 , LINK )
 objectDeleted( 59 , BLOCK )
 objectDeleted( 58 , DIAGRAM )
+// Relaunch Xcos librairy
+loadXcosLibs();
+scicos_log("TRACE");
 // Try with a predefined SuperBlock
 sb = SUPER_f("define");
 objectCreated( 94 , DIAGRAM )
@@ -2965,7 +2971,7 @@ tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
 tf = 100000
 context = []
 void1 = []
-options = tlist("scsopt")
+options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])
 void2 = []
 void3 = []
 doc = list()

diff --git a/scilab/modules/scicos/tests/unit_tests/model/Deep_cloning.tst b/scilab/modules/scicos/tests/unit_tests/model/Deep_cloning.tst
index 32e6c9f..7a01e1c 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/model/Deep_cloning.tst
+++ b/scilab/modules/scicos/tests/unit_tests/model/Deep_cloning.tst
@@ -46,6 +46,10 @@ assert_checkequal(l(1).objs(1).model.rpar.objs(2).to,   [1 1 1]);
 clear
 
 
+// Relaunch Xcos librairy
+loadXcosLibs();
+scicos_log("TRACE");
+
 // Try with two "BIGSOM_f" blocks connected together
 
 // The SuperBlock, containing a Block and a Link
@@ -97,6 +101,10 @@ assert_checkequal(l2(1).objs(1).model.rpar.objs(3).to,   [2 1 1]);
 clear
 
 
+// Relaunch Xcos librairy
+loadXcosLibs();
+scicos_log("TRACE");
+
 // Try with a predefined SuperBlock
 sb = SUPER_f("define");
 scs_m = scicos_diagram();

diff --git a/scilab/modules/scicos/tests/unit_tests/model/Diagram.dia.ref b/scilab/modules/scicos/tests/unit_tests/model/Diagram.dia.ref
index 8fde90f..27649de 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/model/Diagram.dia.ref
+++ b/scilab/modules/scicos/tests/unit_tests/model/Diagram.dia.ref
@@ -24,7 +24,7 @@ tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
 tf = 100000
 context = []
 void1 = []
-options = tlist("scsopt")
+options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])
 void2 = []
 void3 = []
 doc = list()
@@ -36,7 +36,7 @@ tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
 tf = 100000
 context = []
 void1 = []
-options = tlist("scsopt")
+options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])
 void2 = []
 void3 = []
 doc = list()
@@ -446,7 +446,7 @@ tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
 tf = 100000
 context = []
 void1 = []
-options = tlist("scsopt")
+options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])
 void2 = []
 void3 = []
 doc = list()

diff --git a/scilab/modules/scicos/tests/unit_tests/model/SuperBlock.dia.ref b/scilab/modules/scicos/tests/unit_tests/model/SuperBlock.dia.ref
index 33e8b0f..7852516 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/model/SuperBlock.dia.ref
+++ b/scilab/modules/scicos/tests/unit_tests/model/SuperBlock.dia.ref
@@ -434,7 +434,7 @@ evtout = []
 state = []
 dstate = []
 odstate = list()
-rpar = mlist(["diagram","props","objs","version","contrib"],tlist(["params","wpar","title","tol","tf","context","void1","options","void2","void3","doc"],[],["Super Block";""],[0.000001,0.000001,1.000D-10,100001,0,1,0],100000,[],[],tlist("scsopt"),[],[],list()),list(mlist(["Block","graphics","model","gui","doc"],mlist(["graphics","orig","sz","flip","theta","exprs","pin","pout","pein","peout","gr_i","id","in_implicit","out_implicit","in_style","out_style","in_label","out_label","style"],[40,40],[20,20],%t,0,"1",[],0,[],[],[],"",[],"E","","","","",""),mlist(["model","sim","in","in2","intyp","out","out2","outtyp","evtin","evtout","state","dstate","odstate","rpar","ipar","opar","blocktype","firing","dep_ut","label","nzcross","nmode","equations","uid"],"input",[],[],1,-1,-2,-1,[],[],[],[],list(),[],1,list(),"c",[],[%f,%f],"",0,0,list(),""),"IN_f",list()),mlist(["Block","graphics","model","gui","doc"],mlist(["graphics","orig","sz","flip","theta","exprs","pin","pout","pein","peout","gr_i","id","in_implicit","out_implicit","in_style","out_style","in_label","out_label","style"],[240,40],[20,20],%t,0,"1",0,[],[],[],[],"","E",[],"","","","",""),mlist(["model","sim","in","in2","intyp","out","out2","outtyp","evtin","evtout","state","dstate","odstate","rpar","ipar","opar","blocktype","firing","dep_ut","label","nzcross","nmode","equations","uid"],"output",-1,-2,-1,[],[],1,[],[],[],[],list(),[],1,list(),"c",[],[%f,%f],"",0,0,list(),""),"OUT_f",list())),"",list())
+rpar = mlist(["diagram","props","objs","version","contrib"],tlist(["params","wpar","title","tol","tf","context","void1","options","void2","void3","doc"],[],["Super Block";""],[0.000001,0.000001,1.000D-10,100001,0,1,0],100000,[],[],tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8]),[],[],list()),list(mlist(["Block","graphics","model","gui","doc"],mlist(["graphics","orig","sz","flip","theta","exprs","pin","pout","pein","peout","gr_i","id","in_implicit","out_implicit","in_style","out_style","in_label","out_label","style"],[40,40],[20,20],%t,0,"1",[],0,[],[],[],"",[],"E","","","","",""),mlist(["model","sim","in","in2","intyp","out","out2","outtyp","evtin","evtout","state","dstate","odstate","rpar","ipar","opar","blocktype","firing","dep_ut","label","nzcross","nmode","equations","uid"],"input",[],[],1,-1,-2,-1,[],[],[],[],list(),[],1,list(),"c",[],[%f,%f],"",0,0,list(),""),"IN_f",list()),mlist(["Block","graphics","model","gui","doc"],mlist(["graphics","orig","sz","flip","theta","exprs","pin","pout","pein","peout","gr_i","id","in_implicit","out_implicit","in_style","out_style","in_label","out_label","style"],[240,40],[20,20],%t,0,"1",0,[],[],[],[],"","E",[],"","","","",""),mlist(["model","sim","in","in2","intyp","out","out2","outtyp","evtin","evtout","state","dstate","odstate","rpar","ipar","opar","blocktype","firing","dep_ut","label","nzcross","nmode","equations","uid"],"output",-1,-2,-1,[],[],1,[],[],[],[],list(),[],1,list(),"c",[],[%f,%f],"",0,0,list(),""),"OUT_f",list())),"",list())
 ipar = []
 opar = list()
 blocktype = "h"
@@ -460,7 +460,7 @@ tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
 tf = 100000
 context = []
 void1 = []
-options = tlist("scsopt")
+options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])
 void2 = []
 void3 = []
 doc = list()
@@ -474,7 +474,7 @@ tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
 tf = 100000
 context = []
 void1 = []
-options = tlist("scsopt")
+options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])
 void2 = []
 void3 = []
 doc = list()
@@ -1660,7 +1660,7 @@ evtout = 1
 state = []
 dstate = []
 odstate = list()
-rpar = mlist(["diagram","props","objs","version","contrib"],tlist(["params","wpar","title","tol","tf","context","void1","options","void2","void3","doc"],[],["Untitled";""],[0.000001,0.000001,1.000D-10,100001,0,1,0],100000,[],[],tlist("scsopt"),[],[],list()),list(mlist(["Block","graphics","model","gui","doc"],mlist(["graphics","orig","sz","flip","theta","exprs","pin","pout","pein","peout","gr_i","id","in_implicit","out_implicit","in_style","out_style","in_label","out_label","style"],[399,162],[20,20],%t,0,"1",[],[],5,[],[],"",[],[],"","","","",""),mlist(["model","sim","in","in2","intyp","out","out2","outtyp","evtin","evtout","state","dstate","odstate","rpar","ipar","opar","blocktype","firing","dep_ut","label","nzcross","nmode","equations","uid"],"output",[],[],1,[],[],1,1,[],[],[],list(),[],1,list(),"d",[],[%f,%f],"",0,0,list(),""),"CLKOUT_f",list()),mlist(["Block","graphics","model","gui","doc"],mlist(["graphics","orig","sz","flip","theta","exprs","pin","pout","pein","peout","gr_i","id","in_implicit","out_implicit","in_style","out_style","in_label","out_label","style"],[320,232],[40,40],%t,0,["0.1";"0.1"],[],[],6,3,[],"",[],[],"","","","",""),mlist(["model","sim","in","in2","intyp","out","out2","outtyp","evtin","evtout","state","dstate","odstate","rpar","ipar","opar","blocktype","firing","dep_ut","label","nzcross","nmode","equations","uid"],list("evtdly4",4),[],[],1,[],[],1,1,1,[],[],list(),[0.1;0.1],[],list(),"d",0.1,[%f,%f],"",0,0,list(),""),"EVTDLY_c",list()),mlist(["Link","xx","yy","id","thick","ct","from","to"],[340;340;380.71],[226.29;172;172],"",[0,0],[5,-1],[2,1,0],[4,1,1]),mlist(["Block","graphics","model","gui","doc"],mlist(["graphics","orig","sz","flip","theta","exprs","pin","pout","pein","peout","gr_i","id","in_implicit","out_implicit","in_style","out_style","in_label","out_label","style"],[380.71066,172],[0.3333333,0.3333333],%t,0,[],[],[],3,[5;6],[],"",[],[],"","","","",""),mlist(["model","sim","in","in2","intyp","out","out2","outtyp","evtin","evtout","state","dstate","odstate","rpar","ipar","opar","blocktype","firing","dep_ut","label","nzcross","nmode","equations","uid"],"split",[],[],1,[],[],1,1,[1;1],[],[],list(),[],[],list(),"d",[0;0],[%f,%f],"",0,0,list(),""),"CLKSPLIT_f",list()),mlist(["Link","xx","yy","id","thick","ct","from","to"],[380.71;399],[172;172],"",[0,0],[5,-1],[4,1,0],[1,1,1]),mlist(["Link","xx","yy","id","thick","ct","from","to"],[380.71;380.71;340;340],[172;302;302;277.71],"",[0,0],[5,-1],[4,2,0],[2,1,1])),"",list())
+rpar = mlist(["diagram","props","objs","version","contrib"],tlist(["params","wpar","title","tol","tf","context","void1","options","void2","void3","doc"],[],["Untitled";""],[0.000001,0.000001,1.000D-10,100001,0,1,0],100000,[],[],tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8]),[],[],list()),list(mlist(["Block","graphics","model","gui","doc"],mlist(["graphics","orig","sz","flip","theta","exprs","pin","pout","pein","peout","gr_i","id","in_implicit","out_implicit","in_style","out_style","in_label","out_label","style"],[399,162],[20,20],%t,0,"1",[],[],5,[],[],"",[],[],"","","","",""),mlist(["model","sim","in","in2","intyp","out","out2","outtyp","evtin","evtout","state","dstate","odstate","rpar","ipar","opar","blocktype","firing","dep_ut","label","nzcross","nmode","equations","uid"],"output",[],[],1,[],[],1,1,[],[],[],list(),[],1,list(),"d",[],[%f,%f],"",0,0,list(),""),"CLKOUT_f",list()),mlist(["Block","graphics","model","gui","doc"],mlist(["graphics","orig","sz","flip","theta","exprs","pin","pout","pein","peout","gr_i","id","in_implicit","out_implicit","in_style","out_style","in_label","out_label","style"],[320,232],[40,40],%t,0,["0.1";"0.1"],[],[],6,3,[],"",[],[],"","","","",""),mlist(["model","sim","in","in2","intyp","out","out2","outtyp","evtin","evtout","state","dstate","odstate","rpar","ipar","opar","blocktype","firing","dep_ut","label","nzcross","nmode","equations","uid"],list("evtdly4",4),[],[],1,[],[],1,1,1,[],[],list(),[0.1;0.1],[],list(),"d",0.1,[%f,%f],"",0,0,list(),""),"EVTDLY_c",list()),mlist(["Link","xx","yy","id","thick","ct","from","to"],[340;340;380.71],[226.29;172;172],"",[0,0],[5,-1],[2,1,0],[4,1,1]),mlist(["Block","graphics","model","gui","doc"],mlist(["graphics","orig","sz","flip","theta","exprs","pin","pout","pein","peout","gr_i","id","in_implicit","out_implicit","in_style","out_style","in_label","out_label","style"],[380.71066,172],[0.3333333,0.3333333],%t,0,[],[],[],3,[5;6],[],"",[],[],"","","","",""),mlist(["model","sim","in","in2","intyp","out","out2","outtyp","evtin","evtout","state","dstate","odstate","rpar","ipar","opar","blocktype","firing","dep_ut","label","nzcross","nmode","equations","uid"],"split",[],[],1,[],[],1,1,[1;1],[],[],list(),[],[],list(),"d",[0;0],[%f,%f],"",0,0,list(),""),"CLKSPLIT_f",list()),mlist(["Link","xx","yy","id","thick","ct","from","to"],[380.71;399],[172;172],"",[0,0],[5,-1],[4,1,0],[1,1,1]),mlist(["Link","xx","yy","id","thick","ct","from","to"],[380.71;380.71;340;340],[172;302;302;277.71],"",[0,0],[5,-1],[4,2,0],[2,1,1])),"",list())
 ipar = []
 opar = list()
 blocktype = "h"
@@ -1679,7 +1679,7 @@ tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
 tf = 100000
 context = []
 void1 = []
-options = tlist("scsopt")
+options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])
 void2 = []
 void3 = []
 doc = list()
@@ -1694,7 +1694,7 @@ tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
 tf = 100000
 context = []
 void1 = []
-options = tlist("scsopt")
+options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])
 void2 = []
 void3 = []
 doc = list()

diff --git a/scilab/modules/scicos/tests/unit_tests/model/SuperBlock_in_SuperBlock.dia.ref b/scilab/modules/scicos/tests/unit_tests/model/SuperBlock_in_SuperBlock.dia.ref
index a354f31..6df4062 100644 (file)
--- a/scilab/modules/scicos/tests/unit_tests/model/SuperBlock_in_SuperBlock.dia.ref
+++ b/scilab/modules/scicos/tests/unit_tests/model/SuperBlock_in_SuperBlock.dia.ref
@@ -214,7 +214,7 @@ evtout = []
 state = []
 dstate = []
 odstate = list()
-rpar = mlist(["diagram","props","objs","version","contrib"],tlist(["params","wpar","title","tol","tf","context","void1","options","void2","void3","doc"],[],["Untitled";""],[0.000001,0.000001,1.000D-10,100001,0,1,0],100000,[],[],tlist("scsopt"),[],[],list()),list(mlist(["Link","xx","yy","id","thick","ct","from","to"],[],[],"",[0,0],[1,1],[2,1,0],[3,1,1])),"",list())
+rpar = mlist(["diagram","props","objs","version","contrib"],tlist(["params","wpar","title","tol","tf","context","void1","options","void2","void3","doc"],[],["Untitled";""],[0.000001,0.000001,1.000D-10,100001,0,1,0],100000,[],[],tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8]),[],[],list()),list(mlist(["Link","xx","yy","id","thick","ct","from","to"],[],[],"",[0,0],[1,1],[2,1,0],[3,1,1])),"",list())
 ipar = []
 opar = list()
 blocktype = "h"
@@ -346,7 +346,7 @@ evtout = []
 state = []
 dstate = []
 odstate = list()
-rpar = mlist(["diagram","props","objs","version","contrib"],tlist(["params","wpar","title","tol","tf","context","void1","options","void2","void3","doc"],[],["Untitled";""],[0.000001,0.000001,1.000D-10,100001,0,1,0],100000,[],[],tlist("scsopt"),[],[],list()),list(mlist(["Block","graphics","model","gui","doc"],mlist(["graphics","orig","sz","flip","theta","exprs","pin","pout","pein","peout","gr_i","id","in_implicit","out_implicit","in_style","out_style","in_label","out_label","style"],[0,0],[20,20],%t,0,[],[],[],[],[],[],"Quat_Conj",[],[],"","","","",""),mlist(["model","sim","in","in2","intyp","out","out2","outtyp","evtin","evtout","state","dstate","odstate","rpar","ipar","opar","blocktype","firing","dep_ut","label","nzcross","nmode","equations","uid"],"super",[],[],1,[],[],1,[],[],[],[],list(),mlist(["diagram","props","objs","version","contrib"],tlist(["params","wpar","title","tol","tf","context","void1","options","void2","void3","doc"],[],["Untitled";""],[0.000001,0.000001,1.000D-10,100001,0,1,0],100000,[],[],tlist("scsopt"),[],[],list()),list(mlist(["Link","xx","yy","id","thick","ct","from","to"],[],[],"",[0,0],[1,1],[2,1,0],[3,1,1])),"",list()),[],list(),"h",[],[%f,%f],"Quat_Conj",0,0,list(),""),"",list())),"",list())
+rpar = mlist(["diagram","props","objs","version","contrib"],tlist(["params","wpar","title","tol","tf","context","void1","options","void2","void3","doc"],[],["Untitled";""],[0.000001,0.000001,1.000D-10,100001,0,1,0],100000,[],[],tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8]),[],[],list()),list(mlist(["Block","graphics","model","gui","doc"],mlist(["graphics","orig","sz","flip","theta","exprs","pin","pout","pein","peout","gr_i","id","in_implicit","out_implicit","in_style","out_style","in_label","out_label","style"],[0,0],[20,20],%t,0,[],[],[],[],[],[],"Quat_Conj",[],[],"","","","",""),mlist(["model","sim","in","in2","intyp","out","out2","outtyp","evtin","evtout","state","dstate","odstate","rpar","ipar","opar","blocktype","firing","dep_ut","label","nzcross","nmode","equations","uid"],"super",[],[],1,[],[],1,[],[],[],[],list(),mlist(["diagram","props","objs","version","contrib"],tlist(["params","wpar","title","tol","tf","context","void1","options","void2","void3","doc"],[],["Untitled";""],[0.000001,0.000001,1.000D-10,100001,0,1,0],100000,[],[],tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8]),[],[],list()),list(mlist(["Link","xx","yy","id","thick","ct","from","to"],[],[],"",[0,0],[1,1],[2,1,0],[3,1,1])),"",list()),[],list(),"h",[],[%f,%f],"Quat_Conj",0,0,list(),""),"",list())),"",list())
 ipar = []
 opar = list()
 blocktype = "h"
@@ -365,7 +365,7 @@ tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
 tf = 100000
 context = []
 void1 = []
-options = tlist("scsopt")
+options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])
 void2 = []
 void3 = []
 doc = list()
@@ -430,7 +430,7 @@ evtout = []
 state = []
 dstate = []
 odstate = list()
-rpar = mlist(["diagram","props","objs","version","contrib"],tlist(["params","wpar","title","tol","tf","context","void1","options","void2","void3","doc"],[],["Untitled";""],[0.000001,0.000001,1.000D-10,100001,0,1,0],100000,[],[],tlist("scsopt"),[],[],list()),list(mlist(["Link","xx","yy","id","thick","ct","from","to"],[],[],"",[0,0],[1,1],[2,1,0],[3,1,1])),"",list())
+rpar = mlist(["diagram","props","objs","version","contrib"],tlist(["params","wpar","title","tol","tf","context","void1","options","void2","void3","doc"],[],["Untitled";""],[0.000001,0.000001,1.000D-10,100001,0,1,0],100000,[],[],tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8]),[],[],list()),list(mlist(["Link","xx","yy","id","thick","ct","from","to"],[],[],"",[0,0],[1,1],[2,1,0],[3,1,1])),"",list())
 ipar = []
 opar = list()
 blocktype = "h"
@@ -449,7 +449,7 @@ tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
 tf = 100000
 context = []
 void1 = []
-options = tlist("scsopt")
+options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])
 void2 = []
 void3 = []
 doc = list()