Commit 5905bd193566324cd9f8458e62991efafbfc942a

Authored by Scott Klum
1 parent ceb1187c

Exposed minNeighbors in sliding window

openbr/plugins/imgproc/slidingwindow.cpp
@@ -48,6 +48,7 @@ class SlidingWindowTransform : public MetaTransform @@ -48,6 +48,7 @@ class SlidingWindowTransform : public MetaTransform
48 Q_PROPERTY(float scaleFactor READ get_scaleFactor WRITE set_scaleFactor RESET reset_scaleFactor STORED false) 48 Q_PROPERTY(float scaleFactor READ get_scaleFactor WRITE set_scaleFactor RESET reset_scaleFactor STORED false)
49 Q_PROPERTY(float confidenceThreshold READ get_confidenceThreshold WRITE set_confidenceThreshold RESET reset_confidenceThreshold STORED false) 49 Q_PROPERTY(float confidenceThreshold READ get_confidenceThreshold WRITE set_confidenceThreshold RESET reset_confidenceThreshold STORED false)
50 Q_PROPERTY(float eps READ get_eps WRITE set_eps RESET reset_eps STORED false) 50 Q_PROPERTY(float eps READ get_eps WRITE set_eps RESET reset_eps STORED false)
  51 + Q_PROPERTY(float minNeighbors READ get_minNeighbors WRITE set_minNeighbors RESET reset_minNeighbors STORED false)
51 52
52 BR_PROPERTY(br::Classifier*, classifier, NULL) 53 BR_PROPERTY(br::Classifier*, classifier, NULL)
53 BR_PROPERTY(int, minSize, 20) 54 BR_PROPERTY(int, minSize, 20)
@@ -55,6 +56,7 @@ class SlidingWindowTransform : public MetaTransform @@ -55,6 +56,7 @@ class SlidingWindowTransform : public MetaTransform
55 BR_PROPERTY(float, scaleFactor, 1.2) 56 BR_PROPERTY(float, scaleFactor, 1.2)
56 BR_PROPERTY(float, confidenceThreshold, 10) 57 BR_PROPERTY(float, confidenceThreshold, 10)
57 BR_PROPERTY(float, eps, 0.2) 58 BR_PROPERTY(float, eps, 0.2)
  59 + BR_PROPERTY(int, minNeighbors, 3)
58 60
59 void train(const TemplateList &data) 61 void train(const TemplateList &data)
60 { 62 {
@@ -147,7 +149,7 @@ class SlidingWindowTransform : public MetaTransform @@ -147,7 +149,7 @@ class SlidingWindowTransform : public MetaTransform
147 } 149 }
148 } 150 }
149 151
150 - OpenCVUtils::group(rects, confidences, confidenceThreshold, eps); 152 + OpenCVUtils::group(rects, confidences, confidenceThreshold, minNeighbors, eps);
151 153
152 if (!enrollAll && rects.empty()) { 154 if (!enrollAll && rects.empty()) {
153 rects.append(Rect(0, 0, m.cols, m.rows)); 155 rects.append(Rect(0, 0, m.cols, m.rows));