Merge pull request #800 from SCIInstitute/renderer-work

Renderer work

Author: dcwhite

src/CMakeLists.txt

@@ -97,7 +97,7 @@ MESSAGE(STATUS "Git version commit hash: " "${VERSION_HASHVAR}")
 string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" VERSION_MAJOR "${VERSION_TAG}")
 string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" VERSION_MINOR "${VERSION_TAG}")
 #TODO: make generic 
-string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\-(alpha.[A-Z]+)\\-.*" "\\1" VERSION_PATCH "${VERSION_TAG}")
+string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\-(alpha.[A-Za-z]+)\\-.*" "\\1" VERSION_PATCH "${VERSION_TAG}")
 #TODO: parse SHA 
 #string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.[0-9]+(.*)" "\\1" VERSION_SHA1 "${VERSION}")
 #set(VERSION_SHORT "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")

src/Core/Algorithms/Base/AlgorithmBase.cc

@@ -84,9 +84,26 @@ void Variable::setValue(const Value& val)
     if (boost::get<std::string>(&val))
     {
       auto stringPath = toString();
-      if (SCIRun::Core::replaceSubstring(stringPath, AlgorithmParameterHelper::dataDir().string(), AlgorithmParameterHelper::dataDirPlaceholder()))
-        value_ = stringPath;
-      return;
+      {
+        // TODO #787
+        // loop through all paths in path list, checking if file in each dir; if one found replace and return
+        if (SCIRun::Core::replaceSubstring(stringPath, AlgorithmParameterHelper::dataDir().string(), AlgorithmParameterHelper::dataDirPlaceholder()))
+        {
+          value_ = stringPath;
+          return;
+        }
+
+        for (const auto& path : AlgorithmParameterHelper::dataPath())
+        {
+          if (SCIRun::Core::replaceSubstring(stringPath, path.string(), AlgorithmParameterHelper::dataDirPlaceholder()))
+          {
+            value_ = stringPath;
+            return;
+          }
+        }
+
+        return;
+      }
     }
   }
 
@@ -142,7 +159,18 @@ boost::filesystem::path AlgorithmParameter::toFilename() const
   {
     // TODO #787
     // loop through all paths in path list, checking if file exists each time. return first one that exists.
-    return AlgorithmParameterHelper::dataDir() / stringPath;
+    auto initialPath = AlgorithmParameterHelper::dataDir() / stringPath;
+    if (boost::filesystem::exists(initialPath))
+      return initialPath;
+
+    for (const auto& path : AlgorithmParameterHelper::dataPath())
+    {
+      auto nextPath = path / stringPath;
+      if (boost::filesystem::exists(nextPath))
+        return nextPath;
+    }
+    //nothing found, let module deal with it.
+    return initialPath;
   }
 
   boost::filesystem::path p(stringPath);
@@ -197,7 +225,18 @@ std::string AlgorithmParameterHelper::dataDirPlaceholder()
   return dataDirPlaceholder_;
 }
 
+void AlgorithmParameterHelper::setDataPath(const std::vector<boost::filesystem::path>& paths)
+{
+  paths_ = paths;
+}
+
+std::vector<boost::filesystem::path> AlgorithmParameterHelper::dataPath()
+{
+  return paths_;
+}
+
 boost::filesystem::path AlgorithmParameterHelper::dataDir_;
+std::vector<boost::filesystem::path> AlgorithmParameterHelper::paths_;
 std::string AlgorithmParameterHelper::dataDirPlaceholder_;
 Mutex AlgorithmParameterHelper::lock_("fsbug");
 

src/Core/Algorithms/Base/AlgorithmParameterHelper.h

@@ -46,10 +46,13 @@ namespace Algorithms {
     static boost::filesystem::path dataDir();
     static void setDataDirPlaceholder(const std::string& str);
     static std::string dataDirPlaceholder();
+    static std::vector<boost::filesystem::path> dataPath();
+    static void setDataPath(const std::vector<boost::filesystem::path>& paths);
     static Thread::Mutex lock_;
   private:
     static boost::filesystem::path dataDir_;
     static std::string dataDirPlaceholder_;
+    static std::vector<boost::filesystem::path> paths_;
   };
 
 }}}

src/Core/Application/Preferences/Preferences.cc

@@ -88,13 +88,15 @@ std::vector<boost::filesystem::path> Preferences::dataPath() const
 void Preferences::addToDataPath(const boost::filesystem::path& path)
 {
   dataPath_.push_back(path);
+  AlgorithmParameterHelper::setDataPath(dataPath_);
 }
 
 void Preferences::setDataPath(const std::string& dirs)
 {
   std::vector<std::string> paths;
   boost::split(paths, dirs, boost::is_any_of(";"));
   std::transform(paths.begin(), paths.end(), std::back_inserter(dataPath_), [](const std::string& p) { return boost::filesystem::path(p); });
+  AlgorithmParameterHelper::setDataPath(dataPath_);
 }
 
 

src/Core/Datatypes/Geometry.h

@@ -161,7 +161,8 @@ namespace Datatypes {
           renderType(renType),
 					vbo(vbo),
 					ibo(ibo),
-          mColorScheme(scheme)
+          mColorScheme(scheme),
+          scalar(1.0)
       {}
 
 			static const char* getName() { return "SpireSubPass"; }
@@ -180,6 +181,7 @@ namespace Datatypes {
       RenderType    renderType;
 			SpireVBO			vbo;
 			SpireIBO			ibo;
+      double        scalar;
 
       struct Uniform
       {