Program: gdcm
Module: $RCSfile: gdcmDicomDir.cxx,v $
Language: C++
- Date: $Date: 2005/02/11 16:55:39 $
- Version: $Revision: 1.132 $
+ Date: $Date: 2005/06/03 16:08:16 $
+ Version: $Revision: 1.140 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// ----------------------------------------------------------------------------
//
// Dicom PS 3.3 describes the relationship between Directory Records, as follow
+// (see also PS 4.3, 2004, page 50 for Entity-Relationship model)
//
// Directory Record Type Directory Record Types which may be included
// in the next lower-level directory Entity
//
-// (Root directory Entity) PATIENT
+// (Root directory Entity) PATIENT, TOPIC, PRIVATE
//
-// PATIENT STUDY
+// PATIENT STUDY, PRIVATE
//
-// STUDY SERIES, VISIT, RESULTS, STUDY COMPONENT
+// STUDY SERIES, VISIT, RESULTS, STUDY COMPONENT, PRIVATE
//
// SERIES IMAGE, OVERLAYS, 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, REGISTRATION, FIDUCIAL
+// RAW DATA, REGISTRATION, FIDUCIAL, PRIVATE,
+// ENCAP DOC
// IMAGE
// OVERLAY
// MODALITY LUT
// RAW DATA
// REGISTRATION
// FIDUCIAL
+// PRIVATE
+// ENCAP DOC
//
// ----------------------
// The current gdcm version only deals with :
* and wants to use it
*/
DicomDir::DicomDir(std::string const &fileName, bool parseDir ):
- Document( fileName )
+ Document( )
{
// At this step, Document constructor is already executed,
- // whatever user passed (a root directory or a DICOMDIR)
+ // 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)
- Initialize(); // sets all private fields to NULL
+ ParseDir = parseDir;
+ SetLoadMode (0x00000000); // concerns only dicom files
+ Load( fileName );
+}
- // if user passed a root directory, sure we didn't get anything
+/**
+ * \brief Canonical destructor
+ */
+DicomDir::~DicomDir()
+{
+ SetStartMethod(NULL);
+ SetProgressMethod(NULL);
+ SetEndMethod(NULL);
- if ( GetFirstEntry() == 0 ) // when user passed a Directory to parse
+ ClearPatient();
+ if ( MetaElems )
{
- if (!parseDir)
- gdcmWarningMacro( "Entry HT empty for file: "<<fileName);
+ delete MetaElems;
+ }
+}
- // Only if user passed a root directory
- // ------------------------------------
- if ( fileName == "." )
- {
- // user passed '.' as Name
- // we get current directory name
- char dummy[1000];
- getcwd(dummy, (size_t)1000);
- SetFileName( dummy ); // will be converted into a string
- }
+//-----------------------------------------------------------------------------
+// Public
- if ( parseDir ) // user asked for a recursive parsing of a root directory
- {
- NewMeta();
+bool DicomDir::Load(std::string const &fileName )
+{
+ Filename = fileName;
+ // We should clean out anything that already exists.
+
+ Initialize(); // sets all private fields to NULL
- gdcmWarningMacro( "Parse directory and create the DicomDir");
- ParseDirectory();
+ if (!ParseDir)
+ {
+ // Only if user passed a DICOMDIR
+ // ------------------------------
+ Fp = 0;
+ if ( !OpenFile() )
+ {
+ return false;
}
- else
+ Document::Load(fileName);
+ if ( GetFirstEntry() == 0 ) // when user passed a Directory to parse
{
- // user may just call ParseDirectory() *after* constructor
+ gdcmWarningMacro( "Entry HT empty for file: "<< fileName);
+ return false;
}
- }
- // Only if user passed a DICOMDIR
- // ------------------------------
- else
- {
// Directory record sequence
DocEntry *e = GetDocEntry(0x0004, 0x1220);
if ( !e )
{
gdcmWarningMacro( "NO 'Directory record sequence' (0x0004,0x1220)"
<< " in file " << fileName);
+ return false;
}
else
CreateDicomDir();
}
-}
-
-/**
- * \brief Canonical destructor
- */
-DicomDir::~DicomDir()
-{
- SetStartMethod(NULL);
- SetProgressMethod(NULL);
- SetEndMethod(NULL);
-
- ClearPatient();
- if ( MetaElems )
+ else
{
- delete MetaElems;
+ // Only if user passed a root directory
+ // ------------------------------------
+ if ( fileName == "." )
+ {
+ // user passed '.' as Name
+ // we get current directory name
+ char dummy[1000];
+ getcwd(dummy, (size_t)1000);
+ SetFileName( dummy ); // will be converted into a string
+ }
+ NewMeta();
+ gdcmWarningMacro( "Parse directory and create the DicomDir : " << Filename );
+
+ ParseDirectory();
}
+ return true;
}
-//-----------------------------------------------------------------------------
-// Public
/**
* \brief This predicate, based on hopefully reasonable heuristics,
* decides whether or not the current document was properly parsed
StartMethodArgDelete = argDelete;
}
+
/**
* \brief Set the progress method to call when the parsing of the
* directory progress
return true;
}
+/**
+ * \brief Anonymize a DICOMDIR
+ * @return true
+ */
+
+bool DicomDir::AnonymizeDicomDir()
+{
+ ValEntry *v;
+ // Something clever to be found to forge the Patient names
+ std::ostringstream s;
+ int i = 1;
+ for(ListDicomDirPatient::iterator cc = Patients.begin();
+ cc!= Patients.end();
+ ++cc)
+ {
+ s << i;
+ v = (*cc)->GetValEntry(0x0010, 0x0010) ; // Patient's Name
+ if (v)
+ {
+ v->SetValue(s.str());
+ }
+
+ v = (*cc)->GetValEntry(0x0010, 0x0020) ; // Patient ID
+ if (v)
+ {
+ v->SetValue(" ");
+ }
+
+ v = (*cc)->GetValEntry(0x0010, 0x0030) ; // Patient's BirthDate
+ if (v)
+ {
+ v->SetValue(" ");
+ }
+ s << "";
+ i++;
+ }
+ return true;
+}
+
//-----------------------------------------------------------------------------
// Protected
/**
DirList dirList(path,1); // gets recursively the file list
unsigned int count = 0;
VectDocument list;
- File *header;
+ File *f;
DirListType fileList = dirList.GetFilenames();
break;
}
- header = new File( it->c_str() );
- if( !header )
- {
- gdcmWarningMacro( "Failure in new gdcm::File " << it->c_str() );
- continue;
- }
+ f = new File( );
+ f->SetLoadMode(LoadMode); // we allow user not to load Sequences...
+ f->Load( it->c_str() );
+
+// if( !f )
+// {
+// gdcmWarningMacro( "Failure in new gdcm::File " << it->c_str() );
+// continue;
+// }
- if( header->IsReadable() )
+ if( f->IsReadable() )
{
// Add the file to the chained list:
- list.push_back(header);
+ list.push_back(f);
gdcmWarningMacro( "Readable " << it->c_str() );
}
else
{
- delete header;
+ delete f;
}
count++;
}
}
/**
- * \brief create a 'DicomDir' from a DICOMDIR Header
+ * \brief create a 'gdcm::DicomDir' from a DICOMDIR Header
*/
void DicomDir::CreateDicomDir()
{
}
else
{
- gdcmWarningMacro( "Not a ValEntry.");
+ gdcmWarningMacro( "(0004,1430) not a ValEntry ?!?");
continue;
}
|| first )
{
SetElement(path, GDCM_DICOMDIR_SERIE, *it);
- first = true;
}
// Always Deal with 'IMAGE' Elements
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff