X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FImageMPR%2FImageMPR.h;h=c9bb20f31f71f214bc00d4933519e7c6f5c6f95f;hb=cb833d2fface96e020fe91584d2206860a8174ee;hp=3a834ae6ee1c6bb1f453e457964d14e088680fbc;hpb=02010627b7276dc77962719b3e5be13c2a5b4605;p=cpPlugins.git

diff --git a/appli/ImageMPR/ImageMPR.h b/appli/ImageMPR/ImageMPR.h
index 3a834ae..c9bb20f 100644
--- a/appli/ImageMPR/ImageMPR.h
+++ b/appli/ImageMPR/ImageMPR.h
@@ -9,7 +9,6 @@
 #include <QMainWindow>
 
 // vtk stuff
-#include <vtkRenderer.h>
 #include <vtkSmartPointer.h>
 
 // Plugins interface
@@ -17,26 +16,7 @@
 #include <cpPlugins/Interface/ProcessObject.h>
 #include <cpPlugins/Interface/Image.h>
 #include <cpPlugins/Interface/DataObject.h>
-#include <cpPlugins/Extensions/Visualization/MPRActors.h>
-#include <cpPlugins/Extensions/Visualization/ImageInteractorStyle.h>
-
-
-/*
-  #include <vtkOrientationMarkerWidget.h>
-
-// Local stuff
-#include "InteractorStyleImage.h"
-#include "VolumeActors.h"
-
-
-  #include <itkImage.h>
-  #include <itkImageToVTKImageFilter.h>
-
-  #include <cpm/DataStructures/QuadEdgeMesh.h>
-
-  #include <cpm/VTK/MeshMapper.h>
-  #include <cpm/Algorithms/QuadEdge/MeshPlaneCutterFilter.h>
-*/
+#include <cpPlugins/Extensions/Visualization/MPRWithDifferentWindows.h>
 
 // -------------------------------------------------------------------------
 namespace Ui
@@ -62,9 +42,7 @@ public:
   typedef TPlugin::TParameters                TParameters;
 
   typedef std::map< std::string, std::string > TStringMap;
-  typedef cpPlugins::Extensions::Visualization::MPRActors TMPRActors;
-  typedef cpPlugins::Extensions::Visualization::ImageInteractorStyle TStyle;
-
+  typedef cpPlugins::Extensions::Visualization::MPRWithDifferentWindows TMPR;
 
 public:
   explicit ImageMPR( QWidget* parent = 0 );
@@ -84,29 +62,14 @@ private:
   TStringMap m_BaseClasses;
 
   // Real data
-  TPluginImage* m_InputImage;
+  TPluginImage::Pointer m_InputImage;
 
   // Visualization stuff
-  vtkSmartPointer< vtkRenderer > m_3DRenderer;
-  vtkSmartPointer< vtkRenderer > m_XPlaneRenderer;
-  vtkSmartPointer< vtkRenderer > m_YPlaneRenderer;
-  vtkSmartPointer< vtkRenderer > m_ZPlaneRenderer;
-  vtkSmartPointer< TMPRActors >  m_MPRActors;
-  vtkSmartPointer< TStyle > m_XStyle;
-  vtkSmartPointer< TStyle > m_YStyle;
-  vtkSmartPointer< TStyle > m_ZStyle;
+  TMPR* m_MPR;
 
   /* TODO
-     vtkSmartPointer< idms::VolumeActors > m_ImageActors;
      vtkSmartPointer< vtkOrientationMarkerWidget > m_3DOrientationWidget;
   */
-
-  /*
-    TTriangulation::Pointer                 m_Mesh;
-    vtkSmartPointer< TTriangulationMapper > m_MeshMapper;
-    vtkSmartPointer< vtkActor >             m_MeshActor;
-    TCutter::Pointer m_ZCutter;
-  */
 };
 
 #endif // __IMAGEMPR__H__