X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracas_ViewerWidget.cxx;h=d86fec0162637eb518d4b636c3e9561b9ed610c6;hb=4443a8fe2b4992b6abee8531917fd0803018fc12;hp=dd6b80cf5d8c455295ab7de2ade80fae77ef488e;hpb=e6b030ceb3ee4eea1f012e7d5c47503cf6322c61;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 dd6b80c..d86fec0 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracas_ViewerWidget.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/03/24 10:49:21 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2009/04/01 08:41:35 $
+  Version:   $Revision: 1.6 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -66,20 +66,20 @@
 
 		if (type==0)
 		{
-			mvtkmpr2Dview_Z = new wxVtkMPR2DView(panel,0);
+			mvtkmpr2Dview_Z = new wxVtkMPR2DView(panel,2);
 			mvtkmpr2Dview_Z->SetVtkBaseData(mvtkmprbasedata);
 			wxwindow		= mvtkmpr2Dview_Z->GetWxVTKRenderWindowInteractor();
 		}
 		if (type==1)
 		{
-			mvtkmpr2Dview_X = new wxVtkMPR2DView(panel,1);
+			mvtkmpr2Dview_X = new wxVtkMPR2DView(panel,0);
 			mvtkmpr2Dview_X->SetVtkBaseData(mvtkmprbasedata);
 			wxwindow		=	mvtkmpr2Dview_X->GetWxVTKRenderWindowInteractor();
 		}
 
 		if (type==2)
 		{
-			mvtkmpr2Dview_Y = new wxVtkMPR2DView(panel,2);
+			mvtkmpr2Dview_Y = new wxVtkMPR2DView(panel,1);
 			mvtkmpr2Dview_Y->SetVtkBaseData(mvtkmprbasedata);
 			wxwindow		= mvtkmpr2Dview_Y->GetWxVTKRenderWindowInteractor();
 		}
@@ -239,7 +239,7 @@
 			mvtkmprbasedata->SetY( y );
 			mvtkmprbasedata->SetZ( z );
 		}
-		RefreshView();
+//		RefreshView();
 	}
 
 	//-------------------------------------------------------------------------
@@ -252,6 +252,7 @@
 	//-------------------------------------------------------------------------
 	void wxMaracas_ViewerWidget::RefreshView()
 	{
+		
 			if (mvtk2Dbaseview				!=NULL ){ mvtk2Dbaseview				-> Refresh();		}
 			if (mvtkmpr2Dview_X				!=NULL ){ mvtkmpr2Dview_X				-> Refresh();		}
 			if (mvtkmpr2Dview_Y				!=NULL ){ mvtkmpr2Dview_Y				-> Refresh();		}
@@ -262,6 +263,7 @@
 			if (mwxvtkmpr3Dview				!=NULL ){ mwxvtkmpr3Dview				-> RefreshView();	}
 			if (mwxvtkclipping3Dview		!=NULL ){ mwxvtkclipping3Dview			-> Refresh();		}
 			if (mwxvtk3Dbaseview_Clipping3D !=NULL ){ mwxvtk3Dbaseview_Clipping3D	-> Refresh();		}
+
 	}
 
 	//-------------------------------------------------------------------------
@@ -281,7 +283,6 @@
 
 	void wxMaracas_ViewerWidget::SetImage( vtkImageData *image	)
 	{
-		//printf("EED wxMaracas_ViewerWidget::SetImage   IMPORTANT this methode is missing \n");
 		marImageData* mar = mvtkmprbasedata->GetMarImageData();
 		mar->removeImageData(0);
 		mar->AddImageData(image);