X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FImageMPR%2FImageMPR.h;h=c4d43e33d37b8aee02f8a092812ec7f78ea5e238;hb=3633aade338a13bc83642e99e6d61b6499e4b3af;hp=a89d0f9ed2c80bf625b05889eefa73fc97f718f4;hpb=2eaf38cfdcbd2cfb0cc323dad6ded6bbeb436edf;p=cpPlugins.git

diff --git a/appli/ImageMPR/ImageMPR.h b/appli/ImageMPR/ImageMPR.h
index a89d0f9..c4d43e3 100644
--- a/appli/ImageMPR/ImageMPR.h
+++ b/appli/ImageMPR/ImageMPR.h
@@ -1,9 +1,11 @@
 #ifndef __IMAGEMPR__H__
 #define __IMAGEMPR__H__
 
+#include <map>
 #include <vector>
 
 // Qt stuff
+#include <QApplication>
 #include <QMainWindow>
 
 // vtk stuff
@@ -11,14 +13,7 @@
 #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/ImplicitFunction.h>
-#include <cpPlugins/Interface/Mesh.h>
-#include <vtkMetaImageWriter.h>
-#include <vtkMetaImageReader.h>
-
+#include <cpPlugins/Interface/Plugins.h>
 
 // -------------------------------------------------------------------------
 namespace Ui
@@ -123,10 +118,7 @@ public:
   typedef QMainWindow Superclass;
 
   typedef cpExtensions::Visualization::MPRObjects TMPRObjects;
-  typedef TMPRObjects::TCursorCommand     TCursorCommand;
-  typedef TMPRObjects::TMouseCommand      TMouseCommand;
-  typedef TMPRObjects::TMouseWheelCommand TMouseWheelCommand;
-  typedef TMPRObjects::TKeyCommand        TKeyCommand;
+  typedef cpPlugins::Interface::Plugins           TPlugins;
 
   // Plugins types
   /*
@@ -145,6 +137,18 @@ public:
   explicit ImageMPR( QWidget* parent = 0 );
   virtual ~ImageMPR( );
 
+protected:
+  inline void _Block( )
+    {
+      QApplication::setOverrideCursor( Qt::WaitCursor );
+      this->setEnabled( false );
+    }
+  inline void _Unblock( )
+    {
+      QApplication::restoreOverrideCursor( );
+      this->setEnabled( true );
+    }
+
   /*
     protected:
     bool _LoadPlugins( const std::string& filename );
@@ -154,6 +158,7 @@ public:
 
 private slots:
   void _aOpenImage( );
+  void _aOpenDICOMSeries( );
   void _aOpenSegmentation( );
   void _aOpenPolyData( );
   void _aSaveImage( );
@@ -166,16 +171,14 @@ private slots:
 
   void _execPlugin( );
 
-protected:
-  // Callbacks
-  static void _CursorCommand( double* pos, int axis, void* data );
-
 private:
   Ui::ImageMPR* m_UI;
+  TPlugins*     m_Plugins;
 
-  // Some state flags
-  std::string m_ImageLoaded;
-  bool m_Flooding;
+  // Objects
+  typedef std::pair< std::string, TPlugins::TDataObject::Pointer > TTreeNode;
+  typedef std::map< std::string, TTreeNode > TTree;
+  TTree m_Objects;
 
   // Plugins objects
   /*