...

[cpPlugins.git] / lib / cpExtensions / QT / MPR3DWidget.h

diff --git a/lib/cpExtensions/QT/MPR3DWidget.h b/lib/cpExtensions/QT/MPR3DWidget.h
index 6dcd86493ee3865f86df6a50f0b6705900b2ed75..6a0ef6ebc849197afb851e0efc83c1b99ca61fec 100644 (file)
--- a/lib/cpExtensions/QT/MPR3DWidget.h
+++ b/lib/cpExtensions/QT/MPR3DWidget.h
@@ -3,8 +3,6 @@
 
 #include <cpExtensions/QT/RendererWidget.h>
 
-#ifdef cpExtensions_QT4
-
 // -------------------------------------------------------------------------
 class vtkDataSet;
 
@@ -14,6 +12,7 @@ namespace cpExtensions
   namespace Visualization
   {
     class ImageOutlineActor;
+    class MeshActor;
     class WindowLevelImageActor;
   }
 
@@ -30,6 +29,7 @@ namespace cpExtensions
       typedef MPR3DWidget                      Self;
       typedef cpExtensions::QT::RendererWidget Superclass;
 
+      typedef cpExtensions::Visualization::MeshActor             TActor;
       typedef cpExtensions::Visualization::ImageOutlineActor     TOLActor;
       typedef cpExtensions::Visualization::WindowLevelImageActor TWLActor;
 
@@ -39,6 +39,7 @@ namespace cpExtensions
 
       void Clear( );
       void SetImage( vtkImageData* image, const std::string& name );
+      void Add( vtkDataSet* data, const std::string& name );
 
       TWLActor* GetImageActor( int o );
       const TWLActor* GetImageActor( int o ) const;
@@ -46,35 +47,18 @@ namespace cpExtensions
       void SetSliceNumber( int orientation, int slice );
       void SetSlicesNumbers( int x, int y, int z );
 
-      /* TODO
-         void SetImage( vtkImageData* image, const std::string& name );
-         void Add( vtkDataSet* data, const std::string& name );
-
-
-         void SetScalarRange( double r[ 2 ] );
-         void SetWindowLevel( double wl[ 2 ] );
-         void SetImageOpacity( double o );
-         void SetImageInterpolation( unsigned char i );
-      */
-
     protected:
       std::string m_ImageName;
 
       vtkSmartPointer< TWLActor > m_WLActors[ 3 ];
       vtkSmartPointer< TOLActor > m_OLActors[ 3 ];
-
-      /* TODO
-         vtkSmartPointer< cpExtensions::Visualization::MPR3DActors > m_Actors;
-         std::string m_ImageName;
-      */
+      std::vector< TActor* > m_Actors;
     };
 
   } // ecapseman
 
 } // ecapseman
 
-#endif // cpExtensions_QT4
-
 #endif // __cpExtensions__QT__MPR3DWidget__h__
 
 // eof - $RCSfile$