Separated point reordering functionality, reverted openbr_plugin change such tha…

…t Fork is not affected

Separated point reordering functionality, reverted openbr_plugin change such tha…
…t Fork is not affected
Scott Klum
1 parent 1c003ddc
Showing 5 changed files with 62 additions and 33 deletions
openbr/openbr_plugin.cpp
openbr/plugins/algorithms.cpp
openbr/plugins/regions.cpp
openbr/plugins/register.cpp
openbr/plugins/template.cpp
@@ -81,10 +81,8 @@ QString File::hash() const
 void File::append(const QVariantMap &metadata)
 {
-    foreach (const QString &key, metadata.keys()) {
-        if (key != "Points" && key != "Rects")
-            set(key, metadata[key]);
-    }
+    foreach (const QString &key, metadata.keys())
+        set(key, metadata[key]);
 }
 void File::append(const File &other)
@@ -98,8 +96,6 @@ void File::append(const File &amp;other)
         }
     }
     append(other.m_metadata);
-    appendPoints(other.points());
-    appendRects(other.rects());
 }
 QList<File> File::split() const
@@ -79,10 +79,10 @@ class AlgorithmsInitializer : public Initializer
         Globals->abbreviations.insert("RegisterAffine", "Open+Affine(256,256,0.37,0.45)");
         Globals->abbreviations.insert("ContrastEnhanced", "Open+Affine(256,256,0.37,0.45)+Cvt(Gray)+Blur(1.1)+Gamma(0.2)+DoG(1,2)+ContrastEq(0.1,10)");
         Globals->abbreviations.insert("ColoredLBP", "Open+Affine(128,128,0.37,0.45)+Cvt(Gray)+Blur(1.1)+Gamma(0.2)+DoG(1,2)+ContrastEq(0.1,10)+LBP(1,2)+ColoredU2");
-        Globals->abbreviations.insert("FlipMUCT","Flip(from=[ 0, 1, 2, 3, 4, 5, 6, 7, 17,18,19,20,21,31,32,36,37,38,39,40,41,48,49,50,55,56,60,61,65], \
-                                                         to=[16,15,14,13,12,11,10, 9, 26,25,24,23,22,35,34,45,44,43,42,47,46,54,53,52,59,58,64,63,67])");
-        Globals->abbreviations.insert("FlipMUCTNoJaw","Flip(from=[0,1,2,3,4,14,15,19,20,21,22,23,24,31,32,33,38,39,43,44,48], \
-                                                              to=[9,8,7,6,5,18,17,28,27,26,25,30,29,37,36,35,42,41,47,46,50])");
+        Globals->abbreviations.insert("FlipMUCT","Flip+ReorderPoints([ 0, 1, 2, 3, 4, 5, 6, 7, 17,18,19,20,21,31,32,36,37,38,39,40,41,48,49,50,55,56,60,61,65], \
+                                                         to=[16,15,14,13,12,11,10, 9, 26,25,24,23,22,35,34,45,44,43,42,47,46,54,53,52,59,58,64,63,67],true)");
+        Globals->abbreviations.insert("FlipMUCTNoJaw","Flip+ReorderPoints([0,1,2,3,4,14,15,19,20,21,22,23,24,31,32,33,38,39,43,44,48], \
+                                                              [9,8,7,6,5,18,17,28,27,26,25,30,29,37,36,35,42,41,47,46,50],true)");
         // Transforms
         Globals->abbreviations.insert("FaceDetection", "Open+Cvt(Gray)+Cascade(FrontalFace)");
@@ -246,8 +246,16 @@ class DupTransform : public UntrainableMetaTransform
     void project(const Template &src, Template &dst) const
     {
+        QList<QPointF> points = src.file.points();
+        QList<QRectF> rects = src.file.rects();
+
         for (int i=0; i<n; i++)
             dst.merge(src);
+
+        for (int i=1; i<n; i++) {
+            dst.file.appendPoints(points);
+            dst.file.appendRects(rects);
+        }
     }
 };
@@ -124,17 +124,12 @@ BR_REGISTER(Transform, AffineTransform)
  * \ingroup transforms
  * \brief Flips the image about an axis.
  * \author Josh Klontz \cite jklontz
- * \note In the case that you would like to flip both the image and the template's points but keep the indices for
- *       the points consistent between flipped an unflipped images, the to and from variables specify which indices
- *       to swap (i.e. points[from[0]] becomes points[to[0]] and vice versa).
  */
 class FlipTransform : public UntrainableMetaTransform
 {
     Q_OBJECT
     Q_ENUMS(Axis)
     Q_PROPERTY(Axis axis READ get_axis WRITE set_axis RESET reset_axis STORED false)
-    Q_PROPERTY(QList<int> from READ get_from WRITE set_from RESET reset_from STORED false)
-    Q_PROPERTY(QList<int> to READ get_to WRITE set_to RESET reset_to STORED false)
 public:
     /*!< */
@@ -144,34 +139,29 @@ public:
 private:
     BR_PROPERTY(Axis, axis, Y)
-    BR_PROPERTY(QList<int>, from, QList<int>())
-    BR_PROPERTY(QList<int>, to, QList<int>())
     void project(const TemplateList &src, TemplateList &dst) const
     {
-        dst.append(src.first());
         for (int i=0; i<src.size(); i++) {
+            dst.append(src[i]);
+
             Mat buffer;
             flip(src[i], buffer, axis);
             dst.append(Template(src[i].file,buffer));
-            if (from.size() == to.size()) {
-                QList<QPointF> flippedPoints;
-                foreach(const QPointF &point, dst.last().file.points()) {
-                    if (axis == Y) {
-                        flippedPoints.append(QPointF(src[i].m().cols-point.x(),point.y()));
-                    } else if (axis == X) {
-                        flippedPoints.append(QPointF(point.x(),src[i].m().rows-point.y()));
-                    } else {
-                        flippedPoints.append(QPointF(src[i].m().cols-point.x(),src[i].m().rows-point.y()));
-                    }
+            QList<QPointF> flippedPoints;
+            foreach(const QPointF &point, src.last().file.points()) {
+                if (axis == Y) {
+                    flippedPoints.append(QPointF(src[i].m().cols-point.x(),point.y()));
+                } else if (axis == X) {
+                    flippedPoints.append(QPointF(point.x(),src[i].m().rows-point.y()));
+                } else {
+                    flippedPoints.append(QPointF(src[i].m().cols-point.x(),src[i].m().rows-point.y()));
                 }
+            }
-                for (int j=0; j<from.size(); j++)
-                    std::swap(flippedPoints[from[j]],flippedPoints[to[j]]);
-
-                dst.last().file.setPoints(flippedPoints);
-            } else qFatal("Inconsistent sizes for to and from index lists.");
+            dst.last().file.setPoints(flippedPoints);
+            dst.last().file.set("Flipped",true);
         }
     }
@@ -207,6 +207,41 @@ public:
 BR_REGISTER(Transform, FilterDupeMetadataTransform)
+/*!
+ * \ingroup transforms
+ * \brief Reorder the points such that points[from[i]] becomes points[to[i]] and
+ *        vice versa
+ * \author Scott Klum \cite sklum
+ */
+class ReorderPointsTransform : public UntrainableMetadataTransform
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QList<int> from READ get_from WRITE set_from RESET reset_from STORED false)
+    Q_PROPERTY(QList<int> to READ get_to WRITE set_to RESET reset_to STORED false)
+    Q_PROPERTY(bool flippedOnly READ get_flippedOnly WRITE set_flippedOnly RESET reset_flippedOnly STORED false)
+    BR_PROPERTY(QList<int>, from, QList<int>())
+    BR_PROPERTY(QList<int>, to, QList<int>())
+    BR_PROPERTY(bool, flippedOnly, false)
+
+    void projectMetadata(const File &src, File &dst) const
+    {
+        if (flippedOnly && !src.contains("Flipped")) {
+            dst = src;
+            return;
+        }
+
+        if (from.size() == to.size()) {
+            QList<QPointF> points = src.points();
+            for (int i=0; i<from.size(); i++)
+                std::swap(points[from[i]],points[to[i]]);
+            dst.setPoints(points);
+        } else qFatal("Inconsistent sizes for to and from index lists.");
+    }
+};
+
+BR_REGISTER(Transform, ReorderPointsTransform)
+
 } // namespace br
 #include "template.moc"