Few changes to facilitate merge

Jordan Cheney
1 parent e4d4166c
Showing 7 changed files with 162 additions and 11 deletions
openbr/core/cluster.cpp
openbr/core/cluster.h
openbr/plugins/imgproc/adaptivethreshold.cpp
openbr/plugins/imgproc/canny.cpp
openbr/plugins/imgproc/rndsample.cpp
openbr/plugins/imgproc/samplefrommask.cpp
openbr/plugins/imgproc/scale.cpp
@@ -82,7 +82,7 @@ float normalizedROD(const Neighborhood &amp;neighborhood, int a, int b)
     return 1.f * (distanceA + distanceB) / std::min(indexA+1, indexB+1);
 }
-Neighborhood getNeighborhood(const QStringList &simmats)
+Neighborhood getNeighborhood(const QList<cv::Mat> &simmats)
 {
     Neighborhood neighborhood;
@@ -99,9 +99,7 @@ Neighborhood getNeighborhood(const QStringList &amp;simmats)
         int currentRows = -1;
         int columnOffset = 0;
         for (int j=0; j<numGalleries; j++) {
-            QScopedPointer<br::Format> format(br::Factory<br::Format>::make(simmats[i*numGalleries+j]));
-            br::Template t = format->read();
-            cv::Mat m = t.m();
+            cv::Mat m = simmats[i * numGalleries + j];
             if (j==0) {
                 currentRows = m.rows;
                 allNeighbors.resize(currentRows);
@@ -152,12 +150,11 @@ Neighborhood getNeighborhood(const QStringList &amp;simmats)
                 neighbor.second = (neighbor.second - globalMin) / (globalMax - globalMin);
         }
     }
-
     return neighborhood;
 }
 // Zhu et al. "A Rank-Order Distance based Clustering Algorithm for Face Tagging", CVPR 2011
-br::Clusters br::ClusterGallery(const QStringList &simmats, float aggressiveness, const QString &csv)
+br::Clusters br::ClusterGallery(const QList<cv::Mat> &simmats, float aggressiveness)
 {
     qDebug("Clustering %d simmat(s), aggressiveness %f", simmats.size(), aggressiveness);
@@ -238,6 +235,19 @@ br::Clusters br::ClusterGallery(const QStringList &amp;simmats, float aggressiveness
         clusters = newClusters;
         neighborhood = newNeighborhood;
     }
+    return clusters;
+}
+
+br::Clusters br::ClusterGallery(const QStringList &simmats, float aggressiveness, const QString &csv)
+{
+    QList<cv::Mat> mats;
+    foreach (const QString &simmat, simmats) {
+        QScopedPointer<br::Format> format(br::Factory<br::Format>::make(simmat));
+        br::Template t = format->read();
+        mats.append(t);
+    }
+
+    Clusters clusters = ClusterGallery(mats, aggressiveness);
     // Save clusters
     if (!csv.isEmpty())
@@ -21,12 +21,14 @@
 #include <QString>
 #include <QStringList>
 #include <QVector>
+#include <openbr/openbr_plugin.h>
 namespace br
 {
     typedef QList<int> Cluster; // List of indices into galleries
     typedef QVector<Cluster> Clusters;
+    Clusters ClusterGallery(const QList<cv::Mat> &simmats, float aggressiveness);
     Clusters ClusterGallery(const QStringList &simmats, float aggressiveness, const QString &csv);
     void EvalClustering(const QString &csv, const QString &input, QString truth_property);
+#include <opencv2/imgproc/imgproc.hpp>
+
+#include <openbr/plugins/openbr_internal.h>
+
+using namespace cv;
+
+namespace br
+{
+
+/*!
+ * \ingroup transforms
+ * \brief Wraps OpenCV's adaptive thresholding.
+ * \author Scott Klum \cite sklum
+ */
+class AdaptiveThresholdTransform : public UntrainableTransform
+{
+    Q_OBJECT
+
+    Q_ENUMS(Method)
+    Q_ENUMS(Type)
+    Q_PROPERTY(int maxValue READ get_maxValue WRITE set_maxValue RESET reset_maxValue STORED false)
+    Q_PROPERTY(Method method READ get_method WRITE set_method RESET reset_method STORED false)
+    Q_PROPERTY(Type type READ get_type WRITE set_type RESET reset_type STORED false)
+    Q_PROPERTY(int blockSize READ get_blockSize WRITE set_blockSize RESET reset_blockSize STORED false)
+    Q_PROPERTY(int C READ get_C WRITE set_C RESET reset_C STORED false)
+
+    public:
+    enum Method { Mean = ADAPTIVE_THRESH_MEAN_C,
+                  Gaussian = ADAPTIVE_THRESH_GAUSSIAN_C };
+
+    enum Type { Binary = THRESH_BINARY,
+                Binary_Inv = THRESH_BINARY_INV };
+
+    BR_PROPERTY(int, maxValue, 255)
+    BR_PROPERTY(Method, method, Mean)
+    BR_PROPERTY(Type, type, Binary)
+    BR_PROPERTY(int, blockSize, 3)
+    BR_PROPERTY(int, C, 0)
+
+    void project(const Template &src, Template &dst) const
+    {
+        dst = src;
+
+        Mat mask;
+        adaptiveThreshold(src, mask, maxValue, ADAPTIVE_THRESH_GAUSSIAN_C, THRESH_BINARY, blockSize, C);
+
+        dst.file.set("Mask",QVariant::fromValue(mask));
+    }
+};
+
+BR_REGISTER(Transform, AdaptiveThresholdTransform)
+
+} // namespace br
+
+#include "imgproc/adaptivethreshold.moc"
+#include "opencv2/imgproc/imgproc.hpp"
+
+#include <openbr/plugins/openbr_internal.h>
+
+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 "imgproc/canny.moc"
@@ -17,7 +17,6 @@
 #include <numeric>
 #include <openbr/plugins/openbr_internal.h>
-#include <openbr/core/common.h>
 #include <openbr/core/opencvutils.h>
 #include <openbr/core/qtutils.h>
@@ -57,7 +56,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 ||
@@ -77,6 +76,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;
@@ -85,13 +85,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]++;
                     }
+#include <openbr/plugins/openbr_internal.h>
+
+using namespace cv;
+
+namespace br
+{
+
+/*!
+ * \ingroup transforms
+ * \brief Samples pixels from a mask.
+ * \author Scott Klum \cite sklum
+ */
+class SampleFromMaskTransform : public UntrainableTransform
+{
+    Q_OBJECT
+
+    void project(const Template &src, Template &dst) const
+    {
+        Mat mask = src.file.get<Mat>("Mask");
+        const int count = countNonZero(mask);
+        dst.m() = Mat(1,count,src.m().type());
+
+        Mat masked;
+        src.m().copyTo(masked, mask);
+
+        Mat indices;
+        findNonZero(masked,indices);
+
+        for (int j=0; j<indices.total(); j++)
+            dst.m().at<uchar>(0,j) = masked.at<uchar>(indices.at<Point>(j).y,indices.at<Point>(j).x);
+    }
+};
+
+BR_REGISTER(Transform, SampleFromMaskTransform)
+
+} // namespace br
+
+#include "imgproc/samplefrommask.moc"
@@ -37,7 +37,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);
+
     }
 };