Program: gdcm
Module: $RCSfile: gdcmDicomDir.cxx,v $
Language: C++
- Date: $Date: 2005/07/20 14:49:41 $
- Version: $Revision: 1.150 $
+ 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
#include "gdcmFile.h"
#include "gdcmSeqEntry.h"
#include "gdcmSQItem.h"
-#include "gdcmValEntry.h"
+#include "gdcmDataEntry.h"
#include <fstream>
#include <string>
//
// (Root directory Entity) PATIENT
// PATIENT STUDY
-// STUDY SERIES
+// STUDY SERIES
+// STUDY VISIT
// SERIES IMAGE
// IMAGE /
//
NewMeta();
}
-/**
- * \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)
- */
-#ifndef GDCM_LEGACY_REMOVE
-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 (0x00000000); // concerns only dicom files
- Load( fileName );
-}
-#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 )
{
- delete MetaElems;
+ MetaElems->Delete();
}
}
*/
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 : 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,
+#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,
* 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(dn) instead
+/// 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;
*/
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;
{
// 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();
}
{
if ( Filetype == Unknown )
{
- gdcmWarningMacro( "Wrong filetype");
+ gdcmErrorMacro( "Wrong filetype for " << GetFileName());
return false;
}
if ( !MetaElems )
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 )
if ( dynamic_cast<SeqEntry *>(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;
*/
DicomDirPatient *DicomDir::NewPatient()
{
- DicomDirPatient *p = new DicomDirPatient();
- AddPatientToEnd( p );
- return p;
+ DicomDirPatient *dd = DicomDirPatient::New();
+ AddPatientToEnd( dd );
+ return dd;
}
/**
cc!= Patients.end();
++cc)
{
- delete *cc;
+ (*cc)->Unregister();
}
Patients.clear();
}
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.
* @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 };
* @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;
++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++;
break;
}
- 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 )
-// {
-// gdcmWarningMacro( "Failure in new gdcm::File " << it->c_str() );
-// continue;
-// }
-
+ f = File::New( );
+ f->SetLoadMode(LoadMode); // we allow user not to load Sequences,
+ // or Shadow groups, or ......
+ f->SetFileName( it->c_str() );
+ f->Load( );
+
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++;
}
itDoc!=list.end();
++itDoc)
{
- delete dynamic_cast<File *>(*itDoc);
+ dynamic_cast<File *>(*itDoc)->Delete();
}
}
// 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);
while(tmpSI)
{
d = tmpSI->GetDocEntry(0x0004, 0x1430); // Directory Record Type
- if ( ValEntry* valEntry = dynamic_cast<ValEntry *>(d) )
+ if ( DataEntry *dataEntry = dynamic_cast<DataEntry *>(d) )
{
- v = valEntry->GetValue();
+ v = dataEntry->GetString();
}
else
{
- gdcmWarningMacro( "(0004,1430) not a ValEntry ?!?");
+ gdcmWarningMacro( "(0004,1430) not a DataEntry ?!?");
continue;
}
if ( v == "IMAGE " )
{
- si = new DicomDirImage(true);
+ si = DicomDirImage::New(true);
if ( !AddImageToEnd( static_cast<DicomDirImage *>(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<DicomDirSerie *>(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<DicomDirVisit *>(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<DicomDirStudy *>(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<DicomDirPatient *>(si)) )
{
- delete si;
+ si->Delete();
si = NULL;
gdcmErrorMacro( "Add PatientToEnd failed");
}
{
// 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);
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();
++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 )
{
ListDicomDirElem::const_iterator it;
uint16_t tmpGr, tmpEl;
DictEntry *dictEntry;
- ValEntry *entry;
+ DataEntry *entry;
std::string val;
SQItem *si;
{
case GDCM_DICOMDIR_IMAGE:
elemList = Global::GetDicomDirElements()->GetDicomDirImageElements();
- si = new DicomDirImage(true);
+ si = DicomDirImage::New(true);
if ( !AddImageToEnd(static_cast<DicomDirImage *>(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<DicomDirSerie *>(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<DicomDirStudy *>(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<DicomDirPatient *>(si)) )
{
- delete si;
+ si->Delete();
gdcmErrorMacro( "Add PatientToEnd failed");
}
break;
case GDCM_DICOMDIR_META:
- elemList = Global::GetDicomDirElements()->GetDicomDirMetaElements();
- si = new DicomDirMeta(true);
if ( MetaElems )
{
- delete MetaElems;
+ MetaElems->Delete();
gdcmErrorMacro( "MetaElements already exist, they will be destroyed");
}
- MetaElems = static_cast<DicomDirMeta *>(si);
+ elemList = Global::GetDicomDirElements()->GetDicomDirMetaElements();
+ MetaElems = DicomDirMeta::New(true);
+ si = MetaElems;
break;
default:
return;
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
{
}
else
{
- val = &(header->GetFileName().c_str()[path.length()]);
+ val = &(header->GetFileName().c_str()[path.length()+1]);
}
}
else
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");
+ gdcmDebugMacro("GDCM_DICOMDIR_META ?!? should never print that");
}
si->AddEntry(entry);
+ entry->Delete();
}
}
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();