improved DrawTransform

Josh Klontz
1 parent 75bfbaec
Showing 3 changed files with 22 additions and 0 deletions
sdk/openbr_plugin.cpp
sdk/openbr_plugin.h
sdk/plugins/draw.cpp
@@ -227,6 +227,24 @@ QList&lt;QPointF&gt; File::landmarks() const
     return landmarks;
 }
+QList<QPointF> File::namedLandmarks() const
+{
+    QList<QPointF> landmarks;
+    QStringList keys = localMetadata().keys();
+    foreach (const QString &key, keys) {
+        if (!key.endsWith("_X"))
+            continue;
+        QString keyBaseName = key.left(key.size()-2);
+        if (!keys.contains(keyBaseName+"_Y") ||
+            keys.contains(keyBaseName+"_Width") ||
+            keys.contains(keyBaseName+"_Height") ||
+            keys.contains(keyBaseName+"_Radius"))
+            continue;
+        landmarks.append(QPointF(getFloat(keyBaseName+"_X"), getFloat(keyBaseName+"_Y")));
+    }
+    return landmarks;
+}
+
 void File::appendLandmark(const QPointF &landmark)
 {
     QList<QVariant> newLandmarks = m_metadata["Landmarks"].toList();
@@ -204,6 +204,7 @@ struct BR_EXPORT File
     QString getString(const QString &key, const QString &defaultValue) const; /*!< \brief Returns a string value for the key, returning \em defaultValue if the key does not exist. */
     QList<QPointF> landmarks() const; /*!< \brief Returns the file's landmark list. */
+    QList<QPointF> namedLandmarks() const; /*!< \brief Returns landmarks derived from metadata keys. */
     void appendLandmark(const QPointF &landmark); /*!< \brief Adds a landmark to the file's landmark list. */
     void appendLandmarks(const QList<QPointF> &landmarks); /*!< \brief Adds landmarks to the file's landmark list. */
     inline void clearLandmarks() { m_metadata["Landmarks"] = QList<QVariant>(); } /*!< \brief Clears the file's landmark list. */
@@ -44,6 +44,9 @@ class DrawTransform : public UntrainableTransform
         QList<Point2f> landmarks = OpenCVUtils::toPoints(src.file.landmarks());
         foreach (const Point2f &landmark, landmarks)
             circle(dst, landmark, 3, color, -1);
+        QList<Point2f> namedLandmarks = OpenCVUtils::toPoints(src.file.namedLandmarks());
+        foreach (const Point2f &landmark, namedLandmarks)
+            circle(dst, landmark, 3, color);
         QList<Rect> ROIs = OpenCVUtils::toRects(src.file.ROIs());
         foreach (const Rect ROI, ROIs)
             rectangle(dst, ROI, color);