X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Fkernel_ManagerContour_NDimensions%2FKernelManagerContour.cxx;h=3f4a144a4ba9afb48eead9f98a17b6835b497922;hb=6c905248260709012e018c112dab06da8deecede;hp=57f9228ee6499549b0e365b5c5903e11b158e520;hpb=3ede91ddd835ef6f6eaf9e72956be7c6ebd69ad4;p=creaContours.git diff --git a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx index 57f9228..3f4a144 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 @@ -12,7 +37,7 @@ KernelManagerContour::KernelManagerContour(){ ** **/ inredo = 0; - inundo = 0; + inundo = 0; time_t seconds; seconds = time (NULL); @@ -42,7 +67,7 @@ KernelManagerContour::KernelManagerContour(std::vector images,std ** **/ inredo = 0; - inundo = 0; + inundo = 0; time_t seconds; seconds = time (NULL); @@ -51,7 +76,7 @@ KernelManagerContour::KernelManagerContour(std::vector images,std stundoredo = tmpdir+"/temp"+intToString(time); _currentIndex = 0; - + _contourPropagation = NULL; #if(WIN32) mkdir(tmpdir.c_str()); @@ -64,34 +89,59 @@ KernelManagerContour::KernelManagerContour(std::vector images,std /** ** FINISH PERSISTANCE **/ - setVectImages(images); + setVectImages(images); initializeEnvironment(datadir); } -KernelManagerContour::~KernelManagerContour(){ -} -std::vector KernelManagerContour::getVectImages(){ +KernelManagerContour::~KernelManagerContour() +{ +} + +std::vector KernelManagerContour::getVectImages() +{ return vectimages; } -void KernelManagerContour::setVectImages(std::vector vectimg){ + +void KernelManagerContour::setVectImages(std::vector vectimg) +{ + double spc[3]; + std::vector vectspc; + for(int i = 0; i < (int)(vectimg.size()); i++){ vtkImageData* img = vectimg[i]; vtkImageChangeInformation* change = vtkImageChangeInformation::New(); change->SetInformationInput(img); change->SetInputConnection(img->GetProducerPort()); - + 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"; @@ -102,7 +152,7 @@ void KernelManagerContour::initializeEnvironment(std::string datadir){ std::map * sourcesMap = new std::map(); std::map* sectionsMap = new std::map(); std::map* axesMap = new std::map(); - std::map* outlinesMap = new std::map(); + std::map* outlinesMap = new std::map(); for(int i = 0; i < (int)(vectimages.size()); i++){ vtkImageData* selectedimage = vectimages[i]; @@ -110,11 +160,11 @@ void KernelManagerContour::initializeEnvironment(std::string datadir){ std::string imgstring = "Source Image "+intToString(i+1); sourcesMap->insert(std::pair( imgstring, thing)); } - + OutlineModelBuilder * _builder = new OutlineModelBuilder( conceptsFN ,datadir); _builder->buildImageSource_Envornment( imageSourcesFN, sourcesMap ); - _builder->buildImageSection_Envornment( imageSectionsFN, sectionsMap ); + _builder->buildImageSection_Envornment( imageSectionsFN, sectionsMap ); _builder->buildAxe_Envornment(axeThingsFN, axesMap ); _builder->buildCountour_Envornment( imageSectionsFN, outlinesMap ); @@ -144,7 +194,7 @@ std::string KernelManagerContour::intToString(int num){ while (k > 0){ char temp = k % 10 + 48; k = k / 10; - result = temp + result; + result = temp + result; } } return result; @@ -208,7 +258,9 @@ std::string KernelManagerContour::createCopyContourOf ( std::string anExistingKN { return modelManager->createCopyContourOf(anExistingKName, instantNoTouchData); } -manualBaseModel* KernelManagerContour::getOutlineByKeyName(std::string cloneName){ + +manualBaseModel* KernelManagerContour::getOutlineByKeyName(std::string cloneName) +{ return modelManager->getOutlineByKeyName (cloneName )->getModel(); } @@ -216,16 +268,16 @@ bool KernelManagerContour::onRedo(std::string& filename){ if(inredo > 0){ inredo--; inundo++; - std::string str = intToString(inundo); - filename = stundoredo + str + ".roi"; - //loadState(temp); + std::string str = intToString(inundo); + filename = stundoredo + str + ".roi"; + //loadState(temp); return true; } return false; } bool KernelManagerContour::onUndo(std::string& filename){ - if(inundo>0){ + if(inundo>0){ inredo++; inundo--; @@ -233,9 +285,9 @@ bool KernelManagerContour::onUndo(std::string& filename){ //itoa(inundo, str, 10); std::string str = intToString(inundo); - + filename = stundoredo + str + ".roi"; - + return true;//loadState(temp); } return false; @@ -259,7 +311,7 @@ bool KernelManagerContour::onUndoSaveFile(std::string& filename){ filename = stundoredo + str + ".roi"; return true; - //saveFileWithContours(temp); + //saveFileWithContours(temp); } } @@ -271,53 +323,55 @@ void KernelManagerContour :: changeContourOfManager(std::string keyName, Instant modelManager->ChangeContourOfList(keyName, instant); } -void KernelManagerContour ::resetAppend(){ - if(isInitContourPropagation()){ +void KernelManagerContour ::resetAppend() +{ + if (_contourPropagation!=NULL) + { _contourPropagation->resetAppend(); - } -} - -bool KernelManagerContour::isInitContourPropagation(){ - if(_contourPropagation == NULL){ - _contourPropagation = new ContourPropagation(); - }else{ - return true; } - return false; - } -std::string KernelManagerContour::onSpreadAdd( std::vector *vecX, std::vector *vecY, std::vector *vecZ, std::vector instants){ - if(isInitContourPropagation()){ - if (vecX->size()!=0){ - - int i,size=vecZ->size(); - int actualSlice = instants[1]; - for ( i=0 ; iappendContour(vecX , vecY , vecZ); - return intToString(actualSlice); - } - } +std::string KernelManagerContour::onSpreadAdd( std::vector *vecX, std::vector *vecY, std::vector *vecZ, std::vector instants) +{ + if (_contourPropagation==NULL) + { + _contourPropagation = new ContourPropagation(); + } + + if (vecX->size()!=0){ + + int i,size=vecZ->size(); + int actualSlice = instants[1]; + for ( i=0 ; iappendContour(vecX , vecY , vecZ); + return intToString(actualSlice); + } return ""; } -void KernelManagerContour::getMaxMinZ(double *minZ,double *maxZ){ - if(isInitContourPropagation()){ + +void KernelManagerContour::getMaxMinZ(double *minZ,double *maxZ) +{ + if (_contourPropagation!=NULL) + { _contourPropagation->getMaxMinZ(minZ, maxZ); } } -void KernelManagerContour::CalculeSplinePropagation(){ + + +void KernelManagerContour::CalculeSplinePropagation() +{ _contourPropagation->setInterpolationNumber(100); _contourPropagation->CalculeSplinePropagation(); } -manualBaseModel* KernelManagerContour::GetPoints(int z,int type, std::vector* vecCtrlPointX,std::vector* vecCtrlPointY,std::vector* vecCtrlPointZ, std::string& theName,int typeofcontour, std::vector tempVector){ - - +manualBaseModel* KernelManagerContour::GetPoints(int z,int type, std::vector* vecCtrlPointX,std::vector* vecCtrlPointY,std::vector* vecCtrlPointZ, std::string& theName,int typeofcontour, std::vector tempVector) +{ bool addedModel = false; manualBaseModel* manModelContour=NULL; @@ -328,9 +382,9 @@ manualBaseModel* KernelManagerContour::GetPoints(int z,int type, std::vectorFindIdWithZ(z); if (type==0) // Initial Points - { + { _contourPropagation->GetInitialControlPoints( idTmp , vecCtrlPointX,vecCtrlPointY,vecCtrlPointZ); - } + } if (type==1) // Automatique Method { _contourPropagation->GetControlPoints( idTmp ,vecCtrlPointX,vecCtrlPointY,vecCtrlPointZ); @@ -344,7 +398,7 @@ manualBaseModel* KernelManagerContour::GetPoints(int z,int type, std::vectorAddPoint( (*vecCtrlPointX)[j] , (*vecCtrlPointY)[j] , 900 ); + manModelContour->AddPoint( (*vecCtrlPointX)[j] , (*vecCtrlPointY)[j] , -900 ); //-------------------------------------------------------------------- } // for j @@ -354,13 +408,13 @@ manualBaseModel* KernelManagerContour::GetPoints(int z,int type, std::vector KernelManagerContour::getOutlinesNameAtInstant(std::vec ContourThing **contourthing = vectcont[i]; vectname.push_back((*contourthing)->getName()); } - return vectname; + return vectname; } std::vector KernelManagerContour::getOutlinesAtInstant(Instant* instant ){ @@ -467,7 +521,7 @@ void KernelManagerContour::setCurrentFileName(std::string filenam){ } std::string KernelManagerContour::parseOsirixFile(std::string filename){ - + #ifdef ParserOsirix_BUILD vtkImageData* sourceimage; @@ -487,7 +541,7 @@ std::string KernelManagerContour::parseOsirixFile(std::string filename){ return p.getContoursFileName(); #else return ""; -#endif +#endif }