Program: gdcm
Module: $RCSfile: vtkGdcm4DSplitter.cxx,v $
Language: C++
- Date: $Date: 2011/04/20 15:03:54 $
- Version: $Revision: 1.13 $
+ Date: $Date: 2011/10/25 20:36:21 $
+ Version: $Revision: 1.16 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
PrintFile dirin=Root_Directory_holding_the_images rec > 1.txt
-open it with any test editor, and/or (Linux users)
+open it with any text editor, and/or (Linux users)
grep a_supposed_to_be_string_of_interest 1.txt
- Choose 'flip' option
----------------------
-VTK reader 'flop upside down' the images to display them correctly ?!?
+VTK reader 'flips upside down' the images to display them correctly ?!?
When a 'math guy' gets the image, the first thing he does is flipping it again.
Avoid loosing CPU time using :
void SetFlipY(bool); // Wrong = no flip
*/
vtkGdcm4DSplitter::~vtkGdcm4DSplitter()
{
- /// \TODO : delete everything that must be!
+ /// \TODO : delete everything that must be!
+
+ GDCM_NAME_SPACE::XCoherentFileSetmap::iterator it;
+ std::vector<GDCM_NAME_SPACE::File*>::iterator it2;
+
+ for ( it = xcm.begin(); // for each std::vector<gdcm::File*>
+ it != xcm.end();
+ ++it)
+ {
+ for ( it2 = (*it).second->begin(); // for each gdcm::File*
+ it2 != (*it).second->end();
+ ++it2)
+ {
+ (*it2)->Delete(); // delete gdcm::File
+ }
+ delete (*it).second; // delete the now empty std::vector<gdcm::File*>
+ }
+
+ // VectGdcmFileLists is a vector of pointers on elements of xcm : nothing to do!
+
}
// Locate Data to process
//SortOnTag=false;
SortOnFileName=false;
SortOnUserFunction=true;
- }
+ }
// void setSortConvertToFloat(bool conv)
// {
std::vector<GDCM_NAME_SPACE::FileList *> *vtkGdcm4DSplitter::GetVectGdcmFileLists()
{
if (SplitOnly)
- return NULL;
+ return &VectGdcmFileLists;
GDCM_NAME_SPACE::XCoherentFileSetmap::iterator it;
for ( it = xcm.begin();
}
GDCM_NAME_SPACE::FileList *l;
-
+
GDCM_NAME_SPACE::SerieHelper *s;
s = GDCM_NAME_SPACE::SerieHelper::New();
-
+
//
// Load the gdcm::File* set, according to user's requierements
// ------------------------------------------------------------
xcm = s->SplitOnTagValueConvertToFloat(l, SplitGroup, SplitElem);
}
}
-
+
if (xcm.size() == 0)
{
if(verbose)
std::cout << xcm.size() << " XCoherent entries found" << std::endl;
}
-std::cout <<"SplitOnly " << SplitOnly << std::endl;
+ // put here, to avoid segfault when unaware user sets SplitOnly to true, and the asks for ImageDataVector
+ ImageDataVector = new std::vector<vtkImageData*>;
+
+ std::cout <<"SplitOnly " << SplitOnly << std::endl;
if(SplitOnly)
return true;
//
//
// ------------------------------------------------------------
//
- ImageDataVector = new std::vector<vtkImageData*>;
+// ImageDataVector = new std::vector<vtkImageData*>;
/// \TODO move inside the loop, or be clever using vtk!
- // vtkGdcmReader *reader = vtkGdcmReader::New(); // move inside the loop, or be clever using vtk!
-
- // XCoherentFileSetmap map < critère de split, FileList (= std::vector de gdcm::File*) >
+ vtkGdcmReader *reader = vtkGdcmReader::New(); // move inside the loop, or be clever using vtk!
+
+ // XCoherentFileSetmap map < critère de split, FileList (= std::vector de gdcm::File*) >
for (GDCM_NAME_SPACE::XCoherentFileSetmap::iterator i = xcm.begin();
- i != xcm.end();
- ++i)
+ i != xcm.end();
+ ++i)
{
- vtkGdcmReader *reader = vtkGdcmReader::New(); /// \TODO FIXME : unable to delete!
+ //vtkGdcmReader *reader = vtkGdcmReader::New(); /// \TODO FIXME : unable to delete!
reader->SetFlipY(FlipY);
// better user SetFileLowerLeft()
//std::cout << std::endl;
}
- //reader->Delete(); // \TODO : fix
+ reader->Delete(); // \TODO : fix
s->Delete();
// f->Delete();
delete l;
GDCM_NAME_SPACE::DirList dirlist(DirName, Recursive); // NO recursive exploration
fileNames = dirlist.GetFilenames(); // all the file names
}
-
+
else if (TypeDir == 2) // a std::vector of directory names was set as input
{
int nbDir = VectDirName.size();
++it)
{
int maxSize = 0x7fff; // load Elements of any length
+ /// \TODO ? gdcm::File are never free'd
f = GDCM_NAME_SPACE::File::New();
f->SetMaxSizeLoadEntry(maxSize);
f->SetFileName( *it );
//to right, "y" is posterior to anterior, and "z" is foot to head (RAH).
//iop is calculated based on the file file
- float cosines[6];
+ float cosines[6];
double normal[3];
double ipp[3];
double dist;
double min = 0, max = 0;
- bool first = true;
+ bool first = true;
//double ZSpacing; // useless here! // JPR
bool DirectOrder = true; // remove it!
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff