Merge branch 'master' into gui_K

Author: dcwhite

src/Core/Algorithms/Factory/AlgorithmFactoryAdditions.cc

@@ -28,14 +28,17 @@
 
 #include <Core/Algorithms/Factory/HardCodedAlgorithmFactory.h>
 #include <Core/Algorithms/Legacy/FiniteElements/BuildMatrix/BuildTDCSMatrix.h>
+#include <Core/Algorithms/Legacy/Fields/MeshDerivatives/SplitByConnectedRegion.h>
 #include <boost/functional/factory.hpp>
 
 using namespace SCIRun::Core::Algorithms;
 using namespace SCIRun::Core::Algorithms::FiniteElements;
+using namespace SCIRun::Core::Algorithms::Fields;
 
 #define ADD_MODULE_ALGORITHM(module, algorithm) factoryMap_[#module] = boost::factory<algorithm*>()
 
 void HardCodedAlgorithmFactory::addToMakerMap2()
 {
   ADD_MODULE_ALGORITHM(BuildTDCSMatrix, BuildTDCSMatrixAlgo);
-}
+  ADD_MODULE_ALGORITHM(SplitFieldByConnectedRegion, SplitFieldByConnectedRegionAlgo);
+}

src/Core/Algorithms/Field/Tests/CMakeLists.txt

@@ -45,6 +45,7 @@ SET(Algorithms_Field_Tests_SRCS
   SetFieldDataAlgoTests.cc
   LoadFieldsForAlgoCoreTests.cc
   LoadFieldsForAlgoCoreTests.h
+  SplitByConnectedRegionTests.cc
 )
 
 SCIRUN_ADD_UNIT_TEST(Algorithms_Field_Tests

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

@@ -233,4 +233,13 @@
    return loadFieldFromFile(TestResources::rootDir() / "_etfielddata/pts.fld");
   } 
 
+  FieldHandle SplitFieldByConnectedRegionModuleTetTests()
+  {
+    return loadFieldFromFile(TestResources::rootDir() / "splitfieldbyconnectedregion/splitfieldbyconnectedregion_tet.fld");
+  }
+  
+  FieldHandle SplitFieldByConnectedRegionModuleTriTests()
+  {
+    return loadFieldFromFile(TestResources::rootDir() / "splitfieldbyconnectedregion/splitfieldbyconnectedregion_tri.fld");
+  }
 

src/Core/Algorithms/Field/Tests/LoadFieldsForAlgoCoreTests.h

@@ -78,5 +78,7 @@ FieldHandle TetMeshOnElemScalar();
 FieldHandle PointCloudOnNodeScalar();
 FieldHandle PointCloudOnNodeVector();
 FieldHandle PointCloudOnNodeTensor();
+FieldHandle SplitFieldByConnectedRegionModuleTetTests();
+FieldHandle SplitFieldByConnectedRegionModuleTriTests();
 
-#endif
+#endif