Changeset 396

Timestamp:

06/23/15 00:52:00 (9 years ago)

Author:

Maciej Komosinski

Message:

• makeParamTab can now turn PARAM_READONLY into PARAM_USERREADONLY
• fixed paramtab/paramobject creation for objects containing 'p' members

Location:

cpp/frams/param

Files:

• paramobj.cpp (modified) (3 diffs)
• paramobj.h (modified) (1 diff)

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)
+                                      int firstprop, int maxprops, bool dupentries, int flagsexclude, bool addnew, const char* rename, bool readonly_into_userreadonly)
 {
         ParamEntry *tab, *t;
@@ -69 +69 @@
         for (i = firstprop; i < pi->getPropCount(); i++)
         {
-                if ((!stripproc) || (strchr("dfsox", *pi->type(i))))
+                const char* type=pi->type(i);
+                if ((!stripproc) || (strchr("dfsox", type[0])))
                 {
                         if ((!flagsexclude) || (!(pi->flags(i)&flagsexclude)))
                         {
-                                t->offset = offset;
-                                if (*pi->type(i) != 'x') t->offset += (((char*)&ex.data[0]) - ((char*)&ex));
+                                if (type[0]=='p')
+                                        t->offset=0;
+                                else
+                                        {
+                                        t->offset = offset;
+                                        if (type[0] != 'x') t->offset += (((char*)&ex.data[0]) - ((char*)&ex));
+                                        offset += sizeof(ExtValue);
+                                        }
                                 t->group = (short)(stripgroups ? 0 : pi->group(i));
                                 t->flags = (short)pi->flags(i);
+                                if (readonly_into_userreadonly && (t->flags & PARAM_READONLY))
+                                        t->flags=(t->flags & ~PARAM_READONLY) | PARAM_USERREADONLY;
                                 t->fun1 = 0;
                                 t->fun2 = 0;
                                 t->id = maybedup(dupentries, pi->id(i));
                                 t->name = maybedup(dupentries, pi->name(i));
-                                t->type = maybedup(dupentries, pi->type(i));
+                                t->type = maybedup(dupentries, type);
                                 t->help = maybedup(dupentries, pi->help(i));
-                                t++; n++; offset += sizeof(ExtValue);
+                                t++; n++;
                                 if (n > count) break;
                         }
@@ -165 +174 @@
 ParamObject* ParamObject::makeObject(ParamEntry *tab)
 {
-        if (!tab) return 0;
-        int n = tab->flags;
-        if (!n) return 0;
-        ParamObject *obj = new(n)ParamObject(n, tab); // new(n): allocate n fields ; ParamObject(n,...): tell the object it has n fields
+        if (!tab) return NULL;
+        int n=tab->flags, used_fields=0;
+        for (ParamEntry *t=tab+tab->group; n > 0; n--, t++)
+                if (strchr("dfsox",t->type[0]))
+                        used_fields++;
+
+        if (used_fields==0) return NULL;
+        ParamObject *obj = new(used_fields)ParamObject(used_fields, tab); // new(n): allocate n fields ; ParamObject(n,...): tell the object it has n fields
         ExtValue *v = &obj->fields[0];
-        tab += tab->group;
-        for (; n > 0; n--, tab++)
-                switch (*tab->type)
+        n=tab->flags;
+        for (ParamEntry *t=tab+tab->group; n > 0; n--, t++)
+                switch (*t->type)
         {
                 case 'd': v->setInt(0); v++; break;

cpp/frams/param/paramobj.h

@@ -53 +53 @@
                 ParamObject::freeObject(obj2);
                 */
-        static ParamEntry* makeParamTab(ParamInterface *pi, bool stripgroups = 0, bool stripproc = 0, int firstprop = 0, int maxprops = 9999, bool dupentries = false, int flagsexclude = 0, bool addnew = false, const char* rename = NULL);
+        static ParamEntry* makeParamTab(ParamInterface *pi, bool stripgroups = 0, bool stripproc = 0, int firstprop = 0, int maxprops = 9999, bool dupentries = false, int flagsexclude = 0, bool addnew = false, const char* rename = NULL,bool readonly_into_userreadonly=false);
 
         /** deallocate paramtab obtained from makeParamTab() */