Commit fe4bceeda1c2459df240c7850102f0f94172ef2a

Authored by Jordan Cheney
1 parent 8cddbeab

Remove model option from SlidingWindow

openbr/plugins/imgproc/slidingwindow.cpp
... ... @@ -40,21 +40,15 @@ class SlidingWindowTransform : public MetaTransform
40 40 Q_PROPERTY(int maxSize READ get_maxSize WRITE set_maxSize RESET reset_maxSize STORED false)
41 41 Q_PROPERTY(float scaleFactor READ get_scaleFactor WRITE set_scaleFactor RESET reset_scaleFactor STORED false)
42 42 Q_PROPERTY(int minNeighbors READ get_minNeighbors WRITE set_minNeighbors RESET reset_minNeighbors STORED false)
43   - Q_PROPERTY(float confidenceThreshold READ get_confidenceThreshold WRITE set_confidenceThreshold RESET reset_confidenceThreshold STORED false)
44 43 Q_PROPERTY(float eps READ get_eps WRITE set_eps RESET reset_eps STORED false)
45 44  
46   - Q_PROPERTY(QString model READ get_model WRITE set_model RESET reset_model STORED false)
47   -
48 45 BR_PROPERTY(br::Classifier *, classifier, NULL)
49 46 BR_PROPERTY(int, minSize, 20)
50 47 BR_PROPERTY(int, maxSize, -1)
51 48 BR_PROPERTY(float, scaleFactor, 1.2)
52 49 BR_PROPERTY(int, minNeighbors, 5)
53   - BR_PROPERTY(float, confidenceThreshold, 2)
54 50 BR_PROPERTY(float, eps, 0.2)
55 51  
56   - BR_PROPERTY(QString, model, "")
57   -
58 52 void train(const TemplateList &data)
59 53 {
60 54 classifier->train(data.data(), File::get<float>(data, "Label", -1));
... ... @@ -134,7 +128,7 @@ class SlidingWindowTransform : public MetaTransform
134 128 }
135 129 }
136 130  
137   - OpenCVUtils::group(rects, confidences, confidenceThreshold, eps);
  131 + OpenCVUtils::group(rects, confidences, eps);
138 132  
139 133 if (!enrollAll && rects.empty())
140 134 rects.push_back(Rect(0, 0, m.cols, m.rows));
... ...