Merge branch 'master' of 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 b0ba3c4268480963dfd1de33c239fbd4e711ab4c..cf3e5c1b5f3695955396cb7ad45331a8f1fec5a6 100644 (file)
--- a/appli/ImageMPR/ImageMPR.h
+++ b/appli/ImageMPR/ImageMPR.h
@@ -1,23 +1,20 @@
 #ifndef __IMAGEMPR__H__
 #define __IMAGEMPR__H__
 
-// Standard stuff
-#include <map>
-#include <set>
+#include <vector>
 
 // 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 <cpExtensions/Visualization/MPRWithDifferentWindows.h>
 
 // -------------------------------------------------------------------------
 namespace Ui
@@ -43,8 +40,7 @@ public:
   typedef cpPlugins::Interface::ProcessObject TPluginFilter;
   typedef cpPlugins::Interface::Parameters    TParameters;
 
-  typedef std::set< std::string > TStringContainer;
-  typedef cpExtensions::Visualization::MPRWithDifferentWindows TMPR;
+  typedef cpExtensions::Visualization::MPRObjects TMPRObjects;
 
 public:
   explicit ImageMPR( QWidget* parent = 0 );
@@ -52,11 +48,14 @@ public:
 
 protected:
   bool _LoadPlugins( const std::string& filename );
-  bool _ParametersDialog( TPluginFilter* filter );
+  std::string _LoadImage(
+    TPluginImage::Pointer& image, const QStringList& names
+    );
 
 private slots:
   void _triggered_actionOpenPlugins( );
   void _triggered_actionOpenInputImage( );
+  void _triggered_actionOpenSegmentation( );
   void _triggered_actionOpenInputPolyData( );
   void _triggered_actionImageToImage( );
   void _triggered_actionImageToMesh( );
@@ -72,19 +71,14 @@ private:
   std::string m_ImageWriterClass;
   std::string m_MeshReaderClass;
   std::string m_MeshWriterClass;
-  TStringContainer m_ImageToImageFilters;
-  TStringContainer m_ImageToMeshFilters;
 
   // Real data
   TPluginImage::Pointer m_InputImage;
+  TPluginImage::Pointer m_InputSegmentation;
   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;