Promote modelSearch to a member of br::Context

Charles Otto
1 parent 14afc4ea
Showing 3 changed files with 10 additions and 9 deletions
openbr/core/core.cpp
openbr/openbr_plugin.h
openbr/plugins/core/loadstore.cpp
@@ -142,11 +142,8 @@ struct AlgorithmCore
         // assuming it is not already present.
         QFileInfo finfo(model);
         QString path = finfo.absolutePath();
-        QList<QString> paths = Globals->file.getList("modelSearch",QList<QString>() );
-        if (!paths.contains(path)) {
-            paths.append(path);
-            Globals->file.setList("modelSearch", paths);
-        }
+        if (!Globals->modelSearch.contains(path))
+            Globals->modelSearch.append(path);
         QtUtils::BlockCompression compressedRead;
         QFile inFile(model);
@@ -777,9 +774,7 @@ class pathInitializer : public Initializer
     Q_OBJECT
     void initialize() const
     {
-        QList<QString> paths = Globals->file.getList("modelSearch",QList<QString>());
-        paths.append(Globals->sdkPath + "/share/openbr/models/transforms/");
-        Globals->file.setList("modelSearch", paths);
+        Globals->modelSearch.append(Globals->sdkPath + "/share/openbr/models/transforms/");
     }
 };
@@ -754,6 +754,12 @@ public:
     Q_PROPERTY(int crossValidate READ get_crossValidate WRITE set_crossValidate RESET reset_crossValidate)
     BR_PROPERTY(int, crossValidate, 0)
+    /*!
+     * \brief List of paths sub-models will be searched for on
+     */
+    Q_PROPERTY(QList<QString> modelSearch READ get_modelSearch WRITE set_modelSearch RESET reset_modelSearch)
+    BR_PROPERTY(QList<QString>, modelSearch, QList<QString>() )
+
     QHash<QString,QString> abbreviations; /*!< \brief Used by br::Transform::make() to expand abbreviated algorithms into their complete definitions. */
     QTime startTime; /*!< \brief Used to estimate timeRemaining(). */
@@ -130,7 +130,7 @@ private:
     {
         if (QFileInfo(fileName).exists()) return fileName;
-        foreach(const QString &path, Globals->file.getList("modelSearch",QList<QString>())) {
+        foreach(const QString &path, Globals->modelSearch) {
             const QString file = path + "/" + fileName;
             if (QFileInfo(file).exists())
                 return file;