Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/cpPlugins

diff --git a/appli/ImageMPR/ImageMPR.cxx b/appli/ImageMPR/ImageMPR.cxx
index ce1f2fc769c7f39232d3902adbb18353cb367936..c18fcd24fad447bd2d4c5fd23f49fd1d826ec4fa 100644 (file)
--- a/appli/ImageMPR/ImageMPR.cxx
+++ b/appli/ImageMPR/ImageMPR.cxx
@@ -76,8 +76,14 @@ UpdateActualFilter( )
 
   // Show outputs
   for( auto oIt = outputs.begin( ); oIt != outputs.end( ); ++oIt )
-    std::cout << *oIt << std::endl;
-  
+  {
+    std::string parent = this->m_Plugins.GetParent( *oIt );
+    TDataObject* dobj = this->m_Plugins.GetData< TDataObject >( *oIt );
+    this->m_UI->MPR->AddData( dobj, *oIt, parent );
+    this->m_UI->MPR->ShowData( *oIt );
+
+  } // rof
+
   /* TODO
      std::vector< std::string > outputs;
      std::string err = this->m_Plugins->UpdateActiveFilter( outputs );

diff --git a/appli/ImageMPR/ImageMPR.h b/appli/ImageMPR/ImageMPR.h
index e11ec5ddc71ca6261548cbbd880f423f8c926bb5..1302006a7500b9d620a3e4a426b4ed7e08897be2 100644 (file)
--- a/appli/ImageMPR/ImageMPR.h
+++ b/appli/ImageMPR/ImageMPR.h
@@ -120,6 +120,7 @@ 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;
 
@@ -127,7 +128,6 @@ public:
   /*
     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;