Preliminary support for supplying additional arguments to algorithms

Allow users to supply additional arguments to abbreviations or pre-trained algorithms (e.g. FaceRecogntion(a=b) is now possible). Arguments supplied must be key/value pairs, not positional. Any listed additional properties will be assigned to the first matching transform using a pre-order traversal of the algorithm tree.

Preliminary support for supplying additional arguments to algorithms
Allow users to supply additional arguments to abbreviations or pre-trained algorithms (e.g. FaceRecogntion(a=b) is now possible). Arguments supplied must be key/value pairs, not positional. Any listed additional properties will be assigned to the first matching transform using a pre-order traversal of the algorithm tree.
Charles Otto
1 parent f04a4fa4
Showing 3 changed files with 37 additions and 1 deletions
openbr/core/core.cpp
openbr/openbr_plugin.cpp
openbr/plugins/openbr_internal.h
@@ -542,10 +542,25 @@ private:
             return;
         }
  
+        File parsed("."+description);
+        const QString parsedFname = getFileName(parsed.suffix());
+        QFileInfo pFile(parsedFname);
+        if (pFile.exists()) {
+            load(parsedFname);
+            applyAdditionalProperties(parsed, transform.data());
+            return;
+        }
+
         // Expand abbreviated algorithms to their full strings
         if (Globals->abbreviations.contains(description))
             return init(Globals->abbreviations[description]);
  
+        if (Globals->abbreviations.contains(parsed.suffix())) {
+            init(Globals->abbreviations[parsed.suffix()]);
+            applyAdditionalProperties(parsed, transform.data());
+            return;
+        }
+
         const bool compareTransform = description.contains('!');
         QStringList words = QtUtils::parse(description, compareTransform ? '!' : ':');
  
@@ -38,6 +38,7 @@
 #include "core/common.h"
 #include "core/opencvutils.h"
 #include "core/qtutils.h"
+#include "openbr/plugins/openbr_internal.h"
  
 using namespace br;
 using namespace cv;
@@ -721,7 +722,6 @@ bool Object::setPropertyRecursive(const QString &amp;name, QVariant value)
 {
     if (this->metaObject()->indexOfProperty(qPrintable(name)) == -1)
         return false;
-
     setProperty(name, value);
     init();
     return true;
@@ -1235,6 +1235,13 @@ Transform *Transform::make(QString str, QObject *parent)
     if (Globals->abbreviations.contains(str))
         return make(Globals->abbreviations[str], parent);
  
+    File parsed("."+str);
+    if (Globals->abbreviations.contains(parsed.suffix())) {
+        Transform * res = make(Globals->abbreviations[parsed.suffix()], parent);
+        applyAdditionalProperties(parsed, res);
+        return res;
+    }
+
     //! [Make a pipe]
     { // Check for use of '+' as shorthand for Pipe(...)
         QStringList words = parse(str, '+');
@@ -1435,3 +1442,14 @@ void Distance::compareBlock(const TemplateList &amp;target, const TemplateList &amp;quer
             if (target[j].isEmpty() || query[i].isEmpty()) output->setRelative(-std::numeric_limits<float>::max(),i+queryOffset, j+targetOffset);
             else output->setRelative(compare(target[j], query[i]), i+queryOffset, j+targetOffset);
 }
+
+void br::applyAdditionalProperties(File & temp, Transform * target)
+{
+    QVariantMap meta = temp.localMetadata();
+    for (QVariantMap::iterator i = meta.begin(); i != meta.end(); ++i) {
+        if (i.key().startsWith("_Arg"))
+            continue;
+
+        target->setPropertyRecursive(i.key(), i.value() );
+    }
+}
@@ -385,6 +385,9 @@ public:
     qint64 position() { return f.pos(); }
 };
  
+
+void applyAdditionalProperties(File & temp, Transform * target);
+
 }
  
 #endif // OPENBR_INTERNAL_H