X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FPlugins%2FImageReader.h;h=1bcf6aec5fff1c8c327894c3dd450dbd818444ae;hb=132530e0876c10981f096abfea81d92ca840d333;hp=2c73d70ddaae32af73b48c100a43b072c46b82ee;hpb=cb833d2fface96e020fe91584d2206860a8174ee;p=cpPlugins.git

diff --git a/lib/cpPlugins/Plugins/ImageReader.h b/lib/cpPlugins/Plugins/ImageReader.h
index 2c73d70..1bcf6ae 100644
--- a/lib/cpPlugins/Plugins/ImageReader.h
+++ b/lib/cpPlugins/Plugins/ImageReader.h
@@ -1,9 +1,15 @@
 #ifndef __CPPLUGINS__PLUGINS__IMAGEREADER__H__
 #define __CPPLUGINS__PLUGINS__IMAGEREADER__H__
 
+#include <vector>
+
 #include <cpPlugins/Plugins/cpPlugins_Export.h>
-#include <cpPlugins/Interface/ImageSource.h>
-#include <itkProcessObject.h>
+#include <cpPlugins/Interface/BaseProcessObjects.h>
+
+namespace itk
+{
+  class ImageIOBase;
+}
 
 namespace cpPlugins
 {
@@ -20,16 +26,14 @@ namespace cpPlugins
       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:
       itkNewMacro( Self );
       itkTypeMacro( ImageReader, cpPluginsInterfaceImageSource );
 
-    public:
-      virtual std::string GetClassName( ) const;
-
     protected:
       ImageReader( );
       virtual ~ImageReader( );
@@ -37,10 +41,10 @@ namespace cpPlugins
       virtual std::string _GenerateData( );
 
       template< unsigned int D >
-      std::string _GD0( );
+        std::string _GD0( itk::ImageIOBase* io, const TStringList& names );
 
       template< class P, unsigned int D >
-      std::string _GD1( );
+        std::string _RealGD( const TStringList& names );
 
     private:
       // Purposely not implemented
@@ -49,10 +53,7 @@ namespace cpPlugins
     };
 
     // ---------------------------------------------------------------------
-    PLUMA_INHERIT_PROVIDER_CPPLUGINS(
-      ImageReader,
-      cpPlugins::Interface::Object
-      );
+    CPPLUGINS_INHERIT_PROVIDER( ImageReader );
 
   } // ecapseman