diff --git a/openbr/core/opencvutils.cpp b/openbr/core/opencvutils.cpp index 630e512..5847d50 100644 --- a/openbr/core/opencvutils.cpp +++ b/openbr/core/opencvutils.cpp @@ -455,18 +455,24 @@ void OpenCVUtils::group(QList &rects, QList &confidences, float con for (size_t i = 0; i < labels.size(); i++) { int cls = labels[i]; - rrects[cls].x += rects[i].x; - rrects[cls].y += rects[i].y; - rrects[cls].width += rects[i].width; - rrects[cls].height += rects[i].height; - neighbors[cls]++; if (useMax) { if (confidences[i] > classConfidence[cls]) { classConfidence[cls] = confidences[i]; classMax[cls] = i; + rrects[cls].x = rects[i].x; + rrects[cls].y = rects[i].y; + rrects[cls].width = rects[i].width; + rrects[cls].height = rects[i].height; + neighbors[cls] = 0; } - } else + } else { classConfidence[cls] += confidences[i]; + rrects[cls].x += rects[i].x; + rrects[cls].y += rects[i].y; + rrects[cls].width += rects[i].width; + rrects[cls].height += rects[i].height; + neighbors[cls]++; + } } // Find average rectangle for all classes diff --git a/openbr/plugins/imgproc/pad.cpp b/openbr/plugins/imgproc/pad.cpp index 297efd5..4e72afd 100644 --- a/openbr/plugins/imgproc/pad.cpp +++ b/openbr/plugins/imgproc/pad.cpp @@ -15,7 +15,10 @@ namespace br class PadTransform : public UntrainableTransform { Q_OBJECT - Q_ENUMS(Method) + Q_ENUMS(Border) + Q_PROPERTY(Border border READ get_border WRITE set_border RESET reset_border STORED false) + Q_PROPERTY(float percent READ get_percent WRITE set_percent RESET reset_percent STORED false) + Q_PROPERTY(int value READ get_value WRITE set_value RESET reset_value STORED false) public: /*!< */ @@ -24,9 +27,6 @@ public: Constant = BORDER_CONSTANT}; private: - Q_PROPERTY(Border border READ get_border WRITE set_border RESET reset_border STORED false) - Q_PROPERTY(float percent READ get_percent WRITE set_percent RESET reset_percent STORED false) - Q_PROPERTY(int value READ get_value WRITE set_value RESET reset_value STORED false) BR_PROPERTY(Border, border, Replicate) BR_PROPERTY(float, percent, .1) BR_PROPERTY(float, value, 0)