X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Fkernel_ManagerContour_NDimensions%2FKernelManagerContour.cxx;h=3edce32a41f4b4b81d45ad16beb41ba2bd6779b5;hb=refs%2Fheads%2Fvtk9itk4wx3-macos;hp=873f7104270b1d8aa6492a20f4b6f6cd167ca972;hpb=89f5bbefcd87de09f9c8d60e1d8fecabec554a1c;p=creaContours.git diff --git a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx index 873f710..3edce32 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 @@ -5,23 +30,18 @@ #include "KernelManagerContour.h" -KernelManagerContour::KernelManagerContour(){ - - +KernelManagerContour::KernelManagerContour() +{ /**THIS ALL SHOULD BE IN AN OTHER LIB CALLED PERSISTANCE ** **/ - inredo = 0; - inundo = 0; - + inredo = 0; + inundo = 0; time_t seconds; - seconds = time (NULL); - int time = seconds; - - - stundoredo = "data/temp"+intToString(time); - _currentIndex = 0; - + seconds = time (NULL); + int time = seconds; + stundoredo = "data/temp"+intToString(time); + _currentIndex = 0; _contourPropagation = NULL; #if(WIN32) mkdir(stundoredo.c_str()); @@ -32,64 +52,86 @@ KernelManagerContour::KernelManagerContour(){ /** ** FINISH PERSISTANCE **/ - } -KernelManagerContour::KernelManagerContour(std::vector images,std::string datadir){ - +KernelManagerContour::KernelManagerContour(std::vector images,std::string datadir,std::string tmpdir) +{ /**THIS ALL SHOULD BE IN AN OTHER LIB CALLED PERSISTANCE ** **/ - inredo = 0; - inundo = 0; - + inredo = 0; + inundo = 0; time_t seconds; - seconds = time (NULL); - int time = seconds; - - - stundoredo = datadir+"/temp"+intToString(time); + seconds = time (NULL); + int time = seconds; + 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); + setVectImages(images); initializeEnvironment(datadir); - } -KernelManagerContour::~KernelManagerContour(){ + +KernelManagerContour::~KernelManagerContour() +{ } -std::vector KernelManagerContour::getVectImages(){ +std::vector KernelManagerContour::getVectImages() +{ return vectimages; } -void KernelManagerContour::setVectImages(std::vector vectimg){ - for(int i = 0; i < vectimg.size(); i++){ + +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(); +//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(); - } - + } // for i vectimages = vectimg; } -void KernelManagerContour::initializeEnvironment(std::string datadir){ +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"; std::string imageSourcesFN = datadir+"holaImagesInstantsFile.of"; std::string imageSectionsFN = ""; @@ -98,145 +140,168 @@ 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 < vectimages.size(); i++){ + for(int i = 0; i < (int)(vectimages.size()); i++) + { vtkImageData* selectedimage = vectimages[i]; - ImageSourceThing * thing = new ImageSourceThing(selectedimage); + ImageSourceThing * thing = new ImageSourceThing(selectedimage); std::string imgstring = "Source Image "+intToString(i+1); sourcesMap->insert(std::pair( imgstring, thing)); - } - + } // for 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 ); - //Creating the objects to manage modelManager = new OutlineModelManager( _builder->getImSourceEnv(), _builder->getImSectionEnv(), _builder->getAxesEnv(), _builder->getContourEnv() ); - imageSource = modelManager->getImageSourceThingByKeyName( "Source Image 1" ); - } -vtkImageData* KernelManagerContour::getSourceImage(){ + +vtkImageData* KernelManagerContour::getSourceImage() +{ return imageSource->getSourceImage(); } -OutlineModelManager* KernelManagerContour::getOutlineModelManager(){ + +OutlineModelManager* KernelManagerContour::getOutlineModelManager() +{ return modelManager; } -std::string KernelManagerContour::createOutline(manualContourModel * manModelContour,std::vector instantVector){ +std::string KernelManagerContour::createOutline(manualBaseModel * manModelContour,std::vector instantVector) +{ return modelManager->createOutline( manModelContour, instantVector ); } -std::string KernelManagerContour::intToString(int num){ +std::string KernelManagerContour::intToString(int num) +{ std::string result; - if(num == 0){ + if(num == 0) + { result = "0"; }else{ int k=num; - while (k > 0){ + while (k > 0) + { char temp = k % 10 + 48; k = k / 10; - result = temp + result; - } - } + result = temp + result; + } // while + } // if num return result; } -std::vector KernelManagerContour::GetLstNameThingsStatic(){ +std::vector KernelManagerContour::GetLstNameThingsStatic() +{ return modelManager->GetLstNameThingsStatic(); } -void KernelManagerContour::SaveThingName(FILE* pFile, std::string name ){ - modelManager->SaveThingName(pFile, name); +void KernelManagerContour::SaveThingName(FILE* pFile, FILE *pFileData, std::string name ) +{ + modelManager->SaveThingName(pFile, pFileData, name); } -std::vector KernelManagerContour::GetLstNameThings(){ + +std::vector KernelManagerContour::GetLstNameThings() +{ return modelManager->GetLstNameThings(); } + //int KernelManagerContour::IsPartOfStaticList(std::string keyName ){ // return modelManager->IsPartOfStaticList(keyName); //} -bool KernelManagerContour::IsPartOfStaticList(std::string theKeyName){ +bool KernelManagerContour::IsPartOfStaticList(std::string theKeyName) +{ return modelManager->IsPartOfStaticList(theKeyName) == -1; } -void KernelManagerContour::deleteCModel(std::string theKeyName){ - manualContourModel* cModel = modelManager->getOutlineByKeyName(theKeyName)->getModel(); +void KernelManagerContour::deleteCModel(std::string theKeyName) +{ + manualBaseModel* cModel = modelManager->getOutlineByKeyName(theKeyName)->getModel(); modelManager->removeOutline( theKeyName ); - delete cModel; } -void KernelManagerContour::removeAllOutlines(){ +void KernelManagerContour::removeAllOutlines() +{ modelManager->removeAllOutlines(); } -std::vector KernelManagerContour::getActualInstantOutlines(){ +std::vector KernelManagerContour::getActualInstantOutlines() +{ return modelManager->getActualInstantOutlines(); } -int KernelManagerContour::getNamesWrappingSize(){ +int KernelManagerContour::getNamesWrappingSize() +{ return getActualInstantOutlines().size(); } -std::string KernelManagerContour::getNameWrapping(int i){ +std::string KernelManagerContour::getNameWrapping(int i) +{ return getActualInstantOutlines()[i]->getKeyName(); } -void KernelManagerContour::setInstant(Instant * theInstant){ +void KernelManagerContour::setInstant(Instant * theInstant) +{ modelManager->setInstant(theInstant); //_actualInstant = theInstant; } -Instant * KernelManagerContour::getCurrentInstant(){ +Instant * KernelManagerContour::getCurrentInstant() +{ return modelManager->getInstant(); } -void KernelManagerContour::setInstant(std::vector vectInstant){ + +void KernelManagerContour::setInstant(std::vector vectInstant) +{ Instant* act = new Instant ( &vectInstant ); modelManager->setInstant(act); } -std::string KernelManagerContour::createCopyContourOf ( std::string anExistingKName, std::vector &instantNoTouchData){ +std::string KernelManagerContour::createCopyContourOf ( std::string anExistingKName, std::vector &instantNoTouchData) +{ return modelManager->createCopyContourOf(anExistingKName, instantNoTouchData); } -manualContourModel* KernelManagerContour::getOutlineByKeyName(std::string cloneName){ + +manualBaseModel* KernelManagerContour::getOutlineByKeyName(std::string cloneName) +{ return modelManager->getOutlineByKeyName (cloneName )->getModel(); } -bool KernelManagerContour::onRedo(std::string& filename){ - if(inredo > 0){ +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; - } + } // inredo return false; } -bool KernelManagerContour::onUndo(std::string& filename){ - if(inundo>0){ +bool KernelManagerContour::onUndo(std::string& filename) +{ + if(inundo>0) + { inredo++; inundo--; - //char str[9000]; //itoa(inundo, str, 10); std::string str = intToString(inundo); - - filename = stundoredo + str + ".roi"; - return true;//loadState(temp); } return false; } -std::string KernelManagerContour::saveState(){ +std::string KernelManagerContour::saveState() +{ inredo=0; std::string str = intToString(inundo); std::string temp = stundoredo + str + ".roi"; @@ -244,20 +309,20 @@ std::string KernelManagerContour::saveState(){ return temp; } -bool KernelManagerContour::onUndoSaveFile(std::string& filename){ - if(inundo>0){ - if(inredo==0){ - +bool KernelManagerContour::onUndoSaveFile(std::string& filename) +{ + if(inundo>0) + { + if(inredo==0) + { //char str[9000]; //itoa(inundo, str, 10); std::string str = intToString(inundo); - filename = stundoredo + str + ".roi"; return true; - //saveFileWithContours(temp); - - } - } + //saveFileWithContours(temp); + } // if inundo ==0 + } // if inundo > 0 return false; } @@ -266,66 +331,61 @@ 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(); } -manualContourModel* 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; - manualContourModel* manModelContour=NULL; - - if (_contourPropagation->ifSliceKeyContourExist(z)==false){ - + manualBaseModel* manModelContour=NULL; + if (_contourPropagation->ifSliceKeyContourExist(z)==false) + { manModelContour = factoryManualContourModel( typeofcontour ); - int idTmp = _contourPropagation->FindIdWithZ(z); - if (type==0) // Initial Points - { + { _contourPropagation->GetInitialControlPoints( idTmp , vecCtrlPointX,vecCtrlPointY,vecCtrlPointZ); - } + } if (type==1) // Automatique Method { _contourPropagation->GetControlPoints( idTmp ,vecCtrlPointX,vecCtrlPointY,vecCtrlPointZ); @@ -342,47 +402,57 @@ manualContourModel* KernelManagerContour::GetPoints(int z,int type, std::vector< manModelContour->AddPoint( (*vecCtrlPointX)[j] , (*vecCtrlPointY)[j] , -900 ); //-------------------------------------------------------------------- } // for j - tempVector[1]=z; theName = modelManager->createOutline( manModelContour, tempVector ); addedModel = theName.compare("") != 0; - if(!addedModel){ + if(!addedModel) + { manModelContour = NULL; } - }// ifSliceKeyContourExist return manModelContour; - } -manualContourModel * KernelManagerContour::factoryManualContourModel(int typeContour) -{ - manualContourModel *manModelContour=NULL; - +manualBaseModel *KernelManagerContour::factoryManualContourModel(int typeContour) +{ + manualBaseModel *manModelContour=NULL; + // Creating the model + // NOTE: The view and the controler are created in the wxVtkBaseView_SceneManager class, configureViewControlTo method // spline if (typeContour==0) { manModelContour = new manualContourModel(); } - // spline if (typeContour==1) { manModelContour = new manualContourModel(); } - // rectangle if (typeContour==2) { manModelContour = new manualContourModelRoi(); } - // circle if (typeContour==3) { manModelContour = new manualContourModelCircle(); } - + // line + if (typeContour==6) + { + manModelContour = new manualContourModelLine(); + } + // points + if (typeContour==7) + { + manModelContour = new manualBaseModel(); + } + // polygon + if (typeContour==10) + { + manModelContour = new manualContourModelPolygon(); + } return manModelContour; } @@ -390,20 +460,20 @@ 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()); } - return vectname; + return vectname; } std::vector KernelManagerContour::getOutlinesAtInstant(Instant* instant ){ return modelManager->getOutlinesAtInstant(instant); } -std::vector KernelManagerContour::ExploseEachModel( std::vector lstManConMod ){ - std::vector lstTmp; - std::vector lstResult; +std::vector KernelManagerContour::ExploseEachModel( std::vector lstManConMod ){ + std::vector lstTmp; + std::vector lstResult; int j,jSize; int i,iSize=lstManConMod.size(); for (i=0;i& 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]; } @@ -439,4 +509,32 @@ std::string KernelManagerContour::getCurrentFileName(){ void KernelManagerContour::setCurrentFileName(std::string filenam){ this->filename = filenam; -} \ No newline at end of file +} + +std::string KernelManagerContour::parseOsirixFile(std::string filename){ + + +#ifdef ParserOsirix_BUILD + vtkImageData* sourceimage; + std::string xsdfile; + + xsdfile = _datadir; + + xsdfile.append("\\XML\\osirixschema.xsd"); + + sourceimage = getSourceImage(); + OsirixParser p(xsdfile.c_str(), sourceimage->GetSpacing(), sourceimage->GetExtent()); + + if(p.ParseFile(filename.c_str())!= 0){ + + } + + return p.getContoursFileName(); +#else + return ""; +#endif + + +} + +