Major refactoring

[FrontAlgorithms.git] / lib / fpa / VTK / Image2DObserver.h

diff --git a/lib/fpa/VTK/Image2DObserver.h b/lib/fpa/VTK/Image2DObserver.h
index 68dcae0fe0efcc39a29c5f43b252b6fce5aafd7d..c61af4dc4aa315277446526e8250b1a943aaa639 100644 (file)
--- a/lib/fpa/VTK/Image2DObserver.h
+++ b/lib/fpa/VTK/Image2DObserver.h
@@ -36,8 +36,11 @@ namespace fpa
       itkNewMacro( Self );
       itkTypeMacro( Image2DObserver, itkCommand );
 
+      itkGetConstMacro( RenderPercentage, double );
+      itkSetMacro( RenderPercentage, double );
+
     public:
-      void SetImage( const TImage* img, R* rw );
+      void SetRenderWindow( R* rw );
       void SetPixel(
         typename TImage::IndexType idx,
         unsigned char red,
@@ -51,33 +54,21 @@ namespace fpa
       void Execute( const itk::Object* c, const itk::EventObject& e );
 
     protected:
-      Image2DObserver( )
-        : Superclass( ),
-          m_RenderWindow( NULL ),
-          m_Number( 0 ),
-          m_Percentage( 0 )
-        {
-          this->m_Stencil = TImageData::New( );
-          this->m_StencilActor = TImageActor::New( );
-        }
-      virtual ~Image2DObserver( )
-        { }
+      Image2DObserver( );
+      virtual ~Image2DObserver( );
 
     private:
       Image2DObserver( const Self& ); // Not impl.
       void operator=( const Self& );  // Not impl.
 
     protected:
-      typedef vtkSmartPointer< vtkImageActor > TImageActor;
-      typedef vtkSmartPointer< vtkImageData >  TImageData;
-
-      typename TImage::ConstPointer m_Image;
+      vtkSmartPointer< vtkImageData >  m_Stencil;
+      vtkSmartPointer< vtkImageActor > m_StencilActor;
 
       R*            m_RenderWindow;
-      TImageData    m_Stencil;
-      TImageActor   m_StencilActor;
-      unsigned long m_Number;
-      unsigned long m_Percentage;
+      unsigned long m_Count;
+      unsigned long m_RenderCount;
+      double        m_RenderPercentage;
     };
 
   } // ecapseman