Commit 1cf164ecd0d5a626d86b5615a7aa1eb57b6424d7
1 parent
0a40c8d9
Removed bools from AnonymizeLandmarks
Showing
1 changed file
with
11 additions
and
8 deletions
openbr/plugins/landmarks.cpp
| @@ -416,8 +416,6 @@ BR_REGISTER(Transform, NameLandmarksTransform) | @@ -416,8 +416,6 @@ BR_REGISTER(Transform, NameLandmarksTransform) | ||
| 416 | class AnonymizeLandmarksTransform : public UntrainableMetadataTransform | 416 | class AnonymizeLandmarksTransform : public UntrainableMetadataTransform |
| 417 | { | 417 | { |
| 418 | Q_OBJECT | 418 | Q_OBJECT |
| 419 | - Q_PROPERTY(bool point READ get_point WRITE set_point RESET reset_point STORED false) | ||
| 420 | - BR_PROPERTY(bool, point, true) | ||
| 421 | Q_PROPERTY(QStringList names READ get_names WRITE set_names RESET reset_names STORED false) | 419 | Q_PROPERTY(QStringList names READ get_names WRITE set_names RESET reset_names STORED false) |
| 422 | BR_PROPERTY(QStringList, names, QStringList()) | 420 | BR_PROPERTY(QStringList, names, QStringList()) |
| 423 | 421 | ||
| @@ -425,12 +423,17 @@ class AnonymizeLandmarksTransform : public UntrainableMetadataTransform | @@ -425,12 +423,17 @@ class AnonymizeLandmarksTransform : public UntrainableMetadataTransform | ||
| 425 | { | 423 | { |
| 426 | dst = src; | 424 | dst = src; |
| 427 | 425 | ||
| 428 | - if (point) { | ||
| 429 | - foreach (const QString &name, names) | ||
| 430 | - if (src.contains(name)) dst.appendPoint(src.get<QPointF>(name)); | ||
| 431 | - } else { | ||
| 432 | - foreach (const QString &name, names) | ||
| 433 | - if (src.contains(name)) dst.appendRect(src.get<QRectF>(name)); | 426 | + foreach (const QString &name, names) { |
| 427 | + if (src.contains(name)) { | ||
| 428 | + QVariant variant = src.value(name); | ||
| 429 | + if (variant.canConvert(QMetaType::QPointF)) { | ||
| 430 | + dst.appendPoint(variant.toPointF()); | ||
| 431 | + } else if (variant.canConvert(QMetaType::QRectF)) { | ||
| 432 | + dst.appendRect(variant.toRectF()); | ||
| 433 | + } else { | ||
| 434 | + qFatal("Cannot convert landmark to point or rect."); | ||
| 435 | + } | ||
| 436 | + } | ||
| 434 | } | 437 | } |
| 435 | } | 438 | } |
| 436 | }; | 439 | }; |