Rename StatisticsPlugins to StatsToolbox. (#979)

This will fix a name collision when generating the python wrapping

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

Source/Plugins/Plugins.cmake

@@ -128,7 +128,7 @@ set(DREAM3D_BASE_PLUGINS
   Processing
   Reconstruction
   Sampling
-  Statistics
+  StatsToolbox
   SurfaceMeshing
   SyntheticBuilding
 )

Source/Plugins/Statistics/CMakeLists.txt → 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

Source/Plugins/Statistics/DistributionAnalysisOps/SourceList.cmake → 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()

Source/Plugins/Statistics/Gui/StatisticsGuiPlugin.cpp → 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"

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
+};

Source/Plugins/Statistics/Resources/Statistics.qrc → Source/Plugins/StatsToolbox/Resources/StatsToolbox.qrc

@@ -1,6 +1,6 @@
  <!DOCTYPE RCC>
  <RCC version="1.0">
  <qresource>
- <file>Statistics/StatisticsDescription.txt</file>
+ <file>StatsToolbox/StatsToolboxDescription.txt</file>
  </qresource>
  </RCC>

Source/Plugins/Statistics/Resources/Statistics/StatisticsDescription.txt → Source/Plugins/StatsToolbox/Resources/StatsToolbox/StatsToolboxDescription.txt

@@ -2,10 +2,10 @@
 <html>
 <head>
   <meta http-equiv="Content-type" content="text/html; charset=utf-8">
-  <title>Statistics Plugin</title>
+  <title>StatsToolbox Plugin</title>
 </head>
 <body>
-<h3>Statistics Plugin</h3>
+<h3>StatsToolbox Plugin</h3>
 
 <p>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.</p>
 

Source/Plugins/Statistics/StatisticsConstants.h → Source/Plugins/StatsToolbox/StatsToolboxConstants.h

@@ -2,15 +2,15 @@
 
 #include <QtCore/QString>
 
-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

Source/Plugins/Statistics/StatisticsFilters/CalculateArrayHistogram.cpp → 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;
 }
 // -----------------------------------------------------------------------------

Source/Plugins/Statistics/StatisticsFilters/CalculateArrayHistogram.h → Source/Plugins/StatsToolbox/StatsToolboxFilters/CalculateArrayHistogram.h

@@ -44,12 +44,12 @@
 class IDataArray;
 using IDataArrayWkPtrType = std::weak_ptr<IDataArray>;
 
-#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
 

Source/Plugins/Statistics/StatisticsFilters/ComputeMomentInvariants2D.cpp → 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;
 }
 

Source/Plugins/Statistics/StatisticsFilters/ComputeMomentInvariants2D.h → 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
 

Source/Plugins/StatsToolbox/StatsToolboxFilters/CorrelateFieldStatistics.h

@@ -0,0 +1,4 @@
+#pragma once
+
+#include "StatsToolbox/StatsToolboxConstants.h"
+#include "StatsToolbox/StatsToolboxVersion.h"

Source/Plugins/Statistics/StatisticsFilters/CorrelateValuesWithVectorDirection.cpp → 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;
 }
 

Source/Plugins/Statistics/StatisticsFilters/CorrelateValuesWithVectorDirection.h → Source/Plugins/StatsToolbox/StatsToolboxFilters/CorrelateValuesWithVectorDirection.h

@@ -50,17 +50,17 @@
 #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
  * @author
  * @date Nov 19, 2011
  * @version 1.0
  */
-class Statistics_EXPORT CorrelateValuesWithVectorDirection : public AbstractFilter
+class StatsToolbox_EXPORT CorrelateValuesWithVectorDirection : public AbstractFilter
 {
   Q_OBJECT
 

Source/Plugins/Statistics/StatisticsFilters/FindAvgScalarValueForFeatures.cpp → 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;
 }
 

Source/Plugins/Statistics/StatisticsFilters/FindAvgScalarValueForFeatures.h → Source/Plugins/StatsToolbox/StatsToolboxFilters/FindAvgScalarValueForFeatures.h

@@ -44,12 +44,12 @@
 class IDataArray;
 using IDataArrayWkPtrType = std::weak_ptr<IDataArray>;
 
-#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
 

Source/Plugins/Statistics/StatisticsFilters/FindBoundaryElementFractions.cpp → 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;
 }
 // -----------------------------------------------------------------------------

Source/Plugins/Statistics/StatisticsFilters/FindBoundaryElementFractions.h → 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