X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Fkernel_ManagerContour_NDimensions%2FKernelManagerContour.cxx;h=633d43859b37f1dc24b26e9bd276723efb62deb1;hb=2ca0ae039a31c7aec93da7aadc5fa5e983e08045;hp=8efa5a9eef6582f686059ca8d872b1b45a6d9e64;hpb=b0a60f90532e0fef49b89328910f3b7114796498;p=creaContours.git

diff --git a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx
index 8efa5a9..633d438 100644
--- a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx
+++ b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx
@@ -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.
+# ------------------------------------------------------------------------ */
+
 
 //----------------------------------------------------------------------------------------------------------------
 // Class definition include
@@ -68,30 +93,63 @@ KernelManagerContour::KernelManagerContour(std::vector<vtkImageData*> images,std
 	initializeEnvironment(datadir);
 
 }
-KernelManagerContour::~KernelManagerContour(){
+
+KernelManagerContour::~KernelManagerContour()
+{
 }
 
-std::vector<vtkImageData*> KernelManagerContour::getVectImages(){
+std::vector<vtkImageData*> KernelManagerContour::getVectImages()
+{
 	return vectimages;
 }
-void KernelManagerContour::setVectImages(std::vector<vtkImageData*> vectimg){
 
+
+void KernelManagerContour::setVectImages(std::vector<vtkImageData*> vectimg)
+{
+	double spc[3];
+	std::vector<double> vectspc;
+	
 	for(int i = 0; i < (int)(vectimg.size()); i++){
 		vtkImageData* img = vectimg[i];
 		vtkImageChangeInformation* change = vtkImageChangeInformation::New();
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		change->SetInformationInput(img);
 		change->SetInputConnection(img->GetProducerPort());
+#else
+		change->SetInputData(img);
+#endif
 
+		img->GetSpacing(spc);
 		change->SetOutputSpacing(1,1,1);
 
+//EED 18 fev 2014
+		change->SetOutputOrigin (0, 0, 0);
+
 		change->Update();
+		vectspc.clear();
 
+		vectspc.push_back(spc[0]);
+		vectspc.push_back(spc[1]);
+		vectspc.push_back(spc[2]);
+		vectimagesSpacing.push_back(vectspc);
 		vectimg[i] = change->GetOutput();
 	}
 
 	vectimages = vectimg;
 }
 
+
+void KernelManagerContour::GetSpacing(double *vecspc, int iImage)
+{
+	vecspc[0]=vectimagesSpacing[iImage][0];
+	vecspc[1]=vectimagesSpacing[iImage][1];
+	vecspc[2]=vectimagesSpacing[iImage][2];
+}
+
+
 void KernelManagerContour::initializeEnvironment(std::string datadir){
 	_datadir = datadir;
 	std::string conceptsFN			=  datadir+"holaConceptsFile.cf";
@@ -348,7 +406,7 @@ manualBaseModel* KernelManagerContour::GetPoints(int z,int type, std::vector<dou
 		for (int j=0 ; j<sizeCtrPt ; j++)
 		{
 //JSTG_16-07-08_----------------------------------------------------------------
-			manModelContour->AddPoint( (*vecCtrlPointX)[j] , (*vecCtrlPointY)[j] , 900  );
+			manModelContour->AddPoint( (*vecCtrlPointX)[j] , (*vecCtrlPointY)[j] , -900  );
 //--------------------------------------------------------------------
 		} // for j