Merge branch 'master' of https://github.com/biometrics/openbr

Scott Klum
2 parents d801d6fb 9d059134
Showing 5 changed files with 30 additions and 11 deletions
openbr/core/core.cpp
openbr/openbr_plugin.h
openbr/plugins/draw.cpp
openbr/plugins/meta.cpp
openbr/plugins/stream.cpp
@@ -490,9 +490,18 @@ void br::Cat(const QStringList &amp;inputGalleries, const QString &amp;outputGallery)
     }
 }
-QSharedPointer<br::Transform> br::Transform::fromAlgorithm(const QString &algorithm)
+QSharedPointer<br::Transform> br::Transform::fromAlgorithm(const QString &algorithm, bool preprocess)
 {
-    return AlgorithmManager::getAlgorithm(algorithm)->transform;
+    if (!preprocess)
+        return AlgorithmManager::getAlgorithm(algorithm)->transform;
+    else {
+        QSharedPointer<Transform> orig_tform = AlgorithmManager::getAlgorithm(algorithm)->transform;
+        QSharedPointer<Transform> newRoot = QSharedPointer<Transform>(Transform::make("Stream(Identity)", NULL));
+        WrapperTransform * downcast = dynamic_cast<WrapperTransform *> (newRoot.data());
+        downcast->transform = orig_tform.data();
+        downcast->init();
+        return newRoot;
+    }
 }
 QSharedPointer<br::Distance> br::Distance::fromAlgorithm(const QString &algorithm)
@@ -1105,7 +1105,7 @@ public:
     virtual ~Transform() {}
     static Transform *make(QString str, QObject *parent); /*!< \brief Make a transform from a string. */
-    static QSharedPointer<Transform> fromAlgorithm(const QString &algorithm); /*!< \brief Retrieve an algorithm's transform. */
+    static QSharedPointer<Transform> fromAlgorithm(const QString &algorithm, bool preprocess=true); /*!< \brief Retrieve an algorithm's transform. If preprocess is true, attaches a stream transform as the root of the algorithm*/
     virtual Transform *clone() const; /*!< \brief Copy the transform. */
@@ -1124,6 +1124,7 @@ public:
     /*!< \brief Apply the transform to a single template. Typically used by independent transforms */
     virtual void project(const Template &src, Template &dst) const = 0;
+
     /*!< \brief Apply the transform, taking the full template list as input.
      * A TemplateList is what is typically passed from transform to transform. Transforms that just
      * need to operatoe on a single template at a time (and want to output exactly 1 template) can implement
@@ -336,8 +336,7 @@ class AdjacentOverlayTransform : public Transform
     void init()
     {
-        opener = br::Transform::fromAlgorithm("Cache(Open)");
-
+        opener = QSharedPointer<br::Transform>(br::Transform::make("Cache(Open)", NULL));
     }
 };
@@ -248,8 +248,8 @@ class ExpandTransform : public UntrainableMetaTransform
     virtual void project(const Template & src, Template & dst) const
     {
-        qFatal("this has gone bad");
-        (void) src; (void) dst;
+        dst = src;
+        qDebug("Called Expand project(Template,Template), nothing will happen");
     }
 };
@@ -1007,14 +1007,24 @@ public:
     void project(const Template &src, Template &dst) const
     {
-        (void) src; (void) dst;
-        qFatal("nope");
+        TemplateList in;
+        in.append(src);
+        TemplateList out;
+        CompositeTransform::project(in,out);
+        dst = out.first();
+        if (out.size() > 1)
+            qDebug("Returning first output template only");
     }
     void projectUpdate(const Template &src, Template &dst)
     {
-        (void) src; (void) dst;
-        qFatal("whatever");
+        TemplateList in;
+        in.append(src);
+        TemplateList out;
+        projectUpdate(in,out);
+        dst = out.first();
+        if (out.size() > 1)
+            qDebug("Returning first output template only");
     }