X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuViewerMPR.cxx;h=f0acd3ae904b0c50db6c8f74b3430577a338b0b1;hb=9697c343d164e830207af2a1ca6cd0899c862c51;hp=b260443c583206812d3c387bdfa95cb82814487a;hpb=393855ac9ccdd47bc738cc7c0af199b2b45d89db;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuViewerMPR.cxx b/bbtk/src/bbmaracasvisuViewerMPR.cxx
index b260443..f0acd3a 100644
--- a/bbtk/src/bbmaracasvisuViewerMPR.cxx
+++ b/bbtk/src/bbmaracasvisuViewerMPR.cxx
@@ -40,10 +40,8 @@ END_EVENT_TABLE( );
 		panel	-> Layout();		
   }
 
-  void wxWidgetMPR::setMarImage(marImageData* marimagedata){
-	  wxwidget->setMarImage(marimagedata, 1);
-
-
+  void wxWidgetMPR::setImageData(vtkImageData* img){
+	  wxwidget->setImageData(img, 1);
   }
   void wxWidgetMPR::ConfigureVTK(){
 		wxwidget->ConfigureVTK();
@@ -123,11 +121,20 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ViewerMPR,bbtk::WxBlackBox);
 void ViewerMPR::Process()
 {
 	if (wxwidget!=NULL){
-		if(marimagedata==NULL){
-			wxwidget->setMarImage(new marImageData(bbGetInputIn() ));
-			wxwidget->ConfigureVTK();
-		}
 		wxBusyCursor wait;	   
+		vtkImageData* img = bbGetInputIn();
+		if(img!=NULL && img != _img){
+			_img = img;
+			wxwidget->setImageData(_img);
+			wxwidget->ConfigureVTK();
+			
+//			wxwidget->wxPanel::Refresh();
+			wxwidget->Refresh();
+//			wxwidget->Show();
+
+		}	
+			
+		
 		bbSetOutputPoint( wxwidget->GetPoint() );
 		bbSetOutputRenderer( wxwidget->GetRenderer() );  
 	} // wxwidget
@@ -142,24 +149,26 @@ void ViewerMPR::CreateWidget(wxWindow* parent)
 	bbSetOutputWidget( wxwidget );
 }
 
-void ViewerMPR::bbUserConstructor()
-{
-		marimagedata =	NULL;
-		wxwidget = NULL;
-		bbSetInputIn(NULL);
-}
-void ViewerMPR::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
-
-	marimagedata =	NULL;
+void ViewerMPR::bbUserSetDefaultValues()
+{		
+		_img = NULL;
 		wxwidget = NULL;
 		bbSetInputIn(NULL);
-
 }
-void ViewerMPR::bbUserDestructor()
-{
 
-}
+	
+	//-----------------------------------------------------------------	
+	void ViewerMPR::bbUserInitializeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	void ViewerMPR::bbUserFinalizeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	
 }
 // EO namespace bbcreaMaracasVisu