Merge branch 'master' of https://github.com/biometrics/openbr

Josh Klontz
2 parents d10363ee 686c452f
Showing 2 changed files with 13 additions and 2 deletions
openbr/openbr_plugin.cpp
openbr/plugins/metadata/checkpoints.cpp
@@ -111,7 +111,11 @@ QList&lt;File&gt; File::split(const QString &amp;separator) const
     QList<File> files;
     foreach (const QString &word, name.split(separator, QString::SkipEmptyParts)) {
         File file(word);
-        file.append(m_metadata);
+        // If file metadata is empty after this constructor, it means that this is the
+        // file corresponding to *this.m_metadata, so we append its metadata to get
+        // the correct functionality
+        if (file.m_metadata.isEmpty())
+            file.append(m_metadata);
         files.append(file);
     }
     return files;
@@ -764,7 +768,7 @@ QStringList Object::prunedArguments(bool expanded) const
         const char *name = metaObject()->property(i).name();
         QVariant defaultVal = shellObject->property(name);
-        
+
         if (defaultVal != property(name))
             arguments.append(name + QString("=") + argument(i, expanded));
     }
@@ -14,11 +14,18 @@ class CheckPointsTransform : public UntrainableMetadataTransform
     Q_OBJECT
     Q_PROPERTY(QList<int> indices READ get_indices WRITE set_indices RESET reset_indices STORED false)
+    Q_PROPERTY(int count READ get_count WRITE set_count RESET reset_count STORED false)
     BR_PROPERTY(QList<int>, indices, QList<int>())
+    BR_PROPERTY(int, count, 0)
     void projectMetadata(const File &src, File &dst) const
     {
         dst = src;
+
+        const QList<QPointF> points = src.points();
+        if (count && points.size() < count)
+            dst.fte = true;
+
         for (int i=0; i<indices.size(); i++)
             if (src.points()[indices[i]] == QPointF(-1,-1)) {
                 dst.fte = true;