Fixed Delaunay bug

Scott Klum
1 parent f0170475
Showing 2 changed files with 14 additions and 13 deletions
openbr/plugins/landmarks.cpp
openbr/plugins/regions.cpp
@@ -230,6 +230,9 @@ class DelaunayTransform : public UntrainableTransform
  
             QList<Point2f> mappedPoints;
  
+            dst.file = src.file;
+            qDebug() << dst.file.name;
+
             for (int i = 0; i < validTriangles.size(); i++) {
                 Eigen::MatrixXf srcMat(validTriangles[i].size(), 2);
  
@@ -272,8 +275,8 @@ class DelaunayTransform : public UntrainableTransform
                     bitwise_and(dst.m(),mask,overlap);
                     for (int j = 0; j < overlap.rows; j++) {
                         for (int k = 0; k < overlap.cols; k++) {
-                            if (overlap.at<uchar>(k,j) != 0) {
-                                mask.at<uchar>(k,j) = 0;
+                            if (overlap.at<uchar>(j,k) != 0) {
+                                mask.at<uchar>(j,k) = 0;
                             }
                         }
                     }
@@ -281,11 +284,13 @@ class DelaunayTransform : public UntrainableTransform
  
                 bitwise_and(buffer,mask,output);
  
+
                 dst.m() += output;
             }
  
-            Rect boundingBox = boundingRect(mappedPoints.toVector().toStdVector());
-            dst.file.appendRect(OpenCVUtils::fromRect(boundingBox));
+            // Overwrite any rects
+            //Rect boundingBox = boundingRect(mappedPoints.toVector().toStdVector());
+            //dst.file.setRects(QList<QRectF>() << OpenCVUtils::fromRect(boundingBox));
         }
     }
  
@@ -252,16 +252,12 @@ class CropRectTransform : public UntrainableTransform
     void project(const Template &src, Template &dst) const
     {
         dst = src;
-        QList<QRectF> rects = dst.file.rects();
+        QList<QRectF> rects = src.file.rects();
         for (int i=0;i < rects.size(); i++) {
-            QRectF rect = rects[i];
-
-            rect.setX(rect.x() + rect.width() * QtUtils::toPoint(widthCrop).x());
-            rect.setY(rect.y() + rect.height() * QtUtils::toPoint(heightCrop).x());
-            rect.setWidth(rect.width() * (1-QtUtils::toPoint(widthCrop).y()));
-            rect.setHeight(rect.height() * (1-QtUtils::toPoint(heightCrop).y()));
-
-            dst.m() = Mat(dst.m(), OpenCVUtils::toRect(rect));
+            rects[i].setX(rects[i].x() + rects[i].width() * QtUtils::toPoint(widthCrop).x());
+            rects[i].setY(rects[i].y() + rects[i].height() * QtUtils::toPoint(heightCrop).x());
+            rects[i].setWidth(rects[i].width() * (1-QtUtils::toPoint(widthCrop).y()));
+            rects[i].setHeight(rects[i].height() * (1-QtUtils::toPoint(heightCrop).y()));
         }
         dst.file.setRects(rects);
     }