X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Fkernel_ManagerContour_NDimensions%2FKernelManagerContour.cxx;h=30cff3614c071f943e2a35faf29e2dc23a61d2c1;hb=9212d387102a09fbbfb8876fb7d3eef9ee2617b2;hp=d741dc6b089650d1fb23064067fca4e94a5cf6c5;hpb=3a73ff10fa8904d7aad5df49b1481f58abf829e3;p=creaContours.git

diff --git a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx
index d741dc6..30cff36 100644
--- a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx
+++ b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx
@@ -34,7 +34,8 @@ KernelManagerContour::KernelManagerContour(){
 **/
 
 }
-KernelManagerContour::KernelManagerContour(std::vector<vtkImageData*> images){
+KernelManagerContour::KernelManagerContour(std::vector<vtkImageData*> images,std::string datadir,std::string tmpdir)
+{
 
 
 /**THIS ALL SHOULD BE IN AN OTHER LIB CALLED PERSISTANCE
@@ -48,25 +49,27 @@ KernelManagerContour::KernelManagerContour(std::vector<vtkImageData*> images){
 	int time = seconds;
 
 
-	stundoredo = "data/temp"+intToString(time);
+	stundoredo = tmpdir+"/temp"+intToString(time);
 	_currentIndex = 0;
 	
 	_contourPropagation = NULL;
 #if(WIN32)
-		mkdir(stundoredo.c_str());
+   	mkdir(tmpdir.c_str());
+	mkdir(stundoredo.c_str());
 #else
-		mkdir(stundoredo.c_str(),755);
+	mkdir(tmpdir.c_str(),755);
+	mkdir(stundoredo.c_str(),755);
 #endif
 	stundoredo += "/cont";
 /**
 **  FINISH PERSISTANCE
 **/
 	setVectImages(images);
-	initializeEnvironment();
+	initializeEnvironment(datadir);
 
 }
 KernelManagerContour::~KernelManagerContour(){
-}
+}	
 
 std::vector<vtkImageData*> KernelManagerContour::getVectImages(){
 	return vectimages;
@@ -79,7 +82,7 @@ void KernelManagerContour::setVectImages(std::vector<vtkImageData*> vectimg){
 		change->SetInformationInput(img);
 		change->SetInputConnection(img->GetProducerPort());
 
-		change->SetOutputSpacing(0.6,0.6,0.6);
+		change->SetOutputSpacing(1,1,1);
 		
 		change->Update();
 
@@ -89,9 +92,9 @@ void KernelManagerContour::setVectImages(std::vector<vtkImageData*> vectimg){
 	vectimages = vectimg;
 }
 
-void KernelManagerContour::initializeEnvironment(){
-	std::string conceptsFN			=  "data/holaConceptsFile.cf";
-	std::string imageSourcesFN		= "data/holaImagesInstantsFile.of";
+void KernelManagerContour::initializeEnvironment(std::string datadir){
+	std::string conceptsFN			=  datadir+"holaConceptsFile.cf";
+	std::string imageSourcesFN		=  datadir+"holaImagesInstantsFile.of";
 	std::string imageSectionsFN		= "";
 	std::string axeThingsFN			= "";
 
@@ -108,7 +111,7 @@ void KernelManagerContour::initializeEnvironment(){
 	}
 	
 
-	OutlineModelBuilder * _builder								= new OutlineModelBuilder( conceptsFN );
+	OutlineModelBuilder * _builder								= new OutlineModelBuilder( conceptsFN ,datadir);
 	_builder->buildImageSource_Envornment( imageSourcesFN, sourcesMap );
 	_builder->buildImageSection_Envornment( imageSectionsFN, sectionsMap );		
 	_builder->buildAxe_Envornment(axeThingsFN, axesMap );
@@ -200,7 +203,8 @@ void KernelManagerContour::setInstant(std::vector<int> vectInstant){
 	modelManager->setInstant(act);
 }
 
-std::string KernelManagerContour::createCopyContourOf ( std::string anExistingKName, std::vector<int> &instantNoTouchData){
+std::string KernelManagerContour::createCopyContourOf ( std::string anExistingKName, std::vector<int> &instantNoTouchData)
+{
 	return modelManager->createCopyContourOf(anExistingKName, instantNoTouchData);
 }
 manualContourModel* KernelManagerContour::getOutlineByKeyName(std::string cloneName){
@@ -383,6 +387,12 @@ manualContourModel * KernelManagerContour::factoryManualContourModel(int typeCon
 		manModelContour = new manualContourModelCircle();
 	}
 
+	// line
+	if (typeContour==6)
+	{
+		manModelContour = new manualContourModelLine();
+	}
+
 	return manModelContour;
 }
 
@@ -439,4 +449,6 @@ std::string KernelManagerContour::getCurrentFileName(){
 
 void KernelManagerContour::setCurrentFileName(std::string filenam){
 	this->filename = filenam;
-}
\ No newline at end of file
+}
+
+