Xcos: first version using the MVC

No more no less than before : just instantiate a diagram.

Change-Id: Ib435a5b7027e73c88cebd3761546f47746c275b4

.gitignore

@@ -1,3 +1,3 @@
-/workspace/
+/workspace*/
 .DS_Store
 /.gitreview

scilab/.gitignore

@@ -108,6 +108,7 @@ ipch
 _UpgradeReport_Files/
 UpgradeLog.XML
 
+
 # eclipse temp files
 workspace/
 .checkstyle
@@ -116,8 +117,8 @@ workspace/
 .cproject
 .settings/
 
-# VIM ctags temp files
-tags
+# vim files
+/tags
 
 # MacOS files
 .DS_Store

scilab/modules/scicos/includes/Controller.hxx

@@ -69,7 +69,7 @@ public:
     };
 
     template<typename T>
-    update_status_t setObjectProperty(ScicosID uid, kind_t k, object_properties_t p, T v)
+    update_status_t setObjectProperty(const ScicosID& uid, kind_t k, object_properties_t p, T v)
     {
         update_status_t status = m_instance.model.setObjectProperty(uid, k, p, v);
         for (view_set_t::iterator iter = m_instance.allViews.begin(); iter != m_instance.allViews.end(); ++iter)

scilab/modules/scicos/includes/Model.hxx

@@ -47,6 +47,7 @@ public:
     bool getObjectProperty(ScicosID uid, kind_t k, object_properties_t p, ScicosID& v) const;
     bool getObjectProperty(ScicosID uid, kind_t k, object_properties_t p, std::vector<double>& v) const;
     bool getObjectProperty(ScicosID uid, kind_t k, object_properties_t p, std::vector<int>& v) const;
+    bool getObjectProperty(ScicosID uid, kind_t k, object_properties_t p, std::vector<bool>& v) const;
     bool getObjectProperty(ScicosID uid, kind_t k, object_properties_t p, std::vector< std::string >& v) const;
     bool getObjectProperty(ScicosID uid, kind_t k, object_properties_t p, std::vector<ScicosID>& v) const;
 
@@ -57,6 +58,7 @@ public:
     update_status_t setObjectProperty(ScicosID uid, kind_t k, object_properties_t p, std::string v);
     update_status_t setObjectProperty(ScicosID uid, kind_t k, object_properties_t p, const std::vector<double>& v);
     update_status_t setObjectProperty(ScicosID uid, kind_t k, object_properties_t p, const std::vector<int>& v);
+    update_status_t setObjectProperty(ScicosID uid, kind_t k, object_properties_t p, const std::vector<bool>& v);
     update_status_t setObjectProperty(ScicosID uid, kind_t k, object_properties_t p, const std::vector< std::string >& v);
     update_status_t setObjectProperty(ScicosID uid, kind_t k, object_properties_t p, const std::vector<ScicosID>& v);
 

scilab/modules/scicos/src/cpp/view_scilab/Adapters.hxx → scilab/modules/scicos/includes/view_scilab/Adapters.hxx

@@ -13,9 +13,17 @@
 #ifndef ADAPTERS_HXX_
 #define ADAPTERS_HXX_
 
+#include <utility>
 #include <vector>
 #include <string>
 
+#include "internal.hxx"
+#include "model/BaseObject.hxx"
+
+extern "C"
+{
+#include "dynlib_scicos.h"
+}
 namespace org_scilab_modules_scicos
 {
 namespace view_scilab
@@ -24,7 +32,7 @@ namespace view_scilab
 /*
  * Shared data between adapters
  */
-class Adapters
+class SCICOS_IMPEXP Adapters
 {
 public:
     typedef enum
@@ -46,6 +54,8 @@ public:
     static Adapters& instance();
 
     adapters_index_t lookup_by_typename(const std::wstring& name);
+    std::wstring get_typename(adapters_index_t index);
+    const model::BaseObject* descriptor(types::InternalType* v);
 
 private:
 

scilab/modules/scicos/sci_gateway/cpp/sci_scicos_new.cpp

@@ -12,6 +12,7 @@
 
 #include <string>
 
+#include "../../includes/view_scilab/Adapters.hxx"
 #include "gw_scicos.hxx"
 
 #include "types.hxx"
@@ -21,7 +22,6 @@
 #include "list.hxx"
 #include "function.hxx"
 
-#include "view_scilab/Adapters.hxx"
 #include "view_scilab/BaseAdapter.hxx"
 #include "view_scilab/BlockAdapter.hxx"
 #include "view_scilab/CprAdapter.hxx"
@@ -129,25 +129,9 @@ types::InternalType * alloc_and_set_as_mlist(types::String* type_name, types::ty
     return mlist;
 }
 
-types::Function::ReturnValue sci_scicos_new(types::typed_list &in, int _iRetCount, types::typed_list &out)
+types::Function::ReturnValue allocate(types::typed_list &in, int _iRetCount, types::typed_list &out)
 {
-    if (in.size() < 1)
-    {
-        Scierror(999, _("%s: Wrong number of input arguments: At least %d expected.\n"), funame.data(), 1);
-        return types::Function::Error;
-    }
-    if (_iRetCount > 1)
-    {
-        Scierror(999, _("%s: Wrong number of output arguments: %d expected.\n"), funame.data(), 1);
-        return types::Function::Error;
-    }
-
     types::InternalType* type = in[0];
-    if (type->getType() != types::InternalType::ScilabString)
-    {
-        Scierror(999, _("%s: Wrong type for input argument #%d: String expected.\n"), funame.data(), 1);
-        return types::Function::Error;
-    }
 
     types::String* type_name = type->getAs<types::String>();
     if (type_name->getRows() > 1)
@@ -258,3 +242,84 @@ types::Function::ReturnValue sci_scicos_new(types::typed_list &in, int _iRetCoun
 
     return types::Function::OK;
 }
+
+types::Function::ReturnValue get(types::Double* UIDs, int _iRetCount, types::typed_list &out)
+{
+    if (UIDs->getSize() != _iRetCount)
+    {
+        Scierror(999, _("%s: Wrong size for input argument #%d: %dx%d expected.\n"), funame.data(), 1, _iRetCount, 1);
+        return types::Function::Error;
+    }
+
+
+    Controller controller;
+    types::Function::ReturnValue retValue = types::Function::OK;
+    for (int i = 0; i < _iRetCount; ++i)
+    {
+        ScicosID uid = UIDs->get(i);
+
+        // create the associated object
+        model::BaseObject* o = controller.getObject(uid);
+        if (o == nullptr)
+        {
+            Scierror(999, _("%s: Wrong value for input argument #%d: invalid UID.\n"), funame.data(), 1);
+            retValue = types::Function::Error;
+            break;
+        }
+
+        switch (o->kind())
+        {
+            case DIAGRAM:
+                out.push_back(new view_scilab::DiagramAdapter(controller, static_cast<model::Diagram*>(controller.referenceObject(o))));
+                break;
+            case BLOCK:
+                out.push_back(new view_scilab::BlockAdapter(controller, static_cast<model::Block*>(controller.referenceObject(o))));
+                break;
+            case LINK:
+                out.push_back(new view_scilab::LinkAdapter(controller, static_cast<model::Link*>(controller.referenceObject(o))));
+                break;
+            default:
+                Scierror(999, _("%s: Wrong value for input argument #%d: not handled kind.\n"), funame.data(), 1);
+                retValue = types::Function::Error;
+                break;
+        }
+    }
+
+    if (retValue != types::Function::OK)
+    {
+        // something goes wrong, release the allocated data
+        for (types::typed_list::iterator it = out.begin(); it != out.end(); ++it)
+        {
+            delete *it;
+        }
+    }
+
+    return retValue;
+}
+
+types::Function::ReturnValue sci_scicos_new(types::typed_list &in, int _iRetCount, types::typed_list &out)
+{
+    if (in.size() < 1)
+    {
+        Scierror(999, _("%s: Wrong number of input arguments: At least %d expected.\n"), funame.data(), 1);
+        return types::Function::Error;
+    }
+    if (_iRetCount > 1)
+    {
+        Scierror(999, _("%s: Wrong number of output arguments: %d expected.\n"), funame.data(), 1);
+        return types::Function::Error;
+    }
+
+    types::InternalType* type = in[0];
+    switch (type->getType())
+    {
+        case types::InternalType::ScilabString:
+            return allocate(in, _iRetCount, out);
+        case types::InternalType::ScilabDouble:
+            return get(type->getAs<types::Double>(), _iRetCount, out);
+        default:
+            Scierror(999, _("%s: Wrong type for input argument #%d: String or ID expected.\n"), funame.data(), 1);
+            return types::Function::Error;
+    }
+}
+

scilab/modules/scicos/sci_gateway/cpp/sci_scicos_setfield.cpp

@@ -12,14 +12,14 @@
 
 #include <string>
 
+#include "../../includes/view_scilab/Adapters.hxx"
 #include "gw_scicos.hxx"
 
 #include "types.hxx"
 #include "string.hxx"
 #include "list.hxx"
 #include "function.hxx"
 
-#include "view_scilab/Adapters.hxx"
 #include "view_scilab/BaseAdapter.hxx"
 #include "view_scilab/BlockAdapter.hxx"
 #include "view_scilab/CprAdapter.hxx"

scilab/modules/scicos/src/c/scicos.vcxproj

@@ -326,6 +326,7 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
     <ClInclude Include="..\..\includes\Controller.hxx" />
     <ClInclude Include="..\..\includes\Model.hxx" />
     <ClInclude Include="..\..\includes\model\BaseObject.hxx" />
+    <ClInclude Include="..\..\includes\view_scilab\Adapters.hxx" />
     <ClInclude Include="..\..\includes\View.hxx" />
     <ClInclude Include="..\cpp\createblklist.hxx" />
     <ClInclude Include="..\cpp\extractblklist.hxx" />
@@ -341,7 +342,6 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
     <ClInclude Include="..\cpp\model\Diagram.hxx" />
     <ClInclude Include="..\cpp\model\Link.hxx" />
     <ClInclude Include="..\cpp\model\Port.hxx" />
-    <ClInclude Include="..\cpp\view_scilab\Adapters.hxx" />
     <ClInclude Include="..\cpp\view_scilab\BaseAdapter.hxx" />
     <ClInclude Include="..\cpp\view_scilab\BlockAdapter.hxx" />
     <ClInclude Include="..\cpp\view_scilab\CprAdapter.hxx" />

scilab/modules/scicos/src/c/scicos.vcxproj.filters

@@ -337,9 +337,6 @@
     <ClInclude Include="..\cpp\view_scilab\TextAdapter.hxx">
       <Filter>Header Files\MVC\view_scilab</Filter>
     </ClInclude>
-    <ClInclude Include="..\cpp\view_scilab\Adapters.hxx">
-      <Filter>Header Files\MVC\view_scilab</Filter>
-    </ClInclude>
     <ClInclude Include="..\cpp\view_scilab\BaseAdapter.hxx">
       <Filter>Header Files\MVC\view_scilab</Filter>
     </ClInclude>
@@ -379,6 +376,9 @@
     <ClInclude Include="..\..\includes\View.hxx">
       <Filter>Header Files\MVC</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\includes\view_scilab\Adapters.hxx">
+      <Filter>Header Files\MVC\view_scilab</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\includes\Model.hxx">
       <Filter>Header Files\MVC</Filter>
     </ClInclude>

scilab/modules/scicos/src/cpp/Model_getObjectProperties.cpp

@@ -549,6 +549,57 @@ bool Model::getObjectProperty(ScicosID uid, kind_t k, object_properties_t p, std
     return false;
 }
 
+bool Model::getObjectProperty(ScicosID uid, kind_t k, object_properties_t p, std::vector<bool>& v) const
+{
+    model::BaseObject* baseObject = getObject(uid);
+    if (baseObject == nullptr)
+    {
+        return false;
+    }
+
+    if (k == ANNOTATION)
+    {
+        switch (p)
+        {
+            default:
+                break;
+        }
+    }
+    else if (k == BLOCK)
+    {
+        switch (p)
+        {
+            default:
+                break;
+        }
+    }
+    else if (k == DIAGRAM)
+    {
+        switch (p)
+        {
+            default:
+                break;
+        }
+    }
+    else if (k == LINK)
+    {
+        switch (p)
+        {
+            default:
+                break;
+        }
+    }
+    else if (k == PORT)
+    {
+        switch (p)
+        {
+            default:
+                break;
+        }
+    }
+    return false;
+}
+
 bool Model::getObjectProperty(ScicosID uid, kind_t k, object_properties_t p, std::vector<std::string>& v) const
 {
     model::BaseObject* baseObject = getObject(uid);

scilab/modules/scicos/src/cpp/Model_setObjectProperties.cpp

@@ -501,6 +501,57 @@ update_status_t Model::setObjectProperty(ScicosID uid, kind_t k, object_properti
     return FAIL;
 }
 
+update_status_t Model::setObjectProperty(ScicosID uid, kind_t k, object_properties_t p, const std::vector<bool>& v)
+{
+    model::BaseObject* baseObject = getObject(uid);
+    if (baseObject == nullptr)
+    {
+        return FAIL;
+    }
+
+    if (k == ANNOTATION)
+    {
+        switch (p)
+        {
+            default:
+                break;
+        }
+    }
+    else if (k == BLOCK)
+    {
+        switch (p)
+        {
+            default:
+                break;
+        }
+    }
+    else if (k == DIAGRAM)
+    {
+        switch (p)
+        {
+            default:
+                break;
+        }
+    }
+    else if (k == LINK)
+    {
+        switch (p)
+        {
+            default:
+                break;
+        }
+    }
+    else if (k == PORT)
+    {
+        switch (p)
+        {
+            default:
+                break;
+        }
+    }
+    return FAIL;
+}
+
 update_status_t Model::setObjectProperty(ScicosID uid, kind_t k, object_properties_t p, const std::vector<std::string>& v)
 {
     model::BaseObject* baseObject = getObject(uid);