Peter M. Groen / openbr

Commit 419d7858f38b9fe4bf23f8cc1114aea7a4042f96

Authored by Scott Klum
1 parent 07212516

Minor sliding window tweaks

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
openbr/plugins/imgproc/slidingwindow.cpp
  View file @419d785
@@ -72,7 +72,7 @@ class SlidingWindowTransform : public MetaTransform @@ -72,7 +72,7 @@ class SlidingWindowTransform : public MetaTransform
72 BR_PROPERTY(bool, clone, true) 72 BR_PROPERTY(bool, clone, true)
73 BR_PROPERTY(float, minConfidence, 0) 73 BR_PROPERTY(float, minConfidence, 0)
74 BR_PROPERTY(bool, ROCMode, false) 74 BR_PROPERTY(bool, ROCMode, false)
75 - BR_PROPERTY(QString, outputVariable, "FrontalFace") 75 + BR_PROPERTY(QString, outputVariable, "Face")
76 76
77 void train(const TemplateList &data) 77 void train(const TemplateList &data)
78 { 78 {
@@ -173,7 +173,7 @@ class SlidingWindowTransform : public MetaTransform @@ -173,7 +173,7 @@ class SlidingWindowTransform : public MetaTransform
173 if (group) 173 if (group)
174 OpenCVUtils::group(rects, confidences, minGroupingConfidence, minNeighbors, eps); 174 OpenCVUtils::group(rects, confidences, minGroupingConfidence, minNeighbors, eps);
175 175
176 - if (findMostConfident && !rects.isEmpty()) { 176 + if (!ROCMode && findMostConfident && !rects.isEmpty()) {
177 Rect rect = rects.first(); 177 Rect rect = rects.first();
178 float maxConfidence = confidences.first(); 178 float maxConfidence = confidences.first();
179 for (int i=0; i<rects.size(); i++) 179 for (int i=0; i<rects.size(); i++)