Commit 5ebf2011b26e217f885b0df962315c74ba26b94e

Authored by Josh Klontz
1 parent 228020c4

improved support for finding thirdparty LoadStore transforms and distances

openbr/core/core.cpp
... ... @@ -786,11 +786,12 @@ QSharedPointer<br::Distance> br::Distance::fromAlgorithm(const QString &algorith
786 786 class pathInitializer : public Initializer
787 787 {
788 788 Q_OBJECT
  789 +
789 790 void initialize() const
790 791 {
791   - Globals->modelSearch.append(Globals->sdkPath + "/share/openbr/models/transforms/");
  792 + Globals->modelSearch.append(Globals->sdkPath + "/share/openbr/models/transforms");
  793 + Globals->modelSearch.append(Globals->sdkPath + "/../share/openbr/models/transforms");
792 794 }
793   -
794 795 };
795 796 BR_REGISTER(Initializer, pathInitializer)
796 797  
... ...
openbr/plugins/core/loadstore.cpp
... ... @@ -202,7 +202,8 @@ private:
202 202 QString getFileName() const
203 203 {
204 204 foreach (const QString &file, QStringList() << fileName
205   - << Globals->sdkPath + "/share/openbr/models/distances/" + fileName)
  205 + << Globals->sdkPath + "/share/openbr/models/distances/" + fileName
  206 + << Globals->sdkPath + "/../share/openbr/models/distances/" + fileName)
206 207 if (QFileInfo(file).exists())
207 208 return file;
208 209 return QString();
... ...