Merge branch 'SCIInstitute/master'

Author: allywarner

README.md

@@ -67,6 +67,9 @@ For documentation, please see: http://sciinstitute.github.io/SCIRun/
 * Parallel make builds can be used as long the Boost target is built first, for example:
   - make -j4 Boost_external && make -j4
 
+### Tagging releases
+On an OSX system, run script `release.sh` in the `src` directory with the release name in format `alpha.XX` as a parameter.
+
 ### Questions and Answers
 For help, email the testing mailing list at [email protected].
 

src/CMakeLists.txt

@@ -106,6 +106,11 @@ git_describe(VERSION_TAG --tag)
 git_describe(VERSION_BRANCH --all)
 get_git_head_revision(VERSION_REFSPEC VERSION_HASHVAR)
 
+IF(VERSION_TAG MATCHES "HEAD-HASH-NOTFOUND")
+  FILE(READ ${CMAKE_CURRENT_SOURCE_DIR}/LATEST_TAG.txt VERSION_TAG)
+  MESSAGE(STATUS "Found tag file for version info: " "${VERSION_TAG}")
+ENDIF()
+
 MESSAGE(STATUS "Git version tag: " "${VERSION_TAG}")
 MESSAGE(STATUS "Git version branch: " "${VERSION_BRANCH}")
 MESSAGE(STATUS "Git version commit hash: " "${VERSION_HASHVAR}")

src/Core/Algorithms/Base/AlgorithmBase.cc

@@ -458,6 +458,11 @@ std::vector<std::string> Core::Algorithms::toStringVector(const Variable::List&
   return toTypedVector<std::string>(list, [](const Variable& v) { return v.toString(); });
 }
 
+std::vector<std::string> Core::Algorithms::toNameVector(const Variable::List& list)
+{
+  return toTypedVector<std::string>(list, [](const Variable& v) { return v.name().name(); });
+}
+
 std::vector<double> Core::Algorithms::toDoubleVector(const Variable::List& list)
 {
   return toTypedVector<double>(list, [](const Variable& v) { return v.toDouble(); });

src/Core/Algorithms/Base/Variable.h

@@ -134,6 +134,7 @@ namespace Algorithms {
   }
 
   SCISHARE std::vector<std::string> toStringVector(const Variable::List& list);
+  SCISHARE std::vector<std::string> toNameVector(const Variable::List& list);
   SCISHARE std::vector<double> toDoubleVector(const Variable::List& list);
 
   typedef Variable AlgorithmParameter;