X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpExtensions%2FVisualization%2FMPRActors.h;h=85cee5949c2fba29d3173c290ff1f01613637a98;hb=2553991938011b002691361f0ed4ae95a552a686;hp=f9fb2132613a1f6214d9bb114305da103758babc;hpb=e9143845b476fc8b86c1706fb140ebee770a650b;p=cpPlugins.git

diff --git a/lib/cpExtensions/Visualization/MPRActors.h b/lib/cpExtensions/Visualization/MPRActors.h
index f9fb213..85cee59 100644
--- a/lib/cpExtensions/Visualization/MPRActors.h
+++ b/lib/cpExtensions/Visualization/MPRActors.h
@@ -6,21 +6,6 @@
 #include <cpExtensions/cpExtensions_Export.h>
 #include <cpExtensions/Visualization/ImageSliceActors.h>
 
-/*
-#include <vtkSmartPointer.h>
-#include <vtkActor.h>
-#include <vtkImageMapToColors.h>
-*/
-
-// -------------------------------------------------------------------------
-/*
-class vtkAlgorithmOutput;
-class vtkImageData;
-class vtkRenderer;
-class vtkScalarsToColors;
-*/
-
-// -------------------------------------------------------------------------
 namespace cpExtensions
 {
   namespace Visualization
@@ -42,14 +27,9 @@ namespace cpExtensions
 
       ImageSliceActors* GetSliceActors( const int& i ) const;
 
-      int AddInputConnection(
-        vtkAlgorithmOutput* aout,
-        ImageSliceActors::LUTType lut = ImageSliceActors::LUTType_WindowLevel
-        );
-      int AddInputData(
-        vtkImageData* image,
-        ImageSliceActors::LUTType lut = ImageSliceActors::LUTType_WindowLevel
-        );
+      int AddInputConnection( vtkAlgorithmOutput* aout );
+      int AddInputData( vtkImageData* new_image );
+      unsigned int GetNumberOfImages( ) const;
 
       void PushActorsInto(
         vtkRenderWindow* x,
@@ -57,36 +37,16 @@ namespace cpExtensions
         vtkRenderWindow* z,
         vtkRenderWindow* w
         );
-      void PopDataFrom(
-        vtkRenderer* x,
-        vtkRenderer* y,
-        vtkRenderer* z,
-        vtkRenderer* w
+      void PopActorsFrom(
+        vtkRenderWindow* x,
+        vtkRenderWindow* y,
+        vtkRenderWindow* z,
+        vtkRenderWindow* w
         );
 
-      // Lookup table methods
-      void SetLookupTable( unsigned int i, vtkScalarsToColors* lut );
-      vtkScalarsToColors* GetLookupTable( unsigned int i ) const;
-
-      // Grayscale window/level lookup
-      void SetLookupTableToWindowLevel( unsigned int i );
-      double GetMinWindow( unsigned int i ) const;
-      double GetMaxWindow( unsigned int i ) const;
-      double GetMinLevel( unsigned int i ) const;
-      double GetMaxLevel( unsigned int i ) const;
-      double GetWindow( unsigned int i ) const;
-      double GetLevel( unsigned int i ) const;
-      void SetWindow( unsigned int i, const double& w );
-      void SetLevel( unsigned int i, const double& l );
-      void SetWindowLevel( unsigned int i, const double& w, const double& l );
-      void ResetWindowLevel( unsigned int i );
-
       // Color lookup table
-      void SetLookupTableToColor(
-        unsigned int i,
-        const double& r = double( 1 ),
-        const double& g = double( 0 ),
-        const double& b = double( 0 )
+      void SetLookupTableAsColor(
+        unsigned int i, double r, double g, double b
         );
 
       // Slice access
@@ -112,7 +72,6 @@ namespace cpExtensions
       Self& operator=( const Self& );
 
     protected:
-      // TODO: std::vector< vtkSmartPointer< vtkImageMapToColors > > ImageMaps;
       vtkSmartPointer< vtkActor >         ImageOutlineActor;
       vtkSmartPointer< ImageSliceActors > Slices[ 2 ][ 3 ];
     };