X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpExtensions%2FVisualization%2FImageSliceActors.h;h=25f81f6fae52a849e86019fe9a2b2c84e6b1dfcd;hb=f1747c7248d5eead5ea9d7e57bda0b081bcef065;hp=d51d656ba48a883fb63756e7daafa0455441fae5;hpb=2da3b422ceb0b6abfd336200a4ede6efe982ebe2;p=cpPlugins.git

diff --git a/lib/cpExtensions/Visualization/ImageSliceActors.h b/lib/cpExtensions/Visualization/ImageSliceActors.h
index d51d656..25f81f6 100644
--- a/lib/cpExtensions/Visualization/ImageSliceActors.h
+++ b/lib/cpExtensions/Visualization/ImageSliceActors.h
@@ -1,23 +1,11 @@
-#ifndef __CPEXTENSIONS__VISUALIZATION__IMAGESLICEACTORS__H__
-#define __CPEXTENSIONS__VISUALIZATION__IMAGESLICEACTORS__H__
+#ifndef __cpExtensions__Visualization__ImageSliceActors__h__
+#define __cpExtensions__Visualization__ImageSliceActors__h__
 
-#include <cpExtensions/cpExtensions_Export.h>
-
-#include <utility>
-#include <vector>
-
-#include <vtkActor.h>
-#include <vtkImageActor.h>
-#include <vtkImageSliceMapper.h>
-#include <vtkPlane.h>
-#include <vtkPolyData.h>
-#include <vtkPolyDataMapper.h>
+#include <cpExtensions/Config.h>
 #include <vtkPropCollection.h>
 #include <vtkSmartPointer.h>
-#include <vtkTextActor.h>
 
 // -------------------------------------------------------------------------
-class vtkAlgorithmOutput;
 class vtkImageData;
 
 // -------------------------------------------------------------------------
@@ -25,6 +13,10 @@ namespace cpExtensions
 {
   namespace Visualization
   {
+    class ImageOutlineActor;
+    class LUTImageActor;
+    class WindowLevelImageActor;
+
     /**
      */
     class cpExtensions_EXPORT ImageSliceActors
@@ -33,92 +25,50 @@ namespace cpExtensions
     public:
       typedef ImageSliceActors Self;
 
-      typedef void ( *TUpdateCommand )( void* );
-
     public:
       vtkTypeMacro( ImageSliceActors, vtkPropCollection );
 
     public:
-      // Creation
-      static ImageSliceActors* New( );
-
-      void AddInputConnection( vtkAlgorithmOutput* aout, int axis = 0 );
-      void AddInputData( vtkImageData* data, int axis = 0 );
-      void Clear( );
-
-      unsigned int GetNumberOfImageActors( ) const;
-      vtkImageActor* GetImageActor( unsigned int id );
-      const vtkImageActor* GetImageActor( unsigned int id ) const;
-      vtkTextActor* GetTextActor( );
-      const vtkTextActor* GetTextActor( ) const;
-      vtkActor* GetPlaneActor( );
-      const vtkActor* GetPlaneActor( ) const;
-      vtkPlane* GetPlaneFunction( );
-      const vtkPlane* GetPlaneFunction( ) const;
-
-      void AddActor( vtkAlgorithm* algorithm, vtkActor* actor );
-      void AddActor( vtkActor* actor );
-
-      void SetInterpolate( bool v );
-      void InterpolateOn( );
-      void InterpolateOff( );
-
-      double* GetDisplayBounds( ) const;
-      void GetDisplayBounds( double bounds[ 6 ] ) const;
-
-      int GetAxis( ) const;
+      static Self* New( );
+
+      vtkImageData* GetImage( );
+      const vtkImageData* GetImage( ) const;
+
+      WindowLevelImageActor* GetWindowLevelImageActor( );
+      const WindowLevelImageActor* GetWindowLevelImageActor( ) const;
+
+      LUTImageActor* GetLUTImageActor( );
+      const LUTImageActor* GetLUTImageActor( ) const;
+
+      ImageOutlineActor* GetImageOutlineActor( );
+      const ImageOutlineActor* GetImageOutlineActor( ) const;
+
+      int GetOrientation( ) const;
+
       int GetSliceNumber( ) const;
-      int GetSliceNumberMinValue( ) const;
-      int GetSliceNumberMaxValue( ) const;
-      void SetSliceNumber( const int& slice );
-      void UpdateText( );
-      void UpdateText( const double& w, const double& l );
-
-      TUpdateCommand SetUpdateCommand( TUpdateCommand cmd, void* data )
-        {
-          this->m_UpdateCommand = cmd;
-          this->m_UpdateData = data;
-        }
+      virtual void SetImage( vtkImageData* image, int orientation );
+      virtual unsigned int AddLUTImage( vtkImageData* image );
+      virtual void SetSliceNumber( int slice );
 
     protected:
       ImageSliceActors( );
       virtual ~ImageSliceActors( );
 
-      void _ConfigureNewInput( int axis );
-
     private:
       // Purposely not implemented
       ImageSliceActors( const Self& );
       Self& operator=( const Self& );
 
     protected:
-      // Multiple actors
-      std::vector< vtkSmartPointer< vtkImageSliceMapper > > SliceMappers;
-      std::vector< vtkSmartPointer< vtkImageActor > >       ImageActors;
-
-      typedef
-      std::pair< vtkSmartPointer< vtkAlgorithm >, vtkSmartPointer< vtkActor > >
-      TActorPair;
-      std::vector< TActorPair > OtherActors;
-      bool Interpolate;
-
-      // Unique objects
-      vtkSmartPointer< vtkPlane >          PlaneFunction;
-      vtkSmartPointer< vtkPolyData >       PlaneSource;
-      vtkSmartPointer< vtkPolyDataMapper > PlaneMapper;
-      char                                 TextBuffer[ 1024 ];
-      vtkSmartPointer< vtkTextActor >      TextActor;
-      vtkSmartPointer< vtkActor >          PlaneActor;
-
-
-      TUpdateCommand m_UpdateCommand;
-      void* m_UpdateData;
+      vtkSmartPointer< ImageOutlineActor >     m_ImageOutlineActor;
+      vtkSmartPointer< LUTImageActor >         m_LUTImageActor;
+      vtkSmartPointer< WindowLevelImageActor > m_WindowLevelImageActor;
     };
 
   } // ecapseman
 
 } // ecapseman
 
-#endif //  __CPEXTENSIONS__VISUALIZATION__IMAGESLICEACTORS__H__
+#endif // __cpExtensions__Visualization__ImageSliceActors__h__
 
 // eof - $RCSfile$