Merge branch 'master' into janus

Josh Klontz
2 parents 9b1c46f3 6dea1280
Showing 9 changed files with 94 additions and 52 deletions
openbr/core/core.cpp
openbr/openbr.cpp
openbr/openbr.h
openbr/openbr_plugin.cpp
openbr/plugins/meta.cpp
openbr/plugins/openbr_internal.h
openbr/plugins/regions.cpp
openbr/plugins/slidingwindow.cpp
openbr/plugins/template.cpp
@@ -45,7 +45,8 @@ struct AlgorithmCore
         qDebug("Training on %s%s", qPrintable(input.flat()),
                model.isEmpty() ? "" : qPrintable(" to " + model));
-        QScopedPointer<Transform> trainingWrapper(Transform::make("DirectStream([Identity])", NULL));
+        QScopedPointer<Transform> trainingWrapper(Transform::make("DirectStream([Identity], readMode=DistributeFrames)", NULL));
+
         CompositeTransform * downcast = dynamic_cast<CompositeTransform *>(trainingWrapper.data());
         if (downcast == NULL)
             qFatal("downcast failed?");
@@ -70,7 +71,7 @@ struct AlgorithmCore
         if (!distance.isNull()) {
             qDebug("Projecting Enrollment");
-            data >> *downcast;
+            downcast->projectUpdate(data,data);
             qDebug("Training Comparison");
             distance->train(data);
@@ -353,6 +353,17 @@ void br_set_filename(br_template tmpl, const char *filename)
     t->file.name = filename;
 }
+const char* br_get_metadata_string(br_template tmpl, const char *key)
+{
+    Template *t = reinterpret_cast<Template*>(tmpl);
+    // need an object outside of this scope
+    // so the char pointer is valid
+    static QByteArray result;
+    QVariant qvar = t->file.value(key);
+    result = QtUtils::toString(qvar).toUtf8();
+    return result.data();
+}
+
 br_template_list br_enroll_template(br_template tmpl)
 {
     Template *t = reinterpret_cast<Template*>(tmpl);
@@ -475,6 +475,10 @@ BR_EXPORT bool br_img_is_empty(br_template tmpl);
   */
 BR_EXPORT void br_set_filename(br_template tmpl, const char *filename);
 /*!
+  * \brief Get metadata as a string for the given key in the given template.
+  */
+BR_EXPORT const char* br_get_metadata_string(br_template, const char *key);
+/*!
   * \brief Enroll a br::Template from the C API! Returns a pointer to a br::TemplateList
   * \param tmpl Pointer to a br::Template.
   */
@@ -550,20 +550,18 @@ QStringList Object::parameters() const
     for (int i = firstAvailablePropertyIdx; i < metaObject()->propertyCount();i++) {
         QMetaProperty property = metaObject()->property(i);
-        if (property.isStored(this)) continue;
         parameters.append(QString("%1 %2 = %3").arg(property.typeName(), property.name(), property.read(this).toString()));
     }
+
     return parameters;
 }
 QStringList Object::arguments() const
 {
     QStringList arguments;
-    for (int i=metaObject()->propertyOffset(); i<metaObject()->propertyCount(); i++) {
-        QMetaProperty property = metaObject()->property(i);
-        if (property.isStored(this)) continue;
+    for (int i=metaObject()->propertyOffset(); i<metaObject()->propertyCount(); i++)
         arguments.append(argument(i));
-    }
+
     return arguments;
 }
@@ -705,7 +703,14 @@ void Object::setProperty(const QString &amp;name, QVariant value)
     int index = metaObject()->indexOfProperty(qPrintable(name));
     if (index != -1) type = metaObject()->property(index).typeName();
-    if ((type.startsWith("QList<") && type.endsWith(">")) || (type == "QStringList")) {
+    if (metaObject()->property(index).isEnumType()) {
+        // This is necessary because setProperty can only set enums
+        // using their integer value if the QVariant is of type int (or uint)
+        bool ok;
+        int v = value.toInt(&ok);
+        if (ok)
+            value = v;
+    } else if ((type.startsWith("QList<") && type.endsWith(">")) || (type == "QStringList")) {
         QVariantList elements;
         if (value.canConvert<QVariantList>()) {
             elements = value.value<QVariantList>();
@@ -766,8 +771,8 @@ void Object::setProperty(const QString &amp;name, QVariant value)
     }
     if (!QObject::setProperty(qPrintable(name), value) && !type.isEmpty())
-        qFatal("Failed to set %s::%s to: %s",
-               metaObject()->className(), qPrintable(name), qPrintable(value.toString()));
+        qFatal("Failed to set %s %s::%s to: %s",
+               qPrintable(type), metaObject()->className(), qPrintable(name), qPrintable(value.toString()));
 }
 QStringList Object::parse(const QString &string, char split)
@@ -717,42 +717,6 @@ public:
 };
 BR_REGISTER(Transform, DistributeTemplateTransform)
-/*!
- * \ingroup transforms
- * \brief Filters a gallery based on the value of a metadata field.
- * \author Brendan Klare \cite bklare
- */
-class FilterOnMetadataTransform : public UntrainableMetaTransform
-{
-    Q_OBJECT
-    Q_PROPERTY(QString attributeName READ get_attributeName WRITE set_attributeName RESET reset_attributeName STORED false)
-    Q_PROPERTY(float threshold READ get_threshold WRITE set_threshold RESET reset_threshold STORED false)
-    Q_PROPERTY(bool isGreaterThan READ get_isGreaterThan WRITE set_isGreaterThan RESET reset_isGreaterThan STORED false)
-    BR_PROPERTY(QString, attributeName, "Confidence")
-    BR_PROPERTY(float, threshold, 0)
-    BR_PROPERTY(bool, isGreaterThan, true)
-
-    void project(const TemplateList &src, TemplateList &dst) const
-    {
-        QList<Template> filtered;
-        foreach (Template t, src) {
-            if (!t.file.contains(attributeName))
-                continue;
-            bool pass = t.file.get<float>(attributeName) > threshold;
-            if (isGreaterThan ? pass : !pass)
-                filtered.append(t);
-        }
-        dst = TemplateList(filtered);
-    }
-
-    void project(const Template &src, Template &dst) const
-    {
-        (void) src; (void) dst; qFatal("shouldn't be here");
-    }
-};
-
-BR_REGISTER(Transform, FilterOnMetadataTransform)
-
 } // namespace br
 #include "meta.moc"
@@ -260,9 +260,19 @@ public:
         newTransform = true;
         QString name = metaObject()->className();
+
         name.replace("Transform","");
-        name += "([])";
+        name += "([]";
+
+        QStringList arguments = this->arguments();
+        if (!arguments.isEmpty()) {
+            name += ",";
+            name += this->arguments().join(",");
+        }
+
+        name += ")";
         name.replace("br::","");
+
         CompositeTransform * output = dynamic_cast<CompositeTransform *>(Transform::make(name, NULL));
         if (output == NULL)
@@ -372,7 +372,7 @@ class FaceFromEyesTransform : public UntrainableTransform
     BR_PROPERTY(double, widthPadding, 0.7)
     BR_PROPERTY(double, verticalLocation, 0.25)
     BR_PROPERTY(int, leftEyeIdx, 0)
-    BR_PROPERTY(int, rightEyeIdx, 0)
+    BR_PROPERTY(int, rightEyeIdx, 1)
     void project(const Template &src, Template &dst) const
     {
@@ -384,8 +384,8 @@ class FaceFromEyesTransform : public UntrainableTransform
             return;
         }
-        QPointF eyeL = src.file.points()[0];
-        QPointF eyeR = src.file.points()[1];
+        QPointF eyeL = src.file.points()[leftEyeIdx];
+        QPointF eyeR = src.file.points()[rightEyeIdx];
         QPointF eyeCenter((eyeL.x() + eyeR.x()) / 2, (eyeL.y() + eyeR.y()) / 2);
         float ipd = sqrt(pow(eyeL.x() - eyeR.x(), 2) + pow(eyeL.y() - eyeR.y(), 2));
         float width = ipd + 2 * widthPadding * ipd;
@@ -46,11 +46,13 @@ class SlidingWindowTransform : public MetaTransform
     Q_PROPERTY(bool takeFirst READ get_takeFirst WRITE set_takeFirst RESET reset_takeFirst STORED false)
     Q_PROPERTY(float threshold READ get_threshold WRITE set_threshold RESET reset_threshold STORED false)
     Q_PROPERTY(float stepFraction READ get_stepFraction WRITE set_stepFraction RESET reset_stepFraction STORED false)
+    Q_PROPERTY(int ignoreBorder READ get_ignoreBorder WRITE set_ignoreBorder RESET reset_ignoreBorder STORED false)
     BR_PROPERTY(br::Transform *, transform, NULL)
     BR_PROPERTY(int, windowWidth, 24)
     BR_PROPERTY(bool, takeFirst, false)
     BR_PROPERTY(float, threshold, 0)
     BR_PROPERTY(float, stepFraction, 0.25)
+    BR_PROPERTY(int, ignoreBorder, 0)
 private:
     int windowHeight;
@@ -61,8 +63,17 @@ private:
         if (aspectRatio == -1)
             aspectRatio = getAspectRatio(data);
         windowHeight = qRound(windowWidth / aspectRatio);
+
         if (transform->trainable) {
-            transform->train(data);
+            TemplateList dataOut = data;
+            if (ignoreBorder > 0) {
+                for (int i = 0; i < dataOut.size(); i++) {
+                    Template t = dataOut[i];
+                    Mat m = t.m();
+                    dataOut.replace(i,Template(t.file, Mat(m,Rect(ignoreBorder,ignoreBorder,m.cols - ignoreBorder * 2, m.rows - ignoreBorder * 2))));
+                }
+            }
+            transform->train(dataOut);
         }
     }
@@ -101,7 +112,7 @@ protected:
         foreach (const Template &t, src) {
             for (float y = 0; y + windowHeight < t.m().rows; y += windowHeight*stepFraction) {
                 for (float x = 0; x + windowWidth < t.m().cols; x += windowWidth*stepFraction) {
-                    Mat windowMat(t.m(), Rect(x, y, windowWidth, windowHeight));
+                    Mat windowMat(t.m(), Rect(x + ignoreBorder, y + ignoreBorder, windowWidth - ignoreBorder * 2, windowHeight - ignoreBorder * 2));
                     Template detect;
                     transform->project(Template(t.file, windowMat), detect);
@@ -50,6 +50,42 @@ class RemoveTemplatesTransform : public UntrainableMetaTransform
 BR_REGISTER(Transform, RemoveTemplatesTransform)
+/*!
+ * \ingroup transforms
+ * \brief Filters a gallery based on the value of a metadata field.
+ * \author Brendan Klare \cite bklare
+ */
+class FilterOnMetadataTransform : public UntrainableMetaTransform
+{
+    Q_OBJECT
+    Q_PROPERTY(QString attributeName READ get_attributeName WRITE set_attributeName RESET reset_attributeName STORED false)
+    Q_PROPERTY(float threshold READ get_threshold WRITE set_threshold RESET reset_threshold STORED false)
+    Q_PROPERTY(bool isGreaterThan READ get_isGreaterThan WRITE set_isGreaterThan RESET reset_isGreaterThan STORED false)
+    BR_PROPERTY(QString, attributeName, "Confidence")
+    BR_PROPERTY(float, threshold, 0)
+    BR_PROPERTY(bool, isGreaterThan, true)
+
+    void project(const TemplateList &src, TemplateList &dst) const
+    {
+        QList<Template> filtered;
+        foreach (Template t, src) {
+            if (!t.file.contains(attributeName))
+                continue;
+            bool pass = t.file.get<float>(attributeName) > threshold;
+            if (isGreaterThan ? pass : !pass)
+                filtered.append(t);
+        }
+        dst = TemplateList(filtered);
+    }
+
+    void project(const Template &src, Template &dst) const
+    {
+        (void) src; (void) dst; qFatal("shouldn't be here");
+    }
+};
+
+BR_REGISTER(Transform, FilterOnMetadataTransform)
+
 } // namespace br
 #include "template.moc"