X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracas_ViewerWidget.cxx;h=b90dbaff4c38b4ee7cfa6a8a1cedb1a6db836a6e;hb=8cb2e736dbd160649089afd44928db6d26febcca;hp=9fee22620db3f2a3efdbf636276225a123a8e24b;hpb=b80b4dcc301c1c2c63c0f76cd06b0a434350f7a7;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 9fee226..b90dbaf 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
@@ -66,7 +66,7 @@
 		//RaC 03-2010 Adding a tab
 		wxPanel				*controlPanelClippingVol3D	= NULL;
 
-		wxBoxSizer *sizer			= 0;
+		wxBoxSizer *sizer								= 0;
 
 		mType = type;
 
@@ -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   ;