X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Fkernel_ManagerContour_NDimensions%2FKernelManagerContour.cxx;h=9d3f861c36c4e01e4ab0f245637e629d87b91f11;hb=refs%2Ftags%2FEED.02Oct2009;hp=24307db8f8a38c16da8466286620a8f0d25c2dd2;hpb=ff6d06534aba33daee30bbacbcb73cbb35dcbb48;p=creaContours.git diff --git a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx index 24307db..9d3f861 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 images,std::string datadir,std::string tmpdir){ +KernelManagerContour::KernelManagerContour(std::vector images,std::string datadir,std::string tmpdir) +{ /**THIS ALL SHOULD BE IN AN OTHER LIB CALLED PERSISTANCE @@ -75,7 +76,7 @@ std::vector KernelManagerContour::getVectImages(){ } void KernelManagerContour::setVectImages(std::vector vectimg){ - for(int i = 0; i < vectimg.size(); i++){ + for(int i = 0; i < (int)(vectimg.size()); i++){ vtkImageData* img = vectimg[i]; vtkImageChangeInformation* change = vtkImageChangeInformation::New(); change->SetInformationInput(img); @@ -102,7 +103,7 @@ void KernelManagerContour::initializeEnvironment(std::string datadir){ std::map* axesMap = new std::map(); std::map* outlinesMap = new std::map(); - for(int i = 0; i < vectimages.size(); i++){ + for(int i = 0; i < (int)(vectimages.size()); i++){ vtkImageData* selectedimage = vectimages[i]; ImageSourceThing * thing = new ImageSourceThing(selectedimage); std::string imgstring = "Source Image "+intToString(i+1); @@ -342,7 +343,7 @@ manualContourModel* KernelManagerContour::GetPoints(int z,int type, std::vector< for (int j=0 ; jAddPoint( (*vecCtrlPointX)[j] , (*vecCtrlPointY)[j] , -900 ); + manModelContour->AddPoint( (*vecCtrlPointX)[j] , (*vecCtrlPointY)[j] , 900 ); //-------------------------------------------------------------------- } // for j @@ -355,7 +356,6 @@ manualContourModel* KernelManagerContour::GetPoints(int z,int type, std::vector< }// ifSliceKeyContourExist return manModelContour; - } manualContourModel * KernelManagerContour::factoryManualContourModel(int typeContour) @@ -399,7 +399,7 @@ std::vector KernelManagerContour::getOutlinesNameAtInstant(std::vec Instant instant(&tempvector); std::vector vectcont = modelManager->getOutlinesAtInstant( &instant ); std::vector vectname; - for(int i = 0; i < vectcont.size(); i++){ + for(int i = 0; i < (int)(vectcont.size()); i++){ ContourThing **contourthing = vectcont[i]; vectname.push_back((*contourthing)->getName()); } @@ -435,7 +435,7 @@ void KernelManagerContour::getConceptsInformation(std::vector& conc vtkImageData* KernelManagerContour::getImageAtInstant(std::vector inst){ int index = inst[5]-1; - if(index < vectimages.size()&&index!=_currentIndex){ + if(index < (int)(vectimages.size())&&index!=_currentIndex){ _currentIndex=index; return vectimages[index]; }