Peter M. Groen / openbr

Commit 501769abff810e9e2ff0449c8df9237852fc09f2

Authored by Scott Klum
2 parents 0f9a2740 bb0da9e4

Merge branch 'util_update'

Inline Side-by-side
Showing 2 changed files with 16 additions and 10 deletions
openbr/core/opencvutils.cpp
  View file @501769a
... ... @@ -455,18 +455,24 @@ void OpenCVUtils::group(QList<Rect> &rects, QList<float> &confidences, float con
455 455 for (size_t i = 0; i < labels.size(); i++)
456 456 {
457 457 int cls = labels[i];
458   - rrects[cls].x += rects[i].x;
459   - rrects[cls].y += rects[i].y;
460   - rrects[cls].width += rects[i].width;
461   - rrects[cls].height += rects[i].height;
462   - neighbors[cls]++;
463 458 if (useMax) {
464 459 if (confidences[i] > classConfidence[cls]) {
465 460 classConfidence[cls] = confidences[i];
466 461 classMax[cls] = i;
  462 + rrects[cls].x = rects[i].x;
  463 + rrects[cls].y = rects[i].y;
  464 + rrects[cls].width = rects[i].width;
  465 + rrects[cls].height = rects[i].height;
  466 + neighbors[cls] = 0;
467 467 }
468   - } else
  468 + } else {
469 469 classConfidence[cls] += confidences[i];
  470 + rrects[cls].x += rects[i].x;
  471 + rrects[cls].y += rects[i].y;
  472 + rrects[cls].width += rects[i].width;
  473 + rrects[cls].height += rects[i].height;
  474 + neighbors[cls]++;
  475 + }
470 476 }
471 477  
472 478 // Find average rectangle for all classes
... ...
openbr/plugins/imgproc/pad.cpp
  View file @501769a
... ... @@ -15,7 +15,10 @@ namespace br
15 15 class PadTransform : public UntrainableTransform
16 16 {
17 17 Q_OBJECT
18   - Q_ENUMS(Method)
  18 + Q_ENUMS(Border)
  19 + Q_PROPERTY(Border border READ get_border WRITE set_border RESET reset_border STORED false)
  20 + Q_PROPERTY(float percent READ get_percent WRITE set_percent RESET reset_percent STORED false)
  21 + Q_PROPERTY(int value READ get_value WRITE set_value RESET reset_value STORED false)
19 22  
20 23 public:
21 24 /*!< */
... ... @@ -24,9 +27,6 @@ public:
24 27 Constant = BORDER_CONSTANT};
25 28  
26 29 private:
27   - Q_PROPERTY(Border border READ get_border WRITE set_border RESET reset_border STORED false)
28   - Q_PROPERTY(float percent READ get_percent WRITE set_percent RESET reset_percent STORED false)
29   - Q_PROPERTY(int value READ get_value WRITE set_value RESET reset_value STORED false)
30 30 BR_PROPERTY(Border, border, Replicate)
31 31 BR_PROPERTY(float, percent, .1)
32 32 BR_PROPERTY(float, value, 0)
... ...