X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkGdcm4DSplitter.cxx;h=3f632c28c2d575274924f1c0cd26392df6f7bee2;hb=c9387641191b32da1ca5088cdb262819a55281ca;hp=091d3d7865fa2417cf9317c2bf4157234e22f643;hpb=8f9e2f78143c81f382d33d8b22c12332b1875f1c;p=gdcm.git diff --git a/vtk/vtkGdcm4DSplitter.cxx b/vtk/vtkGdcm4DSplitter.cxx index 091d3d78..3f632c28 100644 --- a/vtk/vtkGdcm4DSplitter.cxx +++ b/vtk/vtkGdcm4DSplitter.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: vtkGdcm4DSplitter.cxx,v $ Language: C++ - Date: $Date: 2011/03/29 13:33:48 $ - Version: $Revision: 1.3 $ + Date: $Date: 2011/03/30 14:49:04 $ + Version: $Revision: 1.5 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -43,11 +43,11 @@ it by an other image. User needs to be aware, *only him* knows want he wants to do. vtkGdcm4DSplitter class does the job for hom -(it works on 3D or 2D+T images too) +(despite its name, it works on 3D or 2D+T images too) User will have to specify some points -. Select input data +. Choose input data ------------------- - a single directory @@ -68,9 +68,12 @@ User will have to specify some points - ImageOrientationPatient void setSplitOnOrientation(); - User choosen tag + ==> WARNING : This one has troubles; do NOT use it, right now! void setSplitOnTag(unsigned short splitGroup, unsigned short splitElem); void setSplitConvertToFloat(bool conv); - + - UserDefined Function + void setSortOnUserFunction (FoncComp f); + . Choose 'sort' criterion : -------------------------- @@ -186,18 +189,20 @@ User will have to specify some points return true; } - bool vtkGdcm4DSplitter::CompareOnSortTagConvertToFloat(GDCM_NAME_SPACE::File *file1, GDCM_NAME_SPACE::File *file2) + /*static */bool vtkGdcm4DSplitter::CompareOnSortTagConvertToFloat(GDCM_NAME_SPACE::File *file1, GDCM_NAME_SPACE::File *file2) { - if (verbose) printf ("%04x %04x\n", this->SortGroup,this->SortElem); + /* if (verbose) printf ("%04x %04x\n", this->SortGroup,this->SortElem); if (verbose) std :: cout << file1->GetEntryString(SortGroup,SortElem).c_str() << " : " << atof(file1->GetEntryString(SortGroup,SortElem).c_str()) << std::endl; - return atof(file1->GetEntryString(SortGroup,SortElem).c_str()) < atof(file2->GetEntryString(SortGroup,SortElem).c_str()); +*/ +// return atof(file1->GetEntryString(vtkGdcm4DSplitter::SortGroup,vtkGdcm4DSplitter::SortElem).c_str()) < atof(file2->GetEntryString(vtkGdcm4DSplitter::SortGroup,vtkGdcm4DSplitter::SortElem).c_str()); + return atof(file1->GetEntryString(SortGroup,SortElem).c_str()) < atof(file2->GetEntryString(SortGroup,SortElem).c_str()); } - bool vtkGdcm4DSplitter::CompareOnSortTag(GDCM_NAME_SPACE::File *file1, GDCM_NAME_SPACE::File *file2) + /*static */bool vtkGdcm4DSplitter::CompareOnSortTag(GDCM_NAME_SPACE::File *file1, GDCM_NAME_SPACE::File *file2) { - return file1->GetEntryString(SortGroup,SortElem) < file2->GetEntryString(SortGroup,SortElem); + return file1->GetEntryString(vtkGdcm4DSplitter::SortGroup,vtkGdcm4DSplitter::SortElem) < file2->GetEntryString(vtkGdcm4DSplitter::SortGroup,vtkGdcm4DSplitter::SortElem); } bool vtkGdcm4DSplitter::Go() @@ -312,7 +317,8 @@ User will have to specify some points TypeResult=2; ImageDataVector = new std::vector; - vtkGdcmReader *reader = vtkGdcmReader::New(); + // vtkGdcmReader *reader = vtkGdcmReader::New(); // move inside the loop, or be clever using vtk! + for (GDCM_NAME_SPACE::XCoherentFileSetmap::iterator i = xcm.begin(); i != xcm.end(); ++i) @@ -326,19 +332,22 @@ User will have to specify some points i != xcm.end(); ++i) { - if (verbose) + + vtkGdcmReader *reader = vtkGdcmReader::New(); /// \FIXME : unable to delete! + + if (verbose) std::cout << "==========================================xCoherentName = [" << (*i).first << "]" << std::endl; - if (SortOnPosition) - { + if (SortOnPosition) + { if (verbose) std::cout << "SortOnPosition" << std::endl; // (will be IPPSorter, in GDCM2) s->ImagePositionPatientOrdering((*i).second); if (verbose) std::cout << "out of SortOnPosition" << std::endl; - } + } - if (SortOnOrientation) - { + else if (SortOnOrientation) + { if (verbose) std::cout << "SortOnOrientation" << std::endl; /// \TODO SortOnOrientation() // Within a 'just to see' program, @@ -351,48 +360,70 @@ User will have to specify some points // 0020,0030 : Image Position (RET) // we still miss an algo to sort an Orientation, given by 6 cosines! - // Anything like this, in GDCM2? - std::cout << "SortOnOrientation : not so easy - I(mage)O(rientation)P(atient)Sorter still missing! -" << std::endl; - // have a look at SerieHelper::SplitOnPosition() to have an idea of the mess! + // Anything like this, in GDCM2? + std::cout << "SortOnOrientation : not so easy - I(mage)O(rientation)P(atient)Sorter still missing! -" << std::endl; + // have a look at SerieHelper::SplitOnOrientation() to have an idea of the mess! - //Better sort on the file name, right now... - s->FileNameOrdering((*i).second); - } + //Better sort on the file name, right now... + s->FileNameOrdering((*i).second); + } - if (SortOnFileName) - { - if (verbose) std::cout << "SortOnFileName" << std::endl; - if (verbose) std::cout << "taille " << ((*i).second)->size() << std::endl; - s->FileNameOrdering((*i).second); - if (verbose) std::cout << "Out of SortOnFileName" << std::endl; - } + else if (SortOnFileName) + { + if (verbose) std::cout << "SortOnFileName" << std::endl; + if (verbose) std::cout << "taille " << ((*i).second)->size() << std::endl; - if (SortOnTag) - { - if (verbose) std::cout << "SortOnTag" << std::endl; - printf ("--> %04x %04x\n", SortGroup,SortElem); - if ( SortConvertToFloat ) - s->SetUserLessThanFunction( reinterpret_cast - ( &vtkGdcm4DSplitter::CompareOnSortTagConvertToFloat)); - else - s->SetUserLessThanFunction( reinterpret_cast - ( &vtkGdcm4DSplitter::CompareOnSortTag)); + s->FileNameOrdering((*i).second); + if (verbose) std::cout << "Out of SortOnFileName" << std::endl; + } + + else if (SortOnTag) + { + if (verbose) std::cout << "SortOnTag" << std::endl; + printf ("--> %04x %04x\n", SortGroup,SortElem); + std::cout << "Sorry, troubles not solved yet; use SortOnUserFunction, right now!" << std::endl; + + /* ==> WARNING : This one has troubles; do NOT use it, right now! + if ( SortConvertToFloat ) + s->SetUserLessThanFunction( reinterpret_cast + ( &vtkGdcm4DSplitter::CompareOnSortTagConvertToFloat)); + else + s->SetUserLessThanFunction( reinterpret_cast + ( &vtkGdcm4DSplitter::CompareOnSortTag)); - // Anything like this, in GDCM2? - s->UserOrdering((*i).second); - if (verbose) std::cout << "Out of SortOnTag" << std::endl; - } + // Anything like this, in GDCM2? + s->UserOrdering((*i).second); + */ - reader->SetCoherentFileList((*i).second); - reader->Update(); - ImageDataVector->push_back(reader->GetOutput() ); + //if (verbose) std::cout << "Out of SortOnTag" << std::endl; + std::cout << "NO ordering performed :-( " << std::endl; + } + + else if (SortOnUserFunction) + { + if (verbose) std::cout << "SortOnUserFunction" << std::endl; + s->SetUserLessThanFunction( UserCompareFunction ); + // Anything like this, in GDCM2? + s->UserOrdering((*i).second); + if (verbose) std::cout << "Out of SortOnUserFunction" << std::endl; + } - std::cout << std::endl; + reader->SetCoherentFileList((*i).second); + reader->Update(); + + /// \TODO : remove the following + //if (verbose) reader->GetOutput()->PrintSelf(std::cout, vtkIndent(2)); + + ImageDataVector->push_back(reader->GetOutput() ); + + std::cout << std::endl; } - reader->Delete(); + //reader->Delete(); // \TODO : fix s->Delete(); f->Delete(); delete l; + + return true; }