Permalink
Browse files

Add UUID to AbstractFilter API. Update API when getting a filter by C…

…lass Name or UUID. Update pipeline deserialization to use UUID be default and fall back to C++ class name.
  • Loading branch information...
imikejackson committed Jan 11, 2018
1 parent 8f12de9 commit b304d3b7a04dcb9972b8fd6902153a3ad7f235df
Showing with 92 additions and 92 deletions.
  1. +2 −2 Documentation/Tools/GenerateHTMLDocs.cpp
  2. +1 −1 Source/OrientationLib/Test/OrientationTransformsTest.cpp
  3. +7 −7 Source/Plugins/EMMPM/Test/EMMPMSegmentationTest.cpp
  4. +6 −6 Source/Plugins/IO/Test/DxIOTest.cpp
  5. +3 −3 Source/Plugins/IO/Test/EnsembleInfoReaderTest.cpp
  6. +2 −2 Source/Plugins/IO/Test/ExportDataTest.cpp
  7. +6 −6 Source/Plugins/IO/Test/PhIOTest.cpp
  8. +1 −1 Source/Plugins/IO/Test/VtkStruturedPointsReaderTest.cpp
  9. +1 −1 Source/Plugins/IO/Tools/PhToHDF5.cpp
  10. +2 −2 Source/Plugins/ImageIO/Test/WriteImagesTest.cpp
  11. +2 −2 Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadH5Ebsd.cpp
  12. +2 −2 Source/Plugins/OrientationAnalysis/Test/AngCachingTest.cpp
  13. +1 −1 Source/Plugins/OrientationAnalysis/Test/AngleFileIOTest.cpp
  14. +2 −2 Source/Plugins/OrientationAnalysis/Test/CreateLambertSphereTest.cpp
  15. +2 −2 Source/Plugins/OrientationAnalysis/Test/CtfCachingTest.cpp
  16. +1 −1 Source/Plugins/OrientationAnalysis/Test/GenerateFZQuaternionsTest.cpp
  17. +1 −1 Source/Plugins/OrientationAnalysis/Test/OrientationUtilityTest.cpp
  18. +1 −1 Source/Plugins/OrientationAnalysis/Test/Stereographic3DTest.cpp
  19. +2 −2 Source/Plugins/OrientationAnalysis/Test/WriteIPFStandardTriangleTest.cpp
  20. +1 −1 Source/Plugins/OrientationAnalysis/Widgets/QEbsdReferenceFrameDialog.cpp
  21. +2 −2 Source/Plugins/Reconstruction/Test/ComputeFeatureRectTest.cpp
  22. +2 −2 Source/Plugins/Sampling/Test/CropVolumeTest.cpp
  23. +1 −1 Source/Plugins/Sampling/Test/SampleSurfaceMeshSpecifiedPointsTest.cpp
  24. +2 −2 Source/Plugins/Statistics/Test/CalculateArrayHistogramTest.cpp
  25. +2 −2 Source/Plugins/Statistics/Test/ComputeMomentInvariants2DTest.cpp
  26. +2 −2 Source/Plugins/Statistics/Test/FindDifferenceMapTest.cpp
  27. +2 −2 Source/Plugins/Statistics/Test/FindEuclideanDistMapTest.cpp
  28. +4 −4 Source/Plugins/Statistics/Test/FindShapesTest.cpp
  29. +2 −2 Source/Plugins/Statistics/Test/FindSizesTest.cpp
  30. +1 −1 Source/Plugins/StatsGenerator/Test/GeneratePrimaryStatsDataTest.cpp
  31. +1 −1 Source/Plugins/StatsGenerator/Test/StatsGeneratorFilterTest.cpp
  32. +2 −2 Source/Plugins/SurfaceMeshing/Test/FindTriangleGeomCentroidsTest.cpp
  33. +2 −2 Source/Plugins/SurfaceMeshing/Test/FindTriangleGeomNeighborsTest.cpp
  34. +8 −8 Source/Plugins/SurfaceMeshing/Test/FindTriangleGeomShapesTest.cpp
  35. +2 −2 Source/Plugins/SurfaceMeshing/Test/FindTriangleGeomSizesTest.cpp
  36. +2 −2 Source/Plugins/SurfaceMeshing/Test/QuickSurfaceMeshTest.cpp
  37. +7 −7 Test/PreFlightTest.cpp
  38. +1 −1 Tools/ExamplePipelineCoverage.cpp
  39. +1 −1 Tools/FilterParameterTool.cpp
@@ -180,7 +180,7 @@ QString getNavIndex(const QFileInfo& fi, const QFileInfo& htmlFileInfo)
for(auto filter: filters)
{
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filter);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filter);
QString humanName = filterFactory->getFilterHumanLabel();
QString className = filterFactory->getFilterClassName();
@@ -806,7 +806,7 @@ void GenerateIndexFile2()
for(auto filter: filters)
{
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filter);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filter);
QString humanName = filterFactory->getFilterHumanLabel();
QString className = filterFactory->getFilterClassName();
@@ -105,7 +105,7 @@ class OrientationTransformsTest
{
// Now instantiate the PhWriter Filter from the FilterManager
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr == filterFactory.get())
{
std::stringstream ss;
@@ -87,7 +87,7 @@ class EMMPMSegmentationTest
// Now instantiate the EMMPM Filter from the FilterManager
QString filtName = "EMMPMFilter";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr == filterFactory.get())
{
std::stringstream ss;
@@ -100,7 +100,7 @@ class EMMPMSegmentationTest
// Now instantiate the MultiEmmpm Filter from the FilterManager
QString filtName = "MultiEmmpmFilter";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr == filterFactory.get())
{
std::stringstream ss;
@@ -114,7 +114,7 @@ class EMMPMSegmentationTest
m_ImageProcessingPluginLoaded = 1; // Assume it loaded.
QString filtName = m_ReadImageFilterName;
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr == filterFactory.get())
{
std::stringstream ss;
@@ -134,7 +134,7 @@ class EMMPMSegmentationTest
{
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(m_ReadImageFilterName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(m_ReadImageFilterName);
if(nullptr != filterFactory.get())
{
@@ -165,7 +165,7 @@ class EMMPMSegmentationTest
{
QString filtName = "ItkRGBToGray";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr != filterFactory.get())
{
@@ -206,7 +206,7 @@ class EMMPMSegmentationTest
{
QString filtName = "EMMPMFilter";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr != filterFactory.get())
{
@@ -241,7 +241,7 @@ class EMMPMSegmentationTest
{
QString filtName = "MultiEmmpmFilter";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr != filterFactory.get())
{
@@ -96,7 +96,7 @@ class DxIOTest
// Now instantiate the DxWriter Filter from the FilterManager
QString filtName = "DxWriter";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr == filterFactory.get())
{
std::stringstream ss;
@@ -105,7 +105,7 @@ class DxIOTest
}
filtName = "DxReader";
filterFactory = fm->getFactoryForFilter(filtName);
filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr == filterFactory.get())
{
std::stringstream ss;
@@ -140,7 +140,7 @@ class DxIOTest
// Now instantiate the DxWriter Filter from the FilterManager
QString filtName = "DxWriter";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr != filterFactory.get())
{
// If we get this far, the Factory is good so creating the filter should not fail unless something has
@@ -191,7 +191,7 @@ class DxIOTest
// Now instantiate the DxWriter Filter from the FilterManager
QString filtName = "DxWriter";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr != filterFactory.get())
{
// If we get this far, the Factory is good so creating the filter should not fail unless something has
@@ -236,7 +236,7 @@ class DxIOTest
AbstractFilter::Pointer dxReader = AbstractFilter::NullPointer();
QString filtName = "DxReader";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr != filterFactory.get())
{
// If we get this far, the Factory is good so creating the filter should not fail unless something has gone horribly wrong in which case the system is going to come down quickly after this.
@@ -308,7 +308,7 @@ class DxIOTest
AbstractFilter::Pointer dxReader = AbstractFilter::NullPointer();
QString filtName = "DxReader";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
// Reading first file
{
@@ -85,7 +85,7 @@ class EnsembleInfoReaderTest
// Now instantiate the EnsembleInfoReader Filter from the FilterManager
QString filtName = "EnsembleInfoReader";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr == filterFactory.get())
{
std::stringstream ss;
@@ -131,7 +131,7 @@ class EnsembleInfoReaderTest
// Now instantiate the EnsembleInfoReader Filter from the FilterManager
QString filtName = "EnsembleInfoReader";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr != filterFactory.get())
{
// If we get this far, the Factory is good so creating the filter should not fail unless something has
@@ -199,7 +199,7 @@ class EnsembleInfoReaderTest
// Now instantiate the EnsembleInfoReader Filter from the FilterManager
QString filtName = "EnsembleInfoReader";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr != filterFactory.get())
{
// If we get this far, the Factory is good so creating the filter should not fail unless something has
@@ -91,7 +91,7 @@ class ExportDataTest
// Now instantiate the WriteASCIIData Filter from the FilterManager
QString filtName = "WriteASCIIData";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr == filterFactory.get())
{
std::stringstream ss;
@@ -180,7 +180,7 @@ class ExportDataTest
// Now instantiate the EnsembleInfoReader Filter from the FilterManager
QString filtName = "WriteASCIIData";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr != filterFactory.get())
{
// If we get this far, the Factory is good so creating the filter should not fail unless something has
@@ -96,7 +96,7 @@ class PhIOTest
// Now instantiate the PhWriter Filter from the FilterManager
QString filtName = "PhWriter";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr == filterFactory.get())
{
std::stringstream ss;
@@ -105,7 +105,7 @@ class PhIOTest
}
filtName = "PhReader";
filterFactory = fm->getFactoryForFilter(filtName);
filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr == filterFactory.get())
{
std::stringstream ss;
@@ -140,7 +140,7 @@ class PhIOTest
// Now instantiate the phWriter Filter from the FilterManager
QString filtName = "PhWriter";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr != filterFactory.get())
{
// If we get this far, the Factory is good so creating the filter should not fail unless something has
@@ -190,7 +190,7 @@ class PhIOTest
// Now instantiate the phWriter Filter from the FilterManager
QString filtName = "PhWriter";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr != filterFactory.get())
{
// If we get this far, the Factory is good so creating the filter should not fail unless something has
@@ -235,7 +235,7 @@ class PhIOTest
AbstractFilter::Pointer phReader = AbstractFilter::NullPointer();
QString filtName = "PhReader";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr != filterFactory.get())
{
// If we get this far, the Factory is good so creating the filter should not fail unless something has gone horribly wrong in which case the system is going to come down quickly after this.
@@ -307,7 +307,7 @@ class PhIOTest
AbstractFilter::Pointer phReader = AbstractFilter::NullPointer();
QString filtName = "PhReader";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
// Reading first file
{
@@ -230,7 +230,7 @@ class VtkStruturedPointsReaderTest
// Now instantiate the PhWriter Filter from the FilterManager
QString filtName = "VtkStructuredPointsReader";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr != filterFactory.get())
{
// If we get this far, the Factory is good so creating the filter should not fail unless something has
@@ -91,7 +91,7 @@ int ReadPHFile(QString FileName, QVector<int>& data, int& nx, int& ny, int& nz)
dca->pushBack(m);
FilterManager::Pointer fm = FilterManager::Instance();
AbstractFilter::Pointer reader = fm->getFactoryForFilter("PhReader")->create();
AbstractFilter::Pointer reader = fm->getFactoryFromClassName("PhReader")->create();
reader->setDataContainerArray(dca);
bool propWasSet = reader->setProperty("InputFile", FileName);
if(propWasSet == false)
@@ -95,7 +95,7 @@ class WriteImagesTest
// Now instantiate the SaveImages Filter from the FilterManager
QString filtName = WRITE_IMAGES_FILTER_NAME;
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr == filterFactory.get())
{
std::stringstream ss;
@@ -252,7 +252,7 @@ class WriteImagesTest
// Now instantiate the SaveImages Filter from the FilterManager
QString filtName = WRITE_IMAGES_FILTER_NAME;
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr != filterFactory.get())
{
// If we get this far, the Factory is good so creating the filter should not fail unless something has
@@ -594,7 +594,7 @@ void ReadH5Ebsd::execute()
sampleAxis.z = m_SampleTransformation.l;
QString filtName = "RotateSampleRefFrame";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer rotSampleFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer rotSampleFactory = fm->getFactoryFromClassName(filtName);
if(nullptr != rotSampleFactory.get())
{
// If we get this far, the Factory is good so creating the filter should not fail unless something has
@@ -672,7 +672,7 @@ void ReadH5Ebsd::execute()
QString filtName = "RotateEulerRefFrame";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer rotEulerFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer rotEulerFactory = fm->getFactoryFromClassName(filtName);
if(nullptr != rotEulerFactory.get())
{
// If we get this far, the Factory is good so creating the filter should not fail unless something has
@@ -104,7 +104,7 @@ class AngCachingTest
// Now instantiate the ReadAngData Filter from the FilterManager
QString filtName = "ReadAngData";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr == filterFactory.get())
{
std::stringstream ss;
@@ -122,7 +122,7 @@ class AngCachingTest
AbstractFilter::Pointer angReader = AbstractFilter::NullPointer();
QString filtName = "ReadAngData";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
Ang_Private_Data originalData;
// Reading first file
@@ -117,7 +117,7 @@ class AngleFileIOTest
AbstractFilter::Pointer filter = AbstractFilter::NullPointer();
QString filtName = "WriteStatsGenOdfAngleFile";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
DREAM3D_REQUIRE_VALID_POINTER(filterFactory.get())
@@ -50,7 +50,7 @@ class CreateLambertSphereTest
// Now instantiate the CreateLambertSphereTest Filter from the FilterManager
QString filtName = m_FiltName;
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr == filterFactory.get())
{
std::stringstream ss;
@@ -68,7 +68,7 @@ class CreateLambertSphereTest
AbstractFilter::Pointer filter = AbstractFilter::NullPointer();
QString filtName = m_FiltName;
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
DREAM3D_REQUIRE_VALID_POINTER(filterFactory.get());
@@ -105,7 +105,7 @@ class CtfCachingTest
// Now instantiate the ReadCtfData Filter from the FilterManager
QString filtName = "ReadCtfData";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr == filterFactory.get())
{
std::stringstream ss;
@@ -123,7 +123,7 @@ class CtfCachingTest
AbstractFilter::Pointer ctfReader = AbstractFilter::NullPointer();
QString filtName = "ReadCtfData";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
// Reading first file
{
@@ -48,7 +48,7 @@ class GenerateFZQuaternionsTest
// Now instantiate the GenerateFZQuaternionsTest Filter from the FilterManager
QString filtName = "GenerateFZQuaternions";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr == filterFactory.get())
{
std::stringstream ss;
@@ -79,7 +79,7 @@ class OrientationUtilityTest
// Now instantiate the OrientationUtility Filter from the FilterManager
QString filtName = "OrientationUtility";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr == filterFactory.get())
{
std::stringstream ss;
@@ -48,7 +48,7 @@ class Stereographic3DTest
// Now instantiate the Stereographic3DTest Filter from the FilterManager
QString filtName = "Stereographic3D";
FilterManager* fm = FilterManager::Instance();
IFilterFactory::Pointer filterFactory = fm->getFactoryForFilter(filtName);
IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
if(nullptr == filterFactory.get())
{
std::stringstream ss;
Oops, something went wrong.

0 comments on commit b304d3b

Please sign in to comment.