X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSerieHelper.cxx;h=9ac3369398b74da8fdcf28759746825f0eea2d3d;hb=0a63df7d5417e936948123cb00a80d58addcae66;hp=77849c9fe1ae1c605713f8a6d7f7a894f060606a;hpb=262bd420b44791777972b1d574fe94827da54e03;p=gdcm.git diff --git a/src/gdcmSerieHelper.cxx b/src/gdcmSerieHelper.cxx index 77849c9f..9ac33693 100644 --- a/src/gdcmSerieHelper.cxx +++ b/src/gdcmSerieHelper.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSerieHelper.cxx,v $ Language: C++ - Date: $Date: 2005/02/02 15:12:09 $ - Version: $Revision: 1.1 $ + Date: $Date: 2005/06/24 10:55:59 $ + Version: $Revision: 1.10 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -20,15 +20,14 @@ #include "gdcmDirList.h" #include "gdcmFile.h" #include "gdcmDebug.h" +#include "gdcmUtil.h" #include -#include #include +#include namespace gdcm { -typedef std::list GdcmFileList; -typedef std::vector GdcmFileVector; //----------------------------------------------------------------------------- // Constructor / Destructor @@ -38,13 +37,13 @@ typedef std::vector GdcmFileVector; SerieHelper::SerieHelper() { // For all the File lists of the gdcm::Serie - GdcmFileList *l = GetFirstCoherentFileList(); + FileList *l = GetFirstCoherentFileList(); while (l) { // For all the files of a File list - for (GdcmFileList::iterator it = l->begin(); - it != l->end(); - ++it) + for (FileList::iterator it = l->begin(); + it != l->end(); + ++it) { delete *it; } @@ -60,13 +59,13 @@ SerieHelper::SerieHelper() SerieHelper::~SerieHelper() { // For all the Coherent File lists of the gdcm::Serie - GdcmFileList *l = GetFirstCoherentFileList(); + FileList *l = GetFirstCoherentFileList(); while (l) { // For all the files of a Coherent File list - for (GdcmFileList::iterator it = l->begin(); - it != l->end(); - ++it) + for (FileList::iterator it = l->begin(); + it != l->end(); + ++it) { delete *it; } @@ -87,30 +86,71 @@ SerieHelper::~SerieHelper() */ void SerieHelper::AddFileName(std::string const &filename) { - //directly use string and not const char*: + // Create a DICOM file File *header = new File( filename ); - if( header->IsReadable() ) + if ( header->IsReadable() ) { - // 0020 000e UI REL Series Instance UID - std::string uid = header->GetEntryValue (0x0020, 0x000e); - // if uid == GDCM_UNFOUND then consistently we should find GDCM_UNFOUND - // no need here to do anything special + int allrules = 1; + // First step the user has defined s set of rules for the DICOM he is looking for + // make sure the file correspond to his set of rules: + for(SerieRestrictions::iterator it = Restrictions.begin(); + it != Restrictions.end(); + ++it) + { + const Rule &r = *it; + const std::string s;// = header->GetEntryValue( r.first ); + if ( !Util::DicomStringEqual(s, r.second.c_str()) ) + { + // Argh ! This rule is unmatch let's just quit + allrules = 0; + break; + } + } + if ( allrules ) // all rules are respected: + { + // Alright ! we have a found a DICOM that match the user expectation. + // Let's add it ! + + // 0020 000e UI REL Series Instance UID + const std::string &uid = header->GetEntryValue (0x0020, 0x000e); + // if uid == GDCM_UNFOUND then consistently we should find GDCM_UNFOUND + // no need here to do anything special - if ( CoherentGdcmFileListHT.count(uid) == 0 ) + if ( CoherentFileListHT.count(uid) == 0 ) + { + gdcmDebugMacro(" New Serie UID :[" << uid << "]"); + // create a std::list in 'uid' position + CoherentFileListHT[uid] = new FileList; + } + // Current Serie UID and DICOM header seems to match add the file: + CoherentFileListHT[uid]->push_back( header ); + } + else { - gdcmVerboseMacro(" New Serie UID :[" << uid << "]"); - // create a std::list in 'uid' position - CoherentGdcmFileListHT[uid] = new GdcmFileList; + // at least one rule was unmatch we need to deallocate the file: + delete header; } - // Current Serie UID and DICOM header seems to match add the file: - CoherentGdcmFileListHT[uid]->push_back( header ); } else { - gdcmVerboseMacro("Could not read file: " << filename ); + gdcmWarningMacro("Could not read file: " << filename ); delete header; } } +/** + * \brief add a rules for restricting a DICOM file to be in the serie we are + * trying to find. For example you can select only the DICOM file from a + * directory which would have a particular EchoTime==4.0. + * This method is a user level, value is not required to be formatted as a DICOM + * string + */ +void SerieHelper::AddRestriction(TagKey const &key, std::string const &value) +{ + Rule r; + r.first = key; + r.second = value; + Restrictions.push_back( r ); +} /** * \brief Sets the root Directory @@ -135,32 +175,30 @@ void SerieHelper::SetDirectory(std::string const &dir, bool recursive) * But as I don't know how to do it, I leave it this way * BTW, this is also a Strategy, I don't know this is the best approach :) */ -void SerieHelper::OrderGdcmFileList(GdcmFileList *CoherentGdcmFileList) +void SerieHelper::OrderFileList(FileList *coherentFileList) { - if( ImagePositionPatientOrdering( CoherentGdcmFileList ) ) + if ( ImagePositionPatientOrdering( coherentFileList ) ) { return ; } - else if( ImageNumberOrdering(CoherentGdcmFileList ) ) + else if ( ImageNumberOrdering(coherentFileList ) ) { return ; } else { - FileNameOrdering(CoherentGdcmFileList ); + FileNameOrdering(coherentFileList ); } } /** * \brief Get the first List while visiting the CoherentFileListHT - * @return The first GdcmFileList if found, otherwhise NULL + * @return The first FileList if found, otherwhise NULL */ - std::list *SerieHelper::GetFirstCoherentFileList() -// Why doesn't it compile ?!? -//GdcmFileList *SerieHelper::GetFirstCoherentFileList() +FileList *SerieHelper::GetFirstCoherentFileList() { - ItListHt = CoherentGdcmFileListHT.begin(); - if( ItListHt != CoherentGdcmFileListHT.end() ) + ItListHt = CoherentFileListHT.begin(); + if ( ItListHt != CoherentFileListHT.end() ) return ItListHt->second; return NULL; } @@ -168,14 +206,14 @@ void SerieHelper::OrderGdcmFileList(GdcmFileList *CoherentGdcmFileList) /** * \brief Get the next List while visiting the CoherentFileListHT * \note : meaningfull only if GetFirstCoherentFileList already called - * @return The next GdcmFileList if found, otherwhise NULL + * @return The next FileList if found, otherwhise NULL */ -std::list *SerieHelper::GetNextCoherentFileList() +FileList *SerieHelper::GetNextCoherentFileList() { - gdcmAssertMacro (ItListHt != CoherentGdcmFileListHT.end()); + gdcmAssertMacro (ItListHt != CoherentFileListHT.end()); ++ItListHt; - if ( ItListHt != CoherentGdcmFileListHT.end() ) + if ( ItListHt != CoherentFileListHT.end() ) return ItListHt->second; return NULL; } @@ -183,13 +221,13 @@ std::list *SerieHelper::GetNextCoherentFileList() /** * \brief Get the Coherent Files list according to its Serie UID * @param SerieUID SerieUID - * \return pointer to the Coherent Filseslist if found, otherwhise NULL + * \return pointer to the Coherent Files list if found, otherwhise NULL */ -GdcmFileList *SerieHelper::GetCoherentFileList(std::string SerieUID) +FileList *SerieHelper::GetCoherentFileList(std::string SerieUID) { - if ( CoherentGdcmFileListHT.count(SerieUID) == 0 ) + if ( CoherentFileListHT.count(SerieUID) == 0 ) return 0; - return CoherentGdcmFileListHT[SerieUID]; + return CoherentFileListHT[SerieUID]; } //----------------------------------------------------------------------------- @@ -203,11 +241,11 @@ GdcmFileList *SerieHelper::GetCoherentFileList(std::string SerieUID) * -# Image Position Patient * -# Image Number * -# More to come :-) - * @param CoherentGdcmFileList Coherent File list (same Serie UID) to sort + * WARNING : FileList = std::vector + * @param fileList Coherent File list (same Serie UID) to sort * @return false only if the header is bugged ! */ -bool SerieHelper::ImagePositionPatientOrdering( - GdcmFileList *CoherentGdcmFileList ) +bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList ) //based on Jolinda's algorithm { //iop is calculated based on the file file @@ -221,11 +259,11 @@ bool SerieHelper::ImagePositionPatientOrdering( std::vector distlist; //!\todo rewrite this for loop. - for ( GdcmFileList::const_iterator - it = CoherentGdcmFileList->begin(); - it != CoherentGdcmFileList->end(); ++it ) + for ( FileList::const_iterator + it = fileList->begin(); + it != fileList->end(); ++it ) { - if( first ) + if ( first ) { (*it)->GetImageOrientationPatient( cosines ); @@ -247,11 +285,6 @@ bool SerieHelper::ImagePositionPatientOrdering( dist += normal[i]*ipp[i]; } - if( dist == 0 ) - { - return false; - } - distlist.push_back( dist ); max = min = dist; @@ -269,11 +302,6 @@ bool SerieHelper::ImagePositionPatientOrdering( dist += normal[i]*ipp[i]; } - if( dist == 0 ) - { - return false; - } - distlist.push_back( dist ); min = (min < dist) ? min : dist; @@ -285,18 +313,25 @@ bool SerieHelper::ImagePositionPatientOrdering( // Then I order the slices according to the value "dist". Finally, once // I've read in all the slices, I calculate the z-spacing as the difference // between the "dist" values for the first two slices. - GdcmFileVector CoherentGdcmFileVector(n); - // CoherentGdcmFileVector.reserve( n ); - CoherentGdcmFileVector.resize( n ); - // gdcmAssertMacro( CoherentGdcmFileVector.capacity() >= n ); + FileVector CoherentFileVector(n); + // CoherentFileVector.reserve( n ); + CoherentFileVector.resize( n ); + // gdcmAssertMacro( CoherentFileVector.capacity() >= n ); + + // Find out if min/max are coherent + if ( min == max ) + { + gdcmWarningMacro( "Looks like all images have the exact same image position..."); + return false; + } float step = (max - min)/(n - 1); int pos; n = 0; //VC++ don't understand what scope is !! it -> it2 - for (GdcmFileList::const_iterator it2 = CoherentGdcmFileList->begin(); - it2 != CoherentGdcmFileList->end(); ++it2, ++n) + for (FileList::const_iterator it2 = fileList->begin(); + it2 != fileList->end(); ++it2, ++n) { //2*n sort algo !! //Assumption: all files are present (no one missing) @@ -306,47 +341,52 @@ bool SerieHelper::ImagePositionPatientOrdering( // and images may have differents directions // -> More than one may have the same 'pos' // Sorting has then NO meaning ! - if (CoherentGdcmFileVector[pos]==NULL) - CoherentGdcmFileVector[pos] = *it2; + if (CoherentFileVector[pos]==NULL) + CoherentFileVector[pos] = *it2; else { - gdcmVerboseMacro( "2 files same position"); + gdcmWarningMacro( "2 files same position"); return false; } } - CoherentGdcmFileList->clear(); // doesn't delete list elements, only node + fileList->clear(); // doesn't delete list elements, only node //VC++ don't understand what scope is !! it -> it3 - for (GdcmFileVector::const_iterator it3 = CoherentGdcmFileVector.begin(); - it3 != CoherentGdcmFileVector.end(); ++it3) + for (FileVector::const_iterator it3 = CoherentFileVector.begin(); + it3 != CoherentFileVector.end(); ++it3) { - CoherentGdcmFileList->push_back( *it3 ); + fileList->push_back( *it3 ); } distlist.clear(); - CoherentGdcmFileVector.clear(); + CoherentFileVector.clear(); return true; } +bool SerieHelper::ImageNumberLessThan(File *file1, File *file2) +{ + return file1->GetImageNumber() < file2->GetImageNumber(); +} + /** * \brief sorts the images, according to their Image Number * \note Works only on bona fide files (i.e image number is a character string * corresponding to an integer) * within a bona fide serie (i.e image numbers are consecutive) - * @param CoherentGdcmFileList Coherent File list (same Serie UID) to sort + * @param fileList Coherent File list (same Serie UID) to sort * @return false if non nona fide stuff encountered */ -bool SerieHelper::ImageNumberOrdering(GdcmFileList *CoherentGdcmFileList) +bool SerieHelper::ImageNumberOrdering(FileList *fileList) { int min, max, pos; - int n = 0;//CoherentGdcmFileList.size() is a O(N) operation + int n = fileList->size(); - GdcmFileList::const_iterator it = CoherentGdcmFileList->begin(); + FileList::const_iterator it = fileList->begin(); min = max = (*it)->GetImageNumber(); - for (; it != CoherentGdcmFileList->end(); ++it, ++n) + for (; it != fileList->end(); ++it, ++n) { pos = (*it)->GetImageNumber(); min = (min < pos) ? min : pos; @@ -354,44 +394,27 @@ bool SerieHelper::ImageNumberOrdering(GdcmFileList *CoherentGdcmFileList) } // Find out if image numbers are coherent (consecutive) - if( min == max || max == 0 || max >= (n+min)) + if ( min == max || max == 0 || max >= (n+min) ) return false; - unsigned char *partition = new unsigned char[n]; - memset(partition, 0, n); - - GdcmFileVector CoherentGdcmFileVector(n); - - for (it = CoherentGdcmFileList->begin(); - it != CoherentGdcmFileList->end(); ++it) - { - pos = (*it)->GetImageNumber(); - CoherentGdcmFileVector[pos - min] = *it; - partition[pos - min]++; - } - - //VC++ doesn't understand what scope is, it -> it3 - CoherentGdcmFileList->clear(); // doesn't delete list elements, only nodes - for ( GdcmFileVector::const_iterator it3 = CoherentGdcmFileVector.begin(); - it3 != CoherentGdcmFileVector.end(); ++it3 ) - { - CoherentGdcmFileList->push_back( *it3 ); - } - CoherentGdcmFileVector.clear(); - delete[] partition; + std::sort(fileList->begin(), fileList->end(), SerieHelper::ImageNumberLessThan ); return true; } +bool SerieHelper::FileNameLessThan(File *file1, File *file2) +{ + return file1->GetFileName() < file2->GetFileName(); +} + /** * \brief sorts the images, according to their File Name - * @param CoherentGdcmFileList Coherent File list (same Serie UID) to sort + * @param fileList Coherent File list (same Serie UID) to sort * @return false only if the header is bugged ! */ -bool SerieHelper::FileNameOrdering(GdcmFileList *) +bool SerieHelper::FileNameOrdering(FileList *fileList) { - //TODO using the sort - //sort(CoherentGdcmFileList.begin(), CoherentGdcmFileList.end()); + std::sort(fileList->begin(), fileList->end(), SerieHelper::FileNameLessThan); return true; } @@ -400,25 +423,25 @@ bool SerieHelper::FileNameOrdering(GdcmFileList *) /** * \brief Canonical printer. */ -void SerieHelper::Print() +void SerieHelper::Print(std::ostream &os, std::string const &indent) { // For all the Coherent File lists of the gdcm::Serie - CoherentFileListmap::iterator itl = CoherentGdcmFileListHT.begin(); - if ( itl == CoherentGdcmFileListHT.end() ) + CoherentFileListmap::iterator itl = CoherentFileListHT.begin(); + if ( itl == CoherentFileListHT.end() ) { - gdcmVerboseMacro( "No Coherent File list found" ); + gdcmWarningMacro( "No Coherent File list found" ); return; } - while (itl != CoherentGdcmFileListHT.end()) + while (itl != CoherentFileListHT.end()) { - std::cout << "Serie UID :[" << itl->first << "]" << std::endl; + os << "Serie UID :[" << itl->first << "]" << std::endl; // For all the files of a Coherent File list - for (GdcmFileList::iterator it = (itl->second)->begin(); + for (FileList::iterator it = (itl->second)->begin(); it != (itl->second)->end(); ++it) { - std::cout << " --- " << (*it)->GetFileName() << std::endl; + os << indent << " --- " << (*it)->GetFileName() << std::endl; } ++itl; }