Merge branch 'master' into dlib

Scott Klum
2 parents 6dedce73 f7dddb1f
Showing 5 changed files with 53 additions and 6 deletions
openbr/openbr_plugin.h
openbr/plugins/cvt.cpp
openbr/plugins/edge.cpp
openbr/plugins/random.cpp
share/openbr/cmake/FindLibLinear.cmake
@@ -1178,7 +1178,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, bool preprocess=true); /*!< \brief Retrieve an algorithm's transform. If preprocess is true, attaches a stream transform as the root of the algorithm*/
+    static QSharedPointer<Transform> fromAlgorithm(const QString &algorithm, bool preprocess=false); /*!< \brief Retrieve an algorithm's transform. If preprocess is true, attaches a stream transform as the root of the algorithm*/
     static QSharedPointer<Transform> fromComparison(const QString &algorithm);
  
     virtual Transform *clone() const; /*!< \brief Copy the transform. */
@@ -115,7 +115,18 @@ class ScaleTransform : public UntrainableTransform
  
     void project(const Template &src, Template &dst) const
     {
-         resize(src, dst, Size(src.m().cols*scaleFactor,src.m().rows*scaleFactor));
+        resize(src, dst, Size(src.m().cols*scaleFactor,src.m().rows*scaleFactor));
+
+        QList<QRectF> rects = src.file.rects();
+        for (int i=0; i<rects.size(); i++)
+            rects[i] = QRectF(rects[i].topLeft()*scaleFactor,rects[i].bottomRight()*scaleFactor);
+        dst.file.setRects(rects);
+
+        QList<QPointF> points = src.file.points();
+        for (int i=0; i<points.size(); i++)
+            points[i] = points[i] * scaleFactor;
+        dst.file.setPoints(points);
+
     }
 };
  
+#include "openbr_internal.h"
+
+#include "opencv2/imgproc/imgproc.hpp"
+
+using namespace cv;
+
+namespace br
+{
+
+/*!
+ * \ingroup transforms
+ * \brief Warpper to OpenCV Canny edge detector
+ * \author Scott Klum \cite sklum
+ */
+class CannyTransform : public UntrainableTransform
+{
+    Q_OBJECT
+    Q_PROPERTY(double threshold READ get_threshold WRITE set_threshold RESET reset_threshold STORED false)
+    Q_PROPERTY(double aperatureSize READ get_aperatureSize WRITE set_aperatureSize RESET reset_aperatureSize STORED false)
+    Q_PROPERTY(bool L2Gradient READ get_L2Gradient WRITE set_L2Gradient RESET reset_L2Gradient STORED false)
+    BR_PROPERTY(double, threshold, 5)
+    BR_PROPERTY(double, aperatureSize, 3)
+    BR_PROPERTY(bool, L2Gradient, false)
+
+    void project(const Template &src, Template &dst) const
+    {
+        Canny(src,dst, threshold, 3*threshold, aperatureSize, L2Gradient);
+    }
+};
+
+BR_REGISTER(Transform, CannyTransform)
+
+} // namespace br
+
+#include "edge.moc"
@@ -17,6 +17,7 @@
 #include <numeric>
  
 #include <opencv2/imgproc/imgproc.hpp>
+
 #include "openbr_internal.h"
  
 #include "openbr/core/common.h"
@@ -164,7 +165,7 @@ class RndSampleTransform : public UntrainableMetaTransform
     void project(const TemplateList &src, TemplateList &dst) const
     {
         foreach(const Template &t, src) {
-            QPointF point = t.file.points()[0];
+            QPointF point = t.file.points()[pointIndex];
             QRectF region(point.x()-sampleRadius, point.y()-sampleRadius, sampleRadius*2, sampleRadius*2);
  
             if (region.x() < 0 ||
@@ -184,6 +185,7 @@ class RndSampleTransform : public UntrainableMetaTransform
                 labelCount << 0;
  
             while (std::accumulate(labelCount.begin(),labelCount.end(),0.0) < (sampleOverlapBands.size()-1)*samplesPerOverlapBand) {
+
                 float x = rand() % (sampleFactor*sampleRadius) + region.x() - sampleFactor/2*sampleRadius;
                 float y = rand() % (sampleFactor*sampleRadius) + region.y() - sampleFactor/2*sampleRadius;
  
@@ -192,13 +194,13 @@ class RndSampleTransform : public UntrainableMetaTransform
  
                 QRectF negativeLocation = QRectF(x, y, sampleRadius*2, sampleRadius*2);
  
-                float overlap = QtUtils::overlap(region, negativeLocation);
+                float overlap = pow(QtUtils::overlap(region, negativeLocation),overlapPower);
  
                 for (int k = 0; k<sampleOverlapBands.size()-1; k++) {
                     if (overlap >= sampleOverlapBands.at(k) && overlap < sampleOverlapBands.at(k+1) && labelCount[k] < samplesPerOverlapBand) {
                         Mat m(t.m(),OpenCVUtils::toRect(negativeLocation));
                         dst.append(Template(t.file,  m));
-                        float label = classification ? 0 : pow(overlap,overlapPower);
+                        float label = classification ? 0 : overlap;
                         dst.last().file.set(inputVariable, label);
                         labelCount[k]++;
                     }
 find_path(LibLinear_DIR linear.h ${CMAKE_SOURCE_DIR}/3rdparty/*)
  
-message(${LibLinear_DIR})
 mark_as_advanced(LibLinear_DIR)
 include_directories(${LibLinear_DIR})
 include_directories(${LibLinear_DIR}/blas)