Program: gdcm
Module: $RCSfile: gdcmSerieHelper.cxx,v $
Language: C++
- Date: $Date: 2005/10/25 12:40:03 $
- Version: $Revision: 1.29 $
+ Date: $Date: 2005/11/08 16:31:21 $
+ Version: $Revision: 1.34 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
it != l->end();
++it)
{
- delete *it; // remove each entry
+ (*it)->Delete(); // remove each entry
}
l->clear();
delete l; // remove the container
void SerieHelper::AddFileName(std::string const &filename)
{
// Create a DICOM file
- File *header = new File ();
+ File *header = File::New();
header->SetLoadMode(LoadMode);
header->SetFileName( filename );
header->Load();
else
{
// at least one rule was unmatched we need to deallocate the file:
- delete header;
+ header->Delete();
}
}
else
{
gdcmWarningMacro("Could not read file: " << filename );
- delete header;
+ header->Delete();
}
}
* @param value value to be checked to exclude File
* @param op operator we want to use to check
*/
-void SerieHelper::AddRestriction(uint16_t group, uint16_t elem,
+void SerieHelper::AddRestriction(TagKey const &key,
std::string const &value, int op)
{
ExRule r;
- r.group = group;
- r.elem = elem;
+ r.group = key[0];
+ r.elem = key[1];
r.value = value;
r.op = op;
ExRestrictions.push_back( r );
FileList::const_iterator it = fileSet->begin();
- int nX = (*it)->GetXSize();
- int nY = (*it)->GetYSize();
- int pixelSize = (*it)->GetPixelSize();
-
+ int nX = (*it)->GetXSize();
+ int nY = (*it)->GetYSize();
+ int pixelSize = (*it)->GetPixelSize();
+ bool signedPixelData = (*it)->IsSignedPixelData();
it ++;
for ( ;
it != fileSet->end();
return false;
if ( (*it)->GetPixelSize() != pixelSize )
return false;
- // probabely more is to be checked (?)
+ if ( (*it)->IsSignedPixelData() != signedPixelData )
+ return false;
+ // probabely more is to be checked (?)
}
return true;
}
strOrient = ossOrient.str();
ossOrient.str("");
// FIXME : is it a 'cleaner' way to initialize an ostringstream?
-
+
if ( CoherentFileSet.count(strOrient) == 0 )
{
gdcmDebugMacro(" New Orientation :[" << strOrient << "]");
}
// Current Orientation and DICOM header match; add the file:
CoherentFileSet[strOrient]->push_back( (*it) );
- }
+ }
return CoherentFileSet;
}
ossPosition << pos[i];
}
strPosition = ossPosition.str();
-
+ ossPosition.str("");
+
if ( CoherentFileSet.count(strPosition) == 0 )
{
gdcmDebugMacro(" New Position :[" << strPosition << "]");