Program: gdcm
Module: $RCSfile: gdcmDicomDir.cxx,v $
Language: C++
- Date: $Date: 2007/03/23 15:30:15 $
- Version: $Revision: 1.190 $
+ Date: $Date: 2010/04/09 15:23:40 $
+ Version: $Revision: 1.198 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// PRIVATE
// ENCAP DOC
//
+
+/*
+
+// see also : ftp://medical.nema.org/medical/dicom/final/cp343_ft.doc
+
+RELATIONSHIP BETWEEN DIRECTORY RECORDS
+
+Directory Record Type Directory Record Types which may be included
+ in the next lower-level directory Entity
+
+(Root Directory Entity) PATIENT, TOPIC, PRIVATE
+
+PATIENT STUDY, PRIVATE
+
+STUDY SERIES, VISIT, RESULTS, STUDY COMPONENT, PRIVATE
+
+SERIES IMAGE, OVERLAY, MODALITY LUT, VOI LUT, CURVE,
+ STORED PRINT, RT DOSE, RT STRUCTURE SET, RT PLAN,
+ RT TREAT RECORD, PRESENTATION, WAVEFORM, SR DOCUMENT,
+ KEY OBJECT DOC, SPECTROSCOPY, RAW DATA, PRIVATE
+
+IMAGE PRIVATE
+OVERLAY PRIVATE
+MODALITY LUT PRIVATE
+VOI LUT PRIVATE
+CURVE PRIVATE
+STORED PRINT PRIVATE
+RT DOSE PRIVATE
+RT STRUCTURE SET PRIVATE
+RT PLAN PRIVATE
+RT TREAT RECORD PRIVATE
+PRESENTATION PRIVATE
+WAVEFORM PRIVATE
+SR DOCUMENT PRIVATE
+KEY OBJECT DOC PRIVATE
+SPECTROSCOPY PRIVATE
+RAW DATA PRIVATE
+
+TOPIC STUDY, SERIES, IMAGE, OVERLAY, MODALITY LUT, VOI LUT,
+ CURVE, STORED PRINT, RT DOSE, RT STRUCTURE SET,
+ RT PLAN, RT TREAT RECORD, PRESENTATION, WAVEFORM,
+ SR DOCUMENT, KEY OBJECT DOC, SPECTROSCOPY, RAW DATA,
+ PRIVATE
+
+VISIT PRIVATE
+
+RESULTS INTERPRETATION, PRIVATE
+
+INTERPRETATION PRIVATE
+STUDY COMPONENT PRIVATE
+PRIVATE PRIVATE, (any of the above as privately defined)
+MRDR (Not applicable)
+
+Note : Directory Record Types PRINT QUEUE, FILM SESSION, FILM BOX, and
+ IMAGE BOX were previously defined in DICOM. They have been retired.
+ See PS 3.3-1998.
+*/
+
// ----------------------
// The current gdcm version only deals with :
//
// Treelike structure management will have to be upgraded
// ----------------------------------------------------------------------------
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
// 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)
+ // (nothing is checked in Document constructor, to avoid overhead)
ParseDir = parseDir;
SetLoadMode (LD_ALL); // concerns only dicom files
return false;
}
else
+ {
CreateDicomDir();
+ }
}
else
{
DicomDirMeta *DicomDir::NewMeta()
{
if ( MetaElems )
+ {
MetaElems->Delete();
-
+ }
DocEntry *entry = GetFirstEntry();
if ( entry )
{
std::ofstream *fp = new std::ofstream(fileName.c_str(),
std::ios::out | std::ios::binary);
- if ( !fp )
+ if ( !fp )
{
gdcmWarningMacro("Failed to open(write) File: " << fileName.c_str());
return false;
binary_write( *fp, "DICM");
DicomDirMeta *ptrMeta = GetMeta();
- ptrMeta->WriteContent(fp, ExplicitVR);
+ ptrMeta->WriteContent(fp, ExplicitVR, true, false);
// force writing 0004|1220 [SQ ], that CANNOT exist within DicomDirMeta
for(i=0;i<6;++i)
cc != Patients.end();
++cc )
{
- (*cc)->WriteContent( fp, ExplicitVR );
+ (*cc)->WriteContent( fp, ExplicitVR, false, true );
}
// force writing Sequence Delimitation Item
{
// The SeqEntries of "Directory Record Sequence" are parsed.
// When a DicomDir tag ("PATIENT", "STUDY", "SERIE", "IMAGE") is found :
+ // N.B. : VISIT, PRIVATE not fully dealt with
// 1 - we save the beginning iterator
// 2 - we continue to parse
// 3 - we find an other tag
if ( v == "IMAGE " )
{
- si = DicomDirImage::New(true);
+ si = DicomDirImage::New(true); // true = empty
if ( !AddImageToEnd( static_cast<DicomDirImage *>(si)) )
{
si->Delete();
}
else if ( v == "SERIES" )
{
- si = DicomDirSerie::New(true);
+ si = DicomDirSerie::New(true); // true = empty
if ( !AddSerieToEnd( static_cast<DicomDirSerie *>(si)) )
{
si->Delete();
}
else if ( v == "VISIT " )
{
- si = DicomDirVisit::New(true);
+ si = DicomDirVisit::New(true); // true = empty
if ( !AddVisitToEnd( static_cast<DicomDirVisit *>(si)) )
{
si->Delete();
}
else if ( v == "STUDY " )
{
- si = DicomDirStudy::New(true);
+ si = DicomDirStudy::New(true); // true = empty
if ( !AddStudyToEnd( static_cast<DicomDirStudy *>(si)) )
{
si->Delete();
}
else if ( v == "PATIENT " )
{
- si = DicomDirPatient::New(true);
+ si = DicomDirPatient::New(true); // true = empty
if ( !AddPatientToEnd( static_cast<DicomDirPatient *>(si)) )
{
si->Delete();
gdcmErrorMacro( "Add PatientToEnd failed");
}
}
- /// \to do : deal with PRIVATE (not so easy, since PRIVATE appears
- /// at defferent levels ?!? )
+ /// \todo : deal with PRIVATE (not so easy, since PRIVATE appears
+ /// at different levels ?!? )
else if ( v == "PRIVATE " ) // for SIEMENS 'CSA Non Image'
{
gdcmWarningMacro( " -------------------------------------------"
<< "a PRIVATE SQItem was found : " << v);
- si = DicomDirPrivate::New(true);
+ si = DicomDirPrivate::New(true); // true = empty
if ( !AddPrivateToEnd( static_cast<DicomDirPrivate *>(si)) )
{
si->Delete();
// It was neither a 'PATIENT', nor a 'STUDY', nor a 'SERIE',
// nor an 'IMAGE' SQItem. Skip to next item.
gdcmWarningMacro( " -------------------------------------------"
- << "a non PATIENT/STUDY/SERIE/IMAGE SQItem was found : "
+ << "a non PATIENT/STUDY/SERIE/IMAGE /VISIT/PRIVATE SQItem was found : "
<< v);
// FIXME : deal with other item types !
{
// get the current file characteristics
patCurName = (*it)->GetEntryString(0x0010,0x0010);
+ if (patCurName == "") // to prevent further troubles when wild anonymization was performed
+ patCurName = "gdcm^Patient";
patCurID = (*it)->GetEntryString(0x0010,0x0011);
studCurInstanceUID = (*it)->GetEntryString(0x0020,0x000d);
studCurID = (*it)->GetEntryString(0x0020,0x0010);
DataEntry *entry;
std::string val;
SQItem *si;
-
switch( type )
{
case GDCM_DICOMDIR_IMAGE:
gdcmErrorMacro( "Add PatientToEnd failed");
}
break;
- case GDCM_DICOMDIR_META:
+ case GDCM_DICOMDIR_META: // never used ?!? --> Done within DoTheLoadingJob
if ( MetaElems )
{
MetaElems->Delete();
{
tmpGr = it->Group;
tmpEl = it->Elem;
- //dictEntry = GetPubDict()->GetEntry(tmpGr, tmpEl);
- //entry = DataEntry::New( dictEntry );
- entry = DataEntry::New(tmpGr, tmpEl, GDCM_VRUNKNOWN); /// \todo : modify dicomelements file, to store VR
+ entry = DataEntry::New(tmpGr, tmpEl, it->VR); // dicomelements file was modified, to store VR
entry->SetOffset(0); // just to avoid further missprinting
if ( header )
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff