From 256ab1f0e32a5ecfa53192370162a8e54b9506c2 Mon Sep 17 00:00:00 2001
From: donadio <donadio>
Date: Thu, 7 May 2009 09:40:10 +0000
Subject: [PATCH] *** empty log message ***

---
 .../wxWindows/widgets/wxMPRBaseData.cxx       |  1 +
 .../wxWindows/widgets/wxVtkBaseView.cxx       | 22 ++++++++++---------
 .../wxWindows/widgets/wxVtkBaseView.h         |  3 ++-
 .../src/kernel/marImageData.cpp               |  2 +-
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx
index 16fb797..f3217a2 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx
@@ -126,6 +126,7 @@ vtkMPRBaseData::vtkMPRBaseData()
   _y=0;
   _z=0;
   _transformOrientation = NULL;
+  _marImageData = NULL;
 }
 //-------------------------------------------------------------------
 vtkMPRBaseData::~vtkMPRBaseData()
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
index 163aa5f..8585c97 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*)
@@ -1525,17 +1526,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 +1589,6 @@ void wxVtk2DBaseView::ResetView()
  	_imageViewer2XYZ -> GetVtkImageViewer2()->SetupInteractor ( iren );
 
 	_imageViewer2XYZ->GetVtkImageViewer2()->Render();
-
 	SetInteractorStyleImage( vtkInteractorStyleBaseView2D::New() );
 	
 }
@@ -1726,7 +1728,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 );
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h
index 2a6f3de..9b24c18 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h
@@ -318,7 +318,8 @@ private:
 
 class wxVtk3DBaseView;
 
-class creaMaracasVisu_EXPORT vtkInteractorStyleBaseView : public vtkInteractorStyleImage{
+class creaMaracasVisu_EXPORT vtkInteractorStyleBaseView : public vtkInteractorStyleImage
+{
 public:
 	vtkInteractorStyleBaseView();
 	~vtkInteractorStyleBaseView();
diff --git a/lib/maracasVisuLib/src/kernel/marImageData.cpp b/lib/maracasVisuLib/src/kernel/marImageData.cpp
index c717cb9..d8738e7 100644
--- a/lib/maracasVisuLib/src/kernel/marImageData.cpp
+++ b/lib/maracasVisuLib/src/kernel/marImageData.cpp
@@ -26,7 +26,7 @@ marImageData::~marImageData()
 	int i,size=_imagedataLST.size();
 	for (i=0;i<size;i++)
 	{
-		//_imagedataLST[i]->Delete();
+	//	_imagedataLST[i]->Delete();
 	}
 	_imagedataLST.clear();
 }
-- 
2.45.1