Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/cpPlugins

[cpPlugins.git] / lib / cpPlugins / Plugins / ImageSeriesReader.h

diff --git a/lib/cpPlugins/Plugins/ImageSeriesReader.h b/lib/cpPlugins/Plugins/ImageSeriesReader.h
index 6ddf039dbd19f3e4ec6e3a4b5df6fd544a4f3322..f2bcf03aca45f0de811d6cb100ac6b80cb2e2043 100644 (file)
--- a/lib/cpPlugins/Plugins/ImageSeriesReader.h
+++ b/lib/cpPlugins/Plugins/ImageSeriesReader.h
@@ -2,7 +2,7 @@
 #define __CPPLUGINS__PLUGINS__IMAGESERIESREADER__H__
 
 #include <cpPlugins/Plugins/cpPlugins_Export.h>
-#include <cpPlugins/Interface/SourceObject.h>
+#include <cpPlugins/Interface/ImageSource.h>
 #include <itkProcessObject.h>
 
 namespace cpPlugins
@@ -12,22 +12,24 @@ namespace cpPlugins
     /**
      */
     class cpPlugins_EXPORT ImageSeriesReader
-      : public cpPlugins::Interface::SourceObject
+      : public cpPlugins::Interface::ImageSource
     {
     public:
-      typedef ImageSeriesReader                        Self;
-      typedef cpPlugins::Interface::SourceObject Superclass;
-
-      typedef Superclass::TParameter  TParameter;
-      typedef Superclass::TParameters TParameters;
+      typedef ImageSeriesReader                 Self;
+      typedef cpPlugins::Interface::ImageSource Superclass;
+      typedef itk::SmartPointer< Self >         Pointer;
+      typedef itk::SmartPointer< const Self >   ConstPointer;
 
     public:
-      ImageSeriesReader( );
-      virtual ~ImageSeriesReader( );
+      itkNewMacro( Self );
+      itkTypeMacro( ImageSeriesReader, cpPluginsInterfaceImageSource );
 
+    public:
       virtual std::string GetClassName( ) const;
 
     protected:
+      ImageSeriesReader( );
+      virtual ~ImageSeriesReader( );
 
       virtual std::string _GenerateData( );
 
@@ -37,12 +39,14 @@ namespace cpPlugins
       template< class P, unsigned int D >
       std::string _GD1( );
 
-    protected:
-      itk::ProcessObject::Pointer m_Reader;
+    private:
+      // Purposely not implemented
+      ImageSeriesReader( const Self& );
+      Self& operator=( const Self& );
     };
 
     // ---------------------------------------------------------------------
-    PLUMA_INHERIT_PROVIDER( ImageSeriesReader, cpPlugins::Interface::Object );
+    CPPLUGINS_INHERIT_PROVIDER( ImageSeriesReader );
 
   } // ecapseman