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

Brendan Klare
2 parents ca599e75 e89ad62d
Showing 7 changed files with 138 additions and 64 deletions
openbr/core/core.cpp
openbr/openbr_plugin.h
openbr/plugins/draw.cpp
openbr/plugins/landmarks.cpp
openbr/plugins/meta.cpp
openbr/plugins/stream.cpp
openbr/plugins/template.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
@@ -56,7 +56,7 @@ class DrawTransform : public UntrainableTransform
             for (int i=0; i<pointsList.size(); i++) {
                 const Point2f &point = pointsList[i];
                 circle(dst, point, 3, color, -1);
-                if (verbose) putText(dst, QString::number(i).toStdString(), point, FONT_HERSHEY_SIMPLEX, 0.5, verboseColor, 1);
+                if (verbose) putText(dst, QString("%1,(%2,%3)").arg(QString::number(i),QString::number(point.x),QString::number(point.y)).toStdString(), point, FONT_HERSHEY_SIMPLEX, 0.5, verboseColor, 1);
             }
         }
         if (rects) {
@@ -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));
     }
 };
@@ -305,6 +305,113 @@ class DrawDelaunayTransform : public UntrainableTransform
 BR_REGISTER(Transform, DrawDelaunayTransform)
+/*!
+ * \ingroup transforms
+ * \brief Read landmarks from a file and associate them with the correct templates.
+ * \author Scott Klum \cite sklum
+ *
+ * Example of the format:
+ * \code
+ * image_001.jpg:146.000000,190.000000,227.000000,186.000000,202.000000,256.000000
+ * image_002.jpg:75.000000,235.000000,140.000000,225.000000,91.000000,300.000000
+ * image_003.jpg:158.000000,186.000000,246.000000,188.000000,208.000000,233.000000
+ * \endcode
+ */
+class ReadLandmarksTransform : public UntrainableTransform
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString file READ get_file WRITE set_file RESET reset_file STORED false)
+    Q_PROPERTY(QString imageDelimiter READ get_imageDelimiter WRITE set_imageDelimiter RESET reset_imageDelimiter STORED false)
+    Q_PROPERTY(QString landmarkDelimiter READ get_landmarkDelimiter WRITE set_landmarkDelimiter RESET reset_landmarkDelimiter STORED false)
+    BR_PROPERTY(QString, file, QString())
+    BR_PROPERTY(QString, imageDelimiter, ":")
+    BR_PROPERTY(QString, landmarkDelimiter, ",")
+
+    QHash<QString, QList<QPointF> > landmarks;
+
+    void init()
+    {
+        QFile f(file);
+        if (!f.open(QFile::ReadOnly | QFile::Text))
+            qFatal("Failed to open %s for reading.", qPrintable(f.fileName()));
+
+        while (!f.atEnd()) {
+            const QStringList words = QString(f.readLine()).split(imageDelimiter);
+            const QStringList lm = words[1].split(landmarkDelimiter);
+
+            QList<QPointF> points;
+            bool ok;
+            for (int i=0; i<lm.size(); i+=2)
+                points.append(QPointF(lm[i].toFloat(&ok),lm[i+1].toFloat(&ok)));
+            if (!ok) qFatal("Failed to read landmark.");
+
+            landmarks.insert(words[0],points);
+        }
+    }
+
+    void project(const Template &src, Template &dst) const
+    {
+        dst = src;
+
+        dst.file.appendPoints(landmarks[dst.file.fileName()]);
+    }
+};
+
+BR_REGISTER(Transform, ReadLandmarksTransform)
+
+/*!
+ * \ingroup transforms
+ * \brief Name a point
+ * \author Scott Klum \cite sklum
+ */
+class NamePointsTransform : public UntrainableMetaTransform
+{
+    Q_OBJECT
+    Q_PROPERTY(QList<int> indices READ get_indices WRITE set_indices RESET reset_indices STORED false)
+    Q_PROPERTY(QStringList names READ get_names WRITE set_names RESET reset_names STORED false)
+    BR_PROPERTY(QList<int>, indices, QList<int>())
+    BR_PROPERTY(QStringList, names, QStringList())
+
+    void project(const Template &src, Template &dst) const
+    {
+        if (indices.size() != names.size()) qFatal("Point/name size mismatch");
+
+        dst = src;
+
+        QList<QPointF> points = src.file.points();
+
+        for (int i=0; i<indices.size(); i++) {
+            if (indices[i] < points.size()) dst.file.set(names[i], points[indices[i]]);
+            else qFatal("Idex out of range.");
+        }
+    }
+};
+
+BR_REGISTER(Transform, NamePointsTransform)
+
+/*!
+ * \ingroup transforms
+ * \brief Remove a name from a point
+ * \author Scott Klum \cite sklum
+ */
+class AnonymizePointsTransform : public UntrainableMetaTransform
+{
+    Q_OBJECT
+    Q_PROPERTY(QStringList names READ get_names WRITE set_names RESET reset_names STORED false)
+    BR_PROPERTY(QStringList, names, QStringList())
+
+    void project(const Template &src, Template &dst) const
+    {
+        dst = src;
+
+        foreach (const QString &name, names)
+            if (src.file.contains(name)) dst.file.appendPoint(src.file.get<QPointF>(name));
+    }
+};
+
+BR_REGISTER(Transform, AnonymizePointsTransform)
+
 } // namespace br
 #include "landmarks.moc"
@@ -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");
     }
@@ -50,58 +50,6 @@ class RemoveTemplatesTransform : public UntrainableMetaTransform
 BR_REGISTER(Transform, RemoveTemplatesTransform)
-/*!
- * \ingroup transforms
- * \brief Name a point
- * \author Scott Klum \cite sklum
- */
-class NamePointsTransform : public UntrainableMetaTransform
-{
-    Q_OBJECT
-    Q_PROPERTY(QList<int> indices READ get_indices WRITE set_indices RESET reset_indices STORED false)
-    Q_PROPERTY(QStringList names READ get_names WRITE set_names RESET reset_names STORED false)
-    BR_PROPERTY(QList<int>, indices, QList<int>())
-    BR_PROPERTY(QStringList, names, QStringList())
-
-    void project(const Template &src, Template &dst) const
-    {
-        if (indices.size() != names.size()) qFatal("Point/name size mismatch");
-
-        dst = src;
-
-        QList<QPointF> points = src.file.points();
-
-        for (int i=0; i<indices.size(); i++) {
-            if (indices[i] < points.size()) dst.file.set(names[i], points[indices[i]]);
-            else qFatal("Idex out of range.");
-        }
-    }
-};
-
-BR_REGISTER(Transform, NamePointsTransform)
-
-/*!
- * \ingroup transforms
- * \brief Remove a name from a point
- * \author Scott Klum \cite sklum
- */
-class AnonymizePointsTransform : public UntrainableMetaTransform
-{
-    Q_OBJECT
-    Q_PROPERTY(QStringList names READ get_names WRITE set_names RESET reset_names STORED false)
-    BR_PROPERTY(QStringList, names, QStringList())
-
-    void project(const Template &src, Template &dst) const
-    {
-        dst = src;
-
-        foreach (const QString &name, names)
-            if (src.file.contains(name)) dst.file.appendPoint(src.file.get<QPointF>(name));
-    }
-};
-
-BR_REGISTER(Transform, AnonymizePointsTransform)
-
 } // namespace br
 #include "template.moc"