Changeset 490 for cpp/frams/param/paramobj.cpp

Timestamp:

03/30/16 17:08:08 (9 years ago)

Author:

Maciej Komosinski

Message:

Introduced general-use ErrorObject?, fixed enumeration of mixed private/public property lists

File:

• cpp/frams/param/paramobj.cpp (modified) (4 diffs)

cpp/frams/param/paramobj.cpp

@@ -23 +23 @@
 
 ParamEntry* ParamObject::makeParamTab(ParamInterface *pi, bool stripgroups, bool stripproc,
-                                      int firstprop, int maxprops, bool dupentries, int flagsexclude, bool addnew, const char* rename, bool readonly_into_userreadonly)
-{
+                                      int firstprop, int maxprops, bool dupentries, int flagsexclude_data, int flagsexclude_tab, bool addnew, const char* rename, bool readonly_into_userreadonly)
+{
+// flagsexclude_data - skip while calculating data offsets
+// flagsexclude_tab - skip while creating paramtab
+// usually _data==_tab, but vmneuron public properties need _data=0 and _tab=PARAM_USERHIDDEN (data object has all fields, paramtab skips private fields)
         ParamEntry *tab, *t;
         int i, n, offset;
@@ -30 +33 @@
         int count = 0, gcount = 1;
         if (!stripgroups) gcount = pi->getGroupCount();
-        if (stripproc || flagsexclude)
+        if (stripproc || flagsexclude_tab)
                 for (int i = firstprop; i < pi->getPropCount(); i++)
                 {
                 const char*t = pi->type(i);
                 if ((!stripproc) || (strchr("dfsox", *t)))
-                        if ((!flagsexclude) || (!(pi->flags(i)&flagsexclude)))
+                        if ((!flagsexclude_tab) || (!(pi->flags(i)&flagsexclude_tab)))
                                 if (++count >= maxprops) break;
                 }
@@ -72 +75 @@
                 if ((!stripproc) || (strchr("dfsox", type[0])))
                 {
-                        if ((!flagsexclude) || (!(pi->flags(i)&flagsexclude)))
+                        paInt flag=pi->flags(i);
+                        int tmp_offset;
+                        if ((!flagsexclude_data) || (!(flag&flagsexclude_data)))
                         {
                                 if (type[0]=='p')
-                                        t->offset=0;
+                                        tmp_offset=0;
                                 else
                                         {
-                                        t->offset = offset;
-                                        if (type[0] != 'x') t->offset += (((char*)&ex.data[0]) - ((char*)&ex));
+                                        tmp_offset = offset;
+                                        if (type[0] != 'x') tmp_offset += (((char*)&ex.data[0]) - ((char*)&ex));
                                         offset += sizeof(ExtValue);
                                         }
+                        }
+
+                        if ((!flagsexclude_tab) || (!(flag&flagsexclude_tab)))
+                        {
+                                t->offset=tmp_offset;
                                 t->group = (paInt)(stripgroups ? 0 : pi->group(i));
-                                t->flags = (paInt)pi->flags(i);
+                                t->flags = (paInt)flag;
                                 if (readonly_into_userreadonly && (t->flags & PARAM_READONLY))
                                         t->flags=(t->flags & ~PARAM_READONLY) | PARAM_USERREADONLY;
@@ -190 +200 @@
                 case 'f': v->setDouble(0); v++; break;
                 case 's': v->setString(SString::empty()); v++; break;
-                case 'o': v->setObject(ExtObject()); v++; break;
+                case 'o':
+                        {
+                        ExtObject new_obj;
+                        if (t->flags & PARAM_OBJECTSET)
+                                {
+                                ParamInterface *cls=ExtValue::findDeserializableClass(t->type+1);
+                                if (cls)
+                                        {
+                                        int new_fun = cls->findId("new");
+                                        if (new_fun>=0)
+                                                {
+                                                ExtValue dummy,new_value;
+                                                cls->call(new_fun, &dummy, &new_value);
+                                                new_obj=new_value.getObject();
+                                                }
+                                        }
+                                }
+                        v->setObject(new_obj);
+                        v++;
+                        }
+                        break;
                 case 'x': v++; break;
         }