X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Fkernel%2FmarImageData.cpp;h=db028be87769b4dd3c624c78e4d30d8e9c98a93d;hb=f9901e756bb82bd333310b47607875331616bb29;hp=de4273fe032003f2097ff4cb52bfaf76a833e578;hpb=c5feadbb145eecf6d73f793535b7e23eb18db2cb;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/kernel/marImageData.cpp b/lib/maracasVisuLib/src/kernel/marImageData.cpp
index de4273f..db028be 100644
--- a/lib/maracasVisuLib/src/kernel/marImageData.cpp
+++ b/lib/maracasVisuLib/src/kernel/marImageData.cpp
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 /*=========================================================================
 
 
@@ -16,7 +41,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 +51,7 @@ marImageData::~marImageData()
 	int i,size=_imagedataLST.size();
 	for (i=0;i<size;i++)
 	{
-		_imagedataLST[i]->Delete();
+	//	_imagedataLST[i]->Delete();
 	}
 	_imagedataLST.clear();
 }
@@ -71,12 +98,37 @@ 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)
+{
+	if(index < _imagedataLST.size())
+	{
+
+		/*vtkImageData* img = _imagedataLST[index];
+		if(img->GetReferenceCount()>1){
+			img->SetReferenceCount(img->GetReferenceCount()-1);
+			//img->Delete();
+		}*/
+		for(int i = index; i < _imagedataLST.size()-1; i++)
+		{			
+			_imagedataLST[i] = _imagedataLST[i+1];
+		}// for
+		_imagedataLST.pop_back();
+		//delete img;
+	} // if	
 }
 // ----------------------------------------------------------------------------------------------
 int marImageData::GetXOriginal(int value)