make it easier to read/write through Format interface

Josh Klontz
1 parent e3a2aca7
Showing 3 changed files with 18 additions and 1 deletions
openbr/openbr_plugin.cpp
openbr/openbr_plugin.h
openbr/plugins/format.cpp
@@ -1255,6 +1255,17 @@ void MatrixOutput::set(float value, int i, int j)
 BR_REGISTER(Output, MatrixOutput)
+/* Format - public methods */
+Template Format::read(const QString &file)
+{
+    return QScopedPointer<Format>(Factory<Format>::make(file))->read();
+}
+
+void Format::write(const QString &file, const Template &t)
+{
+    QScopedPointer<Format>(Factory<Format>::make(file))->write(t);
+}
+
 /* Gallery - public methods */
 TemplateList Gallery::read()
 {
@@ -1080,6 +1080,8 @@ public:
     virtual ~Format() {}
     virtual Template read() const = 0; /*!< \brief Returns a br::Template created by reading #br::Object::file. */
     virtual void write(const Template &t) const = 0; /*!< \brief Writes the br::Template to #br::Object::file. */
+    static Template read(const QString &file);
+    static void write(const QString &file, const Template &t);
 };
 /*!
@@ -293,7 +293,11 @@ class mtxFormat : public Format
     Template read() const
     {
-        return BEE::readMatrix(file);
+        QString target, query;
+        Template result = BEE::readMatrix(file, &target, &query);
+        result.file.set("Target", target);
+        result.file.set("Query", query);
+        return result;
     }
     void write(const Template &t) const