BUG vtk contours

[creaMaracasVisu.git] / lib / maracasVisuLib / src / kernel / marImageData.cpp

diff --git a/lib/maracasVisuLib/src/kernel/marImageData.cpp b/lib/maracasVisuLib/src/kernel/marImageData.cpp
index 88476ca82ac0b7225d243b6d16cb32059c472198..d8738e7e6057056c733c5c499fec170fc1433ff8 100644 (file)
--- a/lib/maracasVisuLib/src/kernel/marImageData.cpp
+++ b/lib/maracasVisuLib/src/kernel/marImageData.cpp
@@ -16,7 +16,9 @@ marImageData::marImageData(vtkImageData *imagedata)
        _voiOriginal[3] = 0;
        _voiOriginal[4] = 0;
        _voiOriginal[5] = 0;
-       AddImageData(imagedata);
+       if(imagedata!=NULL){
+               AddImageData(imagedata);
+       }
 }
 // ----------------------------------------------------------------------------------------------
 marImageData::~marImageData()
@@ -24,7 +26,7 @@ marImageData::~marImageData()
        int i,size=_imagedataLST.size();
        for (i=0;i<size;i++)
        {
-               _imagedataLST[i]->Delete();
+       //      _imagedataLST[i]->Delete();
        }
        _imagedataLST.clear();
 }
@@ -71,12 +73,18 @@ void marImageData::GetVoiOriginal(int voi[6])
 // ----------------------------------------------------------------------------------------------
 vtkImageData *marImageData::GetImageDataT(int t)
 {
-       return _imagedataLST[t];
+       if(_imagedataLST.size() > t){
+               return _imagedataLST[t];
+       }
+       return NULL;
 }
 // ----------------------------------------------------------------------------------------------
 vtkImageData *marImageData::GetImageData()
 {
-       return _imagedataLST[0];
+       if(_imagedataLST.size()>0){
+               return _imagedataLST[0];
+       }
+       return NULL;
 }
 
 void marImageData::removeImageData(int index)