moved algorithm around fixed linker errors and completed.

Author: cbrightsci

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

@@ -98,7 +98,6 @@ SET(Core_Algorithms_Legacy_Fields_HEADERS
   RegisterWithCorrespondences.h
   SampleField/GeneratePointSamplesFromField.h
   DistanceField/CalculateIsInsideField.h
-  CreateMesh/ConvertMatricesToMeshAlgo.h
 )
 
 SET(Core_Algorithms_Legacy_Fields_SRCS
@@ -120,7 +119,6 @@ SET(Core_Algorithms_Legacy_Fields_SRCS
   #CompareFields/CompareFields.cc
   #CompareFields/SimilarMeshes.cc
   #CreateMesh/CreateMeshFromNrrd.cc
-  CreateMesh/ConvertMatricesToMeshAlgo.h
 
   DistanceField/CalculateDistanceField.cc
   DistanceField/CalculateIsInsideField.cc

src/Core/Algorithms/Legacy/Fields/CreateMesh/ConvertMatricesToMeshAlgo.cc

@@ -33,6 +33,7 @@
 using namespace SCIRun::Gui;
 using namespace SCIRun::Dataflow::Networks;
 using namespace SCIRun::Core::Algorithms::Fields;
+using namespace SCIRun::Modules::Fields;
 
 ConvertMatricesToMeshDialog::ConvertMatricesToMeshDialog(const std::string& name, ModuleStateHandle state,
   QWidget* parent /* = 0 */)
@@ -42,8 +43,8 @@ ConvertMatricesToMeshDialog::ConvertMatricesToMeshDialog(const std::string& name
   setWindowTitle(QString::fromStdString(name));
   fixSize();
 
-  addDynamicLabelManager(nameTextLabel_, ConvertMatricesToMesh::InputFieldTypeName);
-  addDynamicLabelManager(typeNameTextLabel_, ConvertMatricesToMesh::InputFieldTypeTypeName);
-  addComboBoxManager(fieldBaseTypeComboBox_, ConvertMatricesToMesh::FieldBaseType);
-  addComboBoxManager(dataTypeComboBox_, ConvertMatricesToMesh::DataType);
+  addDynamicLabelManager(nameTextLabel_, Modules::Fields::ConvertMatricesToMesh::InputFieldTypeName);
+  addDynamicLabelManager(typeNameTextLabel_, Modules::Fields::ConvertMatricesToMesh::InputFieldTypeTypeName);
+  addComboBoxManager(fieldBaseTypeComboBox_, Modules::Fields::ConvertMatricesToMesh::FieldBaseType);
+  addComboBoxManager(dataTypeComboBox_, Modules::Fields::ConvertMatricesToMesh::DataType);
 }

src/Core/Algorithms/Legacy/Fields/CreateMesh/ConvertMatricesToMeshAlgo.h

@@ -7,9 +7,9 @@
     "header": "Modules/Legacy/Fields/ConvertMatricesToMesh.h"
   },
   "algorithm": {
-    "name": "ConvertMatricesToMeshAlgo",
-    "namespace": "Fields",
-    "header": "Core/Algorithms/Legacy/Fields/CreateMesh/ConvertMatricesToMeshAlgo.h"
+    "name": "N/A",
+    "namespace": "N/A",
+    "header": "N/A"
   },
   "UI": {
     "name": "ConvertMatricesToMeshDialog",