X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FImageMPR%2FImageMPR.h;h=1302006a7500b9d620a3e4a426b4ed7e08897be2;hb=35ad6a2af5b7b0f93d342f7d10d5d669e92ca6d5;hp=9a866e0f9d276558c69bd50930c5a74ccdc7966e;hpb=24dc7fa44ff75dc9336d703b8243ce1e52ff3429;p=cpPlugins.git

diff --git a/appli/ImageMPR/ImageMPR.h b/appli/ImageMPR/ImageMPR.h
index 9a866e0..1302006 100644
--- a/appli/ImageMPR/ImageMPR.h
+++ b/appli/ImageMPR/ImageMPR.h
@@ -13,8 +13,10 @@
 #include <cpExtensions/Visualization/MPRObjects.h>
 
 // Plugins interface
+#include <cpPlugins/Interface/BaseApplication.h>
 #include <cpPlugins/Interface/Plugins.h>
-#include <cpPlugins/Interface/BasePluginsApplication.h>
+#include <cpPlugins/Interface/Image.h>
+#include <cpPlugins/Interface/Mesh.h>
 
 // -------------------------------------------------------------------------
 namespace Ui
@@ -106,12 +108,9 @@ namespace Ui
 // -------------------------------------------------------------------------
 /**
  */
-
-
-
 class ImageMPR
   : public QMainWindow,
-    public cpPlugins::Interface::BasePluginsApplication
+    public cpPlugins::Interface::BaseApplication
 {
   Q_OBJECT;
 
@@ -121,12 +120,14 @@ public:
 
   typedef cpExtensions::Visualization::MPRObjects TMPRObjects;
   typedef cpPlugins::Interface::Plugins           TPlugins;
+  typedef cpPlugins::Interface::DataObject        TDataObject;
+  typedef cpPlugins::Interface::Image             TImage;
+  typedef cpPlugins::Interface::Mesh              TMesh;
 
   // Plugins types
   /*
     typedef cpPlugins::Interface::Interface        TPluginsInterface;
     typedef cpPlugins::Interface::Object           TPluginObject;
-    typedef cpPlugins::Interface::DataObject       TPluginData;
     typedef cpPlugins::Interface::Image            TPluginImage;
     typedef cpPlugins::Interface::ImplicitFunction TPluginImplicitFunction;
     typedef cpPlugins::Interface::Mesh             TPluginMesh;
@@ -155,8 +156,9 @@ public:
      }
   */
 
+protected:
+  void _AssociatePluginsToMenu( );
   /*
-    protected:
     bool _LoadPlugins( const std::string& filename );
     std::string _LoadImage( TPluginImage::Pointer& image );
     std::string _ConfigureMeshActors( );
@@ -179,7 +181,8 @@ private slots:
 
 private:
   Ui::ImageMPR* m_UI;
-  TPlugins*     m_Plugins;
+  TPlugins      m_Plugins;
+  std::string   m_ActiveFilterMainInput;
 
   // Objects
   /*