X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Fkernel_ManagerContour_NDimensions%2FKernelManagerContour.cxx;h=8e9f1d8e3663b3c498ae5d7327eb2c4635c13e7d;hb=5379fd694b086240e72872f2237cae1b67bc7ced;hp=3edce32a41f4b4b81d45ad16beb41ba2bd6779b5;hpb=7ef64acb00d37e665e0bf019b9a7ede2495bf155;p=creaContours.git

diff --git a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx
index 3edce32..8e9f1d8 100644
--- a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx
+++ b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx
@@ -59,12 +59,12 @@ KernelManagerContour::KernelManagerContour(std::vector<vtkImageData*> images,std
 /**THIS ALL SHOULD BE IN AN OTHER LIB CALLED PERSISTANCE
 **
 **/
+    time_t  seconds;
+    seconds     = time (NULL);
+    int time    = seconds;
 	inredo 		= 0;
 	inundo 		= 0;
-	time_t seconds;
-	seconds 	= time (NULL);
-	int time 	= seconds;
-	stundoredo = tmpdir+"/temp"+intToString(time);
+	stundoredo  = tmpdir+"/temp"+intToString(time);
 	_currentIndex = 0;
 	_contourPropagation = NULL;
 #if(WIN32)
@@ -108,7 +108,7 @@ void KernelManagerContour::setVectImages(std::vector<vtkImageData*> vectimg)
 		change->SetInputData(img);
 #endif
 		img->GetSpacing(spc);
-		change->SetOutputSpacing(1,1,1);
+//		change->SetOutputSpacing(1,1,1);
 //EED 18 fev 2014
 		change->SetOutputOrigin (0, 0, 0);
 		change->Update();
@@ -124,24 +124,22 @@ void KernelManagerContour::setVectImages(std::vector<vtkImageData*> vectimg)
 
 void KernelManagerContour::GetSpacing(double *vecspc, int iImage)
 {
-	vecspc[0]=vectimagesSpacing[iImage][0];
-	vecspc[1]=vectimagesSpacing[iImage][1];
-	vecspc[2]=vectimagesSpacing[iImage][2];
+	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";
-	std::string imageSourcesFN		=  datadir+"holaImagesInstantsFile.of";
-	std::string imageSectionsFN		= "";
-	std::string axeThingsFN			= "";
-
-	std::map<std::string, ImageSourceThing *> * sourcesMap		= new std::map<std::string, ImageSourceThing *>();
-	std::map<std::string, ImageSectionThing *>* sectionsMap		= new std::map<std::string, ImageSectionThing *>();
-	std::map<std::string, AxeThing *>* axesMap					= new std::map<std::string, AxeThing *>();
-	std::map<std::string, ContourThing *>* outlinesMap			= new std::map<std::string, ContourThing *>();
-
+	_datadir                                                    = datadir;
+	std::string conceptsFN			                            = datadir+"holaConceptsFile.cf";
+	std::string imageSourcesFN		                            = datadir+"holaImagesInstantsFile.of";
+	std::string imageSectionsFN		                            = "";
+	std::string axeThingsFN			                            = "";
+	std::map<std::string, ImageSourceThing *> * sourcesMap	    = new std::map<std::string, ImageSourceThing *>();
+	std::map<std::string, ImageSectionThing *>* sectionsMap	    = new std::map<std::string, ImageSectionThing *>();
+	std::map<std::string, AxeThing *>* axesMap				    = new std::map<std::string, AxeThing *>();
+	std::map<std::string, ContourThing *>* outlinesMap		    = new std::map<std::string, ContourThing *>();
 	for(int i = 0; i < (int)(vectimages.size()); i++)
 	{
 		vtkImageData* selectedimage = vectimages[i];
@@ -149,15 +147,14 @@ void KernelManagerContour::initializeEnvironment(std::string datadir)
 		std::string imgstring = "Source Image "+intToString(i+1);
 		sourcesMap->insert(std::pair<std::string, ImageSourceThing *>( imgstring, thing));
 	} // for
-
 	OutlineModelBuilder * _builder								= new OutlineModelBuilder( conceptsFN ,datadir);
 	_builder->buildImageSource_Envornment( imageSourcesFN, sourcesMap );
 	_builder->buildImageSection_Envornment( imageSectionsFN, sectionsMap );
 	_builder->buildAxe_Envornment(axeThingsFN, axesMap );
 	_builder->buildCountour_Envornment( imageSectionsFN, outlinesMap );
 	//Creating the objects to manage
-	modelManager				= new OutlineModelManager( _builder->getImSourceEnv(), _builder->getImSectionEnv(), _builder->getAxesEnv(),  _builder->getContourEnv() );
-	imageSource	= modelManager->getImageSourceThingByKeyName( "Source Image 1" );
+	modelManager = new OutlineModelManager( _builder->getImSourceEnv(), _builder->getImSectionEnv(), _builder->getAxesEnv(),  _builder->getContourEnv() );
+	imageSource	 = modelManager->getImageSourceThingByKeyName( "Source Image 1" );
 }
 
 vtkImageData* KernelManagerContour::getSourceImage()