X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracas_ViewerWidget.cxx;h=a9e9e1da583d5186dde889eefc5918258bf86cd6;hb=ca35b13e046343c8b50cbd6b833828b06c9d1608;hp=258bf30de00b84989bb51c5e8d3c58fbbeac7947;hpb=76820b27f1b2256fc0b6849ee77181d46891baa6;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 258bf30..a9e9e1d 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
@@ -317,7 +317,6 @@
 		if ( mwidgetMesure       !=NULL ) { mwidgetMesure->ConfigureA(mvtkplane2Dview); }
 		if ( mwidgetMesure       !=NULL ) { mwidgetMesure->ConfigureA(mvtkplane2Dview); }
 		if ( mwidgetMesure       !=NULL ) { mwidgetMesure->SetActiveLink(true);         }
-		if ( mwidgetMesure       !=NULL ) { mwidgetMesure->SetMesureScale( 1 );         }
 		if ( mwxsphereview       !=NULL ) { mwxsphereview->Configure();                 }
 
 		
@@ -361,15 +360,15 @@ void wxMaracas_ViewerWidget::Refresh(bool eraseBackground ,const wxRect* rect  )
 	//-------------------------------------------------------------------------
 	void wxMaracas_ViewerWidget::RefreshView()
 	{
-		if (mvtk2Dbaseview				!=NULL ){ mvtk2Dbaseview->Refresh();				}
-		if (mvtkmpr2Dview_X				!=NULL ){ mvtkmpr2Dview_X->Refresh();				}
-		if (mvtkmpr2Dview_Y				!=NULL ){ mvtkmpr2Dview_Y->Refresh();				}
-		if (mvtkmpr2Dview_Z				!=NULL ){ mvtkmpr2Dview_Z->Refresh();				}
-		if (mvtkplane2Dview				!=NULL ){ mvtkplane2Dview->Refresh();				}
-		if (mwxsphereview				!=NULL ){ mwxsphereview	->RefreshView();			}
-		if (mwxvtkmpr3Dview				!=NULL ){ mwxvtkmpr3Dview->RefreshView();			}
-		if (mwxvtkclipping3Dview		!=NULL ){ mwxvtkclipping3Dview->Refresh();			}
-		if (mwxvtk3Dbaseview_Clipping3D !=NULL ){ mwxvtk3Dbaseview_Clipping3D->Refresh();	}
+		if (mwxvtk3Dbaseview_Clipping3D !=NULL ){ mwxvtk3Dbaseview_Clipping3D->Refresh();	 }
+		if (mwxvtkclipping3Dview		!=NULL ){ mwxvtkclipping3Dview->Refresh();			 }
+		if (mwxvtkmpr3Dview				!=NULL ){ mwxvtkmpr3Dview->RefreshView();			 }
+		if (mvtk2Dbaseview				!=NULL ){ mvtk2Dbaseview->Refresh();				 }
+		if (mvtkmpr2Dview_X				!=NULL ){ mvtkmpr2Dview_X->Refresh();				 }
+		if (mvtkmpr2Dview_Y				!=NULL ){ mvtkmpr2Dview_Y->Refresh();				 }
+		if (mvtkmpr2Dview_Z				!=NULL ){ mvtkmpr2Dview_Z->Refresh();				 }
+		if (mvtkplane2Dview				!=NULL ){ mvtkplane2Dview->Refresh();				 }
+		if (mwxsphereview				!=NULL ){ mwxsphereview	->RefreshView();			 }
 	}
 
 	//-------------------------------------------------------------------------
@@ -377,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   ;
@@ -404,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();
-
-	}
+}
 
 	//-------------------------------------------------------------------------