Changeset 478 for cpp/frams/param/param.cpp

Timestamp:

03/22/16 01:19:47 (8 years ago)

Author:

Maciej Komosinski

Message:

Accessing const objects, short -> paInt, less critical messages when not necessary, accessing dictionaries with "->"

File:

• cpp/frams/param/param.cpp (modified) (5 diffs)

cpp/frams/param/param.cpp

@@ -602 +602 @@
                         if (v.type == TObj)
                         {
-                                logPrintf("ParamInterface", "set", LOG_WARN, "Getting integer value from object reference (%s)", v.getString().c_str());
+                                logPrintf("ParamInterface", "set", LOG_ERROR, "Setting int '%s.%s' from object reference (%s)", getName(), id(i), v.getString().c_str());
                                 return 0;
                         }
@@ -614 +614 @@
                         if (v.type == TObj)
                         {
-                                logPrintf("ParamInterface", "set", LOG_WARN, "Getting floating point value from object reference (%s)", v.getString().c_str());
+                                logPrintf("ParamInterface", "set", LOG_ERROR, "Setting float '%s.%s' from object reference (%s)", getName(), id(i), v.getString().c_str());
                                 return 0;
                         }
@@ -621 +621 @@
                 }
         case 's': { SString t = v.getString(); return setString(i, t); }
-        case 'o': return setObject(i, v.getObject());
+        case 'o':
+                if ((v.type!=TUnknown)&&(v.type!=TObj))
+                        logPrintf("ParamInterface", "set", LOG_ERROR, "Setting object '%s.%s' from %s", getName(), id(i), v.typeAndValue().c_str());
+                else
+                        return setObject(i, v.getObject());
+                break;
         case 'x': return setExtValue(i, v);
         default: logPrintf("ParamInterface", "set", LOG_ERROR, "'%s.%s' is not a field", getName(), id(i));
@@ -645 +650 @@
                         if ((after == NULL) || (*after))
                         {
-                                logPrintf("ParamInterface", "set", LOG_WARN, "serialization format mismatch in %s.%s", (getName() ? getName() : "<Unknown>"), id(i));
+                                logPrintf("ParamInterface", "set", LOG_ERROR, "serialization format mismatch in %s.%s", (getName() ? getName() : "<Unknown>"), id(i));
                                 e.setEmpty();
                         }
@@ -956 +961 @@
         ParamEntry *pe = entry(i);
         if (pe->flags&PARAM_READONLY) return PSET_RONLY;
+        if (pe->flags&PARAM_OBJECTSET)
+                {
+                ExtObject o=getObject(i);
+                Param tmp;
+                ParamInterface* oif=o.getParamInterface(tmp);
+                int ass;
+                if (oif && ((ass=oif->findId("assign"))>=0))
+                        {
+                        ExtValue arg=x;
+                        oif->call(ass,&arg,&v);
+                        }
+                else
+                        logPrintf("SimpleAbstractParam", "setObject", LOG_ERROR,
+                                  "'%s.%s' is PARAM_OBJECTSET but no 'assign()' in %s", getName(), pe->id, o.interfaceName());
+                return PSET_CHANGED;
+                }
         ExtObject xcopy = x; //only needed for messageOnExceedRange(): retain original, requested value of x because it may be changed below
         if (pe->fun2)