Handling missing data in Flip and ReorderPoints

Scott Klum
1 parent e7549375
Showing 2 changed files with 15 additions and 9 deletions
openbr/plugins/register.cpp
openbr/plugins/template.cpp
@@ -146,12 +146,15 @@ private:
         QList<QPointF> flippedPoints;
         foreach(const QPointF &point, src.file.points()) {
-            if (axis == Y) {
-                flippedPoints.append(QPointF(src.m().cols-point.x(),point.y()));
-            } else if (axis == X) {
-                flippedPoints.append(QPointF(point.x(),src.m().rows-point.y()));
-            } else {
-                flippedPoints.append(QPointF(src.m().cols-point.x(),src.m().rows-point.y()));
+            // Check for missing data using the QPointF(-1,-1) convention
+            if (point != QPointF(-1,-1)) {
+                if (axis == Y) {
+                    flippedPoints.append(QPointF(src.m().cols-point.x(),point.y()));
+                } else if (axis == X) {
+                    flippedPoints.append(QPointF(point.x(),src.m().rows-point.y()));
+                } else {
+                    flippedPoints.append(QPointF(src.m().cols-point.x(),src.m().rows-point.y()));
+                }
             }
         }
@@ -229,9 +229,12 @@ class ReorderPointsTransform : public UntrainableMetadataTransform
     {
         if (from.size() == to.size()) {
             QList<QPointF> points = src.points();
-            for (int i=0; i<from.size(); i++)
-                std::swap(points[from[i]],points[to[i]]);
-            dst.setPoints(points);
+            if (!points.contains(QPointF(-1,-1))) {
+                for (int i=0; i<from.size(); i++) {
+                    std::swap(points[from[i]],points[to[i]]);
+                }
+                dst.setPoints(points);
+            }
         } else qFatal("Inconsistent sizes for to and from index lists.");
     }
 };