Refactored flip to be an opencv utility

Scott Klum
1 parent a64bd9fe
Showing 3 changed files with 64 additions and 45 deletions
openbr/core/opencvutils.cpp
openbr/core/opencvutils.h
openbr/plugins/imgproc/flip.cpp
@@ -436,15 +436,15 @@ public:
 };
  
 // TODO: Make sure case where no confidences are inputted works.
-void OpenCVUtils::group(vector<Rect> &rects, vector<float> &confidences, float confidenceThreshold, float epsilon)
+void OpenCVUtils::group(QList<Rect> &rects, QList<float> &confidences, float confidenceThreshold, float epsilon)
 {
-    if (rects.empty())
+    if (rects.isEmpty())
         return;
  
-    const bool useConfidences = !confidences.empty();
+    const bool useConfidences = !confidences.isEmpty();
  
     vector<int> labels;
-    int nClasses = cv::partition(rects, labels, SimilarRects(epsilon));
+    int nClasses = cv::partition(rects.toVector().toStdVector(), labels, SimilarRects(epsilon));
  
     // Rect for each class (class meaning identity assigned by partition)
     vector<Rect> rrects(nClasses);
@@ -534,13 +534,65 @@ void OpenCVUtils::group(vector&lt;Rect&gt; &amp;rects, vector&lt;float&gt; &amp;confidences, float c
         // Need to return rects and confidences
         if( j == nClasses )
         {
-            rects.push_back(r1);
+            rects.append(r1);
             if (useConfidences)
-                confidences.push_back(w1);
+                confidences.append(w1);
         }
     }
 }
  
+void OpenCVUtils::flip(const br::Template &src, br::Template &dst, int axis)
+{
+    cv::flip(src, dst, axis);
+    dst.file = src.file;
+
+    QList<QPointF> flippedPoints;
+    foreach(const QPointF &point, src.file.points()) {
+        // Check for missing data using the QPointF(-1,-1) convention
+        if (point != QPointF(-1,-1)) {
+            if (axis == 0) {
+                flippedPoints.append(QPointF(point.x(),src.m().rows-point.y()));
+            } else if (axis == 1) {
+                flippedPoints.append(QPointF(src.m().cols-point.x(),point.y()));
+            } else {
+                flippedPoints.append(QPointF(src.m().cols-point.x(),src.m().rows-point.y()));
+            }
+        }
+    }
+
+    QList<QRectF> flippedRects;
+    foreach(const QRectF &rect, src.file.rects()) {
+        if (axis == 0) {
+            flippedRects.append(QRectF(rect.x(),
+                                       src.m().rows-rect.bottom(),
+                                       rect.width(),
+                                       rect.height()));
+        } else if (axis == 1) {
+            flippedRects.append(QRectF(src.m().cols-rect.right(),
+                                       rect.y(),
+                                       rect.width(),
+                                       rect.height()));
+        } else {
+            flippedRects.append(QRectF(src.m().cols-rect.right(),
+                                       src.m().rows-rect.bottom(),
+                                       rect.width(),
+                                       rect.height()));
+        }
+    }
+
+    dst.file.setPoints(flippedPoints);
+    dst.file.setRects(flippedRects);
+}
+
+void OpenCVUtils::flip(const br::TemplateList &src, br::TemplateList &dst, int axis)
+{
+    for (int i=0; i<src.size(); i++) {
+        br::Template t;
+        flip(src[i], t, axis);
+        dst.append(t);
+    }
+}
+
 QDataStream &operator<<(QDataStream &stream, const Mat &m)
 {
     // Write header
@@ -24,6 +24,7 @@
 #include <opencv2/core/core.hpp>
 #include <opencv2/ml/ml.hpp>
 #include <assert.h>
+#include <openbr/openbr_plugin.h>
  
 namespace OpenCVUtils
 {
@@ -101,7 +102,9 @@ namespace OpenCVUtils
     float overlap(const QRectF &rect1, const QRectF &rect2);
  
     // Misc
-    void group(std::vector<cv::Rect> &rects, std::vector<float> &confidences, float confidenceThreshold, float epsilon);
+    void group(QList<cv::Rect> &rects, QList<float> &confidences, float confidenceThreshold, float epsilon);
+    void flip(const br::Template &src, br::Template &dst, int axis);
+    void flip(const br::TemplateList &src, br::TemplateList &dst, int axis);
  
     int getFourcc();
 }
@@ -15,6 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
  
 #include <openbr/plugins/openbr_internal.h>
+#include <openbr/core/opencvutils.h>
  
 namespace br
 {
@@ -41,44 +42,7 @@ private:
  
     void project(const Template &src, Template &dst) const
     {
-        cv::flip(src, dst, axis);
-
-        QList<QPointF> flippedPoints;
-        foreach(const QPointF &point, src.file.points()) {
-            // Check for missing data using the QPointF(-1,-1) convention
-            if (point != QPointF(-1,-1)) {
-                if (axis == Y) {
-                    flippedPoints.append(QPointF(src.m().cols-point.x(),point.y()));
-                } else if (axis == X) {
-                    flippedPoints.append(QPointF(point.x(),src.m().rows-point.y()));
-                } else {
-                    flippedPoints.append(QPointF(src.m().cols-point.x(),src.m().rows-point.y()));
-                }
-            }
-        }
-
-        QList<QRectF> flippedRects;
-        foreach(const QRectF &rect, src.file.rects()) {
-            if (axis == Y) {
-                flippedRects.append(QRectF(src.m().cols-rect.right(),
-                                           rect.y(),
-                                           rect.width(),
-                                           rect.height()));
-            } else if (axis == X) {
-                flippedRects.append(QRectF(rect.x(),
-                                           src.m().rows-rect.bottom(),
-                                           rect.width(),
-                                           rect.height()));
-            } else {
-                flippedRects.append(QRectF(src.m().cols-rect.right(),
-                                           src.m().rows-rect.bottom(),
-                                           rect.width(),
-                                           rect.height()));
-            }
-        }
-
-        dst.file.setPoints(flippedPoints);
-        dst.file.setRects(flippedRects);
+        OpenCVUtils::flip(src,dst,axis);
     }
 };