Formatting code to match the intended ClangFormat style.

Author: imikejackson

ITKImageProcessingConstants.h

@@ -40,43 +40,41 @@
 */
 namespace ITKImageProcessingConstants
 {
-  const QString ITKImageProcessingPluginFile("ITKImageProcessingPlugin");
-  const QString ITKImageProcessingPluginDisplayName("ITKImageProcessingPlugin");
-  const QString ITKImageProcessingBaseName("ITKImageProcessingPlugin");
+const QString ITKImageProcessingPluginFile("ITKImageProcessingPlugin");
+const QString ITKImageProcessingPluginDisplayName("ITKImageProcessingPlugin");
+const QString ITKImageProcessingBaseName("ITKImageProcessingPlugin");
 
-  namespace FilterGroups
-  {
-  	const QString ITKImageProcessingFilters("ITKImageProcessing");
-  }
+namespace FilterGroups
+{
+const QString ITKImageProcessingFilters("ITKImageProcessing");
+}
 
-  //define pixels for dream3d variable types
-  typedef int8_t Int8PixelType;
-  typedef uint8_t UInt8PixelType;
-  typedef int16_t Int16PixelType;
-  typedef uint16_t UInt16PixelType;
-  typedef int32_t Int32PixelType;
-  typedef uint32_t UInt32PixelType;
-  typedef int64_t Int64PixelType;
-  typedef uint64_t UInt64PixelType;
-  typedef float FloatPixelType;
-  typedef double DoublePixelType;
+// define pixels for dream3d variable types
+typedef int8_t Int8PixelType;
+typedef uint8_t UInt8PixelType;
+typedef int16_t Int16PixelType;
+typedef uint16_t UInt16PixelType;
+typedef int32_t Int32PixelType;
+typedef uint32_t UInt32PixelType;
+typedef int64_t Int64PixelType;
+typedef uint64_t UInt64PixelType;
+typedef float FloatPixelType;
+typedef double DoublePixelType;
 
-  //define default pixel type
+// define default pixel type
 #if ImageProcessing_BitDepth == 8
-  typedef UInt8PixelType                     DefaultPixelType;
-  typedef DataArray<DefaultPixelType>        DefaultArrayType;
+typedef UInt8PixelType DefaultPixelType;
+typedef DataArray<DefaultPixelType> DefaultArrayType;
 #elif ImageProcessing_BitDepth == 16
-  typedef UInt16PixelType DefaultPixelType;
-  typedef UInt16ArrayType DefaultArrayType;
+typedef UInt16PixelType DefaultPixelType;
+typedef UInt16ArrayType DefaultArrayType;
 #elif ImageProcessing_BitDepth == 32
-  typedef FloatPixelType DefaultPixelType;
-  typedef FloatArrayType DefaultArrayType;
+typedef FloatPixelType DefaultPixelType;
+typedef FloatArrayType DefaultArrayType;
 #else
-  typedef UInt8PixelType DefaultPixelType;
-  typedef UInt8ArrayType DefaultArrayType;
+typedef UInt8PixelType DefaultPixelType;
+typedef UInt8ArrayType DefaultArrayType;
 #endif
-
-
 }
 
 /**

ITKImageProcessingFilters/Dream3DTemplateAliasMacro.h

@@ -9,25 +9,23 @@
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
-#include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
+#include "SIMPLib/FilterParameters/StringFilterParameter.h"
 
 #include "SIMPLib/Geometry/ImageGeom.h"
 
-
-
-#include "ITKImageProcessing/ITKImageProcessingFilters/itkDream3DImage.h"
 #include "ITKImageProcessing/ITKImageProcessingFilters/Dream3DTemplateAliasMacro.h"
+#include "ITKImageProcessing/ITKImageProcessingFilters/itkDream3DImage.h"
 
 // Include the MOC generated file for this class
 #include "moc_ITKAbsImage.cpp"
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ITKAbsImage::ITKAbsImage() :
-  ITKImageBase()
+ITKAbsImage::ITKAbsImage()
+: ITKImageBase()
 {
 
   setupFilterParameters();
@@ -47,16 +45,13 @@ void ITKAbsImage::setupFilterParameters()
 {
   FilterParameterVector parameters;
 
-
-
   QStringList linkedProps;
   linkedProps << "NewCellArrayName";
   parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Save as New Array", SaveAsNewArray, FilterParameter::Parameter, ITKAbsImage, linkedProps));
   parameters.push_back(SeparatorFilterParameter::New("Cell Data", FilterParameter::RequiredArray));
   {
     DataArraySelectionFilterParameter::RequirementType req =
-      DataArraySelectionFilterParameter::CreateRequirement(SIMPL::Defaults::AnyPrimitive, SIMPL::Defaults::AnyComponentSize,
-      AttributeMatrix::Type::Cell, IGeometry::Type::Image);
+        DataArraySelectionFilterParameter::CreateRequirement(SIMPL::Defaults::AnyPrimitive, SIMPL::Defaults::AnyComponentSize, AttributeMatrix::Type::Cell, IGeometry::Type::Image);
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Attribute Array to filter", SelectedCellArrayPath, FilterParameter::RequiredArray, ITKAbsImage, req));
   }
   parameters.push_back(SeparatorFilterParameter::New("Cell Data", FilterParameter::CreatedArray));
@@ -71,18 +66,17 @@ void ITKAbsImage::setupFilterParameters()
 void ITKAbsImage::readFilterParameters(AbstractFilterParametersReader* reader, int index)
 {
   reader->openFilterGroup(this, index);
-  setSelectedCellArrayPath( reader->readDataArrayPath( "SelectedCellArrayPath", getSelectedCellArrayPath() ) );
-  setNewCellArrayName( reader->readString( "NewCellArrayName", getNewCellArrayName() ) );
-  setSaveAsNewArray( reader->readValue( "SaveAsNewArray", getSaveAsNewArray() ) );
+  setSelectedCellArrayPath(reader->readDataArrayPath("SelectedCellArrayPath", getSelectedCellArrayPath()));
+  setNewCellArrayName(reader->readString("NewCellArrayName", getNewCellArrayName()));
+  setSaveAsNewArray(reader->readValue("SaveAsNewArray", getSaveAsNewArray()));
 
   reader->closeFilterGroup();
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template<typename InputPixelType, typename OutputPixelType, unsigned int Dimension>
-void ITKAbsImage::dataCheck()
+template <typename InputPixelType, typename OutputPixelType, unsigned int Dimension> void ITKAbsImage::dataCheck()
 {
   // Check consistency of parameters
 
@@ -102,24 +96,22 @@ void ITKAbsImage::dataCheckInternal()
 //
 // -----------------------------------------------------------------------------
 
-template<typename InputPixelType, typename OutputPixelType, unsigned int Dimension>
-void ITKAbsImage::filter()
+template <typename InputPixelType, typename OutputPixelType, unsigned int Dimension> void ITKAbsImage::filter()
 {
   typedef itk::Dream3DImage<InputPixelType, Dimension> InputImageType;
   typedef itk::Dream3DImage<OutputPixelType, Dimension> OutputImageType;
-  //define filter
+  // define filter
   typedef itk::AbsImageFilter<InputImageType, OutputImageType> FilterType;
   typename FilterType::Pointer filter = FilterType::New();
   this->ITKImageBase::filter<InputPixelType, OutputPixelType, Dimension, FilterType>(filter);
-
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 void ITKAbsImage::filterInternal()
 {
-    Dream3DArraySwitchMacro(this->filter, getSelectedCellArrayPath(), -4);
+  Dream3DArraySwitchMacro(this->filter, getSelectedCellArrayPath(), -4);
 }
 
 // -----------------------------------------------------------------------------
@@ -139,12 +131,14 @@ AbstractFilter::Pointer ITKAbsImage::newFilterInstance(bool copyFilterParameters
 //
 // -----------------------------------------------------------------------------
 const QString ITKAbsImage::getHumanLabel()
-{ return "ITK::Abs Image Filter"; }
+{
+  return "ITK::Abs Image Filter";
+}
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 const QString ITKAbsImage::getSubGroupName()
-{ return "ITK IntensityTransformation"; }
-
-
+{
+  return "ITK IntensityTransformation";
+}

ITKImageProcessingFilters/ITKAbsImage.cpp

@@ -14,83 +14,77 @@
 
 #include "ITKImageBase.h"
 
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include "SIMPLib/SIMPLib.h"
 
-//Auto includes
+// Auto includes
 #include <itkAbsImageFilter.h>
 
-
 /**
  * @brief The ITKAbsImage class. See [Filter documentation](@ref ITKAbsImage) for details.
  */
 class ITKAbsImage : public ITKImageBase
 {
   Q_OBJECT
 
-  public:
-    SIMPL_SHARED_POINTERS(ITKAbsImage)
-    SIMPL_STATIC_NEW_MACRO(ITKAbsImage)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ITKAbsImage, AbstractFilter)
-
-    virtual ~ITKAbsImage();
-
-
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    virtual AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    virtual const QString getHumanLabel() override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    virtual const QString getSubGroupName() override;
-    
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    virtual void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    virtual void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-  protected:
-    ITKAbsImage();
-
-    /**
-     * @brief dataCheckInternal overloads dataCheckInternal in ITKImageBase and calls templated dataCheck
-     */
-    void virtual dataCheckInternal() override;
-
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    template<typename InputImageType, typename OutputImageType, unsigned int Dimension>
-    void dataCheck();
-
-    /**
-    * @brief filterInternal overloads filterInternal in ITKImageBase and calls templated filter
-    */
-    void virtual filterInternal() override;
-
-    /**
-    * @brief Applies the filter
-    */
-    template<typename InputImageType, typename OutputImageType, unsigned int Dimension>
-    void filter();
-
-  private:
-
-    ITKAbsImage(const ITKAbsImage&); // Copy Constructor Not Implemented
-    void operator=(const ITKAbsImage&); // Operator '=' Not Implemented
+public:
+  SIMPL_SHARED_POINTERS(ITKAbsImage)
+  SIMPL_STATIC_NEW_MACRO(ITKAbsImage)
+  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ITKAbsImage, AbstractFilter)
+
+  virtual ~ITKAbsImage();
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  virtual AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  virtual const QString getHumanLabel() override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  virtual const QString getSubGroupName() override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  virtual void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  virtual void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+protected:
+  ITKAbsImage();
+
+  /**
+   * @brief dataCheckInternal overloads dataCheckInternal in ITKImageBase and calls templated dataCheck
+   */
+  void virtual dataCheckInternal() override;
+
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  template <typename InputImageType, typename OutputImageType, unsigned int Dimension> void dataCheck();
+
+  /**
+  * @brief filterInternal overloads filterInternal in ITKImageBase and calls templated filter
+  */
+  void virtual filterInternal() override;
+
+  /**
+  * @brief Applies the filter
+  */
+  template <typename InputImageType, typename OutputImageType, unsigned int Dimension> void filter();
+
+private:
+  ITKAbsImage(const ITKAbsImage&);    // Copy Constructor Not Implemented
+  void operator=(const ITKAbsImage&); // Operator '=' Not Implemented
 };
 
 #ifdef __clang__