X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=34f7025cf1dace136fe11e7a72a75abd66847923;hb=8670efa6c3fc51c51fe71c2f62af2297a19b07e2;hp=f94de80566bb7f36e82bac2b599d10e204221941;hpb=2767ee200a3dc05314954bd8bb3a0427f3fcb7d9;p=gdcm.git diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index f94de805..34f7025c 100644 --- a/src/gdcmDicomDir.cxx +++ b/src/gdcmDicomDir.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDir.cxx,v $ Language: C++ - Date: $Date: 2005/01/21 15:28:18 $ - Version: $Revision: 1.113 $ + Date: $Date: 2005/02/01 10:34:59 $ + Version: $Revision: 1.124 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -16,6 +16,10 @@ =========================================================================*/ +//----------------------------------------------------------------------------- +// For full DICOMDIR description, see: +// PS 3.3-2003, pages 731-750 +//----------------------------------------------------------------------------- #include "gdcmDicomDir.h" #include "gdcmDicomDirStudy.h" #include "gdcmDicomDirSerie.h" @@ -49,13 +53,8 @@ namespace gdcm { - -//----------------------------------------------------------------------------- -// For full DICOMDIR description, see: -// PS 3.3-2003, pages 731-750 //----------------------------------------------------------------------------- // Constructor / Destructor - /** * \brief Constructor : creates an empty DicomDir */ @@ -89,7 +88,8 @@ DicomDir::DicomDir(std::string const &fileName, bool parseDir ): Initialize(); // sets all private fields to NULL // if user passed a root directory, sure we didn't get anything - if ( GetFirstEntry() != 0 ) // when user passed a Directory to parse + + if ( GetFirstEntry() == 0 ) // when user passed a Directory to parse { if (!parseDir) gdcmVerboseMacro( "Entry HT empty for file: "<SetPrintLevel(PrintLevel); - MetaElems->Print(os); - } - for(ListDicomDirPatient::iterator cc = Patients.begin(); - cc != Patients.end(); - ++cc) - { - (*cc)->SetPrintLevel(PrintLevel); - (*cc)->Print(os); - } -} - //----------------------------------------------------------------------------- // Public /** @@ -333,11 +307,10 @@ DicomDirPatient *DicomDir::GetFirstPatient() DicomDirPatient *DicomDir::GetNextPatient() { gdcmAssertMacro (ItPatient != Patients.end()); - { - ++ItPatient; - if ( ItPatient != Patients.end() ) - return *ItPatient; - } + + ++ItPatient; + if ( ItPatient != Patients.end() ) + return *ItPatient; return NULL; } @@ -401,7 +374,6 @@ bool DicomDir::WriteDicomDir(std::string const &fileName) //----------------------------------------------------------------------------- // Protected - /** * \brief create a Document-like chained list from a root Directory * @param path entry point of the tree-like structure @@ -464,31 +436,27 @@ void DicomDir::CreateDicomDirChainedList(std::string const & path) /** * \brief adds *the* Meta to a partially created DICOMDIR - */ - + */ DicomDirMeta *DicomDir::NewMeta() { if( MetaElems ) delete MetaElems; - // friend hunting : we miss GetLastEntry and GetPreviousEntry - // to be able to remove any direct reference to TagHT - - DocEntry *e = GetFirstEntry(); - if (e) - //if ( TagHT.begin() != TagHT.end() ) // after Document Parsing + DocEntry *entry = GetFirstEntry(); + if( entry ) { MetaElems = new DicomDirMeta(true); - TagDocEntryHT::iterator lastOneButSequence = TagHT.end(); - lastOneButSequence --; - // ALL the 'out of Sequence' Tags belong to Meta Elems - // (we skip 0004|1220 [Directory record sequence] ) - for ( TagDocEntryHT::iterator cc = TagHT.begin(); - cc != lastOneButSequence; - ++cc) + entry = GetFirstEntry(); + while( entry ) { - MetaElems->AddEntry( cc->second ); + if( dynamic_cast(entry) ) + break; + + RemoveEntryNoDestroy(entry); + MetaElems->AddEntry(entry); + + entry = GetFirstEntry(); } } else // after root directory parsing @@ -500,7 +468,8 @@ DicomDirMeta *DicomDir::NewMeta() } /** - * \brief adds a new Patient (with the basic elements) to a partially created DICOMDIR + * \brief adds a new Patient (with the basic elements) to a partially created + * DICOMDIR */ DicomDirPatient *DicomDir::NewPatient() { @@ -509,6 +478,20 @@ DicomDirPatient *DicomDir::NewPatient() return p; } +/** + * \brief Remove all Patients + */ +void DicomDir::ClearPatient() +{ + for(ListDicomDirPatient::iterator cc = Patients.begin(); + cc!= Patients.end(); + ++cc) + { + delete *cc; + } + Patients.clear(); +} + /** * \brief adds to the HTable * the Entries (Dicom Elements) corresponding to the given type @@ -593,7 +576,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, { tmpGr = it->Group; tmpEl = it->Elem; - dictEntry = GetPubDict()->GetDictEntry(tmpGr, tmpEl); + dictEntry = GetPubDict()->GetEntry(tmpGr, tmpEl); entry = new ValEntry( dictEntry ); // Be sure it's never a BinEntry ! @@ -603,7 +586,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, { // NULL when we Build Up (ex nihilo) a DICOMDIR // or when we add the META elems - val = header->GetEntry(tmpGr, tmpEl); + val = header->GetEntryValue(tmpGr, tmpEl); } else { @@ -650,7 +633,6 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, } } -//----------------------------------------------------------------------------- /** * \brief CallStartMethod */ @@ -664,7 +646,6 @@ void DicomDir::CallStartMethod() } } -//----------------------------------------------------------------------------- /** * \brief CallProgressMethod */ @@ -676,7 +657,6 @@ void DicomDir::CallProgressMethod() } } -//----------------------------------------------------------------------------- /** * \brief CallEndMethod */ @@ -717,7 +697,7 @@ void DicomDir::Initialize() */ void DicomDir::CreateDicomDir() { - // The list is parsed. + // The SeqEntries of "Directory Record Sequence" are parsed. // When a DicomDir tag ("PATIENT", "STUDY", "SERIE", "IMAGE") is found : // 1 - we save the beginning iterator // 2 - we continue to parse @@ -729,7 +709,7 @@ void DicomDir::CreateDicomDir() DocEntry *e = GetDocEntry(0x0004, 0x1220); if ( !e ) { - gdcmVerboseMacro( "NO Directory record sequence (0x0004,0x1220)"); + gdcmVerboseMacro( "No Directory Record Sequence (0004,1220) found"); /// \todo FIXME: what to do when the parsed file IS NOT a DICOMDIR file ? return; } @@ -737,14 +717,11 @@ void DicomDir::CreateDicomDir() SeqEntry *s = dynamic_cast(e); if ( !s ) { - gdcmVerboseMacro( "No SeqEntry present"); - // useless : (0x0004,0x1220) IS a Sequence ! + gdcmVerboseMacro( "Element (0004,1220) is not a Sequence ?!?"); return; } NewMeta(); - - //ListSQItem listItems = s->GetSQItems(); DocEntry *d; std::string v; @@ -810,14 +787,12 @@ void DicomDir::CreateDicomDir() // neither an 'IMAGE' SQItem. Skip to next item. continue; } - if( si ) MoveSQItem(si,tmpSI); tmpSI=s->GetNextSQItem(); } -// friend hunting : this one will be difficult to remove ! - TagHT.clear(); + ClearEntry(); } /** @@ -863,14 +838,6 @@ bool DicomDir::AddSerieToEnd(DicomDirSerie *dd) study->AddSerie(dd); return true; } -/* if( (*itp)->GetDicomDirStudies().size() > 0 ) - { - ListDicomDirStudy::const_iterator itst = - (*itp)->GetDicomDirStudies().end(); - itst--; - (*itst)->AddSerie(dd); - return true; - }*/ } return false; } @@ -896,20 +863,6 @@ bool DicomDir::AddImageToEnd(DicomDirImage *dd) return true; } } -/* if( (*itp)->GetDicomDirStudies().size() > 0 ) - { - ListDicomDirStudy::const_iterator itst = - (*itp)->GetDicomDirStudies().end(); - itst--; - - if( (*itst)->GetDicomDirSeries().size() > 0 ) - { - ListDicomDirSerie::const_iterator its = (*itst)->GetDicomDirSeries().end(); - its--; - (*its)->AddImage(dd); - return true; - } - }*/ } return false; } @@ -921,8 +874,8 @@ bool DicomDir::AddImageToEnd(DicomDirImage *dd) */ void DicomDir::SetElements(std::string const & path, VectDocument const &list) { - TagHT.clear(); - Patients.clear(); + ClearEntry(); + ClearPatient(); std::string patPrevName = "", patPrevID = ""; std::string studPrevInstanceUID = "", studPrevID = ""; @@ -937,12 +890,12 @@ void DicomDir::SetElements(std::string const & path, VectDocument const &list) it != list.end(); ++it ) { // get the current file characteristics - patCurName = (*it)->GetEntry(0x0010,0x0010); - patCurID = (*it)->GetEntry(0x0010,0x0011); - studCurInstanceUID = (*it)->GetEntry(0x0020,0x000d); - studCurID = (*it)->GetEntry(0x0020,0x0010); - serCurInstanceUID = (*it)->GetEntry(0x0020,0x000e); - serCurID = (*it)->GetEntry(0x0020,0x0011); + patCurName = (*it)->GetEntryValue(0x0010,0x0010); + patCurID = (*it)->GetEntryValue(0x0010,0x0011); + studCurInstanceUID = (*it)->GetEntryValue(0x0020,0x000d); + studCurID = (*it)->GetEntryValue(0x0020,0x0010); + serCurInstanceUID = (*it)->GetEntryValue(0x0020,0x000e); + serCurID = (*it)->GetEntryValue(0x0020,0x0011); if( patCurName != patPrevName || patCurID != patPrevID || first ) { @@ -985,7 +938,7 @@ void DicomDir::SetElements(std::string const & path, VectDocument const &list) * @param dst destination SQItem * @param src source SQItem */ -void DicomDir::MoveSQItem(SQItem *dst,SQItem *src) +void DicomDir::MoveSQItem(DocEntrySet *dst,DocEntrySet *src) { DocEntry *entry; @@ -1000,13 +953,35 @@ void DicomDir::MoveSQItem(SQItem *dst,SQItem *src) } /** - * \brief compares two dgcmHeaders + * \brief compares two files */ bool DicomDir::HeaderLessThan(Document *header1, Document *header2) { return *header1 < *header2; } -} // end namespace gdcm +//----------------------------------------------------------------------------- +// Print +/** + * \brief Canonical Printer + * @param os ostream we want to print in + * @param indent Indentation string to be prepended during printing + */ +void DicomDir::Print(std::ostream &os, std::string const & ) +{ + if( MetaElems ) + { + MetaElems->SetPrintLevel(PrintLevel); + MetaElems->Print(os); + } + for(ListDicomDirPatient::iterator cc = Patients.begin(); + cc != Patients.end(); + ++cc) + { + (*cc)->SetPrintLevel(PrintLevel); + (*cc)->Print(os); + } +} //----------------------------------------------------------------------------- +} // end namespace gdcm