X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FImageMPR%2FImageMPR.h;h=ba05de9f9de5c0f88264f967132f8b1c3c93b35a;hb=682f9e89a6ad9d24eadc51751a56fd3f146d649b;hp=959daf1fc2a62195bbe3ce2031b4c5c379c4cd78;hpb=9015cf98c60cf4ab304a639990004ee783a8bec0;p=cpPlugins.git

diff --git a/appli/ImageMPR/ImageMPR.h b/appli/ImageMPR/ImageMPR.h
index 959daf1..ba05de9 100644
--- a/appli/ImageMPR/ImageMPR.h
+++ b/appli/ImageMPR/ImageMPR.h
@@ -3,20 +3,20 @@
 
 // Standard stuff
 #include <map>
-#include <string>
+#include <set>
 
 // Qt stuff
 #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
@@ -42,8 +42,8 @@ public:
   typedef cpPlugins::Interface::ProcessObject TPluginFilter;
   typedef cpPlugins::Interface::Parameters    TParameters;
 
-  typedef std::map< std::string, std::string > TStringMap;
-  typedef cpPlugins::Extensions::Visualization::MPRWithDifferentWindows TMPR;
+  typedef std::set< std::string > TStringContainer;
+  typedef cpExtensions::Visualization::MPRObjects TMPRObjects;
 
 public:
   explicit ImageMPR( QWidget* parent = 0 );
@@ -56,6 +56,8 @@ private slots:
   void _triggered_actionOpenPlugins( );
   void _triggered_actionOpenInputImage( );
   void _triggered_actionOpenInputPolyData( );
+  void _triggered_actionImageToImage( );
+  void _triggered_actionImageToMesh( );
 
 private:
   Ui::ImageMPR* m_UI;
@@ -64,16 +66,19 @@ private:
   TPluginsInterface m_Plugins;
 
   // Needed object from plugins
-  TStringMap m_BaseClasses;
+  std::string m_ImageReaderClass;
+  std::string m_ImageWriterClass;
+  std::string m_MeshReaderClass;
+  std::string m_MeshWriterClass;
+  TStringContainer m_ImageToImageFilters;
+  TStringContainer m_ImageToMeshFilters;
 
   // Real data
   TPluginImage::Pointer m_InputImage;
   TPluginMesh::Pointer  m_InputMesh;
 
   // Visualization stuff
-  TMPR* m_MPR;
-  vtkSmartPointer< vtkPolyDataMapper > m_InputMeshMapper;
-  vtkSmartPointer< vtkActor >          m_InputMeshActor;
+  vtkSmartPointer< TMPRObjects > m_MPRObjects;
 
   /* TODO
      vtkSmartPointer< vtkOrientationMarkerWidget > m_3DOrientationWidget;