From 1cf164ecd0d5a626d86b5615a7aa1eb57b6424d7 Mon Sep 17 00:00:00 2001 From: Scott Klum Date: Wed, 15 Oct 2014 09:39:01 -0400 Subject: [PATCH] Removed bools from AnonymizeLandmarks --- openbr/plugins/landmarks.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/openbr/plugins/landmarks.cpp b/openbr/plugins/landmarks.cpp index 01acf3e..a76dc57 100644 --- a/openbr/plugins/landmarks.cpp +++ b/openbr/plugins/landmarks.cpp @@ -416,8 +416,6 @@ BR_REGISTER(Transform, NameLandmarksTransform) class AnonymizeLandmarksTransform : public UntrainableMetadataTransform { Q_OBJECT - Q_PROPERTY(bool point READ get_point WRITE set_point RESET reset_point STORED false) - BR_PROPERTY(bool, point, true) Q_PROPERTY(QStringList names READ get_names WRITE set_names RESET reset_names STORED false) BR_PROPERTY(QStringList, names, QStringList()) @@ -425,12 +423,17 @@ class AnonymizeLandmarksTransform : public UntrainableMetadataTransform { dst = src; - if (point) { - foreach (const QString &name, names) - if (src.contains(name)) dst.appendPoint(src.get(name)); - } else { - foreach (const QString &name, names) - if (src.contains(name)) dst.appendRect(src.get(name)); + foreach (const QString &name, names) { + if (src.contains(name)) { + QVariant variant = src.value(name); + if (variant.canConvert(QMetaType::QPointF)) { + dst.appendPoint(variant.toPointF()); + } else if (variant.canConvert(QMetaType::QRectF)) { + dst.appendRect(variant.toRectF()); + } else { + qFatal("Cannot convert landmark to point or rect."); + } + } } } }; -- libgit2 0.21.4