X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpExtensions%2FVisualization%2FMPRObjects.h;h=c21fca66f55e2fc36614e1442e502ad0c6af86a7;hb=31e4cf1f3580efa059d3ffad14ba6a15d2372f5c;hp=a348e91513d15c4379091677f4621ee48f3041f1;hpb=1d735deae0ae5e8bff643a59370a03c961ef780c;p=cpPlugins.git

diff --git a/lib/cpExtensions/Visualization/MPRObjects.h b/lib/cpExtensions/Visualization/MPRObjects.h
index a348e91..c21fca6 100644
--- a/lib/cpExtensions/Visualization/MPRObjects.h
+++ b/lib/cpExtensions/Visualization/MPRObjects.h
@@ -3,7 +3,6 @@
 
 #include <cpExtensions/cpExtensions_Export.h>
 #include <cpExtensions/Visualization/MPRActors.h>
-#include <cpExtensions/Visualization/ImageInteractorStyle.h>
 
 #include <vtkObject.h>
 #include <vtkRenderer.h>
@@ -20,8 +19,19 @@ namespace cpExtensions
     {
     public:
       typedef MPRObjects Self;
-      typedef cpExtensions::Visualization::MPRActors            TMPRActors;
-      typedef cpExtensions::Visualization::ImageInteractorStyle TStyle;
+
+      typedef MPRActors::TStyle                   TStyle;
+      typedef MPRActors::TMouseCommand            TMouseCommand;
+      typedef MPRActors::TMouseWheelCommand       TMouseWheelCommand;
+      typedef MPRActors::TKeyCommand              TKeyCommand;
+      typedef MPRActors::TVoidCommand             TVoidCommand;
+      typedef MPRActors::TMouseMoveCommand        TMouseMoveCommand;
+      typedef MPRActors::TMouseClickCommand       TMouseClickCommand;
+      typedef MPRActors::TMouseDoubleClickCommand TMouseDoubleClickCommand;
+      typedef MPRActors::TExposeCommand           TExposeCommand;
+      typedef MPRActors::TConfigureCommand        TConfigureCommand;
+      typedef MPRActors::TEnterCommand            TEnterCommand;
+      typedef MPRActors::TLeaveCommand            TLeaveCommand;
 
     public:
       vtkTypeMacro( MPRObjects, vtkObject );
@@ -34,13 +44,14 @@ namespace cpExtensions
         vtkRenderWindow* wx, vtkRenderWindow* wy,
         vtkRenderWindow* wz, vtkRenderWindow* w3D
         );
-      void SetImage( vtkImageData* image );
-      void ActivateInteractors( );
+      void AddImage( vtkImageData* image );
+      unsigned int GetNumberOfImages( ) const;
+      void ClearAll( );
 
       void ResetCamera( const int& id );
       void ResetCameras( );
-      void Render( const int& id );
-      void RenderAll( );
+      void Render( const int& id, const double& t );
+      void RenderAll( const double& t );
       vtkRenderer* GetXRenderer( );
       vtkRenderer* GetYRenderer( );
       vtkRenderer* GetZRenderer( );
@@ -50,6 +61,12 @@ namespace cpExtensions
       const vtkRenderer* GetZRenderer( ) const;
       const vtkRenderer* Get3DRenderer( ) const;
 
+      MPRActors* GetMPRActors( );
+      const MPRActors* GetMPRActors( ) const;
+
+      double GetWindow( ) const;
+      double GetLevel( ) const;
+
     protected:
       MPRObjects( );
       virtual ~MPRObjects( );
@@ -64,9 +81,8 @@ namespace cpExtensions
       vtkSmartPointer< vtkRenderWindow > m_Windows[ 4 ];
 
       // Internal pipelines
-      vtkSmartPointer< TMPRActors >  m_MPRActors;
+      vtkSmartPointer< MPRActors >   m_MPRActors;
       vtkSmartPointer< vtkRenderer > m_Renderers[ 4 ];
-      vtkSmartPointer< TStyle >      m_Styles[ 3 ];
     };
 
   } // ecapseman