X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FcpExtensions%2FQT%2FSimpleMPRWidget.cxx;h=9b47dfddbb020ab1cc3aed6fca956c77f505179f;hb=5cbe75ae1fb27d18932b6278f97c4a865cddd592;hp=7721b257b8690277433736a463fb0bfc5de8f5b3;hpb=0b1cc98bd202845bbfbcfb1ef46a0ec9ba1e33c4;p=cpPlugins.git

diff --git a/lib/cpExtensions/QT/SimpleMPRWidget.cxx b/lib/cpExtensions/QT/SimpleMPRWidget.cxx
index 7721b25..9b47dfd 100644
--- a/lib/cpExtensions/QT/SimpleMPRWidget.cxx
+++ b/lib/cpExtensions/QT/SimpleMPRWidget.cxx
@@ -1,7 +1,4 @@
 #include <cpExtensions/QT/SimpleMPRWidget.h>
-
-#ifdef cpExtensions_QT4
-
 #include <cpExtensions/QT/ui_SimpleMPRWidget.h>
 #include <cpExtensions/QT/ImageWidget.h>
 #include <cpExtensions/QT/MPR3DWidget.h>
@@ -164,9 +161,9 @@ SetImage( vtkImageData* image, const std::string& name )
 
   if( this->m_MainImage != NULL && this->m_MainImageName != "" )
   {
-    this->m_XImage->SetImage( this->m_MainImage, 0, name );
-    this->m_YImage->SetImage( this->m_MainImage, 1, name );
-    this->m_ZImage->SetImage( this->m_MainImage, 2, name );
+    this->m_XImage->SetImage( this->m_MainImage, name, 0 );
+    this->m_YImage->SetImage( this->m_MainImage, name, 1 );
+    this->m_ZImage->SetImage( this->m_MainImage, name, 2 );
     this->m_3DView->SetImage( this->m_MainImage, name );
 
   } // fi
@@ -217,6 +214,8 @@ GetViewProps( const std::string& name ) const
   if( w != NULL ) props.insert( w );
   return( props );
 */
+  TProps props;
+  return( props );
 }
 
 // -------------------------------------------------------------------------
@@ -360,6 +359,18 @@ Render( )
   this->m_3DView->Render( );
 }
 
+// -------------------------------------------------------------------------
+std::set< vtkRenderWindowInteractor* > cpExtensions::QT::SimpleMPRWidget::
+GetInteractors( ) const
+{
+  std::set< vtkRenderWindowInteractor* > ret;
+  ret.insert( this->m_XImage->GetInteractor( ) );
+  ret.insert( this->m_YImage->GetInteractor( ) );
+  ret.insert( this->m_ZImage->GetInteractor( ) );
+  ret.insert( this->m_3DView->GetInteractor( ) );
+  return( ret );
+}
+
 // -------------------------------------------------------------------------
 std::set< std::string > cpExtensions::QT::SimpleMPRWidget::
 GetActorsNames( ) const
@@ -621,6 +632,4 @@ _SyncTop( int a, int b )
   this->m_UI->Top->setSizes( this->m_UI->Bottom->sizes( ) );
 }
 
-#endif // cpExtensions_QT4
-
 // eof - $RCSfile$