]> Creatis software - cpPlugins.git/commitdiff
...
authorLeonardo Florez-Valencia <florez-l@javeriana.edu.co>
Tue, 5 Apr 2016 04:25:10 +0000 (23:25 -0500)
committerLeonardo Florez-Valencia <florez-l@javeriana.edu.co>
Tue, 5 Apr 2016 04:25:10 +0000 (23:25 -0500)
34 files changed:
lib/cpPlugins/CMakeLists.txt
lib/cpPlugins_Instances/Base.i
lib/cpPlugins_Instances/Base_extra.cxx
lib/cpPlugins_Instances/CMakeLists.txt
lib/cpPlugins_Instances/GaussianImageFilters.i [new file with mode: 0644]
lib/cpPlugins_Instances/Image.i
lib/cpPlugins_Instances/ImageFiltersBase.i
lib/cpPlugins_Instances/ImageIO.i
lib/cpPlugins_Instances/ImageIterators.i
lib/cpPlugins_Instances/InPlaceImageFiltersBase.i
lib/cpPlugins_Instances/ResamplingFilters.i
lib/cpPlugins_Instances/ThresholdFilters.i
lib/cpPlugins_Instances/Transforms.i
plugins/cpPluginsIO/ImageReader.cxx
plugins/cpPluginsIO/ImageWriter.cxx
plugins/cpPluginsImageFilters/BinaryThresholdImageFilter.cxx
plugins/cpPluginsImageFilters/CMakeLists.txt
plugins/cpPluginsImageFilters/ExtractImageFilter.cxx [deleted file]
plugins/cpPluginsImageFilters/ExtractImageFilter.h [deleted file]
plugins/cpPluginsImageFilters/HistogramThresholdImageFilter.cxx [deleted file]
plugins/cpPluginsImageFilters/HistogramThresholdImageFilter.h [deleted file]
plugins/cpPluginsImageFilters/ImageToHistogramFilter.cxx [deleted file]
plugins/cpPluginsImageFilters/ImageToHistogramFilter.h [deleted file]
plugins/cpPluginsImageFilters/IsoImageSlicer.cxx [deleted file]
plugins/cpPluginsImageFilters/IsoImageSlicer.h [deleted file]
plugins/cpPluginsImageFilters/JoinSeriesImageFilter.cxx [deleted file]
plugins/cpPluginsImageFilters/JoinSeriesImageFilter.h [deleted file]
plugins/cpPluginsImageFilters/MaskedImageToHistogramFilter.cxx [deleted file]
plugins/cpPluginsImageFilters/MaskedImageToHistogramFilter.h [deleted file]
plugins/cpPluginsImageFilters/MultiScaleGaussianImageFilter.cxx
plugins/cpPluginsImageFilters/OtsuThresholdImageFilter.cxx [deleted file]
plugins/cpPluginsImageFilters/OtsuThresholdImageFilter.h [deleted file]
plugins/cpPluginsImageFilters/ResampleImageFilter.cxx
plugins/cpPluginsWidgets/SeedWidget.cxx

index d289746dbc2184478d1aaaabed25def46d58cd51..5516a22a1ce442f51a699739318cd84a8bf59cdd 100644 (file)
@@ -84,17 +84,19 @@ SET(
 SET(
   target_LIBRARIES
   cpPlugins_Base
-  cpPlugins_Transforms
-  cpPlugins_Image
-  cpPlugins_Mesh
+  cpPlugins_DistanceMapFilters
+  cpPlugins_GaussianImageFilters
   cpPlugins_ImageFiltersBase
   cpPlugins_ImageIO
   cpPlugins_ImageIterators
   cpPlugins_ImageITK2VTK
-  cpPlugins_ThresholdFilters
-  cpPlugins_DistanceMapFilters
+  cpPlugins_Image
+  cpPlugins_InPlaceImageFiltersBase
+  cpPlugins_Mesh
   cpPlugins_ResamplingFilters
+  cpPlugins_ThresholdFilters
   cpPlugins_tinyxml2
+  cpPlugins_Transforms
   )
 IF(NOT WIN32)
   SET(
index 40e158d9c14d6c1bacbec7897bb6afc50cc36d4b..8a7e94643ac9e16c65bf7443da5414bfa3ae24eb 100644 (file)
@@ -1,6 +1,9 @@
 f cpPlugins_Config.h
 
+t itkArray.h
+t itkArray2D.h
 t itkCovariantVector.h
+t itkDiffusionTensor3D.h
 t itkFixedArray.h
 t itkMatrix.h
 t itkPoint.h
@@ -8,18 +11,23 @@ t itkRGBPixel.h
 t itkRGBAPixel.h
 t itkSymmetricEigenAnalysis.h
 t itkSymmetricSecondRankTensor.h
+t itkVariableLengthVector.h
 t itkVector.h
+t itkVectorContainer.h
 
-d #dims=1;2;3;4
+d #dims=1;2;3
 d #int=char;short;int;long
 d #float=float;double
 d #scalar=#int;unsigned #int;#float
 d #color_pixels=itk::RGBPixel< #scalar >;itk::RGBAPixel< #scalar >
 d #lin_alg_vectors=itk::CovariantVector;itk::Point;itk::Vector
 
+c @{itk::Array;itk::Array2D;itk::VariableLengthVector}< #float >
 c itk::FixedArray< #scalar, #dims >
 c #color_pixels
 c #lin_alg_vectors< #float, #dims >
 c itk::Matrix< #float, #dims, #dims >
 c itk::SymmetricEigenAnalysis< itk::Matrix< #float, #dims, #dims >, itk::FixedArray< #float, #dims >, itk::Matrix< #float, #dims, #dims > >
 c itk::SymmetricSecondRankTensor< #float, #dims >
+c itk::DiffusionTensor3D< #float >
+c itk::VectorContainer< unsigned long, itk::Point< #float, #dims > >
\ No newline at end of file
index 4da64631ef2ccd7c4451eee672a8e94716e77850..77449ff7121affed142063219b5fbe48c8a546d2 100644 (file)
@@ -2,10 +2,12 @@
 #include <cpPlugins_Config.h>
 
 #include <itkImageRegion.h>
+#include <itkFixedArray.h>
 #include <itkPoint.h>
 #include <itkVector.h>
 
 #include <itkImageRegion.hxx>
+#include <itkFixedArray.hxx>
 #include <itkPoint.hxx>
 #include <itkVector.hxx>
 
@@ -38,6 +40,7 @@ cpPlugins_Base_extra_SimpleArray( itk::ImageRegion, 4 );
   cpPlugins_Base_extra_Array_AllScalars( V, 3 );              \
   cpPlugins_Base_extra_Array_AllScalars( V, 4 )
 
+cpPlugins_Base_extra_Array_AllScalars_AllDims( itk::FixedArray );
 cpPlugins_Base_extra_Array_AllScalars_AllDims( itk::Point );
 cpPlugins_Base_extra_Array_AllScalars_AllDims( itk::Vector );
 
index a70119b932c8b897cd0fe8139487ea91801143cd..6dd61ea3c6c9c9a164ebe80a33d7955ba74ec83a 100644 (file)
@@ -45,8 +45,10 @@ TARGET_LINK_LIBRARIES(cpPlugins_ImageFiltersBase cpPlugins_Image)
 TARGET_LINK_LIBRARIES(cpPlugins_InPlaceImageFiltersBase cpPlugins_ImageFiltersBase)
 TARGET_LINK_LIBRARIES(cpPlugins_ThresholdFilters cpPlugins_InPlaceImageFiltersBase cpPlugins_ImageIterators)
 TARGET_LINK_LIBRARIES(cpPlugins_DistanceMapFilters cpPlugins_ThresholdFilters)
-TARGET_LINK_LIBRARIES(cpPlugins_ImageIO cpPlugins_ImageFiltersBase)
+TARGET_LINK_LIBRARIES(cpPlugins_ImageIO cpPlugins_ImageFiltersBase cpPlugins_ImageIterators)
 TARGET_LINK_LIBRARIES(cpPlugins_ImageITK2VTK cpPlugins_ImageFiltersBase)
+TARGET_LINK_LIBRARIES(cpPlugins_ResamplingFilters cpPlugins_ImageFiltersBase cpPlugins_ImageIterators cpPlugins_Transforms)
+TARGET_LINK_LIBRARIES(cpPlugins_GaussianImageFilters cpPlugins_ImageFiltersBase cpPlugins_ImageIterators)
 
 #TARGET_LINK_LIBRARIES(cpPlugins_Transforms
 #   cpPlugins_Base
diff --git a/lib/cpPlugins_Instances/GaussianImageFilters.i b/lib/cpPlugins_Instances/GaussianImageFilters.i
new file mode 100644 (file)
index 0000000..9792abd
--- /dev/null
@@ -0,0 +1,23 @@
+f cpPlugins_Instances/ImageFiltersBase.h
+
+t cpExtensions/Algorithms/MultiScaleGaussianImageFilter.h
+t itkGradientRecursiveGaussianImageFilter.h
+t itkImageToImageFilter.h
+t itkImageAdaptor.h
+t itkRecursiveGaussianImageFilter.h
+t itkRecursiveSeparableImageFilter.h
+t itkInPlaceImageFilter.h
+t itkUnaryFunctorImageFilter.h
+t itkBinaryFunctorImageFilter.h
+t itkImageRegionIteratorWithIndex.h
+t itkImageConstIteratorWithIndex.h
+t itkImageRegionConstIteratorWithIndex.h
+t itkSimpleDataObjectDecorator.h
+
+d #dims=2;3
+d #int=char;short;int;long
+d #float=float;double
+d #scalar=#int;unsigned #int;#float
+d #gradients=itk::CovariantVector
+
+c cpExtensions::Algorithms::MultiScaleGaussianImageFilter< itk::Image< #scalar, #dims >, itk::Image< #gradients< #float, #dims >, #dims > >
index 1370210d5e590e246db4c5a04daa04568b4e3abd..13879971628a1444adebed3c4da63d62519563cf 100644 (file)
@@ -6,7 +6,7 @@ t itkImageBase.h
 t itkImportImageContainer.h
 t itkImageRegion.h
 
-d #dims=1;2;3;4
+d #dims=1;2;3
 d #int=char;short;int;long
 d #float=float;double
 d #scalar=#int;unsigned #int;#float
@@ -20,7 +20,9 @@ d #double_array_pixels=itk::Matrix
 c itk::ImportImageContainer< unsigned long, #pixels >
 c itk::ImportImageContainer< unsigned long, #array_pixels< #float, #dims > >
 c itk::ImportImageContainer< unsigned long, #double_array_pixels< #float, #dims, #dims > >
+c itk::ImportImageContainer< unsigned long, itk::DiffusionTensor3D< #float > >
 
 c itk::Image< #pixels, #dims >
 c itk::Image< #array_pixels< #float, #dims >, #dims >
 c itk::Image< #double_array_pixels< #float, #dims, #dims >, #dims >
+c itk::Image< itk::DiffusionTensor3D< #float >, #dims >
index 30b308a55eb9392275a7f4b7648e50b5b7d089e1..c93f46995f1195ff55c371a1f86457e4f3772758 100644 (file)
@@ -3,7 +3,7 @@ f cpPlugins_Instances/Image.h
 t itkImageSource.h
 t itkImageToImageFilter.h
 
-d #dims=1;2;3;4
+d #dims=2;3
 d #int=char;short;int;long
 d #float=float;double
 d #scalar=#int;unsigned #int;#float
index 4c781e063e768b8f68e8dcf8da58a7a4e2f97870..e6397bcff8cccf47bdd93d178d041da2052040fc 100644 (file)
@@ -12,8 +12,9 @@ t itkImageFileWriter.h
 t itkImageSeriesReader.h
 t itkConvertPixelBuffer.h
 t itkImageAlgorithm.h
+t itkSimpleDataObjectDecorator.h
 
-d #dims=1;2;3;4
+d #dims=2;3
 d #int=char;short;int;long
 d #float=float;double
 d #scalar=#int;unsigned #int;#float
index 276a9377dff3fe2504bdd08a27ee98c14b19aaec..29f4bc8b6872c0ca7fbccfdb6fe14c177e7c15a2 100644 (file)
@@ -19,7 +19,7 @@ t itkShapedNeighborhoodIterator.h
 t itkImageRegionConstIteratorWithIndex.h
 t itkImageRegionIteratorWithIndex.h
 
-d #dims=1;2;3;4
+d #dims=1;2;3
 d #int=char;short;int;long
 d #float=float;double
 d #scalar=#int;unsigned #int;#float
index 15469b684e84e295b3e0117a2bbb78ffa6d5f3cc..7ec274d08d6d282e8c3f1b31e43553e3756754ae 100644 (file)
@@ -2,7 +2,7 @@ f cpPlugins_Instances/ImageFiltersBase.h
 
 t itkInPlaceImageFilter.h
 
-d #dims=1;2;3;4
+d #dims=2;3
 d #int=char;short;int;long
 d #float=float;double
 d #scalar=#int;unsigned #int;#float
index 864a0b47066508c9a296d033e350cb1ab352cf93..46fc759c53ba23c7690d8a27c7ab0edb329f5713 100644 (file)
@@ -1,12 +1,14 @@
 f cpPlugins_Instances/ImageFiltersBase.h
 f cpPlugins_Instances/Transforms.h
-i itkContinuousIndex.h
+
 t itkResampleImageFilter.h
 t itkLinearInterpolateImageFunction.h
+t itkImageFunction.h
 
-c itk::LinearInterpolateImageFunction< itk::Image< #scalars, #dims >, #float_types >
-c itk::ResampleImageFilter< itk::Image< #scalars, #dims >, itk::Image< #scalars, #dims >, float, float >
-c itk::ResampleImageFilter< itk::Image< #scalars, #dims >, itk::Image< #scalars, #dims >, double, double >
+d #dims=2;3
+d #int=char;short;int;long
+d #float=float;double
+d #scalar=#int;unsigned #int;#float
 
-d #scalars=#int_types;#uint_types;#float_types
-d #dims=1;2;3;4
+c itk::LinearInterpolateImageFunction< itk::Image< #scalar, #dims >, #float >
+c itk::ResampleImageFilter< itk::Image< #scalar, #dims >, itk::Image< #scalar, #dims >, #float, #float >
index c0066bea973b450bbe7731c8dc8f7ea01f8b14b6..125d7cca2d6eb962eb50253f75ee18d740e0f175 100644 (file)
@@ -4,7 +4,7 @@ t itkBinaryThresholdImageFilter.h
 t itkUnaryFunctorImageFilter.h
 t itkSimpleDataObjectDecorator.h
 
-d #dims=1;2;3;4
+d #dims=2;3
 d #int=char;short;int;long
 d #float=float;double
 d #scalar=#int;unsigned #int;#float
index dc85eea2ad8b24566fea9cfdb01b6fb8b0659e98..15ce975422ba70b2c2ec6c851d643b919ff97e97 100644 (file)
@@ -1,6 +1,6 @@
 f cpPlugins_Instances/Base.h
 
-d #dims=1;2;3;4
+d #dims=2;3
 d #float=float;double
 
 t itkTransform.h
index 225bcdeb27bca72b943bb384312b44f37ac5b94c..f614a63807404b89483f1370aae723ca4599cb8e 100644 (file)
@@ -45,10 +45,10 @@ _GenerateData( )
       {
         switch( io->GetNumberOfDimensions( ) )
         {
-        case 1: r = this->_GD0< 1 >( io ); break;
+          // TODO: case 1: r = this->_GD0< 1 >( io ); break;
         case 2: r = this->_GD0< 2 >( io ); break;
         case 3: r = this->_GD0< 3 >( io ); break;
-        case 4: r = this->_GD0< 4 >( io ); break;
+          // TODO: case 4: r = this->_GD0< 4 >( io ); break;
         default:
           r = "IO::ImageReader: Image dimension not supported.";
           break;
index ca4710a8d58f2d655267b28bd17113bfac0a57c9..80384174c247a3206c7b08e1bf7cda1074abb669 100644 (file)
@@ -31,8 +31,10 @@ _GenerateData( )
   {
     std::string   r = cpPlugin_Image_Demangle_Dim( _GD0, input, 3 );
     if( r != "" ) r = cpPlugin_Image_Demangle_Dim( _GD0, input, 2 );
-    if( r != "" ) r = cpPlugin_Image_Demangle_Dim( _GD0, input, 4 );
-    if( r != "" ) r = cpPlugin_Image_Demangle_Dim( _GD0, input, 1 );
+    /* TODO
+       if( r != "" ) r = cpPlugin_Image_Demangle_Dim( _GD0, input, 4 );
+       if( r != "" ) r = cpPlugin_Image_Demangle_Dim( _GD0, input, 1 );
+    */
     return( r );
   }
   catch( itk::ExceptionObject& err )
index 62cafdb1f0a47305ccf0c76cd5fc8c95588bd1ca..6c49a3efe12f3c47b35105a9065f72195f462b05 100644 (file)
@@ -33,10 +33,12 @@ std::string cpPluginsImageFilters::BinaryThresholdImageFilter::
 _GenerateData( )
 {
   auto image = this->GetInputData( "Input" )->GetITK< itk::DataObject >( );
-  std::string   cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 1 );
-  if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 2 );
+  std::string   cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 2 );
   if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 3 );
-  if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 4 );
+  /* TODO
+     if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 1 );
+     if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 4 );
+  */
   return( r );
 }
 
index bd8d5046866794d074a5777672b8162d10ee95a0..99fca1514fcbbbca333efe33bd13da8dff2053b7 100644 (file)
@@ -5,27 +5,12 @@ SET(lib_DIR  cpPluginsImageFilters)
 ## = Source code =
 ## ===============
 
-#FILE(GLOB lib_HEADERS_H   "*.h")
+FILE(GLOB lib_HEADERS_H   "*.h")
 FILE(GLOB lib_HEADERS_HPP "*.hpp")
 FILE(GLOB lib_HEADERS_HXX "*.hxx")
 FILE(GLOB lib_SOURCES_C   "*.c")
 FILE(GLOB lib_SOURCES_CPP "*.cpp")
-#FILE(GLOB lib_SOURCES_CXX "*.cxx")
-
-SET(
-  lib_HEADERS_H
-  ${CMAKE_CURRENT_SOURCE_DIR}/SignedMaurerDistanceMapImageFilter.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/BinaryThresholdImageFilter.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/BinaryContourImageFilter.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/ResampleImageFilter.h
-  )
-SET(
-  lib_SOURCES_CXX
-  ${CMAKE_CURRENT_SOURCE_DIR}/SignedMaurerDistanceMapImageFilter.cxx
-  ${CMAKE_CURRENT_SOURCE_DIR}/BinaryThresholdImageFilter.cxx
-  ${CMAKE_CURRENT_SOURCE_DIR}/BinaryContourImageFilter.cxx
-  ${CMAKE_CURRENT_SOURCE_DIR}/ResampleImageFilter.cxx
-  )
+FILE(GLOB lib_SOURCES_CXX "*.cxx")
 
 # ===================================
 # = Integrate all source file names =
diff --git a/plugins/cpPluginsImageFilters/ExtractImageFilter.cxx b/plugins/cpPluginsImageFilters/ExtractImageFilter.cxx
deleted file mode 100644 (file)
index ac2b1cd..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-#include <cpPluginsImageFilters/ExtractImageFilter.h>
-#include <cpPlugins/Image.h>
-#include <cpPlugins_ITKInstances/ImageFilters.h>
-
-#include <itkExtractImageFilter.h>
-#include <itkExtractImageFilter.hxx>
-#include <itkImageAlgorithm.hxx>
-
-// -------------------------------------------------------------------------
-cpPluginsImageFilters::ExtractImageFilter::
-ExtractImageFilter( )
-  : Superclass( )
-{
-  this->_AddInput( "Input" );
-  this->_AddOutput< cpPlugins::Image >( "Output" );
-  this->m_Parameters.ConfigureAsBool( "ReduceDimension" );
-  this->m_Parameters.SetBool( "ReduceDimension", false );
-
-  /* TODO
-     std::vector< std::string > choices;
-     choices.push_back( "float" );
-     choices.push_back( "double" );
-     this->m_Parameters.ConfigureAsChoices( "ScalarType", choices );
-     this->m_Parameters.SetSelectedChoice( "ScalarType", "float" );
-     this->m_Parameters.ConfigureAsReal( "UpperThresholdValue" );
-     this->m_Parameters.ConfigureAsUint( "InsideValue" );
-     this->m_Parameters.ConfigureAsUint( "OutsideValue" );
-
-     this->m_Parameters.SetReal( "LowerThresholdValue", 0 );
-     this->m_Parameters.SetReal( "UpperThresholdValue", 10000 );
-     this->m_Parameters.SetReal( "InsideValue", 1 );
-     this->m_Parameters.SetReal( "OutsideValue", 0 );
-  */
-}
-
-// -------------------------------------------------------------------------
-cpPluginsImageFilters::ExtractImageFilter::
-~ExtractImageFilter( )
-{
-}
-
-// -------------------------------------------------------------------------
-std::string cpPluginsImageFilters::ExtractImageFilter::
-_GenerateData( )
-{
-  auto image = this->GetInputData( "Input" )->GetITK< itk::DataObject >( );
-  std::string cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 3 );
-  return( r );
-}
-
-// -------------------------------------------------------------------------
-template< class _TImage >
-std::string cpPluginsImageFilters::ExtractImageFilter::
-_GD0( _TImage* image )
-{
-  typedef
-    itk::Image< typename _TImage::PixelType, _TImage::ImageDimension - 1 >
-    _TOutImage;
-  typedef itk::ExtractImageFilter< _TImage, _TOutImage > _TFilter;
-
-  if( image == NULL )
-    return(
-      "ImageFilters::ExtractImageFilter: No valid input image."
-      );
-
-
-  // Configure filter
-  typename _TImage::RegionType reg;
-
-  _TFilter* filter = this->_CreateITK< _TFilter >( );
-  filter->SetInput( image );
-  filter->SetExtractionRegion( reg );
-
-  // Connect output
-  this->GetOutputData( "Output" )->SetITK( filter->GetOutput( ) );
-  return( "" );
-}
-
-// eof - $RCSfile$
diff --git a/plugins/cpPluginsImageFilters/ExtractImageFilter.h b/plugins/cpPluginsImageFilters/ExtractImageFilter.h
deleted file mode 100644 (file)
index 6910cd1..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef __CPPLUGINSIMAGEFILTERS__EXTRACTIMAGEFILTER__H__
-#define __CPPLUGINSIMAGEFILTERS__EXTRACTIMAGEFILTER__H__
-
-#include <plugins/cpPluginsImageFilters/cpPluginsImageFilters_Export.h>
-#include <cpPlugins/ProcessObject.h>
-
-namespace cpPluginsImageFilters
-{
-  /**
-   */
-  class cpPluginsImageFilters_EXPORT ExtractImageFilter
-    : public cpPlugins::ProcessObject
-  {
-  public:
-    typedef ExtractImageFilter                  Self;
-    typedef cpPlugins::ProcessObject        Superclass;
-    typedef itk::SmartPointer< Self >       Pointer;
-    typedef itk::SmartPointer< const Self > ConstPointer;
-
-  public:
-    itkNewMacro( Self );
-    itkTypeMacro( ExtractImageFilter, cpPlugins::ProcessObject );
-    cpPlugins_Id_Macro( ExtractImageFilter, ImageFilters );
-
-  protected:
-    ExtractImageFilter( );
-    virtual ~ExtractImageFilter( );
-
-    virtual std::string _GenerateData( ) ITK_OVERRIDE;
-
-    template< class _TImage >
-      inline std::string _GD0( _TImage* image );
-
-  private:
-    // Purposely not implemented
-    ExtractImageFilter( const Self& );
-    Self& operator=( const Self& );
-  };
-
-} // ecapseman
-
-#endif // __CPPLUGINSIMAGEFILTERS__EXTRACTIMAGEFILTER__H__
-
-// eof - $RCSfile$
diff --git a/plugins/cpPluginsImageFilters/HistogramThresholdImageFilter.cxx b/plugins/cpPluginsImageFilters/HistogramThresholdImageFilter.cxx
deleted file mode 100644 (file)
index c890d83..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-#include <cpPluginsImageFilters/HistogramThresholdImageFilter.h>
-#include <cpPlugins/Image.h>
-#include <cpPlugins_ITKInstances/ImageFilters.h>
-
-#include <itkHistogramThresholdImageFilter.h>
-#include <itkHistogramThresholdImageFilter.hxx>
-#include <itkBinaryFunctorImageFilter.hxx>
-#include <itkImageToHistogramFilter.hxx>
-#include <itkMaskedImageToHistogramFilter.hxx>
-#include <itkBinaryThresholdImageFilter.hxx>
-
-// -------------------------------------------------------------------------
-cpPluginsImageFilters::HistogramThresholdImageFilter::
-HistogramThresholdImageFilter( )
-  : Superclass( )
-{
-  this->_AddInput( "Input" );
-  this->_AddInput( "Calculator" );
-  this->_AddInput( "Mask", false );
-  this->_AddOutput< cpPlugins::Image >( "Output" );
-
-  this->m_Parameters.ConfigureAsUint( "NumberOfHistogramBins" );
-  this->m_Parameters.ConfigureAsBool( "AutoMinimumMaximum" );
-  this->m_Parameters.ConfigureAsBool( "MaskOutput" );
-  this->m_Parameters.ConfigureAsReal( "MaskValue" );
-  this->m_Parameters.ConfigureAsReal( "Threshold" );
-
-  this->m_Parameters.SetUint( "NumberOfHistogramBins", 256 );
-  this->m_Parameters.SetBool( "AutoMinimumMaximum", true );
-  this->m_Parameters.SetBool( "MaskOutput", false );
-  this->m_Parameters.SetReal( "MaskValue", 1 );
-  this->m_Parameters.SetReal( "Threshold", 0 );
-}
-
-// -------------------------------------------------------------------------
-cpPluginsImageFilters::HistogramThresholdImageFilter::
-~HistogramThresholdImageFilter( )
-{
-}
-
-// -------------------------------------------------------------------------
-std::string cpPluginsImageFilters::HistogramThresholdImageFilter::
-_GenerateData( )
-{
-  auto image = this->GetInputData( "Input" )->GetITK< itk::DataObject >( );
-  std::string   cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 1 );
-  if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 2 );
-  if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 3 );
-  if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 4 );
-  return( r );
-}
-
-// -------------------------------------------------------------------------
-template< class _TImage >
-std::string cpPluginsImageFilters::HistogramThresholdImageFilter::
-_GD0( _TImage* image )
-{
-  if( image != NULL )
-    return( this->_GD1< _TImage, unsigned char >( image ) );
-  else
-    return(
-      "ImageFilters::HistogramThresholdImageFilter: No valid input image."
-      );
-}
-
-// -------------------------------------------------------------------------
-template< class _TImage, class _TBinaryPixel >
-std::string cpPluginsImageFilters::HistogramThresholdImageFilter::
-_GD1( _TImage* image )
-{
-  typedef itk::Image< _TBinaryPixel, _TImage::ImageDimension > _TBinaryImage;
-  typedef itk::HistogramThresholdImageFilter< _TImage, _TBinaryImage > _TFilter;
-
-  // Get parameters
-
-  // Configure filter
-  _TFilter* filter = this->_CreateITK< _TFilter >( );
-  filter->SetInput( image );
-  filter->Update( );
-
-  // Connect output
-  this->GetOutputData( "Output" )->SetITK( filter->GetOutput( ) );
-  return( "HistogramThresholdImage: not complete yet." );
-}
-
-// eof - $RCSfile$
diff --git a/plugins/cpPluginsImageFilters/HistogramThresholdImageFilter.h b/plugins/cpPluginsImageFilters/HistogramThresholdImageFilter.h
deleted file mode 100644 (file)
index 1c0260f..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef __CPPLUGINSIMAGEFILTERS__HISTOGRAMTHRESHOLDIMAGEFILTER__H__
-#define __CPPLUGINSIMAGEFILTERS__HISTOGRAMTHRESHOLDIMAGEFILTER__H__
-
-#include <plugins/cpPluginsImageFilters/cpPluginsImageFilters_Export.h>
-#include <cpPlugins/ProcessObject.h>
-
-namespace cpPluginsImageFilters
-{
-  /**
-   */
-  class cpPluginsImageFilters_EXPORT HistogramThresholdImageFilter
-    : public cpPlugins::ProcessObject
-  {
-  public:
-    typedef HistogramThresholdImageFilter   Self;
-    typedef cpPlugins::ProcessObject        Superclass;
-    typedef itk::SmartPointer< Self >       Pointer;
-    typedef itk::SmartPointer< const Self > ConstPointer;
-
-  public:
-    itkNewMacro( Self );
-    itkTypeMacro( HistogramThresholdImageFilter, cpPlugins::ProcessObject );
-    cpPlugins_Id_Macro( HistogramThresholdImageFilter, ImageFilters );
-
-  protected:
-    HistogramThresholdImageFilter( );
-    virtual ~HistogramThresholdImageFilter( );
-
-    virtual std::string _GenerateData( ) ITK_OVERRIDE;
-
-    template< class _TImage >
-      inline std::string _GD0( _TImage* image );
-
-    template< class _TImage, class _TBinaryPixel >
-      inline std::string _GD1( _TImage* image );
-
-  private:
-    // Purposely not implemented
-    HistogramThresholdImageFilter( const Self& );
-    Self& operator=( const Self& );
-  };
-
-} // ecapseman
-
-#endif // __CPPLUGINSIMAGEFILTERS__HISTOGRAMTHRESHOLDIMAGEFILTER__H__
-
-// eof - $RCSfile$
diff --git a/plugins/cpPluginsImageFilters/ImageToHistogramFilter.cxx b/plugins/cpPluginsImageFilters/ImageToHistogramFilter.cxx
deleted file mode 100644 (file)
index 968e5a5..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-#include <cpPluginsImageFilters/ImageToHistogramFilter.h>
-#include <cpPlugins/Image.h>
-#include <cpPlugins_ITKInstances/ImageFilters.h>
-
-#include <itkImageToHistogramFilter.h>
-#include <itkImageToHistogramFilter.hxx>
-
-// -------------------------------------------------------------------------
-cpPluginsImageFilters::ImageToHistogramFilter::
-ImageToHistogramFilter( )
-  : Superclass( )
-{
-  this->_AddInput( "Input" );
-  this->_AddOutput< cpPlugins::DataObject >( "Output" );
-}
-
-// -------------------------------------------------------------------------
-cpPluginsImageFilters::ImageToHistogramFilter::
-~ImageToHistogramFilter( )
-{
-}
-
-// -------------------------------------------------------------------------
-std::string cpPluginsImageFilters::ImageToHistogramFilter::
-_GenerateData( )
-{
-  auto image = this->GetInputData( "Input" )->GetITK< itk::DataObject >( );
-  std::string   cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 1 );
-  if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 2 );
-  if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 3 );
-  if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 4 );
-  return( r );
-}
-
-// -------------------------------------------------------------------------
-template< class _TImage >
-std::string cpPluginsImageFilters::ImageToHistogramFilter::
-_GD0( _TImage* image )
-{
-  typedef itk::Statistics::ImageToHistogramFilter< _TImage > _TFilter;
-  /*
-    typedef typename _TImage::PixelType _TP;
-    typedef typename _TBinaryImage::PixelType _UP;
-
-    // Get parameters
-    _TP lower_val = _TP( this->m_Parameters.GetReal( "LowerThresholdValue" ) );
-    _TP upper_val = _TP( this->m_Parameters.GetReal( "UpperThresholdValue" ) );
-    _UP in_val    = _UP( this->m_Parameters.GetUint( "InsideValue" ) );
-    _UP out_val   = _UP( this->m_Parameters.GetUint( "OutsideValue" ) );
-  */
-
-  // Configure filter
-  _TFilter* filter = this->_CreateITK< _TFilter >( );
-  filter->SetInput( image );
-  /*
-    filter->SetLowerThreshold( lower_val );
-    filter->SetUpperThreshold( upper_val );
-    filter->SetInsideValue( in_val );
-    filter->SetOutsideValue( out_val );
-  */
-  filter->Update( );
-
-  // Connect output
-  this->GetOutputData( "Output" )->SetITK( filter->GetOutput( ) );
-  return( "ImageToHistogramFilter: not ready yet." );
-}
-
-// eof - $RCSfile$
diff --git a/plugins/cpPluginsImageFilters/ImageToHistogramFilter.h b/plugins/cpPluginsImageFilters/ImageToHistogramFilter.h
deleted file mode 100644 (file)
index d166a3c..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef __CPPLUGINSIMAGEFILTERS__IMAGETOHISTOGRAMFILTER__H__
-#define __CPPLUGINSIMAGEFILTERS__IMAGETOHISTOGRAMFILTER__H__
-
-#include <plugins/cpPluginsImageFilters/cpPluginsImageFilters_Export.h>
-#include <cpPlugins/ProcessObject.h>
-
-namespace cpPluginsImageFilters
-{
-  /**
-   */
-  class cpPluginsImageFilters_EXPORT ImageToHistogramFilter
-    : public cpPlugins::ProcessObject
-  {
-  public:
-    typedef ImageToHistogramFilter          Self;
-    typedef cpPlugins::ProcessObject        Superclass;
-    typedef itk::SmartPointer< Self >       Pointer;
-    typedef itk::SmartPointer< const Self > ConstPointer;
-
-  public:
-    itkNewMacro( Self );
-    itkTypeMacro( ImageToHistogramFilter, cpPlugins::ProcessObject );
-    cpPlugins_Id_Macro( ImageToHistogramFilter, ImageFilters );
-
-  protected:
-    ImageToHistogramFilter( );
-    virtual ~ImageToHistogramFilter( );
-
-    virtual std::string _GenerateData( ) ITK_OVERRIDE;
-
-    template< class _TImage >
-      inline std::string _GD0( _TImage* image );
-
-  private:
-    // Purposely not implemented
-    ImageToHistogramFilter( const Self& );
-    Self& operator=( const Self& );
-  };
-
-} // ecapseman
-
-#endif // __CPPLUGINSIMAGEFILTERS__IMAGETOHISTOGRAMFILTER__H__
-
-// eof - $RCSfile$
diff --git a/plugins/cpPluginsImageFilters/IsoImageSlicer.cxx b/plugins/cpPluginsImageFilters/IsoImageSlicer.cxx
deleted file mode 100644 (file)
index 5869746..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-#include <cpPluginsImageFilters/IsoImageSlicer.h>
-#include <cpPlugins/Image.h>
-#include <cpPlugins_ITKInstances/ImageFilters.h>
-
-#include <cpExtensions/Algorithms/IsoImageSlicer.h>
-#include <cpExtensions/Algorithms/IsoImageSlicer.hxx>
-#include <itkAffineTransform.hxx>
-#include <itkMatrixOffsetTransformBase.hxx>
-#include <itkVariableLengthVector.hxx>
-#include <itkDiffusionTensor3D.hxx>
-#include <itkOptimizerParameters.hxx>
-#include <itkExtractImageFilter.hxx>
-#include <itkResampleImageFilter.hxx>
-#include <itkSymmetricSecondRankTensor.hxx>
-#include <itkLinearInterpolateImageFunction.hxx>
-
-/*
-  #include <itkIsoImageSlicer.h>
-  #include <itkIsoImageSlicer.hxx>
-  #include <itkUnaryFunctorImageFilter.hxx>
-*/
-
-// -------------------------------------------------------------------------
-cpPluginsImageFilters::IsoImageSlicer::
-IsoImageSlicer( )
-  : Superclass( )
-{
-  this->_AddInput( "Input" );
-  this->_AddOutput< cpPlugins::Image >( "Output" );
-
-  std::vector< std::string > choices;
-  choices.push_back( "float" );
-  choices.push_back( "double" );
-  this->m_Parameters.ConfigureAsChoices( "ScalarType", choices );
-  this->m_Parameters.SetSelectedChoice( "ScalarType", "float" );
-  /* TODO
-     this->m_Parameters.ConfigureAsReal( "LowerThresholdValue" );
-     this->m_Parameters.ConfigureAsReal( "UpperThresholdValue" );
-     this->m_Parameters.ConfigureAsUint( "InsideValue" );
-     this->m_Parameters.ConfigureAsUint( "OutsideValue" );
-
-     this->m_Parameters.SetReal( "LowerThresholdValue", 0 );
-     this->m_Parameters.SetReal( "UpperThresholdValue", 10000 );
-     this->m_Parameters.SetReal( "InsideValue", 1 );
-     this->m_Parameters.SetReal( "OutsideValue", 0 );
-  */
-}
-
-// -------------------------------------------------------------------------
-cpPluginsImageFilters::IsoImageSlicer::
-~IsoImageSlicer( )
-{
-}
-
-// -------------------------------------------------------------------------
-std::string cpPluginsImageFilters::IsoImageSlicer::
-_GenerateData( )
-{
-  auto image = this->GetInputData( "Input" )->GetITK< itk::DataObject >( );
-  std::string cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 3 );
-  return( r );
-}
-
-// -------------------------------------------------------------------------
-template< class _TImage >
-std::string cpPluginsImageFilters::IsoImageSlicer::
-_GD0( _TImage* image )
-{
-  if( image != NULL )
-  {
-    auto choice = this->m_Parameters.GetSelectedChoice( "OutputResolution" );
-    if( choice == "float" )
-      return( this->_GD1< _TImage, float >( image ) );
-    else if( choice == "double" )
-      return( this->_GD1< _TImage, double >( image ) );
-    else return( "IsoImageSlicer: no valid scalar type." );
-  }
-  else
-    return(
-      "ImageFilters::IsoImageSlicer: No valid input image."
-      );
-}
-
-// -------------------------------------------------------------------------
-template< class _TImage, class _TScalar >
-std::string cpPluginsImageFilters::IsoImageSlicer::
-_GD1( _TImage* image )
-{
-  typedef
-    cpExtensions::Algorithms::IsoImageSlicer< _TImage, _TScalar >
-    _TFilter;
-  typedef typename _TFilter::TVector _TVector;
-  typedef typename _TFilter::TMatrix _TMatrix;
-
-  // Configure filter
-  _TFilter* filter = this->_CreateITK< _TFilter >( );
-  filter->SetInput( image );
-  filter->SetInterpolator( NULL );
-  filter->SetTranslation( _TVector( ) );
-  filter->SetRotation( _TMatrix( ) );
-  filter->SetSize( 1 );
-  /* TODO
-     filter->SetLowerThreshold( lower_val );
-     filter->SetUpperThreshold( upper_val );
-     filter->SetInsideValue( in_val );
-     filter->SetOutsideValue( out_val );
-     filter->Update( );
-  */
-
-  // Connect output
-  this->GetOutputData( "Output" )->SetITK( filter->GetOutput( ) );
-  return( "" );
-}
-
-#include <cpExtensions/Algorithms/BezierCurveFunction.h>
-#include <cpExtensions/Algorithms/BezierCurveFunction.hxx>
-
-template class cpPluginsImageFilters_EXPORT cpExtensions::Algorithms::BezierCurveFunction< itk::Vector< float, 3 > >;
-template class cpPluginsImageFilters_EXPORT cpExtensions::Algorithms::BezierCurveFunction< itk::Vector< double, 3 > >;
-
-// eof - $RCSfile$
diff --git a/plugins/cpPluginsImageFilters/IsoImageSlicer.h b/plugins/cpPluginsImageFilters/IsoImageSlicer.h
deleted file mode 100644 (file)
index d0f6c9e..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef __CPPLUGINSIMAGEFILTERS__ISOIMAGESLICER__H__
-#define __CPPLUGINSIMAGEFILTERS__ISOIMAGESLICER__H__
-
-#include <plugins/cpPluginsImageFilters/cpPluginsImageFilters_Export.h>
-#include <cpPlugins/ProcessObject.h>
-
-namespace cpPluginsImageFilters
-{
-  /**
-   */
-  class cpPluginsImageFilters_EXPORT IsoImageSlicer
-    : public cpPlugins::ProcessObject
-  {
-  public:
-    typedef IsoImageSlicer                  Self;
-    typedef cpPlugins::ProcessObject        Superclass;
-    typedef itk::SmartPointer< Self >       Pointer;
-    typedef itk::SmartPointer< const Self > ConstPointer;
-
-  public:
-    itkNewMacro( Self );
-    itkTypeMacro( IsoImageSlicer, cpPlugins::ProcessObject );
-    cpPlugins_Id_Macro( IsoImageSlicer, ImageFilters );
-
-  protected:
-    IsoImageSlicer( );
-    virtual ~IsoImageSlicer( );
-
-    virtual std::string _GenerateData( ) ITK_OVERRIDE;
-
-    template< class _TImage >
-      inline std::string _GD0( _TImage* image );
-
-    template< class _TImage, class _TScalar >
-      inline std::string _GD1( _TImage* image );
-
-  private:
-    // Purposely not implemented
-    IsoImageSlicer( const Self& );
-    Self& operator=( const Self& );
-  };
-
-} // ecapseman
-
-#endif // __CPPLUGINSIMAGEFILTERS__ISOIMAGESLICER__H__
-
-// eof - $RCSfile$
diff --git a/plugins/cpPluginsImageFilters/JoinSeriesImageFilter.cxx b/plugins/cpPluginsImageFilters/JoinSeriesImageFilter.cxx
deleted file mode 100644 (file)
index 9b58be4..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-#include <cpPluginsImageFilters/JoinSeriesImageFilter.h>
-#include <cpPlugins/Image.h>
-#include <cpPlugins_ITKInstances/ImageFilters.h>
-
-#include <itkJoinSeriesImageFilter.h>
-#include <itkJoinSeriesImageFilter.hxx>
-#include <itkImageAlgorithm.hxx>
-
-// -------------------------------------------------------------------------
-cpPluginsImageFilters::JoinSeriesImageFilter::
-JoinSeriesImageFilter( )
-  : Superclass( )
-{
-  this->_AddInput( "Input" );
-  this->_AddOutput< cpPlugins::Image >( "Output" );
-}
-
-// -------------------------------------------------------------------------
-cpPluginsImageFilters::JoinSeriesImageFilter::
-~JoinSeriesImageFilter( )
-{
-}
-
-// -------------------------------------------------------------------------
-std::string cpPluginsImageFilters::JoinSeriesImageFilter::
-_GenerateData( )
-{
-  auto image = this->GetInputData( "Input" )->GetITK< itk::DataObject >( );
-  std::string cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 2 );
-  return( r );
-}
-
-// -------------------------------------------------------------------------
-template< class _TImage >
-std::string cpPluginsImageFilters::JoinSeriesImageFilter::
-_GD0( _TImage* image )
-{
-  typedef
-    itk::Image< typename _TImage::PixelType, _TImage::ImageDimension + 1 >
-    _TOutImage;
-  typedef itk::JoinSeriesImageFilter< _TImage, _TOutImage > _TFilter;
-
-  if( image == NULL )
-    return(
-      "ImageFilters::JoinSeriesImageFilter: No valid input image."
-      );
-
-  // Configure filter
-  _TFilter* filter = this->_CreateITK< _TFilter >( );
-  filter->SetInput( image );
-  /* TODO
-     filter->SetLowerThreshold( lower_val );
-     filter->SetUpperThreshold( upper_val );
-     filter->SetInsideValue( in_val );
-     filter->SetOutsideValue( out_val );
-     filter->Update( );
-  */
-
-  // Connect output
-  this->GetOutputData( "Output" )->SetITK( filter->GetOutput( ) );
-  return( "" );
-}
-
-// eof - $RCSfile$
diff --git a/plugins/cpPluginsImageFilters/JoinSeriesImageFilter.h b/plugins/cpPluginsImageFilters/JoinSeriesImageFilter.h
deleted file mode 100644 (file)
index 2e0aff5..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef __CPPLUGINSIMAGEFILTERS__JOINSERIESIMAGEFILTER__H__
-#define __CPPLUGINSIMAGEFILTERS__JOINSERIESIMAGEFILTER__H__
-
-#include <plugins/cpPluginsImageFilters/cpPluginsImageFilters_Export.h>
-#include <cpPlugins/ProcessObject.h>
-
-namespace cpPluginsImageFilters
-{
-  /**
-   */
-  class cpPluginsImageFilters_EXPORT JoinSeriesImageFilter
-    : public cpPlugins::ProcessObject
-  {
-  public:
-    typedef JoinSeriesImageFilter           Self;
-    typedef cpPlugins::ProcessObject        Superclass;
-    typedef itk::SmartPointer< Self >       Pointer;
-    typedef itk::SmartPointer< const Self > ConstPointer;
-
-  public:
-    itkNewMacro( Self );
-    itkTypeMacro( JoinSeriesImageFilter, cpPlugins::ProcessObject );
-    cpPlugins_Id_Macro( JoinSeriesImageFilter, ImageFilters );
-
-  protected:
-    JoinSeriesImageFilter( );
-    virtual ~JoinSeriesImageFilter( );
-
-    virtual std::string _GenerateData( ) ITK_OVERRIDE;
-
-    template< class _TImage >
-      inline std::string _GD0( _TImage* image );
-
-    template< class _TImage, class _TScalar >
-      inline std::string _GD1( _TImage* image );
-
-  private:
-    // Purposely not implemented
-    JoinSeriesImageFilter( const Self& );
-    Self& operator=( const Self& );
-  };
-
-} // ecapseman
-
-#endif // __CPPLUGINSIMAGEFILTERS__JOINSERIESIMAGEFILTER__H__
-
-// eof - $RCSfile$
diff --git a/plugins/cpPluginsImageFilters/MaskedImageToHistogramFilter.cxx b/plugins/cpPluginsImageFilters/MaskedImageToHistogramFilter.cxx
deleted file mode 100644 (file)
index b2dd577..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-#include <cpPluginsImageFilters/MaskedImageToHistogramFilter.h>
-#include <cpPlugins/Image.h>
-#include <cpPlugins_ITKInstances/ImageFilters.h>
-
-#include <itkMaskedImageToHistogramFilter.h>
-#include <itkMaskedImageToHistogramFilter.hxx>
-#include <itkImageToHistogramFilter.hxx>
-
-// -------------------------------------------------------------------------
-cpPluginsImageFilters::MaskedImageToHistogramFilter::
-MaskedImageToHistogramFilter( )
-  : Superclass( )
-{
-  this->_AddInput( "Input" );
-  this->_AddInput( "Mask" );
-  this->_AddOutput< cpPlugins::DataObject >( "Output" );
-}
-
-// -------------------------------------------------------------------------
-cpPluginsImageFilters::MaskedImageToHistogramFilter::
-~MaskedImageToHistogramFilter( )
-{
-}
-
-// -------------------------------------------------------------------------
-std::string cpPluginsImageFilters::MaskedImageToHistogramFilter::
-_GenerateData( )
-{
-  auto image = this->GetInputData( "Input" )->GetITK< itk::DataObject >( );
-  std::string   cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 1 );
-  if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 2 );
-  if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 3 );
-  if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 4 );
-  return( r );
-}
-
-// -------------------------------------------------------------------------
-template< class _TImage >
-std::string cpPluginsImageFilters::MaskedImageToHistogramFilter::
-_GD0( _TImage* image )
-{
-  if( image != NULL )
-    return(
-      this->_GD1< _TImage, itk::Image< unsigned char, _TImage::ImageDimension > >( image )
-      );
-  else
-    return(
-      "ImageFilters::MaskedImageToHistogramFilter: No valid input image."
-      );
-}
-
-// -------------------------------------------------------------------------
-template< class _TImage, class _TMask >
-std::string cpPluginsImageFilters::MaskedImageToHistogramFilter::
-_GD1( _TImage* image )
-{
-  typedef itk::Statistics::MaskedImageToHistogramFilter< _TImage, _TMask > _F;
-
-  // Get parameters
-
-  // Configure filter
-  _F* filter = this->_CreateITK< _F >( );
-  /*
-    filter->SetInput( image );
-    filter->SetLowerThreshold( lower_val );
-    filter->SetUpperThreshold( upper_val );
-    filter->SetInsideValue( in_val );
-    filter->SetOutsideValue( out_val );
-    filter->Update( );
-
-    // Connect output
-    this->GetOutputData( "Output" )->SetITK( filter->GetOutput( ) );
-  */
-  return( "MaskedImageToHistogramFilter: not ready yet." );
-}
-
-// eof - $RCSfile$
diff --git a/plugins/cpPluginsImageFilters/MaskedImageToHistogramFilter.h b/plugins/cpPluginsImageFilters/MaskedImageToHistogramFilter.h
deleted file mode 100644 (file)
index 4c41418..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef __CPPLUGINSIMAGEFILTERS__MASKEDIMAGETOHISTOGRAMFILTER__H__
-#define __CPPLUGINSIMAGEFILTERS__MASKEDIMAGETOHISTOGRAMFILTER__H__
-
-#include <plugins/cpPluginsImageFilters/cpPluginsImageFilters_Export.h>
-#include <cpPlugins/ProcessObject.h>
-
-namespace cpPluginsImageFilters
-{
-  /**
-   */
-  class cpPluginsImageFilters_EXPORT MaskedImageToHistogramFilter
-    : public cpPlugins::ProcessObject
-  {
-  public:
-    typedef MaskedImageToHistogramFilter   Self;
-    typedef cpPlugins::ProcessObject        Superclass;
-    typedef itk::SmartPointer< Self >       Pointer;
-    typedef itk::SmartPointer< const Self > ConstPointer;
-
-  public:
-    itkNewMacro( Self );
-    itkTypeMacro( MaskedImageToHistogramFilter, cpPlugins::ProcessObject );
-    cpPlugins_Id_Macro( MaskedImageToHistogramFilter, ImageFilters );
-
-  protected:
-    MaskedImageToHistogramFilter( );
-    virtual ~MaskedImageToHistogramFilter( );
-
-    virtual std::string _GenerateData( ) ITK_OVERRIDE;
-
-    template< class _TImage >
-      inline std::string _GD0( _TImage* image );
-
-    template< class _TImage, class _TMask >
-      inline std::string _GD1( _TImage* image );
-
-  private:
-    // Purposely not implemented
-    MaskedImageToHistogramFilter( const Self& );
-    Self& operator=( const Self& );
-  };
-
-} // ecapseman
-
-#endif // __CPPLUGINSIMAGEFILTERS__MASKEDIMAGETOHISTOGRAMFILTER__H__
-
-// eof - $RCSfile$
index b3f2210e81959d4a130fe7754e9b766e4f88a4f3..224aa877e7377973e2ff78e50ef0cf27ecf184fb 100644 (file)
@@ -1,28 +1,30 @@
 #include <cpPluginsImageFilters/MultiScaleGaussianImageFilter.h>
 #include <cpPlugins/Image.h>
-#include <cpPlugins_ITKInstances/ImageFilters.h>
+#include <cpPlugins_Instances/GaussianImageFilters.h>
 
-#include <cpExtensions/Algorithms/MultiScaleGaussianImageFilter.h>
-#include <cpExtensions/Algorithms/MultiScaleGaussianImageFilter.hxx>
-#include <itkGradientRecursiveGaussianImageFilter.hxx>
-#include <itkImageAdaptor.hxx>
-#include <itkImageToImageFilter.hxx>
-#include <itkInPlaceImageFilter.hxx>
-#include <itkUnaryFunctorImageFilter.hxx>
-#include <itkRecursiveGaussianImageFilter.hxx>
-#include <itkImageConstIteratorWithIndex.hxx>
-#include <itkRecursiveSeparableImageFilter.hxx>
-#include <itkBinaryFunctorImageFilter.hxx>
-#include <itkImageRegionConstIterator.hxx>
-#include <itkImageScanlineIterator.hxx>
-#include <itkImageSource.hxx>
-#include <itkImageRegionIteratorWithIndex.hxx>
-#include <itkImageScanlineConstIterator.hxx>
-#include <itkImageRegionIterator.hxx>
-#include <itkSimpleDataObjectDecorator.hxx>
-#include <itkImageRegionConstIteratorWithIndex.hxx>
-#include <itkNthElementPixelAccessor.h>
-#include <itkImageBase.hxx>
+/*
+  #include <cpExtensions/Algorithms/MultiScaleGaussianImageFilter.h>
+  #include <cpExtensions/Algorithms/MultiScaleGaussianImageFilter.hxx>
+  #include <itkGradientRecursiveGaussianImageFilter.hxx>
+  #include <itkImageAdaptor.hxx>
+  #include <itkImageToImageFilter.hxx>
+  #include <itkInPlaceImageFilter.hxx>
+  #include <itkUnaryFunctorImageFilter.hxx>
+  #include <itkRecursiveGaussianImageFilter.hxx>
+  #include <itkImageConstIteratorWithIndex.hxx>
+  #include <itkRecursiveSeparableImageFilter.hxx>
+  #include <itkBinaryFunctorImageFilter.hxx>
+  #include <itkImageRegionConstIterator.hxx>
+  #include <itkImageScanlineIterator.hxx>
+  #include <itkImageSource.hxx>
+  #include <itkImageRegionIteratorWithIndex.hxx>
+  #include <itkImageScanlineConstIterator.hxx>
+  #include <itkImageRegionIterator.hxx>
+  #include <itkSimpleDataObjectDecorator.hxx>
+  #include <itkImageRegionConstIteratorWithIndex.hxx>
+  #include <itkNthElementPixelAccessor.h>
+  #include <itkImageBase.hxx>
+*/
 
 // -------------------------------------------------------------------------
 cpPluginsImageFilters::MultiScaleGaussianImageFilter::
diff --git a/plugins/cpPluginsImageFilters/OtsuThresholdImageFilter.cxx b/plugins/cpPluginsImageFilters/OtsuThresholdImageFilter.cxx
deleted file mode 100644 (file)
index b765f44..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-#include <cpPluginsImageFilters/OtsuThresholdImageFilter.h>
-#include <cpPlugins/Image.h>
-#include <cpPlugins_ITKInstances/ImageFilters.h>
-
-#include <itkOtsuThresholdImageFilter.h>
-#include <itkOtsuMultipleThresholdsCalculator.hxx>
-#include <itkOtsuThresholdCalculator.hxx>
-#include <itkHistogramThresholdImageFilter.hxx>
-#include <itkImageToHistogramFilter.hxx>
-#include <itkMaskedImageToHistogramFilter.hxx>
-#include <itkBinaryThresholdImageFilter.hxx>
-
-// -------------------------------------------------------------------------
-cpPluginsImageFilters::OtsuThresholdImageFilter::
-OtsuThresholdImageFilter( )
-  : Superclass( )
-{
-  this->_AddInput( "Input" );
-  this->_AddOutput< cpPlugins::Image >( "Output" );
-
-  this->m_Parameters.ConfigureAsUint( "NumberOfHistogramBins" );
-  this->m_Parameters.ConfigureAsUint( "InsideValue" );
-  this->m_Parameters.ConfigureAsUint( "OutsideValue" );
-
-  this->m_Parameters.SetUint( "NumberOfHistogramBins", 100 );
-  this->m_Parameters.SetUint( "InsideValue", 255 );
-  this->m_Parameters.SetUint( "OutsideValue", 0 );
-}
-
-// -------------------------------------------------------------------------
-cpPluginsImageFilters::OtsuThresholdImageFilter::
-~OtsuThresholdImageFilter( )
-{
-}
-
-// -------------------------------------------------------------------------
-std::string cpPluginsImageFilters::OtsuThresholdImageFilter::
-_GenerateData( )
-{
-  auto image = this->GetInputData( "Input" )->GetITK< itk::DataObject >( );
-  std::string   cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 1 );
-  if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 2 );
-  if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 3 );
-  if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 4 );
-  return( r );
-}
-
-// -------------------------------------------------------------------------
-template< class _TImage >
-std::string cpPluginsImageFilters::OtsuThresholdImageFilter::
-_GD0( _TImage* image )
-{
-  if( image != NULL )
-    return( this->_GD1< _TImage, unsigned char >( image ) );
-  else
-    return( "ImageFilters::OtsuThresholdImageFilter: No valid input image." );
-}
-
-// -------------------------------------------------------------------------
-template< class _TImage, class _TBinaryPixel >
-std::string cpPluginsImageFilters::OtsuThresholdImageFilter::
-_GD1( _TImage* image )
-{
-  typedef itk::Image< _TBinaryPixel, _TImage::ImageDimension > _TBinaryImage;
-  typedef itk::OtsuThresholdImageFilter< _TImage, _TBinaryImage > _TFilter;
-
-  // Get parameters
-  unsigned int bins = this->m_Parameters.GetUint( "NumberOfHistogramBins" );
-  _TBinaryPixel in_val = _TBinaryPixel( this->m_Parameters.GetUint( "InsideValue" ) );
-  _TBinaryPixel out_val = _TBinaryPixel( this->m_Parameters.GetUint( "OutsideValue" ) );
-
-  // Configure filter
-  _TFilter* filter = this->_CreateITK< _TFilter >( );
-  filter->SetInput( image );
-  filter->SetNumberOfHistogramBins( bins );
-  filter->SetInsideValue( out_val ); // WARNING: these are inverted
-  filter->SetOutsideValue( in_val );
-  filter->Update( );
-
-  // Connect output
-  this->GetOutputData( "Output" )->SetITK( filter->GetOutput( ) );
-  return( "" );
-}
-
-// eof - $RCSfile$
diff --git a/plugins/cpPluginsImageFilters/OtsuThresholdImageFilter.h b/plugins/cpPluginsImageFilters/OtsuThresholdImageFilter.h
deleted file mode 100644 (file)
index db5c201..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef __CPPLUGINSIMAGEFILTERS__OTSUTHRESHOLDIMAGEFILTER__H__
-#define __CPPLUGINSIMAGEFILTERS__OTSUTHRESHOLDIMAGEFILTER__H__
-
-#include <plugins/cpPluginsImageFilters/cpPluginsImageFilters_Export.h>
-#include <cpPlugins/ProcessObject.h>
-
-namespace cpPluginsImageFilters
-{
-  /**
-   */
-  class cpPluginsImageFilters_EXPORT OtsuThresholdImageFilter
-    : public cpPlugins::ProcessObject
-  {
-  public:
-    typedef OtsuThresholdImageFilter        Self;
-    typedef cpPlugins::ProcessObject        Superclass;
-    typedef itk::SmartPointer< Self >       Pointer;
-    typedef itk::SmartPointer< const Self > ConstPointer;
-
-  public:
-    itkNewMacro( Self );
-    itkTypeMacro( OtsuThresholdImageFilter, cpPlugins::ProcessObject );
-    cpPlugins_Id_Macro( OtsuThresholdImageFilter, ImageFilters );
-
-  protected:
-    OtsuThresholdImageFilter( );
-    virtual ~OtsuThresholdImageFilter( );
-
-    virtual std::string _GenerateData( ) ITK_OVERRIDE;
-
-    template< class _TImage >
-      inline std::string _GD0( _TImage* image );
-
-    template< class _TImage, class _TBinaryPixel >
-      inline std::string _GD1( _TImage* image );
-
-  private:
-    // Purposely not implemented
-    OtsuThresholdImageFilter( const Self& );
-    Self& operator=( const Self& );
-  };
-
-} // ecapseman
-
-#endif // __CPPLUGINSIMAGEFILTERS__OTSUTHRESHOLDIMAGEFILTER__H__
-
-// eof - $RCSfile$
index 1d5b592f56df2a98cd83621ae8a8719f865620d1..8c9a8dd2eb070a0c518d917f154a92e24bf3c0a4 100644 (file)
@@ -27,10 +27,12 @@ std::string cpPluginsImageFilters::ResampleImageFilter::
 _GenerateData( )
 {
   auto image = this->GetInputData( "Input" )->GetITK< itk::DataObject >( );
-  std::string   cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 1 );
-  if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 2 );
+  std::string   cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 2 );
   if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 3 );
-  if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 4 );
+  /* TODO
+     if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 1 );
+     if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 4 );
+  */
   return( r );
 }
 
index 34e8efb01a61394c82e0554e82fa688ebce2b7b9..03e721572851e1d1dbbd80bff1153df355af75c8 100644 (file)
@@ -5,6 +5,7 @@
 #include <cpExtensions/Interaction/ImageInteractorStyle.h>
 #include <vtkRenderWindowInteractor.h>
 #include <itkSimpleDataObjectDecorator.h>
+#include <itkSimpleDataObjectDecorator.hxx>
 
 // -------------------------------------------------------------------------
 itk::ModifiedTimeType cpPluginsWidgets::SeedWidget::