X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracas_ViewerWidget.cxx;h=a9e9e1da583d5186dde889eefc5918258bf86cd6;hb=b613b5c774c04bcd993e3c249b43e2c43771847d;hp=8f47f97123b89c99066db0c3e3aab6f7b5b1094d;hpb=307866a8f06b14018ea832926bdf3d887bfffea8;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
index 8f47f97..a9e9e1d 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
@@ -376,25 +376,32 @@ void wxMaracas_ViewerWidget::Refresh(bool eraseBackground ,const wxRect* rect  )
 	wxVtkBaseView *wxMaracas_ViewerWidget::GetwxVtkBaseView()
 	{
 		wxVtkBaseView *wxvtkbaseview=NULL;
-		if (mvtk2Dbaseview!=NULL){
+		if (mvtk2Dbaseview!=NULL)
+		{
 			wxvtkbaseview = mvtk2Dbaseview;
 		}
-		if (mvtkmpr2Dview_X!=NULL){
+		if (mvtkmpr2Dview_X!=NULL)
+		{
 			wxvtkbaseview = mvtkmpr2Dview_X;
 		}
-		if (mvtkmpr2Dview_Y!=NULL){
+		if (mvtkmpr2Dview_Y!=NULL)
+		{
 			wxvtkbaseview = mvtkmpr2Dview_Y;
 		}
-		if (mvtkmpr2Dview_Z!=NULL){
+		if (mvtkmpr2Dview_Z!=NULL)
+		{
 			wxvtkbaseview = mvtkmpr2Dview_Z;
 		}
-		if (mvtkplane2Dview!=NULL){
+		if (mvtkplane2Dview!=NULL)
+		{
 			wxvtkbaseview = mvtkplane2Dview;
 		}
-		if (mwxsphereview!=NULL){
+		if (mwxsphereview!=NULL)
+		{
 			wxvtkbaseview = mwxsphereview;
 		}
-		if (mwxvtk3Dbaseview_Clipping3D!=NULL){
+		if (mwxvtk3Dbaseview_Clipping3D!=NULL)
+		{
 			wxvtkbaseview = mwxvtk3Dbaseview_Clipping3D;
 		}
 		return wxvtkbaseview   ;
@@ -403,56 +410,51 @@ void wxMaracas_ViewerWidget::Refresh(bool eraseBackground ,const wxRect* rect  )
 
 
 //-------------------------------------------------------------------------
-	void wxMaracas_ViewerWidget::SetImage( vtkImageData *image )
+void wxMaracas_ViewerWidget::SetImage( vtkImageData *image )
+{
+	if(mvtkmprbasedata !=NULL)
+	{
+		marImageData* mar = mvtkmprbasedata->GetMarImageData();
+		mar->removeImageData(0);
+		mar->AddImageData(image);
+	}	
+	if (mvtk2Dbaseview!=NULL)
 	{
-		if(mvtkmprbasedata !=NULL)
-		{
-			marImageData* mar = mvtkmprbasedata->GetMarImageData();
-			mar->removeImageData(0);
-			mar->AddImageData(image);
-		}
-		
-		if (mvtk2Dbaseview!=NULL)
-		{
 			mvtk2Dbaseview->SetImageToVtkViewer(image);
-		}
-		
-		if (mvtkmpr2Dview_X!=NULL)
-		{
-			mvtkmpr2Dview_X->SetImageToVtkViewer(image);
-		}
-		if (mvtkmpr2Dview_Y!=NULL)
-		{
-			mvtkmpr2Dview_Y->SetImageToVtkViewer(image);
-		}
-		if (mvtkmpr2Dview_Z!=NULL)
-		{
-			mvtkmpr2Dview_Z->SetImageToVtkViewer(image);
-		}
-		
-		if (mvtkplane2Dview!=NULL)
-		{
-			// ???  EED 10 oct 2012
-		}
-		if (mwxsphereview!=NULL)
-		{
-			mwxsphereview->SetImage();
-		}
-		if (mwxvtkclipping3Dview!=NULL)
-		{
-			mwxvtkclipping3Dview->GetVtkClipping3DDataViewer()->SetImage();
-		}
-		
-		if (mwxvtkmpr3Dview!=NULL)
-		{
-			mwxvtkmpr3Dview->SetImage();
-		}
+	}	
+	if (mvtkmpr2Dview_X!=NULL)
+	{
+		mvtkmpr2Dview_X->SetImageToVtkViewer(image);
+	}
+	if (mvtkmpr2Dview_Y!=NULL)
+	{
+		mvtkmpr2Dview_Y->SetImageToVtkViewer(image);
+	}
+	if (mvtkmpr2Dview_Z!=NULL)
+	{
+		mvtkmpr2Dview_Z->SetImageToVtkViewer(image);
+	}	
+	if (mvtkplane2Dview!=NULL)
+	{
+		// ???  EED 10 oct 2012
+	}
+	if (mwxsphereview!=NULL)
+	{
+		mwxsphereview->SetImage();
+	}
+	if (mwxvtkclipping3Dview!=NULL)
+	{
+		mwxvtkclipping3Dview->GetVtkClipping3DDataViewer()->SetImage();
+	}		
+	if (mwxvtkmpr3Dview!=NULL)
+	{
+		mwxvtkmpr3Dview->SetImage();
+	}
 		
 //EED 26/11/2009
 //		ConfigureVTK();
 //		RefreshView();
-
-	}
+}
 
 	//-------------------------------------------------------------------------