Program: gdcm
Module: $RCSfile: gdcmSerieHelper.cxx,v $
Language: C++
- Date: $Date: 2005/07/29 15:07:16 $
- Version: $Revision: 1.16 $
+ Date: $Date: 2005/08/30 14:15:34 $
+ Version: $Revision: 1.19 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
namespace gdcm
{
+//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// Constructor / Destructor
*/
SerieHelper::SerieHelper()
{
- // For all the File lists of the gdcm::Serie
+ UserLessThanFunction = 0;
+
+ // For all the File lists that may already exist within the gdcm::Serie
FileList *l = GetFirstCoherentFileList();
while (l)
{
it != l->end();
++it)
{
- delete *it;
+ delete *it; // remove entry
}
l->clear();
- delete l;;
+ delete l; // remove the list
l = GetNextCoherentFileList();
}
DirectOrder = true;
it != l->end();
++it)
{
- delete *it;
+ delete *it; // remove entry
}
l->clear();
- delete l;
+ delete l; // remove the list
l = GetNextCoherentFileList();
}
}
*/
void SerieHelper::OrderFileList(FileList *coherentFileList)
{
- if ( ImagePositionPatientOrdering( coherentFileList ) )
+
+ if ( SerieHelper::UserLessThanFunction )
+ {
+ UserOrdering( coherentFileList );
+ return;
+ }
+ else if ( ImagePositionPatientOrdering( coherentFileList ) )
{
return ;
}
}
}
+/**
+ * \brief Elementary coherence checking of the files with the same Serie UID
+ * Only sizes and pixel type are checked right now ...
+ */
+bool SerieHelper::IsCoherent(FileList *coherentFileList)
+{
+ if(coherentFileList->size() == 1)
+ return true;
+
+ FileList::const_iterator it = coherentFileList->begin();
+
+ int nX = (*it)->GetXSize();
+ int nY = (*it)->GetYSize();
+ int pixelSize = (*it)->GetPixelSize();
+
+ it ++;
+ for ( ;
+ it != coherentFileList->end();
+ ++it)
+ {
+ if ( (*it)->GetXSize() != nX )
+ return false;
+ if ( (*it)->GetYSize() != nY )
+ return false;
+ if ( (*it)->GetPixelSize() != pixelSize )
+ return false;
+ // probabely more is to be checked (?)
+ }
+ return true;
+}
/**
* \brief Get the first List while visiting the CoherentFileListHT
* @return The first FileList if found, otherwhise NULL
bool SerieHelper::FileNameLessThan(File *file1, File *file2)
{
- return file1->GetFileName() < file2->GetFileName();
+ return file1->GetFileName() < file2->GetFileName();
}
bool SerieHelper::FileNameGreaterThan(File *file1, File *file2)
{
- return file1->GetFileName() > file2->GetFileName();
+ return file1->GetFileName() > file2->GetFileName();
}
/**
* \brief sorts the images, according to their File Name
return true;
}
+/**
+ * \brief sorts the images, according to user supplied function
+ * @param fileList Coherent File list (same Serie UID) to sort
+ * @return false only if the header is bugged !
+ */
+bool SerieHelper::UserOrdering(FileList *fileList)
+{
+ std::sort(fileList->begin(), fileList->end(), SerieHelper::UserLessThanFunction);
+ if (!DirectOrder)
+ {
+ std::reverse(fileList->begin(), fileList->end());
+ }
+ return true;
+}
+
//-----------------------------------------------------------------------------
// Print
/**