Fixed file.flat() and file.init() to work with points and rects. other minor bug fixes

Scott Klum
1 parent 87f7a91f
Showing 8 changed files with 139 additions and 34 deletions
openbr/openbr_plugin.cpp
openbr/openbr_plugin.h
openbr/plugins/distance.cpp
openbr/plugins/gallery.cpp
openbr/plugins/misc.cpp
openbr/plugins/pp5.cpp
openbr/plugins/regions.cpp
openbr/plugins/stasm.cpp
@@ -43,6 +43,9 @@ using namespace br;
 using namespace cv;
  
 /* File - public methods */
+// Note that the convention for displaying metadata is as follows:
+// [] for lists in which argument order does not matter (e.g. [FTO=false, Index=0]),
+// () for lists in which argument order matters (e.g. First_Eye(100.0,100.0)).
 QString File::flat() const
 {
     QStringList values;
@@ -51,18 +54,14 @@ QString File::flat() const
         const QVariant value = this->value(key);
         if (value.isNull()) values.append(key);
         else {
-            if (value.canConvert(QVariant::String)) {
-                values.append(key + "=" + value.toString());
-            }
-            else {
-                if (value.canConvert(QVariant::PointF)) values.append(key + "=" + QString("(%1,%2)").arg(QString::number(qvariant_cast<QPointF>(value).x()),
-                                                                                                       QString::number(qvariant_cast<QPointF>(value).y())));
-                else if (value.canConvert(QVariant::RectF)) values.append(key + "=" + QString("(%1,%2,%3,%4)").arg(QString::number(qvariant_cast<QRectF>(value).x()),
-                                                                                                                 QString::number(qvariant_cast<QRectF>(value).y()),
-                                                                                                                 QString::number(qvariant_cast<QRectF>(value).width()),
-                                                                                                                 QString::number(qvariant_cast<QRectF>(value).height())));
-                else values.append(key + "=");
+            if (QString(value.typeName()) == "QVariantList") {
+                QStringList landmarks;
+                foreach(const QVariant &landmark, qvariant_cast<QVariantList>(value)) {
+                    landmarks.append(toString(landmark));
+                }
+                if (!landmarks.isEmpty()) values.append(key + "=[" + landmarks.join(", ") + "]");
             }
+            else values.append(key + "=" + toString(value));
         }
     }
  
@@ -266,26 +265,49 @@ void File::init(const QString &amp;file)
                 if (unnamed) setParameter(i, words[0]);
                 else         set(words[0], QVariant());
             } else {
-                if (words[1][0] == '(') {
-                    QStringList values = words[1].split(',');
-                    if (values.size() == 2) /* QPointF */ {
-                        values[1].chop(1);
-                        QPointF point(values[0].mid(1).toFloat(), values[1].remove(')').toFloat());
-                        set(words[0], point);
-                       }
-                    else /* QRectF */ {
-                        values[3].chop(1);
-                        QRectF rect(values[0].mid(1).toFloat(), values[1].toFloat(), values[2].toFloat(), values[3].remove(')').toFloat());
-                        set(words[0], rect);
-                    }
-                }
-                else set(words[0], words[1]);
+                fromString(words[0],words[1]);
             }
         }
         name = name.left(index);
     }
 }
  
+QString File::toString(const QVariant &variant) const
+{
+    if (variant.canConvert(QVariant::String)) return variant.toString();
+    else if(variant.canConvert(QVariant::PointF)) return QString("(%1,%2)").arg(QString::number(qvariant_cast<QPointF>(variant).x()),
+                                                                                               QString::number(qvariant_cast<QPointF>(variant).y()));
+    else if (variant.canConvert(QVariant::RectF)) return QString("(%1,%2,%3,%4)").arg(QString::number(qvariant_cast<QRectF>(variant).x()),
+                                                                                                         QString::number(qvariant_cast<QRectF>(variant).y()),
+                                                                                                         QString::number(qvariant_cast<QRectF>(variant).width()),
+                                                                                                         QString::number(qvariant_cast<QRectF>(variant).height()));
+    return QString();
+}
+
+void File::fromString(const QString &key, const QString &value)
+{
+    if (value[0] == '[') /* QVariantList */ {
+        QStringList values = value.mid(1, value.size()-2).split(", ");
+        foreach(const QString &word, values) fromString(key, word);
+    }
+    else if (value[0] == '(') {
+        QStringList values = value.split(',');
+        if (values.size() == 2) /* QPointF */ {
+            values[1].chop(1);
+            QPointF point(values[0].mid(1).toFloat(), values[1].toFloat());
+            if (key != "Points") set(key, point);
+            else appendPoint(point);
+        }
+        else /* QRectF */ {
+            values[3].chop(1);
+            QRectF rect(values[0].mid(1).toFloat(), values[1].toFloat(), values[2].toFloat(), values[3].toFloat());
+            if (key != "Rects") set(key, rect);
+            else appendRect(rect);
+        }
+    }
+    else set(key, value);
+}
+
 /* File - global methods */
 QDebug br::operator<<(QDebug dbg, const File &file)
 {
@@ -245,6 +245,8 @@ private:
     BR_EXPORT friend QDataStream &operator>>(QDataStream &stream, File &file);
  
     void init(const QString &file);
+    QString toString(const QVariant &variant) const;
+    void fromString(const QString &key, const QString &value);
 };
  
 BR_EXPORT QDebug operator<<(QDebug dbg, const File &file); /*!< \brief Prints br::File::flat() to \c stderr. */
@@ -177,6 +177,37 @@ class PipeDistance : public Distance
  
 BR_REGISTER(Distance, PipeDistance)
  
+class AverageDistance : public Distance
+{
+    Q_OBJECT
+    Q_PROPERTY(br::Distance* distance READ get_distance WRITE set_distance RESET reset_distance STORED false)
+    BR_PROPERTY(br::Distance*, distance, make("Dist(L2)"))
+
+    void train(const TemplateList &src)
+    {
+        distance->train(src);
+    }
+
+    float compare(const Template &a, const Template &b) const
+    {
+        if (a.size() != b.size())
+            qDebug() << a.size() << " " << b.size();
+
+        float score = 0;
+
+        for (int i = 0; i < a.size(); i++) {
+            //Template
+            score += distance->compare(a[i],b[i]);
+        }
+
+        qDebug() << score;
+
+        return score;
+    }
+};
+
+BR_REGISTER(Distance, AverageDistance)
+
 /*!
  * \ingroup distances
  * \brief Fast 8-bit L1 distance
@@ -302,6 +302,8 @@ class memGallery : public Gallery
  
     static void align(TemplateList &templates)
     {
+        //if (templates[0].size() > 1) return;
+
         bool uniform = true;
         QVector<uchar> alignedData(templates.bytes<size_t>());
         size_t offset = 0;
@@ -322,6 +322,54 @@ BR_REGISTER(Transform, RenameFirstTransform)
  
 /*!
  * \ingroup transforms
+ * \brief Name a point
+ * \author Scott Klum \cite sklum
+ */
+class LabelTransform : public UntrainableMetaTransform
+{
+    Q_OBJECT
+    Q_PROPERTY(QList<int> points READ get_points WRITE set_points RESET reset_points STORED false)
+    Q_PROPERTY(QStringList names READ get_names WRITE set_names RESET reset_names STORED false)
+    BR_PROPERTY(QList<int>, points, QList<int>())
+    BR_PROPERTY(QStringList, names, QStringList())
+
+    void project(const Template &src, Template &dst) const
+    {
+        if (points.size() != names.size()) qFatal("Point/name size mismatch");
+
+        dst = src;
+
+        for (int i=0; i<points.size(); i++)
+            dst.file.set(names[i], points[i]);
+    }
+};
+
+BR_REGISTER(Transform, LabelTransform)
+
+/*!
+ * \ingroup transforms
+ * \brief Name a point
+ * \author Scott Klum \cite sklum
+ */
+class AnonymizeTransform : 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, AnonymizeTransform)
+
+/*!
+ * \ingroup transforms
  * \brief Change the br::Template::file extension
  * \author Josh Klontz \cite jklontz
  */
@@ -13,7 +13,7 @@
 #include <pittpatt_license.h>
 #include <openbr_plugin.h>
  
-#include "core/resource.h"
+#include "openbr/core/resource.h"
  
 #define TRY(CC)                                                                                               \
 {                                                                                                             \
@@ -157,7 +157,7 @@ BR_REGISTER(Transform, DupTransform)
  * \todo Padding should be a percent of total image size
  */
  
-class RectFromLandmarksTransform : public UntrainableTransform
+class RectFromPointsTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(QList<int> indices READ get_indices WRITE set_indices RESET reset_indices STORED false)
@@ -181,7 +181,7 @@ class RectFromLandmarksTransform : public UntrainableTransform
         maxX = maxY = -std::numeric_limits<int>::max();
  
         foreach(int index, indices) {
-            if (src.file.points().size() > index+1) {
+            if (src.file.points().size() > index) {
                 if (src.file.points()[index].x() < minX) minX = src.file.points()[index].x();
                 if (src.file.points()[index].x() > maxX) maxX = src.file.points()[index].x();
                 if (src.file.points()[index].y() < minY) minY = src.file.points()[index].y();
@@ -203,7 +203,7 @@ class RectFromLandmarksTransform : public UntrainableTransform
     }
 };
  
-BR_REGISTER(Transform, RectFromLandmarksTransform)
+BR_REGISTER(Transform, RectFromPointsTransform)
  
 } // namespace br
  
@@ -18,11 +18,11 @@ class StasmInitializer : public Initializer
  
     void initialize() const
     {
-        Globals->abbreviations.insert("RectFromStasmEyes","RectFromLandmarks([27, 28, 29, 30, 31, 32, 33, 34, 35, 36],0.125,6.0)+Resize(44,164)"); //
-        Globals->abbreviations.insert("RectFromStasmJaw","RectFromLandmarks([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14],10)");
-        Globals->abbreviations.insert("RectFromStasmBrow","RectFromLandmarks([15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26],0.25,6.5)+Resize(44,230)");
-        Globals->abbreviations.insert("RectFromStasmNose","RectFromLandmarks([38, 39, 40, 41, 42, 43, 44, 67],0.1,1.5)+Resize(44,44)");
-        Globals->abbreviations.insert("RectFromStasmMouth","RectFromLandmarks([48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66],0.3,3.0)+Resize(44,110)");
+        Globals->abbreviations.insert("RectFromStasmEyes","RectFromPoints([27, 28, 29, 30, 31, 32, 33, 34, 35, 36],0.125,6.0)+Resize(44,164)"); //
+        Globals->abbreviations.insert("RectFromStasmJaw","RectFromPoints([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14],10)");
+        Globals->abbreviations.insert("RectFromStasmBrow","RectFromPoints([15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26],0.25,6.5)+Resize(44,230)");
+        Globals->abbreviations.insert("RectFromStasmNose","RectFromPoints([38, 39, 40, 41, 42, 43, 44, 67],0.1,1.5)+Resize(44,44)");
+        Globals->abbreviations.insert("RectFromStasmMouth","RectFromPoints([48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66],0.3,3.0)+Resize(44,110)");
     }
 };