From e473b3f03164672cf61894f0f78167a4568e9d39 Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Mon, 9 Aug 2021 09:17:33 -0400 Subject: [PATCH] Rename StatisticsPlugins to StatsToolbox. (#979) This will fix a name collision when generating the python wrapping Signed-off-by: Michael Jackson --- Source/Plugins/Plugins.cmake | 2 +- .../Statistics/Gui/StatisticsGuiPlugin.h | 25 ------- .../CorrelateFieldStatistics.h | 4 -- .../CMakeLists.txt | 4 +- .../DistributionAnalysisOps/BetaOps.cpp | 0 .../DistributionAnalysisOps/BetaOps.h | 0 .../DistributionAnalysisOps.cpp | 0 .../DistributionAnalysisOps.h | 0 .../DistributionAnalysisOps/LogNormalOps.cpp | 0 .../DistributionAnalysisOps/LogNormalOps.h | 0 .../DistributionAnalysisOps/PowerLawOps.cpp | 0 .../DistributionAnalysisOps/PowerLawOps.h | 0 .../DistributionAnalysisOps/SourceList.cmake | 18 ++--- .../CalculateArrayHistogram.md | 0 .../ComputeMomentInvariants2D.md | 0 .../CorrelateValuesWithVectorDirection.md | 0 .../FindAvgScalarValueForFeatures.md | 0 .../FindBoundaryElementFractions.md | 0 .../StatsToolboxFilters}/FindDifferenceMap.md | 0 .../FindEllipsoidError.md | 0 .../FindEuclideanDistMap.md | 0 .../FindFeatureClustering.md | 0 .../FindFeatureHistogram.md | 0 .../FindLargestCrossSections.md | 0 .../StatsToolboxFilters}/FindNeighborhoods.md | 0 .../StatsToolboxFilters}/FindNeighbors.md | 0 .../StatsToolboxFilters}/FindNumFeatures.md | 0 .../StatsToolboxFilters}/FindRadialDist.md | 0 .../StatsToolboxFilters}/FindSaltykovSizes.md | 0 .../StatsToolboxFilters}/FindShapes.md | 0 .../StatsToolboxFilters}/FindSizes.md | 0 .../FindSlicetoSliceRotations.md | 0 .../FindSurfaceAreaToVolume.md | 0 .../StatsToolboxFilters}/FindVolFractions.md | 0 .../FitCorrelatedFeatureData.md | 0 .../StatsToolboxFilters}/FitFeatureData.md | 0 .../GenerateEnsembleStatistics.md | 0 .../Images/ComputeMomentInvariants2D.png | Bin .../Images/ComputeMomentInvariantsFig1.png | Bin .../Images/ComputeMomentInvariants_Fig1.png | Bin .../Images/HistogramExample.png | Bin .../Images/Sphericity_Equation.png | Bin .../StatsToolboxFilters}/QuiltCellData.md | 0 .../Gui/CMakeLists.txt | 0 .../FilterParameterWidgets/SourceList.cmake | 0 .../Gui/StatsToolboxGuiPlugin.cpp} | 8 +-- .../StatsToolbox/Gui/StatsToolboxGuiPlugin.h | 25 +++++++ .../Gui/Widgets/SourceList.cmake | 0 .../Resources/SourceList.cmake | 0 .../Resources/StatsToolbox.qrc} | 2 +- .../StatsToolbox/StatsToolboxDescription.txt} | 4 +- .../StatsToolboxConstants.h} | 10 +-- .../CalculateArrayHistogram.cpp | 8 +-- .../CalculateArrayHistogram.h | 4 +- .../ComputeMomentInvariants2D.cpp | 10 +-- .../ComputeMomentInvariants2D.h | 4 +- .../CorrelateFieldStatistics.cpp | 0 .../CorrelateFieldStatistics.h | 4 ++ .../CorrelateValuesWithVectorDirection.cpp | 4 +- .../CorrelateValuesWithVectorDirection.h | 8 +-- .../FindAvgScalarValueForFeatures.cpp | 8 +-- .../FindAvgScalarValueForFeatures.h | 4 +- .../FindBoundaryElementFractions.cpp | 8 +-- .../FindBoundaryElementFractions.h | 4 +- .../FindDifferenceMap.cpp | 8 +-- .../StatsToolboxFilters}/FindDifferenceMap.h | 4 +- .../FindEllipsoidError.cpp | 4 +- .../StatsToolboxFilters}/FindEllipsoidError.h | 8 +-- .../FindEuclideanDistMap.cpp | 8 +-- .../FindEuclideanDistMap.h | 4 +- .../FindFeatureClustering.cpp | 8 +-- .../FindFeatureClustering.h | 4 +- .../FindFeatureHistogram.cpp | 10 +-- .../FindFeatureHistogram.h | 8 +-- .../FindLargestCrossSections.cpp | 8 +-- .../FindLargestCrossSections.h | 4 +- .../FindNeighborhoods.cpp | 8 +-- .../StatsToolboxFilters}/FindNeighborhoods.h | 4 +- .../StatsToolboxFilters}/FindNeighbors.cpp | 8 +-- .../StatsToolboxFilters}/FindNeighbors.h | 4 +- .../StatsToolboxFilters}/FindNumFeatures.cpp | 8 +-- .../StatsToolboxFilters}/FindNumFeatures.h | 4 +- .../FindSaltykovSizes.cpp | 8 +-- .../StatsToolboxFilters}/FindSaltykovSizes.h | 4 +- .../StatsToolboxFilters}/FindShapes.cpp | 8 +-- .../StatsToolboxFilters}/FindShapes.h | 4 +- .../StatsToolboxFilters}/FindSizes.cpp | 8 +-- .../StatsToolboxFilters}/FindSizes.h | 4 +- .../FindSurfaceAreaToVolume.cpp | 8 +-- .../FindSurfaceAreaToVolume.h | 4 +- .../StatsToolboxFilters}/FindVolFractions.cpp | 8 +-- .../StatsToolboxFilters}/FindVolFractions.h | 4 +- .../FitCorrelatedFeatureData.cpp | 10 +-- .../FitCorrelatedFeatureData.h | 10 +-- .../StatsToolboxFilters}/FitFeatureData.cpp | 14 ++-- .../StatsToolboxFilters}/FitFeatureData.h | 4 +- .../GenerateEnsembleStatistics.cpp | 14 ++-- .../GenerateEnsembleStatistics.h | 6 +- .../StatsToolboxFilters}/QuiltCellData.cpp | 4 +- .../StatsToolboxFilters}/QuiltCellData.h | 8 +-- .../StatsToolboxFilters}/SourceList.cmake | 10 +-- .../util/MomentInvariants2D.cpp | 0 .../util/MomentInvariants2D.h | 0 .../StatsToolboxPlugin.cpp} | 66 +++++++++--------- .../StatsToolboxPlugin.h} | 20 +++--- .../Test/CMakeLists.txt | 0 .../Test/CalculateArrayHistogramTest.cpp | 2 +- .../Test/ComputeMomentInvariants2DTest.cpp | 4 +- .../Test/FindDifferenceMapTest.cpp | 2 +- .../Test/FindEuclideanDistMapTest.cpp | 2 +- .../Test/FindShapesTest.cpp | 2 +- .../Test/FindSizesTest.cpp | 2 +- .../Test/TestFileLocations.h.in | 0 .../Test/TestFiles/ReadMe.md | 0 114 files changed, 261 insertions(+), 261 deletions(-) delete mode 100644 Source/Plugins/Statistics/Gui/StatisticsGuiPlugin.h delete mode 100644 Source/Plugins/Statistics/StatisticsFilters/CorrelateFieldStatistics.h rename Source/Plugins/{Statistics => StatsToolbox}/CMakeLists.txt (98%) rename Source/Plugins/{Statistics => StatsToolbox}/DistributionAnalysisOps/BetaOps.cpp (100%) rename Source/Plugins/{Statistics => StatsToolbox}/DistributionAnalysisOps/BetaOps.h (100%) rename Source/Plugins/{Statistics => StatsToolbox}/DistributionAnalysisOps/DistributionAnalysisOps.cpp (100%) rename Source/Plugins/{Statistics => StatsToolbox}/DistributionAnalysisOps/DistributionAnalysisOps.h (100%) rename Source/Plugins/{Statistics => StatsToolbox}/DistributionAnalysisOps/LogNormalOps.cpp (100%) rename Source/Plugins/{Statistics => StatsToolbox}/DistributionAnalysisOps/LogNormalOps.h (100%) rename Source/Plugins/{Statistics => StatsToolbox}/DistributionAnalysisOps/PowerLawOps.cpp (100%) rename Source/Plugins/{Statistics => StatsToolbox}/DistributionAnalysisOps/PowerLawOps.h (100%) rename Source/Plugins/{Statistics => StatsToolbox}/DistributionAnalysisOps/SourceList.cmake (78%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/CalculateArrayHistogram.md (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/ComputeMomentInvariants2D.md (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/CorrelateValuesWithVectorDirection.md (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/FindAvgScalarValueForFeatures.md (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/FindBoundaryElementFractions.md (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/FindDifferenceMap.md (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/FindEllipsoidError.md (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/FindEuclideanDistMap.md (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/FindFeatureClustering.md (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/FindFeatureHistogram.md (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/FindLargestCrossSections.md (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/FindNeighborhoods.md (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/FindNeighbors.md (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/FindNumFeatures.md (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/FindRadialDist.md (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/FindSaltykovSizes.md (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/FindShapes.md (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/FindSizes.md (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/FindSlicetoSliceRotations.md (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/FindSurfaceAreaToVolume.md (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/FindVolFractions.md (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/FitCorrelatedFeatureData.md (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/FitFeatureData.md (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/GenerateEnsembleStatistics.md (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/Images/ComputeMomentInvariants2D.png (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/Images/ComputeMomentInvariantsFig1.png (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/Images/ComputeMomentInvariants_Fig1.png (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/Images/HistogramExample.png (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/Images/Sphericity_Equation.png (100%) rename Source/Plugins/{Statistics/Documentation/StatisticsFilters => StatsToolbox/Documentation/StatsToolboxFilters}/QuiltCellData.md (100%) rename Source/Plugins/{Statistics => StatsToolbox}/Gui/CMakeLists.txt (100%) rename Source/Plugins/{Statistics => StatsToolbox}/Gui/FilterParameterWidgets/SourceList.cmake (100%) rename Source/Plugins/{Statistics/Gui/StatisticsGuiPlugin.cpp => StatsToolbox/Gui/StatsToolboxGuiPlugin.cpp} (57%) create mode 100644 Source/Plugins/StatsToolbox/Gui/StatsToolboxGuiPlugin.h rename Source/Plugins/{Statistics => StatsToolbox}/Gui/Widgets/SourceList.cmake (100%) rename Source/Plugins/{Statistics => StatsToolbox}/Resources/SourceList.cmake (100%) rename Source/Plugins/{Statistics/Resources/Statistics.qrc => StatsToolbox/Resources/StatsToolbox.qrc} (56%) rename Source/Plugins/{Statistics/Resources/Statistics/StatisticsDescription.txt => StatsToolbox/Resources/StatsToolbox/StatsToolboxDescription.txt} (85%) rename Source/Plugins/{Statistics/StatisticsConstants.h => StatsToolbox/StatsToolboxConstants.h} (51%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/CalculateArrayHistogram.cpp (98%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/CalculateArrayHistogram.h (98%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/ComputeMomentInvariants2D.cpp (97%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/ComputeMomentInvariants2D.h (98%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/CorrelateFieldStatistics.cpp (100%) create mode 100644 Source/Plugins/StatsToolbox/StatsToolboxFilters/CorrelateFieldStatistics.h rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/CorrelateValuesWithVectorDirection.cpp (99%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/CorrelateValuesWithVectorDirection.h (97%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindAvgScalarValueForFeatures.cpp (97%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindAvgScalarValueForFeatures.h (98%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindBoundaryElementFractions.cpp (97%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindBoundaryElementFractions.h (98%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindDifferenceMap.cpp (98%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindDifferenceMap.h (97%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindEllipsoidError.cpp (99%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindEllipsoidError.h (98%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindEuclideanDistMap.cpp (99%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindEuclideanDistMap.h (99%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindFeatureClustering.cpp (98%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindFeatureClustering.h (99%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindFeatureHistogram.cpp (97%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindFeatureHistogram.h (97%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindLargestCrossSections.cpp (98%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindLargestCrossSections.h (98%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindNeighborhoods.cpp (98%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindNeighborhoods.h (98%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindNeighbors.cpp (98%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindNeighbors.h (99%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindNumFeatures.cpp (97%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindNumFeatures.h (98%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindSaltykovSizes.cpp (98%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindSaltykovSizes.h (98%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindShapes.cpp (99%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindShapes.h (99%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindSizes.cpp (98%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindSizes.h (98%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindSurfaceAreaToVolume.cpp (98%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindSurfaceAreaToVolume.h (98%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindVolFractions.cpp (97%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FindVolFractions.h (98%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FitCorrelatedFeatureData.cpp (98%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FitCorrelatedFeatureData.h (97%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FitFeatureData.cpp (97%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/FitFeatureData.h (98%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/GenerateEnsembleStatistics.cpp (99%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/GenerateEnsembleStatistics.h (99%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/QuiltCellData.cpp (99%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/QuiltCellData.h (97%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/SourceList.cmake (86%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/util/MomentInvariants2D.cpp (100%) rename Source/Plugins/{Statistics/StatisticsFilters => StatsToolbox/StatsToolboxFilters}/util/MomentInvariants2D.h (100%) rename Source/Plugins/{Statistics/StatisticsPlugin.cpp => StatsToolbox/StatsToolboxPlugin.cpp} (80%) rename Source/Plugins/{Statistics/StatisticsPlugin.h => StatsToolbox/StatsToolboxPlugin.h} (87%) rename Source/Plugins/{Statistics => StatsToolbox}/Test/CMakeLists.txt (100%) rename Source/Plugins/{Statistics => StatsToolbox}/Test/CalculateArrayHistogramTest.cpp (99%) rename Source/Plugins/{Statistics => StatsToolbox}/Test/ComputeMomentInvariants2DTest.cpp (99%) rename Source/Plugins/{Statistics => StatsToolbox}/Test/FindDifferenceMapTest.cpp (99%) rename Source/Plugins/{Statistics => StatsToolbox}/Test/FindEuclideanDistMapTest.cpp (99%) rename Source/Plugins/{Statistics => StatsToolbox}/Test/FindShapesTest.cpp (99%) rename Source/Plugins/{Statistics => StatsToolbox}/Test/FindSizesTest.cpp (99%) rename Source/Plugins/{Statistics => StatsToolbox}/Test/TestFileLocations.h.in (100%) rename Source/Plugins/{Statistics => StatsToolbox}/Test/TestFiles/ReadMe.md (100%) diff --git a/Source/Plugins/Plugins.cmake b/Source/Plugins/Plugins.cmake index 113cd0173c..5b5b2ea6ed 100644 --- a/Source/Plugins/Plugins.cmake +++ b/Source/Plugins/Plugins.cmake @@ -128,7 +128,7 @@ set(DREAM3D_BASE_PLUGINS Processing Reconstruction Sampling - Statistics + StatsToolbox SurfaceMeshing SyntheticBuilding ) diff --git a/Source/Plugins/Statistics/Gui/StatisticsGuiPlugin.h b/Source/Plugins/Statistics/Gui/StatisticsGuiPlugin.h deleted file mode 100644 index ae2599dc15..0000000000 --- a/Source/Plugins/Statistics/Gui/StatisticsGuiPlugin.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "Statistics/StatisticsPlugin.h" - -class StatisticsGuiPlugin : public StatisticsPlugin -{ - Q_OBJECT - Q_INTERFACES(ISIMPLibPlugin) - Q_PLUGIN_METADATA(IID "net.bluequartz.dream3d.StatisticsGuiPlugin") - -public: - StatisticsGuiPlugin(); - ~StatisticsGuiPlugin() override; - - /** - * @brief Register all the filters with the FilterWidgetFactory - */ - void registerFilterWidgets(FilterWidgetManager* fwm) override; - -public: - StatisticsGuiPlugin(const StatisticsGuiPlugin&) = delete; // Copy Constructor Not Implemented - StatisticsGuiPlugin(StatisticsGuiPlugin&&) = delete; // Move Constructor Not Implemented - StatisticsGuiPlugin& operator=(const StatisticsGuiPlugin&) = delete; // Copy Assignment Not Implemented - StatisticsGuiPlugin& operator=(StatisticsGuiPlugin&&) = delete; // Move Assignment Not Implemented -}; diff --git a/Source/Plugins/Statistics/StatisticsFilters/CorrelateFieldStatistics.h b/Source/Plugins/Statistics/StatisticsFilters/CorrelateFieldStatistics.h deleted file mode 100644 index b261d0cce6..0000000000 --- a/Source/Plugins/Statistics/StatisticsFilters/CorrelateFieldStatistics.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsVersion.h" diff --git a/Source/Plugins/Statistics/CMakeLists.txt b/Source/Plugins/StatsToolbox/CMakeLists.txt similarity index 98% rename from Source/Plugins/Statistics/CMakeLists.txt rename to Source/Plugins/StatsToolbox/CMakeLists.txt index 15f3f974d4..15d32eff83 100644 --- a/Source/Plugins/Statistics/CMakeLists.txt +++ b/Source/Plugins/StatsToolbox/CMakeLists.txt @@ -2,12 +2,12 @@ #-- Your License or copyright can go here #--//////////////////////////////////////////////////////////////////////////// -set(PLUGIN_NAME Statistics) +set(PLUGIN_NAME StatsToolbox) set(${PLUGIN_NAME}_VERSION "1.0") set(${PLUGIN_NAME}_VERSION_MAJOR "1") set(${PLUGIN_NAME}_VERSION_MINOR "0") get_filename_component(${PLUGIN_NAME}_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}" ABSOLUTE) -set(Statistics_BINARY_DIR "${DREAM3DProj_BINARY_DIR}/Plugins/${PLUGIN_NAME}") +set(${PLUGIN_NAME}_BINARY_DIR "${DREAM3DProj_BINARY_DIR}/Plugins/${PLUGIN_NAME}") # -------------------------------------------------------------------- # Look for Qt 5 as we need it for the plugin GUI to be generated diff --git a/Source/Plugins/Statistics/DistributionAnalysisOps/BetaOps.cpp b/Source/Plugins/StatsToolbox/DistributionAnalysisOps/BetaOps.cpp similarity index 100% rename from Source/Plugins/Statistics/DistributionAnalysisOps/BetaOps.cpp rename to Source/Plugins/StatsToolbox/DistributionAnalysisOps/BetaOps.cpp diff --git a/Source/Plugins/Statistics/DistributionAnalysisOps/BetaOps.h b/Source/Plugins/StatsToolbox/DistributionAnalysisOps/BetaOps.h similarity index 100% rename from Source/Plugins/Statistics/DistributionAnalysisOps/BetaOps.h rename to Source/Plugins/StatsToolbox/DistributionAnalysisOps/BetaOps.h diff --git a/Source/Plugins/Statistics/DistributionAnalysisOps/DistributionAnalysisOps.cpp b/Source/Plugins/StatsToolbox/DistributionAnalysisOps/DistributionAnalysisOps.cpp similarity index 100% rename from Source/Plugins/Statistics/DistributionAnalysisOps/DistributionAnalysisOps.cpp rename to Source/Plugins/StatsToolbox/DistributionAnalysisOps/DistributionAnalysisOps.cpp diff --git a/Source/Plugins/Statistics/DistributionAnalysisOps/DistributionAnalysisOps.h b/Source/Plugins/StatsToolbox/DistributionAnalysisOps/DistributionAnalysisOps.h similarity index 100% rename from Source/Plugins/Statistics/DistributionAnalysisOps/DistributionAnalysisOps.h rename to Source/Plugins/StatsToolbox/DistributionAnalysisOps/DistributionAnalysisOps.h diff --git a/Source/Plugins/Statistics/DistributionAnalysisOps/LogNormalOps.cpp b/Source/Plugins/StatsToolbox/DistributionAnalysisOps/LogNormalOps.cpp similarity index 100% rename from Source/Plugins/Statistics/DistributionAnalysisOps/LogNormalOps.cpp rename to Source/Plugins/StatsToolbox/DistributionAnalysisOps/LogNormalOps.cpp diff --git a/Source/Plugins/Statistics/DistributionAnalysisOps/LogNormalOps.h b/Source/Plugins/StatsToolbox/DistributionAnalysisOps/LogNormalOps.h similarity index 100% rename from Source/Plugins/Statistics/DistributionAnalysisOps/LogNormalOps.h rename to Source/Plugins/StatsToolbox/DistributionAnalysisOps/LogNormalOps.h diff --git a/Source/Plugins/Statistics/DistributionAnalysisOps/PowerLawOps.cpp b/Source/Plugins/StatsToolbox/DistributionAnalysisOps/PowerLawOps.cpp similarity index 100% rename from Source/Plugins/Statistics/DistributionAnalysisOps/PowerLawOps.cpp rename to Source/Plugins/StatsToolbox/DistributionAnalysisOps/PowerLawOps.cpp diff --git a/Source/Plugins/Statistics/DistributionAnalysisOps/PowerLawOps.h b/Source/Plugins/StatsToolbox/DistributionAnalysisOps/PowerLawOps.h similarity index 100% rename from Source/Plugins/Statistics/DistributionAnalysisOps/PowerLawOps.h rename to Source/Plugins/StatsToolbox/DistributionAnalysisOps/PowerLawOps.h diff --git a/Source/Plugins/Statistics/DistributionAnalysisOps/SourceList.cmake b/Source/Plugins/StatsToolbox/DistributionAnalysisOps/SourceList.cmake similarity index 78% rename from Source/Plugins/Statistics/DistributionAnalysisOps/SourceList.cmake rename to Source/Plugins/StatsToolbox/DistributionAnalysisOps/SourceList.cmake index 1ffd358bbd..e44df5fbbe 100644 --- a/Source/Plugins/Statistics/DistributionAnalysisOps/SourceList.cmake +++ b/Source/Plugins/StatsToolbox/DistributionAnalysisOps/SourceList.cmake @@ -34,22 +34,22 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ set(DistributionAnalysisOps_HDRS - ${Statistics_SOURCE_DIR}/DistributionAnalysisOps/BetaOps.h - ${Statistics_SOURCE_DIR}/DistributionAnalysisOps/DistributionAnalysisOps.h - ${Statistics_SOURCE_DIR}/DistributionAnalysisOps/LogNormalOps.h - ${Statistics_SOURCE_DIR}/DistributionAnalysisOps/PowerLawOps.h + ${${PLUGIN_NAME}_SOURCE_DIR}/DistributionAnalysisOps/BetaOps.h + ${${PLUGIN_NAME}_SOURCE_DIR}/DistributionAnalysisOps/DistributionAnalysisOps.h + ${${PLUGIN_NAME}_SOURCE_DIR}/DistributionAnalysisOps/LogNormalOps.h + ${${PLUGIN_NAME}_SOURCE_DIR}/DistributionAnalysisOps/PowerLawOps.h ) set(DistributionAnalysisOps_SRCS - ${Statistics_SOURCE_DIR}/DistributionAnalysisOps/BetaOps.cpp - ${Statistics_SOURCE_DIR}/DistributionAnalysisOps/DistributionAnalysisOps.cpp - ${Statistics_SOURCE_DIR}/DistributionAnalysisOps/LogNormalOps.cpp - ${Statistics_SOURCE_DIR}/DistributionAnalysisOps/PowerLawOps.cpp + ${${PLUGIN_NAME}_SOURCE_DIR}/DistributionAnalysisOps/BetaOps.cpp + ${${PLUGIN_NAME}_SOURCE_DIR}/DistributionAnalysisOps/DistributionAnalysisOps.cpp + ${${PLUGIN_NAME}_SOURCE_DIR}/DistributionAnalysisOps/LogNormalOps.cpp + ${${PLUGIN_NAME}_SOURCE_DIR}/DistributionAnalysisOps/PowerLawOps.cpp ) cmp_IDE_SOURCE_PROPERTIES( "${PLUGIN_NAME}/DistributionAnalysisOps/" "${DistributionAnalysisOps_HDRS}" "${DistributionAnalysisOps_SRCS}" "0") if( ${PROJECT_INSTALL_HEADERS} EQUAL 1 ) INSTALL (FILES ${DREAM3DLib_DistributionAnalysisOps_HDRS} - DESTINATION include/Statistics/DistributionAnalysisOps + DESTINATION include/${PLUGIN_NAME}/DistributionAnalysisOps COMPONENT Headers ) endif() diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/CalculateArrayHistogram.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/CalculateArrayHistogram.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/CalculateArrayHistogram.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/CalculateArrayHistogram.md diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/ComputeMomentInvariants2D.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/ComputeMomentInvariants2D.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/ComputeMomentInvariants2D.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/ComputeMomentInvariants2D.md diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/CorrelateValuesWithVectorDirection.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/CorrelateValuesWithVectorDirection.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/CorrelateValuesWithVectorDirection.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/CorrelateValuesWithVectorDirection.md diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/FindAvgScalarValueForFeatures.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindAvgScalarValueForFeatures.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/FindAvgScalarValueForFeatures.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindAvgScalarValueForFeatures.md diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/FindBoundaryElementFractions.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindBoundaryElementFractions.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/FindBoundaryElementFractions.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindBoundaryElementFractions.md diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/FindDifferenceMap.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindDifferenceMap.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/FindDifferenceMap.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindDifferenceMap.md diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/FindEllipsoidError.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindEllipsoidError.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/FindEllipsoidError.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindEllipsoidError.md diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/FindEuclideanDistMap.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindEuclideanDistMap.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/FindEuclideanDistMap.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindEuclideanDistMap.md diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/FindFeatureClustering.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindFeatureClustering.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/FindFeatureClustering.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindFeatureClustering.md diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/FindFeatureHistogram.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindFeatureHistogram.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/FindFeatureHistogram.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindFeatureHistogram.md diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/FindLargestCrossSections.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindLargestCrossSections.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/FindLargestCrossSections.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindLargestCrossSections.md diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/FindNeighborhoods.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindNeighborhoods.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/FindNeighborhoods.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindNeighborhoods.md diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/FindNeighbors.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindNeighbors.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/FindNeighbors.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindNeighbors.md diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/FindNumFeatures.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindNumFeatures.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/FindNumFeatures.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindNumFeatures.md diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/FindRadialDist.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindRadialDist.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/FindRadialDist.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindRadialDist.md diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/FindSaltykovSizes.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindSaltykovSizes.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/FindSaltykovSizes.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindSaltykovSizes.md diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/FindShapes.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindShapes.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/FindShapes.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindShapes.md diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/FindSizes.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindSizes.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/FindSizes.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindSizes.md diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/FindSlicetoSliceRotations.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindSlicetoSliceRotations.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/FindSlicetoSliceRotations.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindSlicetoSliceRotations.md diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/FindSurfaceAreaToVolume.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindSurfaceAreaToVolume.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/FindSurfaceAreaToVolume.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindSurfaceAreaToVolume.md diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/FindVolFractions.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindVolFractions.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/FindVolFractions.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FindVolFractions.md diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/FitCorrelatedFeatureData.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FitCorrelatedFeatureData.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/FitCorrelatedFeatureData.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FitCorrelatedFeatureData.md diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/FitFeatureData.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FitFeatureData.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/FitFeatureData.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/FitFeatureData.md diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/GenerateEnsembleStatistics.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/GenerateEnsembleStatistics.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/GenerateEnsembleStatistics.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/GenerateEnsembleStatistics.md diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/Images/ComputeMomentInvariants2D.png b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/Images/ComputeMomentInvariants2D.png similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/Images/ComputeMomentInvariants2D.png rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/Images/ComputeMomentInvariants2D.png diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/Images/ComputeMomentInvariantsFig1.png b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/Images/ComputeMomentInvariantsFig1.png similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/Images/ComputeMomentInvariantsFig1.png rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/Images/ComputeMomentInvariantsFig1.png diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/Images/ComputeMomentInvariants_Fig1.png b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/Images/ComputeMomentInvariants_Fig1.png similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/Images/ComputeMomentInvariants_Fig1.png rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/Images/ComputeMomentInvariants_Fig1.png diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/Images/HistogramExample.png b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/Images/HistogramExample.png similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/Images/HistogramExample.png rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/Images/HistogramExample.png diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/Images/Sphericity_Equation.png b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/Images/Sphericity_Equation.png similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/Images/Sphericity_Equation.png rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/Images/Sphericity_Equation.png diff --git a/Source/Plugins/Statistics/Documentation/StatisticsFilters/QuiltCellData.md b/Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/QuiltCellData.md similarity index 100% rename from Source/Plugins/Statistics/Documentation/StatisticsFilters/QuiltCellData.md rename to Source/Plugins/StatsToolbox/Documentation/StatsToolboxFilters/QuiltCellData.md diff --git a/Source/Plugins/Statistics/Gui/CMakeLists.txt b/Source/Plugins/StatsToolbox/Gui/CMakeLists.txt similarity index 100% rename from Source/Plugins/Statistics/Gui/CMakeLists.txt rename to Source/Plugins/StatsToolbox/Gui/CMakeLists.txt diff --git a/Source/Plugins/Statistics/Gui/FilterParameterWidgets/SourceList.cmake b/Source/Plugins/StatsToolbox/Gui/FilterParameterWidgets/SourceList.cmake similarity index 100% rename from Source/Plugins/Statistics/Gui/FilterParameterWidgets/SourceList.cmake rename to Source/Plugins/StatsToolbox/Gui/FilterParameterWidgets/SourceList.cmake diff --git a/Source/Plugins/Statistics/Gui/StatisticsGuiPlugin.cpp b/Source/Plugins/StatsToolbox/Gui/StatsToolboxGuiPlugin.cpp similarity index 57% rename from Source/Plugins/Statistics/Gui/StatisticsGuiPlugin.cpp rename to Source/Plugins/StatsToolbox/Gui/StatsToolboxGuiPlugin.cpp index 124ba97c75..a91fb452a0 100644 --- a/Source/Plugins/Statistics/Gui/StatisticsGuiPlugin.cpp +++ b/Source/Plugins/StatsToolbox/Gui/StatsToolboxGuiPlugin.cpp @@ -1,15 +1,15 @@ -#include "StatisticsGuiPlugin.h" +#include "StatsToolboxGuiPlugin.h" // ----------------------------------------------------------------------------- // // ----------------------------------------------------------------------------- -StatisticsGuiPlugin::StatisticsGuiPlugin() = default; +StatsToolboxGuiPlugin::StatsToolboxGuiPlugin() = default; // ----------------------------------------------------------------------------- // // ----------------------------------------------------------------------------- -StatisticsGuiPlugin::~StatisticsGuiPlugin() = default; +StatsToolboxGuiPlugin::~StatsToolboxGuiPlugin() = default; -#include "Statistics/Gui/FilterParameterWidgets/RegisterKnownFilterParameterWidgets.cpp" +#include "StatsToolbox/Gui/FilterParameterWidgets/RegisterKnownFilterParameterWidgets.cpp" diff --git a/Source/Plugins/StatsToolbox/Gui/StatsToolboxGuiPlugin.h b/Source/Plugins/StatsToolbox/Gui/StatsToolboxGuiPlugin.h new file mode 100644 index 0000000000..c6c264bb73 --- /dev/null +++ b/Source/Plugins/StatsToolbox/Gui/StatsToolboxGuiPlugin.h @@ -0,0 +1,25 @@ +#pragma once + +#include "StatsToolbox/StatsToolboxPlugin.h" + +class StatsToolboxGuiPlugin : public StatsToolboxPlugin +{ + Q_OBJECT + Q_INTERFACES(ISIMPLibPlugin) + Q_PLUGIN_METADATA(IID "net.bluequartz.dream3d.StatsToolboxGuiPlugin") + +public: + StatsToolboxGuiPlugin(); + ~StatsToolboxGuiPlugin() override; + + /** + * @brief Register all the filters with the FilterWidgetFactory + */ + void registerFilterWidgets(FilterWidgetManager* fwm) override; + +public: + StatsToolboxGuiPlugin(const StatsToolboxGuiPlugin&) = delete; // Copy Constructor Not Implemented + StatsToolboxGuiPlugin(StatsToolboxGuiPlugin&&) = delete; // Move Constructor Not Implemented + StatsToolboxGuiPlugin& operator=(const StatsToolboxGuiPlugin&) = delete; // Copy Assignment Not Implemented + StatsToolboxGuiPlugin& operator=(StatsToolboxGuiPlugin&&) = delete; // Move Assignment Not Implemented +}; diff --git a/Source/Plugins/Statistics/Gui/Widgets/SourceList.cmake b/Source/Plugins/StatsToolbox/Gui/Widgets/SourceList.cmake similarity index 100% rename from Source/Plugins/Statistics/Gui/Widgets/SourceList.cmake rename to Source/Plugins/StatsToolbox/Gui/Widgets/SourceList.cmake diff --git a/Source/Plugins/Statistics/Resources/SourceList.cmake b/Source/Plugins/StatsToolbox/Resources/SourceList.cmake similarity index 100% rename from Source/Plugins/Statistics/Resources/SourceList.cmake rename to Source/Plugins/StatsToolbox/Resources/SourceList.cmake diff --git a/Source/Plugins/Statistics/Resources/Statistics.qrc b/Source/Plugins/StatsToolbox/Resources/StatsToolbox.qrc similarity index 56% rename from Source/Plugins/Statistics/Resources/Statistics.qrc rename to Source/Plugins/StatsToolbox/Resources/StatsToolbox.qrc index e13985f0b7..1fb14f6643 100644 --- a/Source/Plugins/Statistics/Resources/Statistics.qrc +++ b/Source/Plugins/StatsToolbox/Resources/StatsToolbox.qrc @@ -1,6 +1,6 @@ - Statistics/StatisticsDescription.txt + StatsToolbox/StatsToolboxDescription.txt diff --git a/Source/Plugins/Statistics/Resources/Statistics/StatisticsDescription.txt b/Source/Plugins/StatsToolbox/Resources/StatsToolbox/StatsToolboxDescription.txt similarity index 85% rename from Source/Plugins/Statistics/Resources/Statistics/StatisticsDescription.txt rename to Source/Plugins/StatsToolbox/Resources/StatsToolbox/StatsToolboxDescription.txt index af7f48bf30..c436ad1fc9 100644 --- a/Source/Plugins/Statistics/Resources/Statistics/StatisticsDescription.txt +++ b/Source/Plugins/StatsToolbox/Resources/StatsToolbox/StatsToolboxDescription.txt @@ -2,10 +2,10 @@ - Statistics Plugin + StatsToolbox Plugin -

Statistics Plugin

+

StatsToolbox Plugin

This plugin contains filters that implement various types of algorithms that can calculate statistics on a set of data such as averages, histograms, distance maps, neighborhoods, sizes, shapes.

diff --git a/Source/Plugins/Statistics/StatisticsConstants.h b/Source/Plugins/StatsToolbox/StatsToolboxConstants.h similarity index 51% rename from Source/Plugins/Statistics/StatisticsConstants.h rename to Source/Plugins/StatsToolbox/StatsToolboxConstants.h index 88f1c2546b..d937d6de0f 100644 --- a/Source/Plugins/Statistics/StatisticsConstants.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxConstants.h @@ -2,15 +2,15 @@ #include -namespace StatisticsConstants +namespace StatsToolboxConstants { -const QString StatisticsPluginFile("StatisticsPlugin"); -const QString StatisticsPluginDisplayName("Statistics"); -const QString StatisticsBaseName("Statistics"); +const QString StatsToolboxPluginFile("StatsToolboxPlugin"); +const QString StatsToolboxPluginDisplayName("StatsToolbox"); +const QString StatsToolboxBaseName("StatsToolbox"); namespace BlueQuartz { const QString VendorName("BlueQuartz Software, LLC"); const QString URL("http://www.bluequartz.net"); const QString Copyright("(C) 2018 BlueQuartz Software, LLC"); } // namespace BlueQuartz -} // namespace StatisticsConstants +} // namespace StatsToolboxConstants diff --git a/Source/Plugins/Statistics/StatisticsFilters/CalculateArrayHistogram.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/CalculateArrayHistogram.cpp similarity index 98% rename from Source/Plugins/Statistics/StatisticsFilters/CalculateArrayHistogram.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/CalculateArrayHistogram.cpp index e24c059e6e..1a1361931f 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/CalculateArrayHistogram.cpp +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/CalculateArrayHistogram.cpp @@ -50,8 +50,8 @@ #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h" #include "SIMPLib/FilterParameters/StringFilterParameter.h" -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsVersion.h" +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxVersion.h" enum createdPathID : RenameDataPath::DataID_t { @@ -326,7 +326,7 @@ AbstractFilter::Pointer CalculateArrayHistogram::newFilterInstance(bool copyFilt // ----------------------------------------------------------------------------- QString CalculateArrayHistogram::getCompiledLibraryName() const { - return StatisticsConstants::StatisticsBaseName; + return StatsToolboxConstants::StatsToolboxBaseName; } // ----------------------------------------------------------------------------- @@ -344,7 +344,7 @@ QString CalculateArrayHistogram::getFilterVersion() const { QString version; QTextStream vStream(&version); - vStream << Statistics::Version::Major() << "." << Statistics::Version::Minor() << "." << Statistics::Version::Patch(); + vStream << StatsToolbox::Version::Major() << "." << StatsToolbox::Version::Minor() << "." << StatsToolbox::Version::Patch(); return version; } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/Statistics/StatisticsFilters/CalculateArrayHistogram.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/CalculateArrayHistogram.h similarity index 98% rename from Source/Plugins/Statistics/StatisticsFilters/CalculateArrayHistogram.h rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/CalculateArrayHistogram.h index ddd91ae037..888892e076 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/CalculateArrayHistogram.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/CalculateArrayHistogram.h @@ -44,12 +44,12 @@ class IDataArray; using IDataArrayWkPtrType = std::weak_ptr; -#include "Statistics/StatisticsDLLExport.h" +#include "StatsToolbox/StatsToolboxDLLExport.h" /** * @brief The CalculateArrayHistogram class. See [Filter documentation](@ref calculatearrayhistogram) for details. */ -class Statistics_EXPORT CalculateArrayHistogram : public AbstractFilter +class StatsToolbox_EXPORT CalculateArrayHistogram : public AbstractFilter { Q_OBJECT diff --git a/Source/Plugins/Statistics/StatisticsFilters/ComputeMomentInvariants2D.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/ComputeMomentInvariants2D.cpp similarity index 97% rename from Source/Plugins/Statistics/StatisticsFilters/ComputeMomentInvariants2D.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/ComputeMomentInvariants2D.cpp index b46bacabac..0e993df8fb 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/ComputeMomentInvariants2D.cpp +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/ComputeMomentInvariants2D.cpp @@ -18,9 +18,9 @@ #include "SIMPLib/Geometry/ImageGeom.h" #include "SIMPLib/Math/SIMPLibMath.h" -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsFilters/util/MomentInvariants2D.h" -#include "Statistics/StatisticsVersion.h" +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxFilters/util/MomentInvariants2D.h" +#include "StatsToolbox/StatsToolboxVersion.h" /* Create Enumerations to allow the created Attribute Arrays to take part in renaming */ enum createdPathID : RenameDataPath::DataID_t @@ -294,7 +294,7 @@ AbstractFilter::Pointer ComputeMomentInvariants2D::newFilterInstance(bool copyFi // ----------------------------------------------------------------------------- QString ComputeMomentInvariants2D::getCompiledLibraryName() const { - return StatisticsConstants::StatisticsBaseName; + return StatsToolboxConstants::StatsToolboxBaseName; } // ----------------------------------------------------------------------------- @@ -312,7 +312,7 @@ QString ComputeMomentInvariants2D::getFilterVersion() const { QString version; QTextStream vStream(&version); - vStream << Statistics::Version::Major() << "." << Statistics::Version::Minor() << "." << Statistics::Version::Patch(); + vStream << StatsToolbox::Version::Major() << "." << StatsToolbox::Version::Minor() << "." << StatsToolbox::Version::Patch(); return version; } diff --git a/Source/Plugins/Statistics/StatisticsFilters/ComputeMomentInvariants2D.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/ComputeMomentInvariants2D.h similarity index 98% rename from Source/Plugins/Statistics/StatisticsFilters/ComputeMomentInvariants2D.h rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/ComputeMomentInvariants2D.h index 7eaaeb29ce..4ac377a08c 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/ComputeMomentInvariants2D.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/ComputeMomentInvariants2D.h @@ -10,12 +10,12 @@ #include "SIMPLib/DataArrays/DataArray.hpp" #include "SIMPLib/Filtering/AbstractFilter.h" -#include "Statistics/StatisticsDLLExport.h" +#include "StatsToolbox/StatsToolboxDLLExport.h" /** * @brief The ComputeMomentInvariants2D class. See [Filter documentation](@ref computemomentinvariants2d) for details. */ -class Statistics_EXPORT ComputeMomentInvariants2D : public AbstractFilter +class StatsToolbox_EXPORT ComputeMomentInvariants2D : public AbstractFilter { Q_OBJECT diff --git a/Source/Plugins/Statistics/StatisticsFilters/CorrelateFieldStatistics.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/CorrelateFieldStatistics.cpp similarity index 100% rename from Source/Plugins/Statistics/StatisticsFilters/CorrelateFieldStatistics.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/CorrelateFieldStatistics.cpp diff --git a/Source/Plugins/StatsToolbox/StatsToolboxFilters/CorrelateFieldStatistics.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/CorrelateFieldStatistics.h new file mode 100644 index 0000000000..e6348a4f58 --- /dev/null +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/CorrelateFieldStatistics.h @@ -0,0 +1,4 @@ +#pragma once + +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxVersion.h" diff --git a/Source/Plugins/Statistics/StatisticsFilters/CorrelateValuesWithVectorDirection.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/CorrelateValuesWithVectorDirection.cpp similarity index 99% rename from Source/Plugins/Statistics/StatisticsFilters/CorrelateValuesWithVectorDirection.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/CorrelateValuesWithVectorDirection.cpp index 011a2917ca..aa0b58775a 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/CorrelateValuesWithVectorDirection.cpp +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/CorrelateValuesWithVectorDirection.cpp @@ -687,7 +687,7 @@ int CorrelateValuesWithVectorDirection::writeCoords(FILE* f, const char* axis, c // ----------------------------------------------------------------------------- QString CorrelateValuesWithVectorDirection::getCompiledLibraryName() const { - return StatisticsConstants::StatisticsBaseName; + return StatsToolboxConstants::StatsToolboxBaseName; } // ----------------------------------------------------------------------------- @@ -705,7 +705,7 @@ QString CorrelateValuesWithVectorDirection::getFilterVersion() const { QString version; QTextStream vStream(&version); - vStream << Statistics::Version::Major() << "." << Statistics::Version::Minor() << "." << Statistics::Version::Patch(); + vStream << StatsToolbox::Version::Major() << "." << StatsToolbox::Version::Minor() << "." << StatsToolbox::Version::Patch(); return version; } diff --git a/Source/Plugins/Statistics/StatisticsFilters/CorrelateValuesWithVectorDirection.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/CorrelateValuesWithVectorDirection.h similarity index 97% rename from Source/Plugins/Statistics/StatisticsFilters/CorrelateValuesWithVectorDirection.h rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/CorrelateValuesWithVectorDirection.h index a86b9628bf..0874bc1135 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/CorrelateValuesWithVectorDirection.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/CorrelateValuesWithVectorDirection.h @@ -50,9 +50,9 @@ #include "SIMPLib/Math/SIMPLibMath.h" #include "SIMPLib/Utilities/SIMPLibEndian.h" -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsDLLExport.h" -#include "Statistics/StatisticsVersion.h" +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxDLLExport.h" +#include "StatsToolbox/StatsToolboxVersion.h" /** * @class CorrelateValuesWithVectorDirection CorrelateValuesWithVectorDirection.h DREAM3DLib/GenericFilters/CorrelateValuesWithVectorDirection.h * @brief @@ -60,7 +60,7 @@ * @date Nov 19, 2011 * @version 1.0 */ -class Statistics_EXPORT CorrelateValuesWithVectorDirection : public AbstractFilter +class StatsToolbox_EXPORT CorrelateValuesWithVectorDirection : public AbstractFilter { Q_OBJECT diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindAvgScalarValueForFeatures.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindAvgScalarValueForFeatures.cpp similarity index 97% rename from Source/Plugins/Statistics/StatisticsFilters/FindAvgScalarValueForFeatures.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindAvgScalarValueForFeatures.cpp index 22245f08da..76bc614745 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindAvgScalarValueForFeatures.cpp +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindAvgScalarValueForFeatures.cpp @@ -44,8 +44,8 @@ #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h" #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h" -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsVersion.h" +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxVersion.h" /* Create Enumerations to allow the created Attribute Arrays to take part in renaming */ enum createdPathID : RenameDataPath::DataID_t @@ -213,7 +213,7 @@ AbstractFilter::Pointer FindAvgScalarValueForFeatures::newFilterInstance(bool co // ----------------------------------------------------------------------------- QString FindAvgScalarValueForFeatures::getCompiledLibraryName() const { - return StatisticsConstants::StatisticsBaseName; + return StatsToolboxConstants::StatsToolboxBaseName; } // ----------------------------------------------------------------------------- @@ -231,7 +231,7 @@ QString FindAvgScalarValueForFeatures::getFilterVersion() const { QString version; QTextStream vStream(&version); - vStream << Statistics::Version::Major() << "." << Statistics::Version::Minor() << "." << Statistics::Version::Patch(); + vStream << StatsToolbox::Version::Major() << "." << StatsToolbox::Version::Minor() << "." << StatsToolbox::Version::Patch(); return version; } diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindAvgScalarValueForFeatures.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindAvgScalarValueForFeatures.h similarity index 98% rename from Source/Plugins/Statistics/StatisticsFilters/FindAvgScalarValueForFeatures.h rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindAvgScalarValueForFeatures.h index 4d2714d2fd..0f9782df71 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindAvgScalarValueForFeatures.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindAvgScalarValueForFeatures.h @@ -44,12 +44,12 @@ class IDataArray; using IDataArrayWkPtrType = std::weak_ptr; -#include "Statistics/StatisticsDLLExport.h" +#include "StatsToolbox/StatsToolboxDLLExport.h" /** * @brief The FindAvgScalarValueForFeatures class. See [Filter documentation](@ref findavgscalarvalueforfeatures) for details. */ -class Statistics_EXPORT FindAvgScalarValueForFeatures : public AbstractFilter +class StatsToolbox_EXPORT FindAvgScalarValueForFeatures : public AbstractFilter { Q_OBJECT diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindBoundaryElementFractions.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindBoundaryElementFractions.cpp similarity index 97% rename from Source/Plugins/Statistics/StatisticsFilters/FindBoundaryElementFractions.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindBoundaryElementFractions.cpp index a984c0616e..892687ce23 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindBoundaryElementFractions.cpp +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindBoundaryElementFractions.cpp @@ -43,8 +43,8 @@ #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h" #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h" -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsVersion.h" +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxVersion.h" /* Create Enumerations to allow the created Attribute Arrays to take part in renaming */ enum createdPathID : RenameDataPath::DataID_t @@ -205,7 +205,7 @@ AbstractFilter::Pointer FindBoundaryElementFractions::newFilterInstance(bool cop // ----------------------------------------------------------------------------- QString FindBoundaryElementFractions::getCompiledLibraryName() const { - return StatisticsConstants::StatisticsBaseName; + return StatsToolboxConstants::StatsToolboxBaseName; } // ----------------------------------------------------------------------------- @@ -223,7 +223,7 @@ QString FindBoundaryElementFractions::getFilterVersion() const { QString version; QTextStream vStream(&version); - vStream << Statistics::Version::Major() << "." << Statistics::Version::Minor() << "." << Statistics::Version::Patch(); + vStream << StatsToolbox::Version::Major() << "." << StatsToolbox::Version::Minor() << "." << StatsToolbox::Version::Patch(); return version; } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindBoundaryElementFractions.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindBoundaryElementFractions.h similarity index 98% rename from Source/Plugins/Statistics/StatisticsFilters/FindBoundaryElementFractions.h rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindBoundaryElementFractions.h index 57998811bf..c10c1c822a 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindBoundaryElementFractions.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindBoundaryElementFractions.h @@ -41,12 +41,12 @@ #include "SIMPLib/DataArrays/DataArray.hpp" #include "SIMPLib/Filtering/AbstractFilter.h" -#include "Statistics/StatisticsDLLExport.h" +#include "StatsToolbox/StatsToolboxDLLExport.h" /** * @brief The FindBoundaryElementFractions class. See [Filter documentation](@ref findboundaryelementfractions) for details. */ -class Statistics_EXPORT FindBoundaryElementFractions : public AbstractFilter +class StatsToolbox_EXPORT FindBoundaryElementFractions : public AbstractFilter { Q_OBJECT diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindDifferenceMap.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindDifferenceMap.cpp similarity index 98% rename from Source/Plugins/Statistics/StatisticsFilters/FindDifferenceMap.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindDifferenceMap.cpp index a4fe131c9b..4f6dced2da 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindDifferenceMap.cpp +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindDifferenceMap.cpp @@ -13,8 +13,8 @@ #include "SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h" #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h" -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsVersion.h" +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxVersion.h" #ifdef SIMPL_USE_PARALLEL_ALGORITHMS #include @@ -305,7 +305,7 @@ AbstractFilter::Pointer FindDifferenceMap::newFilterInstance(bool copyFilterPara // ----------------------------------------------------------------------------- QString FindDifferenceMap::getCompiledLibraryName() const { - return StatisticsConstants::StatisticsBaseName; + return StatsToolboxConstants::StatsToolboxBaseName; } // ----------------------------------------------------------------------------- @@ -323,7 +323,7 @@ QString FindDifferenceMap::getFilterVersion() const { QString version; QTextStream vStream(&version); - vStream << Statistics::Version::Major() << "." << Statistics::Version::Minor() << "." << Statistics::Version::Patch(); + vStream << StatsToolbox::Version::Major() << "." << StatsToolbox::Version::Minor() << "." << StatsToolbox::Version::Patch(); return version; } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindDifferenceMap.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindDifferenceMap.h similarity index 97% rename from Source/Plugins/Statistics/StatisticsFilters/FindDifferenceMap.h rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindDifferenceMap.h index 4f04834c51..481d56b2b0 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindDifferenceMap.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindDifferenceMap.h @@ -12,12 +12,12 @@ class IDataArray; using IDataArrayWkPtrType = std::weak_ptr; -#include "Statistics/StatisticsDLLExport.h" +#include "StatsToolbox/StatsToolboxDLLExport.h" /** * @brief The FindDifferenceMap class. See [Filter documentation](@ref finddifferencemap) for details. */ -class Statistics_EXPORT FindDifferenceMap : public AbstractFilter +class StatsToolbox_EXPORT FindDifferenceMap : public AbstractFilter { Q_OBJECT diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindEllipsoidError.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindEllipsoidError.cpp similarity index 99% rename from Source/Plugins/Statistics/StatisticsFilters/FindEllipsoidError.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindEllipsoidError.cpp index 9cd6e1e4de..61192092da 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindEllipsoidError.cpp +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindEllipsoidError.cpp @@ -355,7 +355,7 @@ AbstractFilter::Pointer FindEllipsoidError::newFilterInstance(bool copyFilterPar // ----------------------------------------------------------------------------- QString FindEllipsoidError::getCompiledLibraryName() const { - return StatisticsConstants::StatisticsBaseName; + return StatsToolboxConstants::StatsToolboxBaseName; } // ----------------------------------------------------------------------------- @@ -373,7 +373,7 @@ QString FindEllipsoidError::getFilterVersion() const { QString version; QTextStream vStream(&version); - vStream << Statistics::Version::Major() << "." << Statistics::Version::Minor() << "." << Statistics::Version::Patch(); + vStream << StatsToolbox::Version::Major() << "." << StatsToolbox::Version::Minor() << "." << StatsToolbox::Version::Patch(); return version; } diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindEllipsoidError.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindEllipsoidError.h similarity index 98% rename from Source/Plugins/Statistics/StatisticsFilters/FindEllipsoidError.h rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindEllipsoidError.h index fee1eacee3..26d55301e9 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindEllipsoidError.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindEllipsoidError.h @@ -46,10 +46,10 @@ #include "SIMPLib/DataContainers/DataContainer.h" #include "SIMPLib/Filtering/AbstractFilter.h" -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsVersion.h" +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxVersion.h" -#include "Statistics/StatisticsDLLExport.h" +#include "StatsToolbox/StatsToolboxDLLExport.h" /** * @class FindEllipsoidError FindEllipsoidError.h DREAM3DLib/GenericFilters/FindEllipsoidError.h @@ -58,7 +58,7 @@ * @date Nov 19, 2011 * @version 1.0 */ -class Statistics_EXPORT FindEllipsoidError : public AbstractFilter +class StatsToolbox_EXPORT FindEllipsoidError : public AbstractFilter { Q_OBJECT diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindEuclideanDistMap.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindEuclideanDistMap.cpp similarity index 99% rename from Source/Plugins/Statistics/StatisticsFilters/FindEuclideanDistMap.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindEuclideanDistMap.cpp index a6508423ec..ec273ce32d 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindEuclideanDistMap.cpp +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindEuclideanDistMap.cpp @@ -57,8 +57,8 @@ #include "SIMPLib/Geometry/ImageGeom.h" #include "SIMPLib/Math/SIMPLibMath.h" -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsVersion.h" +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxVersion.h" /* Create Enumerations to allow the created Attribute Arrays to take part in renaming */ enum createdPathID : RenameDataPath::DataID_t @@ -771,7 +771,7 @@ AbstractFilter::Pointer FindEuclideanDistMap::newFilterInstance(bool copyFilterP // ----------------------------------------------------------------------------- QString FindEuclideanDistMap::getCompiledLibraryName() const { - return StatisticsConstants::StatisticsBaseName; + return StatsToolboxConstants::StatsToolboxBaseName; } // ----------------------------------------------------------------------------- @@ -789,7 +789,7 @@ QString FindEuclideanDistMap::getFilterVersion() const { QString version; QTextStream vStream(&version); - vStream << Statistics::Version::Major() << "." << Statistics::Version::Minor() << "." << Statistics::Version::Patch(); + vStream << StatsToolbox::Version::Major() << "." << StatsToolbox::Version::Minor() << "." << StatsToolbox::Version::Patch(); return version; } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindEuclideanDistMap.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindEuclideanDistMap.h similarity index 99% rename from Source/Plugins/Statistics/StatisticsFilters/FindEuclideanDistMap.h rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindEuclideanDistMap.h index f9017666cc..7f0935c654 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindEuclideanDistMap.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindEuclideanDistMap.h @@ -41,12 +41,12 @@ #include "SIMPLib/DataArrays/DataArray.hpp" #include "SIMPLib/Filtering/AbstractFilter.h" -#include "Statistics/StatisticsDLLExport.h" +#include "StatsToolbox/StatsToolboxDLLExport.h" /** * @brief The FindEuclideanDistMap class. See [Filter documentation](@ref findeuclideandistmap) for details. */ -class Statistics_EXPORT FindEuclideanDistMap : public AbstractFilter +class StatsToolbox_EXPORT FindEuclideanDistMap : public AbstractFilter { Q_OBJECT diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindFeatureClustering.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindFeatureClustering.cpp similarity index 98% rename from Source/Plugins/Statistics/StatisticsFilters/FindFeatureClustering.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindFeatureClustering.cpp index c94750a632..e07735df2c 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindFeatureClustering.cpp +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindFeatureClustering.cpp @@ -53,8 +53,8 @@ #include "SIMPLib/Math/RadialDistributionFunction.h" #include "SIMPLib/Math/SIMPLibMath.h" -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsVersion.h" +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxVersion.h" /* Create Enumerations to allow the created Attribute Arrays to take part in renaming */ enum createdPathID : RenameDataPath::DataID_t @@ -442,7 +442,7 @@ AbstractFilter::Pointer FindFeatureClustering::newFilterInstance(bool copyFilter // ----------------------------------------------------------------------------- QString FindFeatureClustering::getCompiledLibraryName() const { - return StatisticsConstants::StatisticsBaseName; + return StatsToolboxConstants::StatsToolboxBaseName; } // ----------------------------------------------------------------------------- @@ -460,7 +460,7 @@ QString FindFeatureClustering::getFilterVersion() const { QString version; QTextStream vStream(&version); - vStream << Statistics::Version::Major() << "." << Statistics::Version::Minor() << "." << Statistics::Version::Patch(); + vStream << StatsToolbox::Version::Major() << "." << StatsToolbox::Version::Minor() << "." << StatsToolbox::Version::Patch(); return version; } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindFeatureClustering.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindFeatureClustering.h similarity index 99% rename from Source/Plugins/Statistics/StatisticsFilters/FindFeatureClustering.h rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindFeatureClustering.h index ec048f6e0d..6e3fa54300 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindFeatureClustering.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindFeatureClustering.h @@ -42,12 +42,12 @@ #include "SIMPLib/DataArrays/NeighborList.hpp" #include "SIMPLib/Filtering/AbstractFilter.h" -#include "Statistics/StatisticsDLLExport.h" +#include "StatsToolbox/StatsToolboxDLLExport.h" /** * @brief The FindFeatureClustering class. See [Filter documentation](@ref findfeatureclustering) for details. */ -class Statistics_EXPORT FindFeatureClustering : public AbstractFilter +class StatsToolbox_EXPORT FindFeatureClustering : public AbstractFilter { Q_OBJECT diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindFeatureHistogram.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindFeatureHistogram.cpp similarity index 97% rename from Source/Plugins/Statistics/StatisticsFilters/FindFeatureHistogram.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindFeatureHistogram.cpp index e1aa0a1c7e..7f55ac19dc 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindFeatureHistogram.cpp +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindFeatureHistogram.cpp @@ -46,9 +46,9 @@ #include "SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h" #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h" -#include "Statistics/DistributionAnalysisOps/BetaOps.h" -#include "Statistics/DistributionAnalysisOps/LogNormalOps.h" -#include "Statistics/DistributionAnalysisOps/PowerLawOps.h" +#include "StatsToolbox/DistributionAnalysisOps/BetaOps.h" +#include "StatsToolbox/DistributionAnalysisOps/LogNormalOps.h" +#include "StatsToolbox/DistributionAnalysisOps/PowerLawOps.h" // ----------------------------------------------------------------------------- // @@ -300,7 +300,7 @@ AbstractFilter::Pointer FindFeatureHistogram::newFilterInstance(bool copyFilterP // ----------------------------------------------------------------------------- QString FindFeatureHistogram::getCompiledLibraryName() const { - return StatisticsConstants::StatisticsBaseName; + return StatsToolboxConstants::StatsToolboxBaseName; } // ----------------------------------------------------------------------------- @@ -318,7 +318,7 @@ QString FindFeatureHistogram::getFilterVersion() const { QString version; QTextStream vStream(&version); - vStream << Statistics::Version::Major() << "." << Statistics::Version::Minor() << "." << Statistics::Version::Patch(); + vStream << StatsToolbox::Version::Major() << "." << StatsToolbox::Version::Minor() << "." << StatsToolbox::Version::Patch(); return version; } diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindFeatureHistogram.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindFeatureHistogram.h similarity index 97% rename from Source/Plugins/Statistics/StatisticsFilters/FindFeatureHistogram.h rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindFeatureHistogram.h index 6061394b41..5125318b0a 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindFeatureHistogram.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindFeatureHistogram.h @@ -47,10 +47,10 @@ #include "SIMPLib/DataContainers/DataContainer.h" #include "SIMPLib/Filtering/AbstractFilter.h" -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsVersion.h" +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxVersion.h" -#include "Statistics/StatisticsDLLExport.h" +#include "StatsToolbox/StatsToolboxDLLExport.h" /** * @class FindFeatureHistogram FindFeatureHistogram.h /FilterCategoryFilters/FindFeatureHistogram.h @@ -59,7 +59,7 @@ * @date * @version 1.0 */ -class Statistics_EXPORT FindFeatureHistogram : public AbstractFilter +class StatsToolbox_EXPORT FindFeatureHistogram : public AbstractFilter { Q_OBJECT diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindLargestCrossSections.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindLargestCrossSections.cpp similarity index 98% rename from Source/Plugins/Statistics/StatisticsFilters/FindLargestCrossSections.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindLargestCrossSections.cpp index b334749236..108cdb284e 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindLargestCrossSections.cpp +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindLargestCrossSections.cpp @@ -46,8 +46,8 @@ #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h" #include "SIMPLib/Geometry/ImageGeom.h" -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsVersion.h" +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxVersion.h" /* Create Enumerations to allow the created Attribute Arrays to take part in renaming */ enum createdPathID : RenameDataPath::DataID_t @@ -266,7 +266,7 @@ AbstractFilter::Pointer FindLargestCrossSections::newFilterInstance(bool copyFil // ----------------------------------------------------------------------------- QString FindLargestCrossSections::getCompiledLibraryName() const { - return StatisticsConstants::StatisticsBaseName; + return StatsToolboxConstants::StatsToolboxBaseName; } // ----------------------------------------------------------------------------- @@ -284,7 +284,7 @@ QString FindLargestCrossSections::getFilterVersion() const { QString version; QTextStream vStream(&version); - vStream << Statistics::Version::Major() << "." << Statistics::Version::Minor() << "." << Statistics::Version::Patch(); + vStream << StatsToolbox::Version::Major() << "." << StatsToolbox::Version::Minor() << "." << StatsToolbox::Version::Patch(); return version; } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindLargestCrossSections.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindLargestCrossSections.h similarity index 98% rename from Source/Plugins/Statistics/StatisticsFilters/FindLargestCrossSections.h rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindLargestCrossSections.h index 18e6b9909e..d379705db2 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindLargestCrossSections.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindLargestCrossSections.h @@ -41,12 +41,12 @@ #include "SIMPLib/DataArrays/DataArray.hpp" #include "SIMPLib/Filtering/AbstractFilter.h" -#include "Statistics/StatisticsDLLExport.h" +#include "StatsToolbox/StatsToolboxDLLExport.h" /** * @brief The FindLargestCrossSections class. See [Filter documentation](@ref findlargestcrosssections) for details. */ -class Statistics_EXPORT FindLargestCrossSections : public AbstractFilter +class StatsToolbox_EXPORT FindLargestCrossSections : public AbstractFilter { Q_OBJECT diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindNeighborhoods.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindNeighborhoods.cpp similarity index 98% rename from Source/Plugins/Statistics/StatisticsFilters/FindNeighborhoods.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindNeighborhoods.cpp index deb105534c..4b4b798fc2 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindNeighborhoods.cpp +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindNeighborhoods.cpp @@ -50,8 +50,8 @@ #include "SIMPLib/Geometry/ImageGeom.h" #include "SIMPLib/Math/SIMPLibMath.h" -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsVersion.h" +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxVersion.h" #ifdef SIMPL_USE_PARALLEL_ALGORITHMS #include @@ -414,7 +414,7 @@ AbstractFilter::Pointer FindNeighborhoods::newFilterInstance(bool copyFilterPara // ----------------------------------------------------------------------------- QString FindNeighborhoods::getCompiledLibraryName() const { - return StatisticsConstants::StatisticsBaseName; + return StatsToolboxConstants::StatsToolboxBaseName; } // ----------------------------------------------------------------------------- @@ -432,7 +432,7 @@ QString FindNeighborhoods::getFilterVersion() const { QString version; QTextStream vStream(&version); - vStream << Statistics::Version::Major() << "." << Statistics::Version::Minor() << "." << Statistics::Version::Patch(); + vStream << StatsToolbox::Version::Major() << "." << StatsToolbox::Version::Minor() << "." << StatsToolbox::Version::Patch(); return version; } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindNeighborhoods.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindNeighborhoods.h similarity index 98% rename from Source/Plugins/Statistics/StatisticsFilters/FindNeighborhoods.h rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindNeighborhoods.h index 5e34b4f556..07bad28a00 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindNeighborhoods.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindNeighborhoods.h @@ -42,12 +42,12 @@ #include "SIMPLib/DataArrays/NeighborList.hpp" #include "SIMPLib/Filtering/AbstractFilter.h" -#include "Statistics/StatisticsDLLExport.h" +#include "StatsToolbox/StatsToolboxDLLExport.h" /** * @brief The FindNeighborhoods class. See [Filter documentation](@ref findneighborhoods) for details. */ -class Statistics_EXPORT FindNeighborhoods : public AbstractFilter +class StatsToolbox_EXPORT FindNeighborhoods : public AbstractFilter { Q_OBJECT diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindNeighbors.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindNeighbors.cpp similarity index 98% rename from Source/Plugins/Statistics/StatisticsFilters/FindNeighbors.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindNeighbors.cpp index 6bcfb91009..e948901f20 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindNeighbors.cpp +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindNeighbors.cpp @@ -51,8 +51,8 @@ #include "SIMPLib/FilterParameters/StringFilterParameter.h" #include "SIMPLib/Geometry/ImageGeom.h" -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsVersion.h" +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxVersion.h" /* Create Enumerations to allow the created Attribute Arrays to take part in renaming */ enum createdPathID : RenameDataPath::DataID_t @@ -449,7 +449,7 @@ AbstractFilter::Pointer FindNeighbors::newFilterInstance(bool copyFilterParamete // ----------------------------------------------------------------------------- QString FindNeighbors::getCompiledLibraryName() const { - return StatisticsConstants::StatisticsBaseName; + return StatsToolboxConstants::StatsToolboxBaseName; } // ----------------------------------------------------------------------------- @@ -467,7 +467,7 @@ QString FindNeighbors::getFilterVersion() const { QString version; QTextStream vStream(&version); - vStream << Statistics::Version::Major() << "." << Statistics::Version::Minor() << "." << Statistics::Version::Patch(); + vStream << StatsToolbox::Version::Major() << "." << StatsToolbox::Version::Minor() << "." << StatsToolbox::Version::Patch(); return version; } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindNeighbors.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindNeighbors.h similarity index 99% rename from Source/Plugins/Statistics/StatisticsFilters/FindNeighbors.h rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindNeighbors.h index f497d37fa7..69db99d7b4 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindNeighbors.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindNeighbors.h @@ -42,12 +42,12 @@ #include "SIMPLib/DataArrays/NeighborList.hpp" #include "SIMPLib/Filtering/AbstractFilter.h" -#include "Statistics/StatisticsDLLExport.h" +#include "StatsToolbox/StatsToolboxDLLExport.h" /** * @brief The FindNeighbors class. See [Filter documentation](@ref findneighbors) for details. */ -class Statistics_EXPORT FindNeighbors : public AbstractFilter +class StatsToolbox_EXPORT FindNeighbors : public AbstractFilter { Q_OBJECT diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindNumFeatures.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindNumFeatures.cpp similarity index 97% rename from Source/Plugins/Statistics/StatisticsFilters/FindNumFeatures.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindNumFeatures.cpp index eeb46ae862..78118c272c 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindNumFeatures.cpp +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindNumFeatures.cpp @@ -43,8 +43,8 @@ #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h" #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h" -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsVersion.h" +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxVersion.h" /* Create Enumerations to allow the created Attribute Arrays to take part in renaming */ enum createdPathID : RenameDataPath::DataID_t @@ -166,7 +166,7 @@ AbstractFilter::Pointer FindNumFeatures::newFilterInstance(bool copyFilterParame // ----------------------------------------------------------------------------- QString FindNumFeatures::getCompiledLibraryName() const { - return StatisticsConstants::StatisticsBaseName; + return StatsToolboxConstants::StatsToolboxBaseName; } // ----------------------------------------------------------------------------- @@ -184,7 +184,7 @@ QString FindNumFeatures::getFilterVersion() const { QString version; QTextStream vStream(&version); - vStream << Statistics::Version::Major() << "." << Statistics::Version::Minor() << "." << Statistics::Version::Patch(); + vStream << StatsToolbox::Version::Major() << "." << StatsToolbox::Version::Minor() << "." << StatsToolbox::Version::Patch(); return version; } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindNumFeatures.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindNumFeatures.h similarity index 98% rename from Source/Plugins/Statistics/StatisticsFilters/FindNumFeatures.h rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindNumFeatures.h index d40f1488a3..d94bacc497 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindNumFeatures.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindNumFeatures.h @@ -41,12 +41,12 @@ #include "SIMPLib/DataArrays/DataArray.hpp" #include "SIMPLib/Filtering/AbstractFilter.h" -#include "Statistics/StatisticsDLLExport.h" +#include "StatsToolbox/StatsToolboxDLLExport.h" /** * @brief The FindNumFeatures class. See [Filter documentation](@ref findnumfeatures) for details. */ -class Statistics_EXPORT FindNumFeatures : public AbstractFilter +class StatsToolbox_EXPORT FindNumFeatures : public AbstractFilter { Q_OBJECT diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindSaltykovSizes.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindSaltykovSizes.cpp similarity index 98% rename from Source/Plugins/Statistics/StatisticsFilters/FindSaltykovSizes.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindSaltykovSizes.cpp index 1be37a49b1..82d72d9b26 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindSaltykovSizes.cpp +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindSaltykovSizes.cpp @@ -45,8 +45,8 @@ #include "SIMPLib/Math/SIMPLibMath.h" #include "SIMPLib/Math/SIMPLibRandom.h" -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsVersion.h" +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxVersion.h" /* Create Enumerations to allow the created Attribute Arrays to take part in renaming */ enum createdPathID : RenameDataPath::DataID_t @@ -425,7 +425,7 @@ AbstractFilter::Pointer FindSaltykovSizes::newFilterInstance(bool copyFilterPara // ----------------------------------------------------------------------------- QString FindSaltykovSizes::getCompiledLibraryName() const { - return StatisticsConstants::StatisticsBaseName; + return StatsToolboxConstants::StatsToolboxBaseName; } // ----------------------------------------------------------------------------- @@ -443,7 +443,7 @@ QString FindSaltykovSizes::getFilterVersion() const { QString version; QTextStream vStream(&version); - vStream << Statistics::Version::Major() << "." << Statistics::Version::Minor() << "." << Statistics::Version::Patch(); + vStream << StatsToolbox::Version::Major() << "." << StatsToolbox::Version::Minor() << "." << StatsToolbox::Version::Patch(); return version; } diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindSaltykovSizes.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindSaltykovSizes.h similarity index 98% rename from Source/Plugins/Statistics/StatisticsFilters/FindSaltykovSizes.h rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindSaltykovSizes.h index 9701c6d040..39c657d452 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindSaltykovSizes.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindSaltykovSizes.h @@ -45,7 +45,7 @@ #include "SIMPLib/DataContainers/DataContainer.h" #include "SIMPLib/Filtering/AbstractFilter.h" -#include "Statistics/StatisticsDLLExport.h" +#include "StatsToolbox/StatsToolboxDLLExport.h" /** * @class FindSaltykovSizes FindSaltykovSizes.h DREAM3DLib/GenericFilters/FindSaltykovSizes.h @@ -54,7 +54,7 @@ * @date Dec 9, 2014 * @version 5.2 */ -class Statistics_EXPORT FindSaltykovSizes : public AbstractFilter +class StatsToolbox_EXPORT FindSaltykovSizes : public AbstractFilter { Q_OBJECT diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindShapes.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindShapes.cpp similarity index 99% rename from Source/Plugins/Statistics/StatisticsFilters/FindShapes.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindShapes.cpp index a23a274915..b43978b001 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindShapes.cpp +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindShapes.cpp @@ -57,8 +57,8 @@ #include "EbsdLib/Core/Orientation.hpp" #include "EbsdLib/Core/OrientationTransformation.hpp" -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsVersion.h" +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxVersion.h" namespace { @@ -834,7 +834,7 @@ AbstractFilter::Pointer FindShapes::newFilterInstance(bool copyFilterParameters) // ----------------------------------------------------------------------------- QString FindShapes::getCompiledLibraryName() const { - return StatisticsConstants::StatisticsBaseName; + return StatsToolboxConstants::StatsToolboxBaseName; } // ----------------------------------------------------------------------------- @@ -852,7 +852,7 @@ QString FindShapes::getFilterVersion() const { QString version; QTextStream vStream(&version); - vStream << Statistics::Version::Major() << "." << Statistics::Version::Minor() << "." << Statistics::Version::Patch(); + vStream << StatsToolbox::Version::Major() << "." << StatsToolbox::Version::Minor() << "." << StatsToolbox::Version::Patch(); return version; } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindShapes.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindShapes.h similarity index 99% rename from Source/Plugins/Statistics/StatisticsFilters/FindShapes.h rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindShapes.h index 302dd5bdd0..46c33093c0 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindShapes.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindShapes.h @@ -42,12 +42,12 @@ #include "SIMPLib/DataArrays/DataArray.hpp" #include "SIMPLib/Filtering/AbstractFilter.h" -#include "Statistics/StatisticsDLLExport.h" +#include "StatsToolbox/StatsToolboxDLLExport.h" /** * @brief The FindShapes class. See [Filter documentation](@ref findshapes) for details. */ -class Statistics_EXPORT FindShapes : public AbstractFilter +class StatsToolbox_EXPORT FindShapes : public AbstractFilter { Q_OBJECT diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindSizes.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindSizes.cpp similarity index 98% rename from Source/Plugins/Statistics/StatisticsFilters/FindSizes.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindSizes.cpp index d0eab6c2f3..d012898c21 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindSizes.cpp +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindSizes.cpp @@ -48,8 +48,8 @@ #include "SIMPLib/FilterParameters/StringFilterParameter.h" #include "SIMPLib/Math/SIMPLibMath.h" -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsVersion.h" +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxVersion.h" /* Create Enumerations to allow the created Attribute Arrays to take part in renaming */ enum createdPathID : RenameDataPath::DataID_t @@ -377,7 +377,7 @@ AbstractFilter::Pointer FindSizes::newFilterInstance(bool copyFilterParameters) // ----------------------------------------------------------------------------- QString FindSizes::getCompiledLibraryName() const { - return StatisticsConstants::StatisticsBaseName; + return StatsToolboxConstants::StatsToolboxBaseName; } // ----------------------------------------------------------------------------- @@ -395,7 +395,7 @@ QString FindSizes::getFilterVersion() const { QString version; QTextStream vStream(&version); - vStream << Statistics::Version::Major() << "." << Statistics::Version::Minor() << "." << Statistics::Version::Patch(); + vStream << StatsToolbox::Version::Major() << "." << StatsToolbox::Version::Minor() << "." << StatsToolbox::Version::Patch(); return version; } diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindSizes.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindSizes.h similarity index 98% rename from Source/Plugins/Statistics/StatisticsFilters/FindSizes.h rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindSizes.h index 72ce646f41..2436390a17 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindSizes.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindSizes.h @@ -42,12 +42,12 @@ #include "SIMPLib/Filtering/AbstractFilter.h" #include "SIMPLib/Geometry/ImageGeom.h" -#include "Statistics/StatisticsDLLExport.h" +#include "StatsToolbox/StatsToolboxDLLExport.h" /** * @brief The FindSizes class. See [Filter documentation](@ref findsizes) for details. */ -class Statistics_EXPORT FindSizes : public AbstractFilter +class StatsToolbox_EXPORT FindSizes : public AbstractFilter { Q_OBJECT diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindSurfaceAreaToVolume.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindSurfaceAreaToVolume.cpp similarity index 98% rename from Source/Plugins/Statistics/StatisticsFilters/FindSurfaceAreaToVolume.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindSurfaceAreaToVolume.cpp index 82f32096e9..7af20d0d4b 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindSurfaceAreaToVolume.cpp +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindSurfaceAreaToVolume.cpp @@ -48,8 +48,8 @@ #include "SIMPLib/Geometry/ImageGeom.h" #include "SIMPLib/Math/SIMPLibMath.h" -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsVersion.h" +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxVersion.h" /* Create Enumerations to allow the created Attribute Arrays to take part in renaming */ enum createdPathID : RenameDataPath::DataID_t @@ -325,7 +325,7 @@ AbstractFilter::Pointer FindSurfaceAreaToVolume::newFilterInstance(bool copyFilt // ----------------------------------------------------------------------------- QString FindSurfaceAreaToVolume::getCompiledLibraryName() const { - return StatisticsConstants::StatisticsBaseName; + return StatsToolboxConstants::StatsToolboxBaseName; } // ----------------------------------------------------------------------------- @@ -343,7 +343,7 @@ QString FindSurfaceAreaToVolume::getFilterVersion() const { QString version; QTextStream vStream(&version); - vStream << Statistics::Version::Major() << "." << Statistics::Version::Minor() << "." << Statistics::Version::Patch(); + vStream << StatsToolbox::Version::Major() << "." << StatsToolbox::Version::Minor() << "." << StatsToolbox::Version::Patch(); return version; } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindSurfaceAreaToVolume.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindSurfaceAreaToVolume.h similarity index 98% rename from Source/Plugins/Statistics/StatisticsFilters/FindSurfaceAreaToVolume.h rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindSurfaceAreaToVolume.h index 7780ae5be8..7ebee9b913 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindSurfaceAreaToVolume.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindSurfaceAreaToVolume.h @@ -41,12 +41,12 @@ #include "SIMPLib/DataArrays/DataArray.hpp" #include "SIMPLib/Filtering/AbstractFilter.h" -#include "Statistics/StatisticsDLLExport.h" +#include "StatsToolbox/StatsToolboxDLLExport.h" /** * @brief The FindSurfaceAreaToVolume class. See [Filter documentation](@ref findsurfaceareatovolume) for details. */ -class Statistics_EXPORT FindSurfaceAreaToVolume : public AbstractFilter +class StatsToolbox_EXPORT FindSurfaceAreaToVolume : public AbstractFilter { Q_OBJECT diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindVolFractions.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindVolFractions.cpp similarity index 97% rename from Source/Plugins/Statistics/StatisticsFilters/FindVolFractions.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindVolFractions.cpp index b4f125f107..c1cab106bf 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindVolFractions.cpp +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindVolFractions.cpp @@ -44,8 +44,8 @@ #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h" #include "SIMPLib/Geometry/ImageGeom.h" -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsVersion.h" +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxVersion.h" /* Create Enumerations to allow the created Attribute Arrays to take part in renaming */ enum createdPathID : RenameDataPath::DataID_t @@ -178,7 +178,7 @@ AbstractFilter::Pointer FindVolFractions::newFilterInstance(bool copyFilterParam // ----------------------------------------------------------------------------- QString FindVolFractions::getCompiledLibraryName() const { - return StatisticsConstants::StatisticsBaseName; + return StatsToolboxConstants::StatsToolboxBaseName; } // ----------------------------------------------------------------------------- @@ -196,7 +196,7 @@ QString FindVolFractions::getFilterVersion() const { QString version; QTextStream vStream(&version); - vStream << Statistics::Version::Major() << "." << Statistics::Version::Minor() << "." << Statistics::Version::Patch(); + vStream << StatsToolbox::Version::Major() << "." << StatsToolbox::Version::Minor() << "." << StatsToolbox::Version::Patch(); return version; } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindVolFractions.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindVolFractions.h similarity index 98% rename from Source/Plugins/Statistics/StatisticsFilters/FindVolFractions.h rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FindVolFractions.h index 0971ef7176..64dd8cafab 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindVolFractions.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FindVolFractions.h @@ -41,12 +41,12 @@ #include "SIMPLib/DataArrays/DataArray.hpp" #include "SIMPLib/Filtering/AbstractFilter.h" -#include "Statistics/StatisticsDLLExport.h" +#include "StatsToolbox/StatsToolboxDLLExport.h" /** * @brief The FindVolFractions class. See [Filter documentation](@ref findvolfractions) for details. */ -class Statistics_EXPORT FindVolFractions : public AbstractFilter +class StatsToolbox_EXPORT FindVolFractions : public AbstractFilter { Q_OBJECT diff --git a/Source/Plugins/Statistics/StatisticsFilters/FitCorrelatedFeatureData.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FitCorrelatedFeatureData.cpp similarity index 98% rename from Source/Plugins/Statistics/StatisticsFilters/FitCorrelatedFeatureData.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FitCorrelatedFeatureData.cpp index 45accf7c00..7d064a8743 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FitCorrelatedFeatureData.cpp +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FitCorrelatedFeatureData.cpp @@ -47,9 +47,9 @@ #include "SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h" #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h" -#include "Statistics/DistributionAnalysisOps/BetaOps.h" -#include "Statistics/DistributionAnalysisOps/LogNormalOps.h" -#include "Statistics/DistributionAnalysisOps/PowerLawOps.h" +#include "StatsToolbox/DistributionAnalysisOps/BetaOps.h" +#include "StatsToolbox/DistributionAnalysisOps/LogNormalOps.h" +#include "StatsToolbox/DistributionAnalysisOps/PowerLawOps.h" // ----------------------------------------------------------------------------- // @@ -462,7 +462,7 @@ AbstractFilter::Pointer FitCorrelatedFeatureData::newFilterInstance(bool copyFil // ----------------------------------------------------------------------------- QString FitCorrelatedFeatureData::getCompiledLibraryName() const { - return StatisticsConstants::StatisticsBaseName; + return StatsToolboxConstants::StatsToolboxBaseName; } // ----------------------------------------------------------------------------- @@ -480,7 +480,7 @@ QString FitCorrelatedFeatureData::getFilterVersion() const { QString version; QTextStream vStream(&version); - vStream << Statistics::Version::Major() << "." << Statistics::Version::Minor() << "." << Statistics::Version::Patch(); + vStream << StatsToolbox::Version::Major() << "." << StatsToolbox::Version::Minor() << "." << StatsToolbox::Version::Patch(); return version; } diff --git a/Source/Plugins/Statistics/StatisticsFilters/FitCorrelatedFeatureData.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FitCorrelatedFeatureData.h similarity index 97% rename from Source/Plugins/Statistics/StatisticsFilters/FitCorrelatedFeatureData.h rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FitCorrelatedFeatureData.h index ff718c6fc0..0b075acb99 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FitCorrelatedFeatureData.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FitCorrelatedFeatureData.h @@ -47,12 +47,12 @@ #include "SIMPLib/DataContainers/DataContainer.h" #include "SIMPLib/Filtering/AbstractFilter.h" -#include "Statistics/DistributionAnalysisOps/DistributionAnalysisOps.h" +#include "StatsToolbox/DistributionAnalysisOps/DistributionAnalysisOps.h" -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsVersion.h" +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxVersion.h" -#include "Statistics/StatisticsDLLExport.h" +#include "StatsToolbox/StatsToolboxDLLExport.h" /** * @class FitCorrelatedFeatureData FitCorrelatedFeatureData.h /FilterCategoryFilters/FitCorrelatedFeatureData.h @@ -61,7 +61,7 @@ * @date * @version 1.0 */ -class Statistics_EXPORT FitCorrelatedFeatureData : public AbstractFilter +class StatsToolbox_EXPORT FitCorrelatedFeatureData : public AbstractFilter { Q_OBJECT diff --git a/Source/Plugins/Statistics/StatisticsFilters/FitFeatureData.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FitFeatureData.cpp similarity index 97% rename from Source/Plugins/Statistics/StatisticsFilters/FitFeatureData.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FitFeatureData.cpp index 6e2c8e47c3..78f5233dde 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FitFeatureData.cpp +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FitFeatureData.cpp @@ -46,11 +46,11 @@ #include "SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h" #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h" -#include "Statistics/DistributionAnalysisOps/BetaOps.h" -#include "Statistics/DistributionAnalysisOps/LogNormalOps.h" -#include "Statistics/DistributionAnalysisOps/PowerLawOps.h" -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsVersion.h" +#include "StatsToolbox/DistributionAnalysisOps/BetaOps.h" +#include "StatsToolbox/DistributionAnalysisOps/LogNormalOps.h" +#include "StatsToolbox/DistributionAnalysisOps/PowerLawOps.h" +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxVersion.h" // ----------------------------------------------------------------------------- // @@ -283,7 +283,7 @@ AbstractFilter::Pointer FitFeatureData::newFilterInstance(bool copyFilterParamet // ----------------------------------------------------------------------------- QString FitFeatureData::getCompiledLibraryName() const { - return StatisticsConstants::StatisticsBaseName; + return StatsToolboxConstants::StatsToolboxBaseName; } // ----------------------------------------------------------------------------- @@ -301,7 +301,7 @@ QString FitFeatureData::getFilterVersion() const { QString version; QTextStream vStream(&version); - vStream << Statistics::Version::Major() << "." << Statistics::Version::Minor() << "." << Statistics::Version::Patch(); + vStream << StatsToolbox::Version::Major() << "." << StatsToolbox::Version::Minor() << "." << StatsToolbox::Version::Patch(); return version; } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/Statistics/StatisticsFilters/FitFeatureData.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FitFeatureData.h similarity index 98% rename from Source/Plugins/Statistics/StatisticsFilters/FitFeatureData.h rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/FitFeatureData.h index 38b147eb62..f279990b1c 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FitFeatureData.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/FitFeatureData.h @@ -42,12 +42,12 @@ #include "SIMPLib/DataArrays/IDataArray.h" #include "SIMPLib/Filtering/AbstractFilter.h" -#include "Statistics/StatisticsDLLExport.h" +#include "StatsToolbox/StatsToolboxDLLExport.h" /** * @brief The FitFeatureData class. See [Filter documentation](@ref minneighbors) for details. */ -class Statistics_EXPORT FitFeatureData : public AbstractFilter +class StatsToolbox_EXPORT FitFeatureData : public AbstractFilter { Q_OBJECT diff --git a/Source/Plugins/Statistics/StatisticsFilters/GenerateEnsembleStatistics.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/GenerateEnsembleStatistics.cpp similarity index 99% rename from Source/Plugins/Statistics/StatisticsFilters/GenerateEnsembleStatistics.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/GenerateEnsembleStatistics.cpp index 31b7e4bbb6..1d7c9ac0e2 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/GenerateEnsembleStatistics.cpp +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/GenerateEnsembleStatistics.cpp @@ -65,11 +65,11 @@ #include "EbsdLib/Core/Quaternion.hpp" #include "EbsdLib/LaueOps/LaueOps.h" -#include "Statistics/DistributionAnalysisOps/BetaOps.h" -#include "Statistics/DistributionAnalysisOps/LogNormalOps.h" -#include "Statistics/DistributionAnalysisOps/PowerLawOps.h" -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsVersion.h" +#include "StatsToolbox/DistributionAnalysisOps/BetaOps.h" +#include "StatsToolbox/DistributionAnalysisOps/LogNormalOps.h" +#include "StatsToolbox/DistributionAnalysisOps/PowerLawOps.h" +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxVersion.h" /* Create Enumerations to allow the created Attribute Arrays to take part in renaming */ enum createdPathID : RenameDataPath::DataID_t @@ -1441,7 +1441,7 @@ AbstractFilter::Pointer GenerateEnsembleStatistics::newFilterInstance(bool copyF // ----------------------------------------------------------------------------- QString GenerateEnsembleStatistics::getCompiledLibraryName() const { - return StatisticsConstants::StatisticsBaseName; + return StatsToolboxConstants::StatsToolboxBaseName; } // ----------------------------------------------------------------------------- @@ -1459,7 +1459,7 @@ QString GenerateEnsembleStatistics::getFilterVersion() const { QString version; QTextStream vStream(&version); - vStream << Statistics::Version::Major() << "." << Statistics::Version::Minor() << "." << Statistics::Version::Patch(); + vStream << StatsToolbox::Version::Major() << "." << StatsToolbox::Version::Minor() << "." << StatsToolbox::Version::Patch(); return version; } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/Statistics/StatisticsFilters/GenerateEnsembleStatistics.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/GenerateEnsembleStatistics.h similarity index 99% rename from Source/Plugins/Statistics/StatisticsFilters/GenerateEnsembleStatistics.h rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/GenerateEnsembleStatistics.h index 24bb3b0f32..bdd1e29cd8 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/GenerateEnsembleStatistics.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/GenerateEnsembleStatistics.h @@ -43,14 +43,14 @@ #include "SIMPLib/DataArrays/StatsDataArray.h" #include "SIMPLib/Filtering/AbstractFilter.h" -#include "Statistics/DistributionAnalysisOps/DistributionAnalysisOps.h" +#include "StatsToolbox/DistributionAnalysisOps/DistributionAnalysisOps.h" -#include "Statistics/StatisticsDLLExport.h" +#include "StatsToolbox/StatsToolboxDLLExport.h" /** * @brief The GenerateEnsembleStatistics class. See [Filter documentation](@ref generateensemblestatistics) for details. */ -class Statistics_EXPORT GenerateEnsembleStatistics : public AbstractFilter +class StatsToolbox_EXPORT GenerateEnsembleStatistics : public AbstractFilter { Q_OBJECT diff --git a/Source/Plugins/Statistics/StatisticsFilters/QuiltCellData.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/QuiltCellData.cpp similarity index 99% rename from Source/Plugins/Statistics/StatisticsFilters/QuiltCellData.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/QuiltCellData.cpp index 836a24c0c5..cf9f6d7c8a 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/QuiltCellData.cpp +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/QuiltCellData.cpp @@ -435,7 +435,7 @@ AbstractFilter::Pointer QuiltCellData::newFilterInstance(bool copyFilterParamete // ----------------------------------------------------------------------------- QString QuiltCellData::getCompiledLibraryName() const { - return StatisticsConstants::StatisticsBaseName; + return StatsToolboxConstants::StatsToolboxBaseName; } // ----------------------------------------------------------------------------- @@ -453,7 +453,7 @@ QString QuiltCellData::getFilterVersion() const { QString version; QTextStream vStream(&version); - vStream << Statistics::Version::Major() << "." << Statistics::Version::Minor() << "." << Statistics::Version::Patch(); + vStream << StatsToolbox::Version::Major() << "." << StatsToolbox::Version::Minor() << "." << StatsToolbox::Version::Patch(); return version; } diff --git a/Source/Plugins/Statistics/StatisticsFilters/QuiltCellData.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/QuiltCellData.h similarity index 97% rename from Source/Plugins/Statistics/StatisticsFilters/QuiltCellData.h rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/QuiltCellData.h index 00bb5d3f56..013ab60d9d 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/QuiltCellData.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/QuiltCellData.h @@ -45,10 +45,10 @@ #include "SIMPLib/FilterParameters/IntVec3FilterParameter.h" #include "SIMPLib/Filtering/AbstractFilter.h" -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsVersion.h" +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxVersion.h" -#include "Statistics/StatisticsDLLExport.h" +#include "StatsToolbox/StatsToolboxDLLExport.h" /** * @class QuiltCellData QuiltCellData.h /FilterCategoryFilters/QuiltCellData.h @@ -57,7 +57,7 @@ * @date * @version 1.0 */ -class Statistics_EXPORT QuiltCellData : public AbstractFilter +class StatsToolbox_EXPORT QuiltCellData : public AbstractFilter { Q_OBJECT diff --git a/Source/Plugins/Statistics/StatisticsFilters/SourceList.cmake b/Source/Plugins/StatsToolbox/StatsToolboxFilters/SourceList.cmake similarity index 86% rename from Source/Plugins/Statistics/StatisticsFilters/SourceList.cmake rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/SourceList.cmake index b5b0cdef50..9e1f5bd3de 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/SourceList.cmake +++ b/Source/Plugins/StatsToolbox/StatsToolboxFilters/SourceList.cmake @@ -2,7 +2,7 @@ #-- Your License or copyright can go here #--//////////////////////////////////////////////////////////////////////////// -set(_filterGroupName StatisticsFilters) +set(_filterGroupName StatsToolboxFilters) set(${_filterGroupName}_FILTERS_HDRS "") SIMPL_START_FILTER_GROUP( @@ -43,9 +43,9 @@ set_property(GLOBAL PROPERTY PluginNumFilters ${PluginNumFilters}) # Loop on all the filters adding each one. In this loop we default to making each filter exposed in the user # interface in DREAM3D. If you want to have the filter compiled but NOT exposed to the user then use the next loop foreach(f ${_PublicFilters} ) - ADD_SIMPL_FILTER( "Statistics" "Statistics" + ADD_SIMPL_FILTER( "StatsToolbox" "StatsToolbox" ${_filterGroupName} ${f} - ${Statistics_SOURCE_DIR}/Documentation/${_filterGroupName}/${f}.md TRUE) + ${StatsToolbox_SOURCE_DIR}/Documentation/${_filterGroupName}/${f}.md TRUE) endforeach() @@ -64,7 +64,7 @@ set(_PrivateFilters #----------------- # Loop on the Private Filters adding each one to the DREAM3DLib project so that it gets compiled. foreach(f ${_PrivateFilters} ) - ADD_SIMPL_FILTER( "Statistics" "Statistics" + ADD_SIMPL_FILTER( "StatsToolbox" "StatsToolbox" ${_filterGroupName} ${f} ${${PLUGIN_NAME}_SOURCE_DIR}/Documentation/${_filterGroupName}/${f}.md FALSE) endforeach() @@ -73,5 +73,5 @@ ADD_SIMPL_SUPPORT_HEADER(${${PLUGIN_NAME}_SOURCE_DIR} ${_filterGroupName} util/M ADD_SIMPL_SUPPORT_SOURCE(${${PLUGIN_NAME}_SOURCE_DIR} ${_filterGroupName} util/MomentInvariants2D.cpp) -SIMPL_END_FILTER_GROUP(${Statistics_BINARY_DIR} "${_filterGroupName}" "Statistics Filters") +SIMPL_END_FILTER_GROUP(${StatsToolbox_BINARY_DIR} "${_filterGroupName}" "StatsToolbox Filters") diff --git a/Source/Plugins/Statistics/StatisticsFilters/util/MomentInvariants2D.cpp b/Source/Plugins/StatsToolbox/StatsToolboxFilters/util/MomentInvariants2D.cpp similarity index 100% rename from Source/Plugins/Statistics/StatisticsFilters/util/MomentInvariants2D.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/util/MomentInvariants2D.cpp diff --git a/Source/Plugins/Statistics/StatisticsFilters/util/MomentInvariants2D.h b/Source/Plugins/StatsToolbox/StatsToolboxFilters/util/MomentInvariants2D.h similarity index 100% rename from Source/Plugins/Statistics/StatisticsFilters/util/MomentInvariants2D.h rename to Source/Plugins/StatsToolbox/StatsToolboxFilters/util/MomentInvariants2D.h diff --git a/Source/Plugins/Statistics/StatisticsPlugin.cpp b/Source/Plugins/StatsToolbox/StatsToolboxPlugin.cpp similarity index 80% rename from Source/Plugins/Statistics/StatisticsPlugin.cpp rename to Source/Plugins/StatsToolbox/StatsToolboxPlugin.cpp index afbb8ab31e..fed72023b0 100644 --- a/Source/Plugins/Statistics/StatisticsPlugin.cpp +++ b/Source/Plugins/StatsToolbox/StatsToolboxPlugin.cpp @@ -33,7 +33,7 @@ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#include "StatisticsPlugin.h" +#include "StatsToolboxPlugin.h" #include #include @@ -42,19 +42,19 @@ #include "SIMPLib/Filtering/FilterFactory.hpp" #include "SIMPLib/Filtering/FilterManager.h" -#include "Statistics/StatisticsConstants.h" -#include "Statistics/StatisticsVersion.h" +#include "StatsToolbox/StatsToolboxConstants.h" +#include "StatsToolbox/StatsToolboxVersion.h" // ----------------------------------------------------------------------------- // // ----------------------------------------------------------------------------- -StatisticsPlugin::StatisticsPlugin() -: m_Version(Statistics::Version::Complete()) -, m_CompatibilityVersion(Statistics::Version::Package()) -, m_Vendor(StatisticsConstants::BlueQuartz::VendorName) -, m_URL(StatisticsConstants::BlueQuartz::URL) +StatsToolboxPlugin::StatsToolboxPlugin() +: m_Version(StatsToolbox::Version::Complete()) +, m_CompatibilityVersion(StatsToolbox::Version::Package()) +, m_Vendor(StatsToolboxConstants::BlueQuartz::VendorName) +, m_URL(StatsToolboxConstants::BlueQuartz::URL) , m_Location("") -, m_Copyright(StatisticsConstants::BlueQuartz::Copyright) +, m_Copyright(StatsToolboxConstants::BlueQuartz::Copyright) , m_Filters(QList()) , m_DidLoad(false) { @@ -63,36 +63,36 @@ StatisticsPlugin::StatisticsPlugin() // ----------------------------------------------------------------------------- // // ----------------------------------------------------------------------------- -StatisticsPlugin::~StatisticsPlugin() = default; +StatsToolboxPlugin::~StatsToolboxPlugin() = default; // ----------------------------------------------------------------------------- // // ----------------------------------------------------------------------------- -QString StatisticsPlugin::getPluginFileName() +QString StatsToolboxPlugin::getPluginFileName() { - return StatisticsConstants::StatisticsPluginFile; + return StatsToolboxConstants::StatsToolboxPluginFile; } // ----------------------------------------------------------------------------- // // ----------------------------------------------------------------------------- -QString StatisticsPlugin::getPluginDisplayName() +QString StatsToolboxPlugin::getPluginDisplayName() { - return StatisticsConstants::StatisticsPluginDisplayName; + return StatsToolboxConstants::StatsToolboxPluginDisplayName; } // ----------------------------------------------------------------------------- // // ----------------------------------------------------------------------------- -QString StatisticsPlugin::getPluginBaseName() +QString StatsToolboxPlugin::getPluginBaseName() { - return StatisticsConstants::StatisticsBaseName; + return StatsToolboxConstants::StatsToolboxBaseName; } // ----------------------------------------------------------------------------- // // ----------------------------------------------------------------------------- -QString StatisticsPlugin::getVersion() +QString StatsToolboxPlugin::getVersion() { return m_Version; } @@ -100,7 +100,7 @@ QString StatisticsPlugin::getVersion() // ----------------------------------------------------------------------------- // // ----------------------------------------------------------------------------- -QString StatisticsPlugin::getCompatibilityVersion() +QString StatsToolboxPlugin::getCompatibilityVersion() { return m_CompatibilityVersion; } @@ -108,7 +108,7 @@ QString StatisticsPlugin::getCompatibilityVersion() // ----------------------------------------------------------------------------- // // ----------------------------------------------------------------------------- -QString StatisticsPlugin::getVendor() +QString StatsToolboxPlugin::getVendor() { return m_Vendor; } @@ -116,7 +116,7 @@ QString StatisticsPlugin::getVendor() // ----------------------------------------------------------------------------- // // ----------------------------------------------------------------------------- -QString StatisticsPlugin::getURL() +QString StatsToolboxPlugin::getURL() { return m_URL; } @@ -124,7 +124,7 @@ QString StatisticsPlugin::getURL() // ----------------------------------------------------------------------------- // // ----------------------------------------------------------------------------- -QString StatisticsPlugin::getLocation() +QString StatsToolboxPlugin::getLocation() { return m_Location; } @@ -132,9 +132,9 @@ QString StatisticsPlugin::getLocation() // ----------------------------------------------------------------------------- // // ----------------------------------------------------------------------------- -QString StatisticsPlugin::getDescription() +QString StatsToolboxPlugin::getDescription() { - QFile licenseFile(":/Statistics/StatisticsDescription.txt"); + QFile licenseFile(":/StatsToolbox/StatsToolboxDescription.txt"); QFileInfo licenseFileInfo(licenseFile); QString text = "<<--Description was not read-->>"; @@ -152,7 +152,7 @@ QString StatisticsPlugin::getDescription() // ----------------------------------------------------------------------------- // // ----------------------------------------------------------------------------- -QString StatisticsPlugin::getCopyright() +QString StatsToolboxPlugin::getCopyright() { return m_Copyright; } @@ -160,7 +160,7 @@ QString StatisticsPlugin::getCopyright() // ----------------------------------------------------------------------------- // // ----------------------------------------------------------------------------- -QString StatisticsPlugin::getLicense() +QString StatsToolboxPlugin::getLicense() { QFile licenseFile(":/DREAM3D/DREAM3DLicense.txt"); QFileInfo licenseFileInfo(licenseFile); @@ -180,7 +180,7 @@ QString StatisticsPlugin::getLicense() // ----------------------------------------------------------------------------- // // ----------------------------------------------------------------------------- -QMap StatisticsPlugin::getThirdPartyLicenses() +QMap StatsToolboxPlugin::getThirdPartyLicenses() { QMap licenseMap; QList fileStrList; @@ -210,7 +210,7 @@ QMap StatisticsPlugin::getThirdPartyLicenses() // ----------------------------------------------------------------------------- // // ----------------------------------------------------------------------------- -bool StatisticsPlugin::getDidLoad() +bool StatsToolboxPlugin::getDidLoad() { return m_DidLoad; } @@ -218,7 +218,7 @@ bool StatisticsPlugin::getDidLoad() // ----------------------------------------------------------------------------- // // ----------------------------------------------------------------------------- -void StatisticsPlugin::setDidLoad(bool didLoad) +void StatsToolboxPlugin::setDidLoad(bool didLoad) { m_DidLoad = didLoad; } @@ -226,7 +226,7 @@ void StatisticsPlugin::setDidLoad(bool didLoad) // ----------------------------------------------------------------------------- // // ----------------------------------------------------------------------------- -void StatisticsPlugin::setLocation(QString filePath) +void StatsToolboxPlugin::setLocation(QString filePath) { m_Location = filePath; } @@ -234,22 +234,22 @@ void StatisticsPlugin::setLocation(QString filePath) // ----------------------------------------------------------------------------- // // ----------------------------------------------------------------------------- -void StatisticsPlugin::writeSettings(QSettings& prefs) +void StatsToolboxPlugin::writeSettings(QSettings& prefs) { } // ----------------------------------------------------------------------------- // // ----------------------------------------------------------------------------- -void StatisticsPlugin::readSettings(QSettings& prefs) +void StatsToolboxPlugin::readSettings(QSettings& prefs) { } // ----------------------------------------------------------------------------- // // ----------------------------------------------------------------------------- -void StatisticsPlugin::registerFilterWidgets(FilterWidgetManager* fwm) +void StatsToolboxPlugin::registerFilterWidgets(FilterWidgetManager* fwm) { } -#include "StatisticsFilters/RegisterKnownFilters.cpp" +#include "StatsToolboxFilters/RegisterKnownFilters.cpp" diff --git a/Source/Plugins/Statistics/StatisticsPlugin.h b/Source/Plugins/StatsToolbox/StatsToolboxPlugin.h similarity index 87% rename from Source/Plugins/Statistics/StatisticsPlugin.h rename to Source/Plugins/StatsToolbox/StatsToolboxPlugin.h index 3864c9b7b9..744ada92b9 100644 --- a/Source/Plugins/Statistics/StatisticsPlugin.h +++ b/Source/Plugins/StatsToolbox/StatsToolboxPlugin.h @@ -40,25 +40,25 @@ #include "SIMPLib/Plugin/ISIMPLibPlugin.h" -#include "Statistics/StatisticsDLLExport.h" +#include "StatsToolbox/StatsToolboxDLLExport.h" /** - * @class StatisticsPlugin StatisticsPlugin.hStatistics/StatisticsPlugin.h + * @class StatsToolboxPlugin StatsToolboxPlugin.hStatsToolbox/StatsToolboxPlugin.h * @brief * * @date May 10, 2012 * @version 1.0 */ -class Statistics_EXPORT StatisticsPlugin : public QObject, public ISIMPLibPlugin +class StatsToolbox_EXPORT StatsToolboxPlugin : public QObject, public ISIMPLibPlugin { Q_OBJECT Q_INTERFACES(ISIMPLibPlugin) - Q_PLUGIN_METADATA(IID "net.bluequartz.dream3d.StatisticsPlugin") + Q_PLUGIN_METADATA(IID "net.bluequartz.dream3d.StatsToolboxPlugin") public: - StatisticsPlugin(); - ~StatisticsPlugin() override; + StatsToolboxPlugin(); + ~StatsToolboxPlugin() override; /** * @brief Returns the name of the plugin that appears on the file system. * @@ -184,8 +184,8 @@ class Statistics_EXPORT StatisticsPlugin : public QObject, public ISIMPLibPlugin bool m_DidLoad; public: - StatisticsPlugin(const StatisticsPlugin&) = delete; // Copy Constructor Not Implemented - StatisticsPlugin(StatisticsPlugin&&) = delete; // Move Constructor Not Implemented - StatisticsPlugin& operator=(const StatisticsPlugin&) = delete; // Copy Assignment Not Implemented - StatisticsPlugin& operator=(StatisticsPlugin&&) = delete; // Move Assignment Not Implemented + StatsToolboxPlugin(const StatsToolboxPlugin&) = delete; // Copy Constructor Not Implemented + StatsToolboxPlugin(StatsToolboxPlugin&&) = delete; // Move Constructor Not Implemented + StatsToolboxPlugin& operator=(const StatsToolboxPlugin&) = delete; // Copy Assignment Not Implemented + StatsToolboxPlugin& operator=(StatsToolboxPlugin&&) = delete; // Move Assignment Not Implemented }; diff --git a/Source/Plugins/Statistics/Test/CMakeLists.txt b/Source/Plugins/StatsToolbox/Test/CMakeLists.txt similarity index 100% rename from Source/Plugins/Statistics/Test/CMakeLists.txt rename to Source/Plugins/StatsToolbox/Test/CMakeLists.txt diff --git a/Source/Plugins/Statistics/Test/CalculateArrayHistogramTest.cpp b/Source/Plugins/StatsToolbox/Test/CalculateArrayHistogramTest.cpp similarity index 99% rename from Source/Plugins/Statistics/Test/CalculateArrayHistogramTest.cpp rename to Source/Plugins/StatsToolbox/Test/CalculateArrayHistogramTest.cpp index dcf4ba3e2f..c777053283 100644 --- a/Source/Plugins/Statistics/Test/CalculateArrayHistogramTest.cpp +++ b/Source/Plugins/StatsToolbox/Test/CalculateArrayHistogramTest.cpp @@ -49,7 +49,7 @@ #include "UnitTestSupport.hpp" -#include "StatisticsTestFileLocations.h" +#include "StatsToolboxTestFileLocations.h" static const QString DCName("HistogramTest"); static const QString Data_AMName("Data"); diff --git a/Source/Plugins/Statistics/Test/ComputeMomentInvariants2DTest.cpp b/Source/Plugins/StatsToolbox/Test/ComputeMomentInvariants2DTest.cpp similarity index 99% rename from Source/Plugins/Statistics/Test/ComputeMomentInvariants2DTest.cpp rename to Source/Plugins/StatsToolbox/Test/ComputeMomentInvariants2DTest.cpp index b57f1cbb28..5c51565cb3 100644 --- a/Source/Plugins/Statistics/Test/ComputeMomentInvariants2DTest.cpp +++ b/Source/Plugins/StatsToolbox/Test/ComputeMomentInvariants2DTest.cpp @@ -47,13 +47,13 @@ #include "SIMPLib/DataContainers/DataContainerArray.h" #include "SIMPLib/Math/SIMPLibMath.h" -#include "StatisticsTestFileLocations.h" +#include "StatsToolboxTestFileLocations.h" #include // Directly include the .cpp file instead of the header because of the way the unit // tests are compiled. -#include "StatisticsFilters/util/MomentInvariants2D.cpp" +#include "StatsToolboxFilters/util/MomentInvariants2D.cpp" class ComputeMomentInvariants2DTest { diff --git a/Source/Plugins/Statistics/Test/FindDifferenceMapTest.cpp b/Source/Plugins/StatsToolbox/Test/FindDifferenceMapTest.cpp similarity index 99% rename from Source/Plugins/Statistics/Test/FindDifferenceMapTest.cpp rename to Source/Plugins/StatsToolbox/Test/FindDifferenceMapTest.cpp index fb41cecd11..075f3550fb 100644 --- a/Source/Plugins/Statistics/Test/FindDifferenceMapTest.cpp +++ b/Source/Plugins/StatsToolbox/Test/FindDifferenceMapTest.cpp @@ -50,7 +50,7 @@ #include "UnitTestSupport.hpp" -#include "StatisticsTestFileLocations.h" +#include "StatsToolboxTestFileLocations.h" #define CREATE_DATA_ARRAY(type, attrMat, tDims, cDims, initVal, err) \ DataArray::Pointer _##type##_##attrMat##Array = DataArray::CreateArray(tDims, cDims, #type, true); \ diff --git a/Source/Plugins/Statistics/Test/FindEuclideanDistMapTest.cpp b/Source/Plugins/StatsToolbox/Test/FindEuclideanDistMapTest.cpp similarity index 99% rename from Source/Plugins/Statistics/Test/FindEuclideanDistMapTest.cpp rename to Source/Plugins/StatsToolbox/Test/FindEuclideanDistMapTest.cpp index 76e0b30138..f03941fb0b 100644 --- a/Source/Plugins/Statistics/Test/FindEuclideanDistMapTest.cpp +++ b/Source/Plugins/StatsToolbox/Test/FindEuclideanDistMapTest.cpp @@ -51,7 +51,7 @@ #include "UnitTestSupport.hpp" -#include "StatisticsTestFileLocations.h" +#include "StatsToolboxTestFileLocations.h" const DataArrayPath k_FeatureIdsArrayPath = DataArrayPath("TestDataContainer1", "TestAttributeMatrix1", "FeatureIds"); diff --git a/Source/Plugins/Statistics/Test/FindShapesTest.cpp b/Source/Plugins/StatsToolbox/Test/FindShapesTest.cpp similarity index 99% rename from Source/Plugins/Statistics/Test/FindShapesTest.cpp rename to Source/Plugins/StatsToolbox/Test/FindShapesTest.cpp index 406c93642b..72a138d2be 100644 --- a/Source/Plugins/Statistics/Test/FindShapesTest.cpp +++ b/Source/Plugins/StatsToolbox/Test/FindShapesTest.cpp @@ -47,7 +47,7 @@ #include "UnitTestSupport.hpp" -#include "StatisticsTestFileLocations.h" +#include "StatsToolboxTestFileLocations.h" class FindShapesTest { diff --git a/Source/Plugins/Statistics/Test/FindSizesTest.cpp b/Source/Plugins/StatsToolbox/Test/FindSizesTest.cpp similarity index 99% rename from Source/Plugins/Statistics/Test/FindSizesTest.cpp rename to Source/Plugins/StatsToolbox/Test/FindSizesTest.cpp index 9c261d3c2a..c26d0a1900 100644 --- a/Source/Plugins/Statistics/Test/FindSizesTest.cpp +++ b/Source/Plugins/StatsToolbox/Test/FindSizesTest.cpp @@ -56,7 +56,7 @@ #include "UnitTestSupport.hpp" -#include "StatisticsTestFileLocations.h" +#include "StatsToolboxTestFileLocations.h" #define SET_PROPERTIES_AND_CHECK(filter, featureIdsPath, featureAttrMatPath, errVal) \ var.setValue(featureIdsPath); \ diff --git a/Source/Plugins/Statistics/Test/TestFileLocations.h.in b/Source/Plugins/StatsToolbox/Test/TestFileLocations.h.in similarity index 100% rename from Source/Plugins/Statistics/Test/TestFileLocations.h.in rename to Source/Plugins/StatsToolbox/Test/TestFileLocations.h.in diff --git a/Source/Plugins/Statistics/Test/TestFiles/ReadMe.md b/Source/Plugins/StatsToolbox/Test/TestFiles/ReadMe.md similarity index 100% rename from Source/Plugins/Statistics/Test/TestFiles/ReadMe.md rename to Source/Plugins/StatsToolbox/Test/TestFiles/ReadMe.md