X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=b8667b1743bfc3885c91ee8cad9effae4255e5d0;hb=31745b8deed4e159cda4f587d1dfd8024ae6b49b;hp=fd8158c7dff8a4d34f9a959541536e842316752f;hpb=2ce6422178e709073fc24aa2e3d4f5069711cd18;p=gdcm.git diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index fd8158c7..b8667b17 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/10/19 13:15:38 $ - Version: $Revision: 1.161 $ + Date: $Date: 2005/11/04 15:26:22 $ + Version: $Revision: 1.168 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -124,36 +124,6 @@ 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. - * @param fileName name - * - of the root directory (parseDir = true) - * - of the DICOMDIR (parseDir = false) - * @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) - * or : new DicomDir() + SetFileName(name) - */ -DicomDir::DicomDir(std::string const &fileName, bool parseDir ): - Document( ) -{ - // At this step, Document constructor is already executed, - // whatever user passed (either a root directory or a DICOMDIR) - // and whatever the value of parseDir was. - // (nothing is cheked in Document constructor, to avoid overhead) - - ParseDir = parseDir; - SetLoadMode (LD_ALL); // concerns only dicom files - SetFileName( fileName ); - Load( ); -} -#endif - /** * \brief Canonical destructor */ @@ -166,7 +136,7 @@ DicomDir::~DicomDir() ClearPatient(); if ( MetaElems ) { - delete MetaElems; + MetaElems->Delete(); } } @@ -190,22 +160,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); 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 @@ -260,12 +229,12 @@ bool DicomDir::DoTheLoadingJob( ) { // user passed '.' as Name // we get current directory name - char dummy[1000]; + char dummy[1000]; // Hope 1000 is enough! getcwd(dummy, (size_t)1000); SetFileName( dummy ); // will be converted into a string } NewMeta(); - gdcmWarningMacro( "Parse directory and create the DicomDir : " + gdcmDebugMacro( "Parse directory and create the DicomDir : " << GetFileName() ); ParseDirectory(); } @@ -284,7 +253,7 @@ bool DicomDir::IsReadable() { if ( Filetype == Unknown ) { - gdcmWarningMacro( "Wrong filetype"); + gdcmErrorMacro( "Wrong filetype for " << GetFileName()); return false; } if ( !MetaElems ) @@ -307,12 +276,12 @@ bool DicomDir::IsReadable() DicomDirMeta *DicomDir::NewMeta() { if ( MetaElems ) - delete MetaElems; + MetaElems->Delete(); DocEntry *entry = GetFirstEntry(); if ( entry ) { - MetaElems = new DicomDirMeta(true); // true = empty + MetaElems = DicomDirMeta::New(true); // true = empty entry = GetFirstEntry(); while( entry ) @@ -320,15 +289,15 @@ DicomDirMeta *DicomDir::NewMeta() if ( dynamic_cast(entry) ) break; - RemoveEntryNoDestroy(entry); MetaElems->AddEntry(entry); + RemoveEntry(entry); entry = GetFirstEntry(); } } else // after root directory parsing { - MetaElems = new DicomDirMeta(false); // false = not empty + MetaElems = DicomDirMeta::New(false); // false = not empty } MetaElems->SetSQItemNumber(0); // To avoid further missprinting return MetaElems; @@ -340,9 +309,9 @@ DicomDirMeta *DicomDir::NewMeta() */ DicomDirPatient *DicomDir::NewPatient() { - DicomDirPatient *p = new DicomDirPatient(); - AddPatientToEnd( p ); - return p; + DicomDirPatient *dd = DicomDirPatient::New(); + AddPatientToEnd( dd ); + return dd; } /** @@ -354,7 +323,7 @@ void DicomDir::ClearPatient() cc!= Patients.end(); ++cc) { - delete *cc; + (*cc)->Unregister(); } Patients.clear(); } @@ -627,27 +596,21 @@ 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 = File::New( ); + f->SetLoadMode(LoadMode); // we allow user not to load Sequences, + // or Shadow groups, or ...... f->SetFileName( it->c_str() ); - /*int res = */f->Load( ); + f->Load( ); -// if ( !f ) -// { -// gdcmWarningMacro( "Failure in new gdcm::File " << it->c_str() ); -// continue; -// } - if ( f->IsReadable() ) { // Add the file to the chained list: list.push_back(f); - gdcmWarningMacro( "Readable " << it->c_str() ); + gdcmDebugMacro( "Readable " << it->c_str() ); } else { - delete f; + f->Delete(); } count++; } @@ -663,7 +626,7 @@ void DicomDir::CreateDicomDirChainedList(std::string const &path) itDoc!=list.end(); ++itDoc) { - delete dynamic_cast(*itDoc); + dynamic_cast(*itDoc)->Delete(); } } @@ -738,6 +701,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); @@ -780,50 +744,50 @@ void DicomDir::CreateDicomDir() if ( v == "IMAGE " ) { - si = new DicomDirImage(true); + si = DicomDirImage::New(true); if ( !AddImageToEnd( static_cast(si)) ) { - delete si; + si->Delete(); si = NULL; gdcmErrorMacro( "Add AddImageToEnd failed"); } } else if ( v == "SERIES" ) { - si = new DicomDirSerie(true); + si = DicomDirSerie::New(true); if ( !AddSerieToEnd( static_cast(si)) ) { - delete si; + si->Delete(); si = NULL; gdcmErrorMacro( "Add AddSerieToEnd failed"); } } else if ( v == "VISIT " ) { - si = new DicomDirVisit(true); + si = DicomDirVisit::New(true); if ( !AddVisitToEnd( static_cast(si)) ) { - delete si; + si->Delete(); si = NULL; gdcmErrorMacro( "Add AddVisitToEnd failed"); } } else if ( v == "STUDY " ) { - si = new DicomDirStudy(true); + si = DicomDirStudy::New(true); if ( !AddStudyToEnd( static_cast(si)) ) { - delete si; + si->Delete(); si = NULL; gdcmErrorMacro( "Add AddStudyToEnd failed"); } } else if ( v == "PATIENT " ) { - si = new DicomDirPatient(true); + si = DicomDirPatient::New(true); if ( !AddPatientToEnd( static_cast(si)) ) { - delete si; + si->Delete(); si = NULL; gdcmErrorMacro( "Add PatientToEnd failed"); } @@ -832,7 +796,7 @@ void DicomDir::CreateDicomDir() { // It was neither a 'PATIENT', nor a 'STUDY', nor a 'SERIE', // nor an 'IMAGE' SQItem. Skip to next item. - gdcmWarningMacro( " -------------------------------------------" + gdcmDebugMacro( " -------------------------------------------" << "a non PATIENT/STUDY/SERIE/IMAGE SQItem was found : " << v); @@ -1029,48 +993,48 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, { case GDCM_DICOMDIR_IMAGE: elemList = Global::GetDicomDirElements()->GetDicomDirImageElements(); - si = new DicomDirImage(true); + si = DicomDirImage::New(true); if ( !AddImageToEnd(static_cast(si)) ) { - delete si; + si->Delete(); gdcmErrorMacro( "Add ImageToEnd failed"); } break; case GDCM_DICOMDIR_SERIE: elemList = Global::GetDicomDirElements()->GetDicomDirSerieElements(); - si = new DicomDirSerie(true); + si = DicomDirSerie::New(true); if ( !AddSerieToEnd(static_cast(si)) ) { - delete si; + si->Delete(); gdcmErrorMacro( "Add SerieToEnd failed"); } break; case GDCM_DICOMDIR_STUDY: elemList = Global::GetDicomDirElements()->GetDicomDirStudyElements(); - si = new DicomDirStudy(true); + si = DicomDirStudy::New(true); if ( !AddStudyToEnd(static_cast(si)) ) { - delete si; + si->Delete(); gdcmErrorMacro( "Add StudyToEnd failed"); } break; case GDCM_DICOMDIR_PATIENT: elemList = Global::GetDicomDirElements()->GetDicomDirPatientElements(); - si = new DicomDirPatient(true); + si = DicomDirPatient::New(true); if ( !AddPatientToEnd(static_cast(si)) ) { - delete si; + si->Delete(); gdcmErrorMacro( "Add PatientToEnd failed"); } break; case GDCM_DICOMDIR_META: if ( MetaElems ) { - delete MetaElems; + MetaElems->Delete(); gdcmErrorMacro( "MetaElements already exist, they will be destroyed"); } elemList = Global::GetDicomDirElements()->GetDicomDirMetaElements(); - MetaElems = new DicomDirMeta(true); + MetaElems = DicomDirMeta::New(true); si = MetaElems; break; default: @@ -1093,8 +1057,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, tmpEl = it->Elem; dictEntry = GetPubDict()->GetEntry(tmpGr, tmpEl); - entry = new DataEntry( dictEntry ); // Be sure it's never a DataEntry ! - + entry = DataEntry::New( dictEntry ); entry->SetOffset(0); // just to avoid further missprinting if ( header ) @@ -1124,7 +1087,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, } else { - val = &(header->GetFileName().c_str()[path.length()]); + val = &(header->GetFileName().c_str()[path.length()+1]); } } else @@ -1142,9 +1105,10 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, if ( type == GDCM_DICOMDIR_META ) // fusible : should never print ! { - gdcmWarningMacro("GDCM_DICOMDIR_META ?!? should never print that"); + gdcmDebugMacro("GDCM_DICOMDIR_META ?!? should never print that"); } si->AddEntry(entry); + entry->Delete(); } } @@ -1161,7 +1125,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();