Traverse the transform tree using properties

Look for properties with type Transform * or QList<Transform *> and for getEvent, follow the tree using those, rather than having separate methods for different transforms with children.

Traverse the transform tree using properties
Look for properties with type Transform * or QList<Transform *> and for getEvent, follow the tree using those, rather than having separate methods for different transforms with children.
Charles Otto
1 parent 17a93ada
Showing 4 changed files with 24 additions and 20 deletions
openbr/openbr_plugin.cpp
openbr/openbr_plugin.h
openbr/plugins/meta.cpp
openbr/plugins/openbr_internal.h
@@ -1192,6 +1192,21 @@ void Transform::backProject(const TemplateList &amp;dst, TemplateList &amp;src) const
     futures.waitForFinished();
 }
  
+QList<Transform *> Transform::getChildren()
+{
+    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;
+}
+
 /* Distance - public methods */
 Distance *Distance::make(QString str, QObject *parent)
 {
@@ -1164,11 +1164,19 @@ public:
      */
     virtual TemplateEvent * getEvent(const QString & name)
     {
-        (void) name;
+        foreach(Transform * child, getChildren())
+        {
+            TemplateEvent * probe = child->getEvent(name);
+            if (probe)
+                return probe;
+        }
+
         return NULL;
     }
  
 protected:
+    QList<Transform *> getChildren();
+
     Transform(bool independent = true, bool trainable = true); /*!< \brief Construct a transform. */
     inline Transform *make(const QString &description) { return make(description, this); } /*!< \brief Make a subtransform. */
 };
@@ -615,12 +615,6 @@ public:
         return output;
     }
  
-    virtual TemplateEvent * getEvent(const QString & name)
-    {
-        return transform->getEvent(name);
-    }
-
-
     void train(const TemplateList &data)
     {
         transform->train(data);
@@ -234,19 +234,6 @@ public:
         return output;
     }
  
-    virtual TemplateEvent * getEvent(const QString & name)
-    {
-        foreach(Transform* t, transforms )
-        {
-            TemplateEvent * probe = t->getEvent(name);
-            if (probe)
-                return probe;
-        }
-
-        return NULL;
-    }
-
-
 protected:
     bool isTimeVarying;