X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FPlugins%2FImageReader.h;h=f52d4096c54dd8732295426dc2c3b7c51da70fb5;hb=2361f4f97631e09d88d8a5510a369817dcaa19db;hp=6110c928f276cdfee78234b139ebcebea20298d6;hpb=8c23766af88a29c3e830299dffc4b95d9fe61df9;p=cpPlugins.git

diff --git a/lib/cpPlugins/Plugins/ImageReader.h b/lib/cpPlugins/Plugins/ImageReader.h
index 6110c92..f52d409 100644
--- a/lib/cpPlugins/Plugins/ImageReader.h
+++ b/lib/cpPlugins/Plugins/ImageReader.h
@@ -1,8 +1,13 @@
 #ifndef __CPPLUGINS__PLUGINS__IMAGEREADER__H__
 #define __CPPLUGINS__PLUGINS__IMAGEREADER__H__
 
-#include <cpPlugins/Interface/SourceObject.h>
-#include <itkProcessObject.h>
+#include <vector>
+
+#include <cpPlugins/cpPlugins_Export.h>
+#include <cpPlugins/Interface/ImageSource.h>
+
+#define ITK_MANUAL_INSTANTIATION
+#include <itkImageIOBase.h>
 
 namespace cpPlugins
 {
@@ -10,38 +15,43 @@ namespace cpPlugins
   {
     /**
      */
-    class ImageReader
-      : public cpPlugins::Interface::SourceObject
+    class cpPlugins_EXPORT ImageReader
+      : public cpPlugins::Interface::ImageSource
     {
     public:
-      typedef ImageReader                        Self;
-      typedef cpPlugins::Interface::SourceObject Superclass;
+      typedef ImageReader                       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;
+      typedef
+        std::vector< cpPlugins::Interface::Parameters::TString >
+        TStringList;
 
     public:
-      ImageReader( );
-      virtual ~ImageReader( );
-
-      virtual std::string GetClassName( ) const;
+      itkNewMacro( Self );
+      itkTypeMacro( ImageReader, cpPluginsInterfaceImageSource );
 
     protected:
+      ImageReader( );
+      virtual ~ImageReader( );
 
-      virtual bool _GenerateData( );
+      virtual std::string _GenerateData( );
 
       template< unsigned int D >
-      bool _GenerateData0( );
+        std::string _GD0( itk::ImageIOBase* io, const TStringList& names );
 
       template< class P, unsigned int D >
-      bool _GenerateData1( );
+        std::string _RealGD( const TStringList& names );
 
-    protected:
-      itk::ProcessObject::Pointer m_Reader;
+    private:
+      // Purposely not implemented
+      ImageReader( const Self& );
+      Self& operator=( const Self& );
     };
 
     // ---------------------------------------------------------------------
-    PLUMA_INHERIT_PROVIDER( ImageReader, cpPlugins::Interface::Object );
+    CPPLUGINS_INHERIT_PROVIDER( ImageReader );
 
   } // ecapseman