Merge branch 'SCIInstitute/master'

Author: allywarner

bin/.gitignore

@@ -1 +1 @@
-*
+*

src/CMakeLists.txt

@@ -424,7 +424,7 @@ CPM_AddModule("es_general"
 # ++ MODULE: Entity System Rendering.
 CPM_AddModule("es_render"
   GIT_REPOSITORY "https://github.com/CIBC-Internal/cpm-es-render"
-  GIT_TAG "origin/SCIRun"
+  GIT_TAG "origin/AddFBO"
   USE_EXISTING_VER TRUE)
 
 # ++ MODULE: Acorn
@@ -857,6 +857,7 @@ IF(BUILD_TESTING)
   IF(BUILD_WITH_PYTHON)
     SET_PROPERTY(TARGET Core_Python_Tests     PROPERTY FOLDER "Core/Tests")
     SET_PROPERTY(TARGET Engine_Python_Tests   PROPERTY FOLDER "Dataflow/Engine/Tests")
+	SET_PROPERTY(TARGET Modules_Python_Tests   PROPERTY FOLDER "Modules/Python")
   ENDIF()
 ENDIF()
 
@@ -868,6 +869,8 @@ SET_PROPERTY(TARGET xml2 PROPERTY FOLDER "Externals")
 IF(BUILD_WITH_PYTHON)
   SET_PROPERTY(TARGET Core_Python         PROPERTY FOLDER "Core")
   SET_PROPERTY(TARGET SCIRunPythonAPI PROPERTY FOLDER "Dataflow/Engine")
+  SET_PROPERTY(TARGET Modules_Python   PROPERTY FOLDER "Modules/Python")
+  SET_PROPERTY(TARGET Interface_Modules_Python   PROPERTY FOLDER "Interface/Modules")
 ENDIF()
 
 ########################################################################

src/Core/Algorithms/Base/AlgorithmBase.cc

@@ -134,6 +134,12 @@ double AlgorithmParameter::toDouble() const
   return v ? *v : toInt();
 }
 
+std::vector<double> AlgorithmParameter::toDoubleVector() const
+{
+  const std::vector<double>* v = boost::get<std::vector<double>>(&value_);
+  return v ? *v : std::vector<double>();
+}
+
 std::string AlgorithmParameter::toString() const
 {
   const std::string* v = boost::get<std::string>(&value_);

src/Core/Algorithms/Base/Variable.h

@@ -54,12 +54,14 @@ namespace Algorithms {
       std::string,
       bool,
       AlgoOption,
+      std::vector<double>,
       List
     > Value;
 
     Variable() {}
     Variable(const Name& name, const Value& value);
-    Variable(const Name& name, const Datatypes::DatatypeHandle& data) : name_(name), data_(data) {}
+    enum DatatypeVariableDummyEnum { DATATYPE_VARIABLE };
+    Variable(const Name& name, const Datatypes::DatatypeHandle& data, DatatypeVariableDummyEnum) : name_(name), data_(data) {}
     virtual ~Variable() {}
 
     const Name& name() const { return name_; }
@@ -72,6 +74,7 @@ namespace Algorithms {
     std::string toString() const;
     boost::filesystem::path toFilename() const;
     bool toBool() const;
+    std::vector<double> toDoubleVector() const;
     List toVector() const;
     AlgoOption toOption() const;
 

src/Core/Algorithms/Legacy/Converter/CMakeLists.txt

@@ -33,7 +33,7 @@ SET(Core_Algorithms_Legacy_Converter_SRCS
   #MatrixToField.cc
   NrrdToField.cc
   FieldToNrrd.cc
-  #ConvertToNrrd.cc
+  ConvertToNrrd.cc
   #MatricesToDipoleField.cc
   #ConvertBundleToField.cc
   ConvertMatrixToString.cc
@@ -43,7 +43,9 @@ SET(Core_Algorithms_Legacy_Converter_HEADERS
   ConverterAlgo.h
   NrrdToField.h
   FieldToNrrd.h
+  ConvertToNrrd.h
   ConvertMatrixToString.h
+  share.h
 )
 
 SCIRUN_ADD_LIBRARY(Core_Algorithms_Legacy_Converter

src/Core/Algorithms/Legacy/Converter/ConvertMatrixToString.h

@@ -38,16 +38,15 @@ namespace SCIRun {
 	namespace Core {
 		namespace Algorithms {
 				namespace Converters {
-			
+
 		class SCISHARE ConvertMatrixToStringAlgo : public AlgorithmBase
 		{
 			public:
-				static AlgorithmInputName InputMatrix;
 				static AlgorithmOutputName ResultString;
 				ConvertMatrixToStringAlgo() {}
 				bool run(Datatypes::MatrixHandle input, Datatypes::StringHandle& output) const;
 				virtual AlgorithmOutput run_generic(const AlgorithmInput& input) const;
 		};
 }}}}
 
-#endif
+#endif