X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FPlugins%2FMeshReader.h;h=394f6a80bfe652447a761d282aace6d75d974193;hb=96914c02e23847c9d4ecdd085da689e61abb58f8;hp=968c4ac5ae536c10291f4f719780aa54308f7487;hpb=d97da4c5884307e660b0ed9135f87cffff174b93;p=cpPlugins.git

diff --git a/lib/cpPlugins/Plugins/MeshReader.h b/lib/cpPlugins/Plugins/MeshReader.h
index 968c4ac..394f6a8 100644
--- a/lib/cpPlugins/Plugins/MeshReader.h
+++ b/lib/cpPlugins/Plugins/MeshReader.h
@@ -2,8 +2,9 @@
 #define __CPPLUGINS__PLUGINS__MESHREADER__H__
 
 #include <cpPlugins/Plugins/cpPlugins_Export.h>
-#include <cpPlugins/Interface/SourceObject.h>
-#include <itkProcessObject.h>
+#include <cpPlugins/Interface/BaseProcessObjects.h>
+
+class vtkDataReader;
 
 namespace cpPlugins
 {
@@ -12,22 +13,22 @@ namespace cpPlugins
     /**
      */
     class cpPlugins_EXPORT MeshReader
-      : public cpPlugins::Interface::SourceObject
+      : public cpPlugins::Interface::MeshSource
     {
     public:
-      typedef MeshReader                         Self;
-      typedef cpPlugins::Interface::SourceObject Superclass;
-
-      typedef Superclass::TParameter  TParameter;
-      typedef Superclass::TParameters TParameters;
+      typedef MeshReader                       Self;
+      typedef cpPlugins::Interface::MeshSource Superclass;
+      typedef itk::SmartPointer< Self >        Pointer;
+      typedef itk::SmartPointer< const Self >  ConstPointer;
 
     public:
+      itkNewMacro( Self );
+      itkTypeMacro( MeshReader, cpPluginsInterfaceMeshSource );
+
+    protected:
       MeshReader( );
       virtual ~MeshReader( );
 
-      virtual std::string GetClassName( ) const;
-
-    protected:
       virtual std::string _GenerateData( );
 
       template< unsigned int D >
@@ -36,12 +37,17 @@ namespace cpPlugins
       template< class P, unsigned int D >
         std::string _GD1( );
 
+    private:
+      // Purposely not implemented
+      MeshReader( const Self& );
+      Self& operator=( const Self& );
+
     protected:
-      itk::ProcessObject::Pointer m_Reader;
+      vtkDataReader* m_Reader;
     };
 
     // ---------------------------------------------------------------------
-    PLUMA_INHERIT_PROVIDER( MeshReader, cpPlugins::Interface::Object );
+    CPPLUGINS_INHERIT_PROVIDER( MeshReader );
 
   } // ecapseman