X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=775ab82be7a8365ee3fc135d6b3869d4cbbbff6c;hb=05c174bd812b9e375823d6a95683cb5036795a02;hp=de95ee6825d872a1402152a9fe82b9ad8bd547df;hpb=9cd51041e87ba178719523a35ef7ad823924cbf6;p=gdcm.git diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index de95ee68..775ab82b 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/07/19 15:19:26 $ - Version: $Revision: 1.149 $ + Date: $Date: 2005/10/20 08:58:17 $ + Version: $Revision: 1.162 $ 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 @@ -100,7 +100,8 @@ // // (Root directory Entity) PATIENT // PATIENT STUDY -// STUDY SERIES +// STUDY SERIES +// STUDY VISIT // SERIES IMAGE // IMAGE / // @@ -123,6 +124,7 @@ DicomDir::DicomDir() NewMeta(); } +#ifndef GDCM_LEGACY_REMOVE /** * \brief Constructor Parses recursively the directory and creates the DicomDir * or uses an already built DICOMDIR, depending on 'parseDir' value. @@ -134,6 +136,8 @@ DicomDir::DicomDir() * 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) + * or : new DicomDir() + SetFileName(name) */ DicomDir::DicomDir(std::string const &fileName, bool parseDir ): Document( ) @@ -144,18 +148,20 @@ DicomDir::DicomDir(std::string const &fileName, bool parseDir ): // (nothing is cheked in Document constructor, to avoid overhead) ParseDir = parseDir; - SetLoadMode (0x00000000); // concerns only dicom files - Load( fileName ); + SetLoadMode (LD_ALL); // concerns only dicom files + SetFileName( fileName ); + Load( ); } +#endif /** * \brief Canonical destructor */ DicomDir::~DicomDir() { - SetStartMethod(NULL); - SetProgressMethod(NULL); - SetEndMethod(NULL); + SetStartMethod(NULL,NULL,NULL); + SetProgressMethod(NULL,NULL,NULL); + SetEndMethod(NULL,NULL,NULL); ClearPatient(); if ( MetaElems ) @@ -168,42 +174,46 @@ DicomDir::~DicomDir() // Public /** - * \brief Loader. use SetLoadMode(), SetFileName() before ! + * \brief Loader. use SetFileName(fn) + * or SetLoadMode(lm) + SetDirectoryName(dn) before ! * @return false if file cannot be open or no swap info was found, * or no tag was found. */ bool DicomDir::Load( ) { - // We should clean out anything that already exists. - Initialize(); // sets all private fields to NULL - if (!ParseDir) { if ( ! this->Document::Load( ) ) return false; } - return DoTheLoadingJob( ); + return DoTheLoadingJob( ); } +#ifndef GDCM_LEGACY_REMOVE /** - * \brief Loader. (DEPRECATED : not to break the API) + * \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 */ bool DicomDir::Load(std::string const &fileName ) { - // We should clean out anything that already exists. - Initialize(); // sets all private fields to NULL + SetFileName(fileName); + return Load(); +} - SetFileName( fileName ); - if (!ParseDir) - { - if ( ! this->Document::Load( ) ) - return false; - } - return DoTheLoadingJob( ); +/// DEPRECATED : use SetDirectoryName(dname) instead +/** + * \brief Loader. (DEPRECATED : kept not to break the API) + * @param paseDir Parse Dir + * @deprecated use SetDirectoryName(dname) instead + */ +void DicomDir::SetParseDir(bool parseDir) +{ + ParseDir = parseDir; } +#endif /** * \brief Does the Loading Job (internal use only) @@ -212,18 +222,14 @@ bool DicomDir::Load(std::string const &fileName ) */ 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; @@ -388,6 +394,21 @@ void DicomDir::ParseDirectory() CreateDicomDir(); } +void DicomDir::SetStartMethod( DicomDir::Method *method, void *arg ) +{ + SetStartMethod(method,arg,NULL); +} + +void DicomDir::SetProgressMethod( DicomDir::Method *method, void *arg ) +{ + SetProgressMethod(method,arg,NULL); +} + +void DicomDir::SetEndMethod( DicomDir::Method *method, void *arg ) +{ + SetEndMethod(method,arg,NULL); +} + /** * \brief Set the start method to call when the parsing of the * directory starts. @@ -492,7 +513,7 @@ void DicomDir::SetEndMethodArgDelete( DicomDir::Method *method ) * @return false only when fail to open */ -bool DicomDir::WriteDicomDir(std::string const &fileName) +bool DicomDir::Write(std::string const &fileName) { int i; uint16_t sq[4] = { 0x0004, 0x1220, 0xffff, 0xffff }; @@ -544,9 +565,9 @@ bool DicomDir::WriteDicomDir(std::string const &fileName) * @return true */ -bool DicomDir::AnonymizeDicomDir() +bool DicomDir::Anonymize() { - ValEntry *v; + DataEntry *v; // Something clever to be found to forge the Patient names std::ostringstream s; int i = 1; @@ -555,22 +576,22 @@ bool DicomDir::AnonymizeDicomDir() ++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++; @@ -605,10 +626,10 @@ void DicomDir::CreateDicomDirChainedList(std::string const &path) break; } - f = new File( ); - f->SetLoadMode(LoadMode); // we allow user not to load Sequences, or Shadow - // groups, or ...... - f->SetFileName( it->c_str() ); + f = new File( ); + f->SetLoadMode(LoadMode); // we allow user not to load Sequences, or Shadow + // groups, or ...... + f->SetFileName( it->c_str() ); /*int res = */f->Load( ); // if ( !f ) @@ -742,13 +763,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; } @@ -819,8 +840,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(); @@ -945,12 +964,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 ) { @@ -1001,7 +1020,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; @@ -1044,14 +1063,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; @@ -1073,7 +1092,7 @@ 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 = new DataEntry( dictEntry ); // Be sure it's never a DataEntry ! entry->SetOffset(0); // just to avoid further missprinting @@ -1081,7 +1100,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->GetEntryValue(tmpGr, tmpEl); + val = header->GetEntryString(tmpGr, tmpEl); } else { @@ -1118,7 +1137,7 @@ 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 ! {