Merge branch 'master' into ConvertMatricesToMesh

Author: cbrightsci

src/Core/Algorithms/Base/AlgorithmBase.cc

@@ -136,8 +136,9 @@ double AlgorithmParameter::toDouble() const
 
 std::vector<double> AlgorithmParameter::toDoubleVector() const
 {
-  const std::vector<double>* v = boost::get<std::vector<double>>(&value_);
-  return v ? *v : std::vector<double>();
+  return {};
+//  const std::vector<double>* v = boost::get<std::vector<double>>(&value_);
+//  return v ? *v : std::vector<double>();
 }
 
 std::string AlgorithmParameter::toString() const

src/Core/Algorithms/Base/Variable.h

@@ -54,8 +54,8 @@ namespace Algorithms {
       std::string,
       bool,
       AlgoOption,
-      std::vector<double>,
       List
+      //,std::vector<double>
     > Value;
 
     Variable() {}

src/Core/Algorithms/Field/Tests/SetFieldDataAlgoTests.cc

@@ -270,7 +270,8 @@ TEST(SetFieldDataTest, TriSurfOnNodeScalarMatrixTooSmall)
   EXPECT_MATRIX_EQ_TOLERANCE(*resultmatrix, *matrix, 1e-16);
 }
 
-TEST(SetFieldDataTest, TriSurfOnNodeScalarMatrixTooLarge)
+//TODO: issue made, requirements need refining to see if this one is actually a problem.
+TEST(SetFieldDataTest, DISABLED_TriSurfOnNodeScalarMatrixTooLarge)
 {
   SetFieldDataAlgo algo;
 

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