X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FPlugins%2FImageSeriesReader.h;h=9bd9bc2c5c806552c2a5e81345c1fae3c2e9dfbb;hb=cb833d2fface96e020fe91584d2206860a8174ee;hp=6ddf039dbd19f3e4ec6e3a4b5df6fd544a4f3322;hpb=61e052afc5b659224bbc85b7d15b93402ea7d5a7;p=cpPlugins.git

diff --git a/lib/cpPlugins/Plugins/ImageSeriesReader.h b/lib/cpPlugins/Plugins/ImageSeriesReader.h
index 6ddf039..9bd9bc2 100644
--- 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,27 @@ namespace cpPlugins
     /**
      */
     class cpPlugins_EXPORT ImageSeriesReader
-      : public cpPlugins::Interface::SourceObject
+      : public cpPlugins::Interface::ImageSource
     {
     public:
-      typedef ImageSeriesReader                        Self;
-      typedef cpPlugins::Interface::SourceObject Superclass;
+      typedef ImageSeriesReader                 Self;
+      typedef cpPlugins::Interface::ImageSource Superclass;
+      typedef itk::SmartPointer< Self >         Pointer;
+      typedef itk::SmartPointer< const Self >   ConstPointer;
 
       typedef Superclass::TParameter  TParameter;
       typedef Superclass::TParameters TParameters;
 
     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 +42,17 @@ 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 );
+    PLUMA_INHERIT_PROVIDER_CPPLUGINS(
+      ImageSeriesReader,
+      cpPlugins::Interface::Object
+      );
 
   } // ecapseman