X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkBaseView.cxx;h=7bbda0afddaf0f87117dbe6ac11cff696a48df19;hb=1bf58cfa1758464b422d1d0cca808e528043e691;hp=163aa5fda37f1ce00e23950002eead1a31330433;hpb=3948b92b07a8992a6d04081c9649ba63e3e7d613;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
index 163aa5f..7bbda0a 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
@@ -30,7 +30,7 @@ vtkImageViewer2_XYZ::vtkImageViewer2_XYZ()
 //-------------------------------------------------------------------
 vtkImageViewer2_XYZ::~vtkImageViewer2_XYZ()
 {
-	_vtkimageviewer2->Delete();
+	//_vtkimageviewer2->Delete();
 }
 //-------------------------------------------------------------------
 void vtkImageViewer2_XYZ::SetExtentDimension(int x1,int x2,
@@ -190,7 +190,8 @@ wxVtkBaseView::wxVtkBaseView(wxWindow *parent)
 //-------------------------------------------------------------------
 wxVtkBaseView::~wxVtkBaseView()
 {
-	_iren -> Delete();
+ //	_iren -> Delete();
+	_iren=NULL;
 }
 //-------------------------------------------------------------------
 wxVTKRenderWindowInteractor* wxVtkBaseView::GetWxVTKRenderWindowInteractor() throw (char*)
@@ -1497,6 +1498,7 @@ bool vtkInfoTextImageInteractor::OnMouseMove()
 	double xx=X,yy=Y,zz=z;
 	_vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->TransfromeCoordScreenToWorld(xx,yy,zz);
 
+	
 	GetVtkInfoTextImage()->PutWindowLevel();
 	GetVtkInfoTextImage()->PutColorLevel();
 	GetVtkInfoTextImage()->PutPosition( (int)xx , (int)yy , (int)zz );
@@ -1525,17 +1527,19 @@ wxVtk2DBaseView::wxVtk2DBaseView(wxWindow *parent)
 	_vtkIinfoTextImage	= NULL;
 }
 
+//EED 5mai2009
 //-------------------------------------------------------------------
 wxVtk2DBaseView::~wxVtk2DBaseView()
-{
-	if (_imageViewer2XYZ!=NULL) {
-		delete _imageViewer2XYZ; 
-	}
-
-	if (_imageViewer2XYZ!=NULL) {
+{	
+	if (_vtkIinfoTextImage!=NULL) 
+	{
 		delete _vtkIinfoTextImage; 
 	}
 
+	if (_imageViewer2XYZ!=NULL) 
+	{
+		delete _imageViewer2XYZ; 
+	}
 }
 
 //-------------------------------------------------------------------
@@ -1586,7 +1590,6 @@ void wxVtk2DBaseView::ResetView()
  	_imageViewer2XYZ -> GetVtkImageViewer2()->SetupInteractor ( iren );
 
 	_imageViewer2XYZ->GetVtkImageViewer2()->Render();
-
 	SetInteractorStyleImage( vtkInteractorStyleBaseView2D::New() );
 	
 }
@@ -1726,7 +1729,7 @@ void wxVtk2DBaseView::SetInteractorStyleImage(vtkInteractorStyleBaseView *intera
 	iren->SetInteractorStyle(interactorstylebaseview);
 	interactorstylebaseview->SetwxVtkBaseView(this);	
 
-	vtkMaracasImageViewer2Callback *cbk = vtkMaracasImageViewer2Callback::New();
+	vtkMaracasImageViewer2Callback * cbk = vtkMaracasImageViewer2Callback::New();
 	cbk->IV = _imageViewer2XYZ->GetVtkImageViewer2();
 	interactorstylebaseview->AddObserver( vtkCommand::WindowLevelEvent, cbk );
 	interactorstylebaseview->AddObserver( vtkCommand::StartWindowLevelEvent, cbk );