Program: gdcm
Module: $RCSfile: gdcmSerieHelper.cxx,v $
Language: C++
- Date: $Date: 2007/09/28 14:15:34 $
- Version: $Revision: 1.61 $
+ Date: $Date: 2008/02/13 18:53:33 $
+ Version: $Revision: 1.65 $
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 );
}
}
if ( SerieHelper::UserLessThanFunction )
{
+ gdcmDebugMacro("Use UserLessThanFunction");
UserOrdering( fileSet );
return;
}
else if ( ImagePositionPatientOrdering( fileSet ) )
- {
+ {
+ gdcmDebugMacro("ImagePositionPatientOrdering succeeded");
return ;
}
else if ( ImageNumberOrdering(fileSet ) )
{
+ gdcmDebugMacro("ImageNumberOrdering succeeded");
return ;
}
else
{
+ gdcmDebugMacro("Use FileNameOrdering");
FileNameOrdering(fileSet );
}
}
// Private
/**
* \brief sorts the images, according to their Patient Position.
- * As a side effect, it computes the ZSpacing, according to Jolinda Smith'
+ * As a side effect, it computes the ZSpacing, according to Jolinda Smith's
* algorithm. (get it with double GetZSpacing() !)
* We may order, considering :
* -# Image Position Patient
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
it = fileList->begin();
it != fileList->end(); ++it )
{
+ gdcmDebugMacro("deal with " << (*it)->GetFileName() );
if ( first )
{
(*it)->GetImageOrientationPatient( cosines );
dist += normal[i]*ipp[i];
}
+ gdcmDebugMacro("dist : " << dist);
distmultimap.insert(std::pair<const double,File *>(dist, *it));
max = min = dist;
}
distmultimap.insert(std::pair<const double,File *>(dist, *it));
-
+ gdcmDebugMacro("dist : " << dist);
min = (min < dist) ? min : dist;
max = (max > dist) ? max : dist;
}
}
+ gdcmDebugMacro("After parsing vector, nb of elements : " << fileList->size() );
+
// Find out if min/max are coherent
if ( min == max )
{
gdcmWarningMacro("Looks like all images have the exact same image position. "
- << "No PositionPatientOrdering sort performed. "
+ << "No PositionPatientOrdering sort performed. "
<< "No 'ZSpacing' calculated! ");
return false;
}
it2 != distmultimap.end();
++it2)
{
+
+ gdcmDebugMacro("Check if image shares a common position : " << (*it2).second->GetFileName() );
+
if (distmultimap.count((*it2).first) != 1)
{
- gdcmErrorMacro("File: ["
+ gdcmWarningMacro("File: ["
<< ((*it2).second->GetFileName())
<< "] : more than ONE file at distance: '"
<< (*it2).first
- << " (position is not unique!) "
- << "No PositionPatientOrdering sort performed. "
+ << " (position is not unique!) "
+ << "No PositionPatientOrdering sort performed. "
<< "No 'ZSpacing' calculated! ");
ok = false;
if (! DropDuplicatePositions)
return false;
}
-
-// Now, we could calculate Z Spacing as the difference
+
+// Now, we can calculate Z Spacing as the difference
// between the "dist" values for the first two slices.
// The following (un)-commented out code is let here
fileList->push_back( (*it3).second );
if (DropDuplicatePositions)
{
+ /// \todo ImagePositionPatientOrdering wrong duplicates are found ???
+
it3 = distmultimap.upper_bound((*it3).first); // skip all duplicates
if (it3 == distmultimap.end() ) // if last image, stop iterate
break;
{
const ExDetail &r = *it2;
s = inFile->GetEntryString( r.group, r.elem );
+ if (s == "") // avoid troubles when empty string is found
+ s = "-";
// User is allowed to ask for 'convertion', to allow further ordering
// e.g : 100 would be *before* 20; 000020.00 vs 00100.00 : OK