Rework implementation of setPropertyRecursive

Introduce QList<Object*> Object::getChildren(), which returns the (immeidate) child objects of a given transform/distance. The default implementation looks for properties of the appropriate type. Implment setPropertyRecursive leveraging getChildren (this reduces the amount of special casing needed to implement spr). Special casing for stream, independent, and LoadStore due to various oddities in their handling of child transforms

Rework implementation of setPropertyRecursive
Introduce QList<Object*> Object::getChildren(), which returns the (immeidate) child objects of a given transform/distance. The default implementation looks for properties of the appropriate type. Implment setPropertyRecursive leveraging getChildren (this reduces the amount of special casing needed to implement spr). Special casing for stream, independent, and LoadStore due to various oddities in their handling of child transforms
Charles Otto
1 parent fac7a232
Showing 6 changed files with 82 additions and 57 deletions
openbr/openbr_plugin.cpp
openbr/openbr_plugin.h
openbr/plugins/independent.cpp
openbr/plugins/meta.cpp
openbr/plugins/openbr_internal.h
openbr/plugins/stream.cpp
@@ -786,7 +786,7 @@ void Object::load(QDataStream &amp;stream)
     init();
 }
-bool Object::setPropertyRecursive(const QString &name, QVariant value)
+bool Object::setExistingProperty(const QString &name, QVariant value)
 {
     if (this->metaObject()->indexOfProperty(qPrintable(name)) == -1)
         return false;
@@ -795,6 +795,56 @@ bool Object::setPropertyRecursive(const QString &amp;name, QVariant value)
     return true;
 }
+QList<Object *> Object::getChildren() const
+{
+    QList<Object *> output;
+    for (int i=0; i < metaObject()->propertyCount(); i++) {
+        const char *prop_name = metaObject()->property(i).name();
+        const QVariant &variant = this->property(prop_name);
+
+        if (variant.canConvert<Transform *>()) {
+            Transform *tform = variant.value<Transform *>();
+            if (tform)
+                output.append((Object* ) variant.value<Transform *>());
+        }
+        else if (variant.canConvert<QList<Transform *> >()) {
+            foreach (const Transform *tform, variant.value<QList<Transform *> >()) {
+                if (tform)
+                    output.append((Object *) tform);
+            }
+        }
+        else if (variant.canConvert<Distance *>()) {
+            Distance *dist = variant.value<Distance *>();
+            if (dist)
+                output.append((Object* ) variant.value<Distance *>());
+        }
+        else if (variant.canConvert<QList<Distance *> >()) {
+            foreach (const Distance *dist, variant.value<QList<Distance *> >()) {
+                if (dist)
+                    output.append((Object *) dist);
+            }
+        }
+    }
+    return output;
+}
+
+bool Object::setPropertyRecursive(const QString &name, QVariant value)
+{
+    // collect children
+    bool res = setExistingProperty(name, value);
+    if (res)
+        return true;
+
+    QList<Object *> children = getChildren();
+    foreach (Object *obj, children) {
+        if (obj->setPropertyRecursive(name, value)) {
+            init();
+            return true;
+        }
+    }
+    return false;
+}
+
 void Object::setProperty(const QString &name, QVariant value)
 {
     QString type;
@@ -1408,24 +1458,9 @@ void Transform::project(const TemplateList &amp;src, TemplateList &amp;dst) const
     futures.waitForFinished();
 }
-QList<Transform *> Transform::getChildren() const
-{
-    QList<Transform *> output;
-    for (int i=0; i < metaObject()->propertyCount(); i++) {
-        const char *prop_name = metaObject()->property(i).name();
-        const QVariant &variant = this->property(prop_name);
-
-        if (variant.canConvert<Transform *>())
-            output.append(variant.value<Transform *>());
-        if (variant.canConvert<QList<Transform *> >())
-            output.append(variant.value<QList<Transform *> >());
-    }
-    return output;
-}
-
 TemplateEvent *Transform::getEvent(const QString &name)
 {
-    foreach (Transform *child, getChildren()) {
+    foreach (Transform *child, getChildren<Transform>()) {
         TemplateEvent *probe = child->getEvent(name);
         if (probe)
             return probe;
@@ -603,6 +603,22 @@ public:
     void setProperty(const QString &name, QVariant value); /*!< \brief Overload of QObject::setProperty to handle OpenBR data types. */
     virtual bool setPropertyRecursive(const QString &name, QVariant value); /*!< \brief Recursive version of setProperty, try to set the property on this object, or its children, returns true if successful. */
+    bool setExistingProperty(const QString &name, QVariant value); /*! <\brief attempt to set property 'name' on this object. If name is not a pre-declared property, return false */
+
+    virtual QList<Object *> getChildren() const; /*!< \brief retrieve children of this object, default version scans properties, subclasses which do not sotre their children as properties must overload. */
+
+    template<typename T>
+    QList<T *> getChildren() const
+    {
+        QList<Object *> children = getChildren();
+        QList<T *> output;
+        foreach(Object *obj, children) {
+            T *temp = dynamic_cast<T *>(obj);
+            if (temp != NULL)
+                output.append(temp);
+        }
+        return output;
+    }
     static QStringList parse(const QString &string, char split = ','); /*!< \brief Splits the string while respecting lexical scoping of <tt>()</tt>, <tt>[]</tt>, <tt>\<\></tt>, and <tt>{}</tt>. */
@@ -1276,12 +1292,6 @@ public:
      */
     virtual TemplateEvent *getEvent(const QString &name);
-    /*!
-     * \brief Get a list of child transforms of this transform, child transforms are considered to be
-     * any transforms stored as properties of this transform.
-     */
-    QList<Transform *> getChildren() const;
-
     static Transform *deserialize(QDataStream &stream)
     {
         QString desc;
@@ -138,9 +138,10 @@ class IndependentTransform : public MetaTransform
         return transform->description(expanded);
     }
+    // can't use general setPropertyRecursive because of transforms oddness
     bool setPropertyRecursive(const QString &name, QVariant value)
     {
-        if (br::Object::setPropertyRecursive(name, value))
+        if (br::Object::setExistingProperty(name, value))
             return true;
         if (!transform->setPropertyRecursive(name, value))
@@ -529,11 +529,11 @@ public:
         return res;
     }
-    bool setPropertyRecursive(const QString &name, QVariant value)
+    QList<Object *> getChildren() const
     {
-        if (br::Object::setPropertyRecursive(name, value))
-            return true;
-        return transform->setPropertyRecursive(name, value);
+        QList<Object *> rval;
+        rval.append(transform);
+        return rval;
     }
 private:
@@ -227,19 +227,6 @@ public:
         return output;
     }
-
-    bool setPropertyRecursive(const QString &name, QVariant value)
-    {
-        if (br::Object::setPropertyRecursive(name, value))
-            return true;
-
-        if (transform->setPropertyRecursive(name, value)) {
-            init();
-            return true;
-        }
-        return false;
-    }
-
     Transform *smartCopy(bool &newTransform)
     {
         if (!timeVarying()) {
@@ -392,21 +379,6 @@ public:
         return output;
     }
-    bool setPropertyRecursive(const QString &name, QVariant value)
-    {
-        if (br::Object::setPropertyRecursive(name, value))
-            return true;
-
-        for (int i=0; i < this->transforms.size();i++) {
-            if (transforms[i]->setPropertyRecursive(name, value)) {
-                init();
-                return true;
-            }
-        }
-        return false;
-    }
-
-
 protected:
     bool isTimeVarying;
@@ -1325,9 +1325,10 @@ public:
         return res;
     }
+    // can't use general setPropertyRecursive due to special handling of basis
     bool setPropertyRecursive(const QString &name, QVariant value)
     {
-        if (br::Object::setPropertyRecursive(name, value))
+        if (br::Object::setExistingProperty(name, value))
             return true;
         for (int i=0; i < basis->transforms.size();i++) {
@@ -1336,6 +1337,12 @@ public:
                 return true;
             }
         }
+
+        if (basis->endPoint->setPropertyRecursive(name, value)) {
+            basis->endPoint->init();
+            return true;
+        }
+
         return false;
     }