Program: gdcm
Module: $RCSfile: gdcmSerieHelper.cxx,v $
Language: C++
- Date: $Date: 2007/10/30 11:11:04 $
- Version: $Revision: 1.63 $
+ Date: $Date: 2008/02/14 21:21:58 $
+ Version: $Revision: 1.66 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
ClearAll();
UserLessThanFunction = 0;
DirectOrder = true;
-
+ DropDuplicatePositions = false;
}
/**
for( DirListType::const_iterator it = filenames_list.begin();
it != filenames_list.end(); ++it)
{
+ // std::cout << "--------------------------------filename [" << *it << "]"
+ // << std::endl;
+ gdcmDebugMacro("filename [" << *it << "]" );
AddFileName( *it );
}
}
bool first = true;
ZSpacing = -1.0; // will be updated if process doesn't fail
+ gdcmDebugMacro("============================================DropDuplicatePositions : " << DropDuplicatePositions );
+
std::multimap<double,File *> distmultimap;
// Use a multimap to sort the distances from 0,0,0
for ( FileList::const_iterator
}
}
+ gdcmDebugMacro("After parsing vector, nb of elements : " << fileList->size() );
+
// Find out if min/max are coherent
if ( min == max )
{
it2 != distmultimap.end();
++it2)
{
+
+ gdcmDebugMacro("Check if image shares a common position : " << (*it2).second->GetFileName() );
+
if (distmultimap.count((*it2).first) != 1)
{
gdcmWarningMacro("File: ["
fileList->push_back( (*it3).second );
if (DropDuplicatePositions)
{
- /// \todo ImagePositionPatientOrdering wrong duplicates are found ???
-
+ // ImagePositionPatientOrdering wrong duplicates are found ???
+ // --> fixed. See comment
+
it3 = distmultimap.upper_bound((*it3).first); // skip all duplicates
+ // the upper_bound function increments the iterator to the next non-duplicate entry
+ // The for loop iteration also increments the iterator, which causes the code to skip every other image
+ // --> decrement the iterator after the upper_bound function call
+ it3--;
if (it3 == distmultimap.end() ) // if last image, stop iterate
break;
}