Merge ssh://git.creatis.insa-lyon.fr/cpPlugins

[cpPlugins.git] / appli / ImageMPR / ImageMPR.h

diff --git a/appli/ImageMPR/ImageMPR.h b/appli/ImageMPR/ImageMPR.h
index 5fdf07a45f171c30841a5981d23d0dd7ae8b2af8..ba05de9f9de5c0f88264f967132f8b1c3c93b35a 100644 (file)
--- a/appli/ImageMPR/ImageMPR.h
+++ b/appli/ImageMPR/ImageMPR.h
@@ -6,18 +6,17 @@
 #include <set>
 
 // Qt stuff
-#include <QDialog>
 #include <QMainWindow>
 
 // vtk stuff
 #include <vtkSmartPointer.h>
+#include <cpExtensions/Visualization/MPRObjects.h>
 
 // Plugins interface
 #include <cpPlugins/Interface/Interface.h>
 #include <cpPlugins/Interface/ProcessObject.h>
 #include <cpPlugins/Interface/Image.h>
 #include <cpPlugins/Interface/Mesh.h>
-#include <cpPlugins/Extensions/Visualization/MPRWithDifferentWindows.h>
 
 // -------------------------------------------------------------------------
 namespace Ui
@@ -44,7 +43,7 @@ public:
   typedef cpPlugins::Interface::Parameters    TParameters;
 
   typedef std::set< std::string > TStringContainer;
-  typedef cpPlugins::Extensions::Visualization::MPRWithDifferentWindows TMPR;
+  typedef cpExtensions::Visualization::MPRObjects TMPRObjects;
 
 public:
   explicit ImageMPR( QWidget* parent = 0 );
@@ -52,7 +51,6 @@ public:
 
 protected:
   bool _LoadPlugins( const std::string& filename );
-  bool _ParametersDialog( TPluginFilter* filter );
 
 private slots:
   void _triggered_actionOpenPlugins( );
@@ -80,11 +78,7 @@ private:
   TPluginMesh::Pointer  m_InputMesh;
 
   // Visualization stuff
-  TMPR* m_MPR;
-  vtkSmartPointer< vtkPolyDataMapper > m_InputMeshMapper;
-  vtkSmartPointer< vtkActor >          m_InputMeshActor;
-
-  QDialog* m_ParametersDlg;
+  vtkSmartPointer< TMPRObjects > m_MPRObjects;
 
   /* TODO
      vtkSmartPointer< vtkOrientationMarkerWidget > m_3DOrientationWidget;