X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=17da13ee9e5aebf45bb5bc7c44590a3e3c163607;hb=bf254f32ff1391a5da3ccc13b0aaba4446ee60a6;hp=123b0fa6495213b6cb214c23a1e879bb55867f5c;hpb=04e8ab90af5ff69eb35e51d56177a4d4c487e300;p=gdcm.git diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index 123b0fa6..17da13ee 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/08/31 16:24:19 $ - Version: $Revision: 1.159 $ + Date: $Date: 2005/10/25 09:22:15 $ + Version: $Revision: 1.166 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -36,7 +36,7 @@ #include "gdcmFile.h" #include "gdcmSeqEntry.h" #include "gdcmSQItem.h" -#include "gdcmValEntry.h" +#include "gdcmDataEntry.h" #include #include @@ -125,18 +125,18 @@ DicomDir::DicomDir() } #ifndef GDCM_LEGACY_REMOVE -/** - * \brief Constructor Parses recursively the directory and creates the DicomDir +/* * + * \ brief Constructor Parses recursively the directory and creates the DicomDir * or uses an already built DICOMDIR, depending on 'parseDir' value. - * @param fileName name + * @ param fileName name * - of the root directory (parseDir = true) * - of the DICOMDIR (parseDir = false) - * @param parseDir boolean + * @ param parseDir boolean * - true if user passed an entry point * and wants to explore recursively the directories * - false if user passed an already built DICOMDIR file * and wants to use it - * @deprecated use : new DicomDir() + [ SetLoadMode(lm) + ] SetDirectoryName(name) + * @ deprecated use : new DicomDir() + [ SetLoadMode(lm) + ] SetDirectoryName(name) * or : new DicomDir() + SetFileName(name) */ DicomDir::DicomDir(std::string const &fileName, bool parseDir ): @@ -181,9 +181,6 @@ DicomDir::~DicomDir() */ bool DicomDir::Load( ) { - // We should clean out anything that already exists. - Initialize(); // sets all private fields to NULL - if (!ParseDir) { if ( ! this->Document::Load( ) ) @@ -193,29 +190,21 @@ bool DicomDir::Load( ) } #ifndef GDCM_LEGACY_REMOVE -/** - * \brief Loader. (DEPRECATED : kept not to break the API) - * @param fileName file to be open for parsing - * @return false if file cannot be open or no swap info was found, +/* * + * \ brief Loader. (DEPRECATED : kept not to break the API) + * @ param fileName file to be open for parsing + * @ return false if file cannot be open or no swap info was found, * or no tag was found. - * @deprecated use SetFileName(n) + Load() instead + * @ deprecated use SetFileName(n) + Load() instead */ bool DicomDir::Load(std::string const &fileName ) { - // We should clean out anything that already exists. - Initialize(); // sets all private fields to NULL - - SetFileName( fileName ); - if (!ParseDir) - { - if ( ! this->Document::Load( ) ) - return false; - } - return DoTheLoadingJob( ); + SetFileName(fileName); + return Load(); } /// DEPRECATED : use SetDirectoryName(dname) instead -/** +/* * * \brief Loader. (DEPRECATED : kept not to break the API) * @param paseDir Parse Dir * @deprecated use SetDirectoryName(dname) instead @@ -233,18 +222,14 @@ void DicomDir::SetParseDir(bool parseDir) */ bool DicomDir::DoTheLoadingJob( ) { - // We should clean out anything that already exists. - Initialize(); // sets all private fields to NULL + Progress = 0.0f; + Abort = false; if (!ParseDir) { // Only if user passed a DICOMDIR // ------------------------------ Fp = 0; - if ( !OpenFile() ) - { - return false; - } if (!Document::Load() ) { return false; @@ -334,8 +319,8 @@ DicomDirMeta *DicomDir::NewMeta() if ( dynamic_cast(entry) ) break; - RemoveEntryNoDestroy(entry); MetaElems->AddEntry(entry); + RemoveEntry(entry); entry = GetFirstEntry(); } @@ -582,7 +567,7 @@ bool DicomDir::Write(std::string const &fileName) bool DicomDir::Anonymize() { - ValEntry *v; + DataEntry *v; // Something clever to be found to forge the Patient names std::ostringstream s; int i = 1; @@ -591,22 +576,22 @@ bool DicomDir::Anonymize() ++cc) { s << i; - v = (*cc)->GetValEntry(0x0010, 0x0010) ; // Patient's Name + v = (*cc)->GetDataEntry(0x0010, 0x0010) ; // Patient's Name if (v) { - v->SetValue(s.str()); + v->SetString(s.str()); } - v = (*cc)->GetValEntry(0x0010, 0x0020) ; // Patient ID + v = (*cc)->GetDataEntry(0x0010, 0x0020) ; // Patient ID if (v) { - v->SetValue(" "); + v->SetString(" "); } - v = (*cc)->GetValEntry(0x0010, 0x0030) ; // Patient's BirthDate + v = (*cc)->GetDataEntry(0x0010, 0x0030) ; // Patient's BirthDate if (v) { - v->SetValue(" "); + v->SetString(" "); } s << ""; i++; @@ -752,6 +737,7 @@ void DicomDir::CreateDicomDir() // 3 - we find an other tag // + we create the object for the precedent tag // + loop to 1 - + gdcmDebugMacro("Create DicomDir"); // Directory record sequence DocEntry *e = GetDocEntry(0x0004, 0x1220); @@ -778,13 +764,13 @@ void DicomDir::CreateDicomDir() while(tmpSI) { d = tmpSI->GetDocEntry(0x0004, 0x1430); // Directory Record Type - if ( ValEntry* valEntry = dynamic_cast(d) ) + if ( DataEntry *dataEntry = dynamic_cast(d) ) { - v = valEntry->GetValue(); + v = dataEntry->GetString(); } else { - gdcmWarningMacro( "(0004,1430) not a ValEntry ?!?"); + gdcmWarningMacro( "(0004,1430) not a DataEntry ?!?"); continue; } @@ -855,8 +841,6 @@ void DicomDir::CreateDicomDir() continue; } if ( si ) - //MoveSQItem(si,tmpSI); // Old code : Copies each Entry - // -and then removes the source- si->MoveObject(tmpSI); // New code : Copies the List tmpSI=s->GetNextSQItem(); @@ -981,12 +965,12 @@ void DicomDir::SetElements(std::string const &path, VectDocument const &list) ++it ) { // get the current file characteristics - 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); + patCurName = (*it)->GetEntryString(0x0010,0x0010); + patCurID = (*it)->GetEntryString(0x0010,0x0011); + studCurInstanceUID = (*it)->GetEntryString(0x0020,0x000d); + studCurID = (*it)->GetEntryString(0x0020,0x0010); + serCurInstanceUID = (*it)->GetEntryString(0x0020,0x000e); + serCurID = (*it)->GetEntryString(0x0020,0x0011); if ( patCurName != patPrevName || patCurID != patPrevID || first ) { @@ -1037,7 +1021,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, ListDicomDirElem::const_iterator it; uint16_t tmpGr, tmpEl; DictEntry *dictEntry; - ValEntry *entry; + DataEntry *entry; std::string val; SQItem *si; @@ -1080,14 +1064,14 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, } break; case GDCM_DICOMDIR_META: - elemList = Global::GetDicomDirElements()->GetDicomDirMetaElements(); - si = new DicomDirMeta(true); if ( MetaElems ) { delete MetaElems; gdcmErrorMacro( "MetaElements already exist, they will be destroyed"); } - MetaElems = static_cast(si); + elemList = Global::GetDicomDirElements()->GetDicomDirMetaElements(); + MetaElems = new DicomDirMeta(true); + si = MetaElems; break; default: return; @@ -1109,15 +1093,14 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, tmpEl = it->Elem; dictEntry = GetPubDict()->GetEntry(tmpGr, tmpEl); - entry = new ValEntry( dictEntry ); // Be sure it's never a BinEntry ! - + entry = DataEntry::New( dictEntry ); entry->SetOffset(0); // just to avoid further missprinting if ( header ) { // NULL when we Build Up (ex nihilo) a DICOMDIR // or when we add the META elems - val = header->GetEntryValue(tmpGr, tmpEl); + val = header->GetEntryString(tmpGr, tmpEl); } else { @@ -1154,13 +1137,14 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, val = it->Value; } - entry->SetValue( val ); // troubles expected when vr=SQ ... + entry->SetString( val ); // troubles expected when vr=SQ ... if ( type == GDCM_DICOMDIR_META ) // fusible : should never print ! { gdcmWarningMacro("GDCM_DICOMDIR_META ?!? should never print that"); } si->AddEntry(entry); + entry->Delete(); } } @@ -1177,7 +1161,7 @@ void DicomDir::MoveSQItem(DocEntrySet *dst,DocEntrySet *src) entry = src->GetFirstEntry(); while(entry) { - src->RemoveEntryNoDestroy(entry); + src->RemoveEntry(entry); dst->AddEntry(entry); // we destroyed -> the current iterator is not longer valid entry = src->GetFirstEntry();