* Testing/TestAllReadCompareDicom.cxx : now use test files (invented file

[gdcm.git] / src / gdcmDicomDir.cxx

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index f25fefd786f195de9111b89d1e89b500ff3f659b..9145817176fed5f65f028c9f21af06b5c0dd2ffc 100644 (file)
--- a/src/gdcmDicomDir.cxx
+++ b/src/gdcmDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/06 14:31:09 $
-  Version:   $Revision: 1.129 $
+  Date:      $Date: 2005/03/09 19:29:38 $
+  Version:   $Revision: 1.136 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -55,9 +55,10 @@
 // ----------------------------------------------------------------------------
 //
 //  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
+//                                in the next lower-level directory Entity
 //
 // (Root directory Entity)     PATIENT
 //
@@ -96,7 +97,7 @@
 // PATIENT                     STUDY
 // STUDY                       SERIES 
 // SERIES                      IMAGE
-// IMAGE
+// IMAGE                       /
 //
 // DicomDir::CreateDicomDir will have to be completed
 // Treelike structure management will have to be upgraded
@@ -163,11 +164,12 @@ DicomDir::DicomDir(std::string const &fileName, bool parseDir ):
          gdcmWarningMacro( "Parse directory and create the DicomDir");
          ParseDirectory();
       }
+      /*
       else
       {
-         /// \todo if parseDir == false, it should be tagged as an error
-         // NO ! user may just call ParseDirectory() *after* constructor
+         //  user may just call ParseDirectory() *after* constructor
       }
+      */
    }
    // Only if user passed a DICOMDIR
    // ------------------------------
@@ -179,8 +181,6 @@ DicomDir::DicomDir(std::string const &fileName, bool parseDir ):
       {
          gdcmWarningMacro( "NO 'Directory record sequence' (0x0004,0x1220)"
                           << " in file " << fileName);
-         /// \todo FIXME : what do we do when the parsed file IS NOT a
-         ///       DICOMDIR file ?         
       }
       else
          CreateDicomDir();
@@ -427,9 +427,6 @@ void DicomDir::SetEndMethodArgDelete( DicomDir::Method *method )
  * \brief    writes on disc a DICOMDIR
  * \ warning does NOT add the missing elements in the header :
  *           it's up to the user doing it !
- * \todo : to be re-written using the DICOMDIR tree-like structure
- *         *not* the chained list
- *         (does NOT exist if the DICOMDIR is user-forged !)
  * @param  fileName file to be written to 
  * @return false only when fail to open
  */
@@ -450,7 +447,7 @@ bool DicomDir::WriteDicomDir(std::string const &fileName)
 
    char filePreamble[128];
    memset(filePreamble, 0, 128);
-   fp->write(filePreamble, 128); //FIXME
+   fp->write(filePreamble, 128);
    binary_write( *fp, "DICM");
  
    DicomDirMeta *ptrMeta = GetMeta();
@@ -481,6 +478,44 @@ bool DicomDir::WriteDicomDir(std::string const &fileName)
    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
 /**
@@ -620,7 +655,6 @@ void DicomDir::CreateDicomDir()
    if ( !e )
    {
       gdcmWarningMacro( "No Directory Record Sequence (0004,1220) found");
-      /// \todo FIXME: what to do when the parsed file IS NOT a DICOMDIR file ? 
       return;         
    }
    
@@ -647,7 +681,7 @@ void DicomDir::CreateDicomDir()
       }
       else
       {
-         gdcmWarningMacro( "Not a ValEntry.");
+         gdcmWarningMacro( "(0004,1430) not a ValEntry ?!?");
          continue;
       }
 
@@ -828,7 +862,6 @@ void DicomDir::SetElements(std::string const &path, VectDocument const &list)
          || first )
       {
          SetElement(path, GDCM_DICOMDIR_SERIE, *it);
-         first = true;
       }
       
       // Always Deal with 'IMAGE' Elements  
@@ -855,7 +888,7 @@ void DicomDir::SetElements(std::string const &path, VectDocument const &list)
 void DicomDir::SetElement(std::string const &path, DicomDirType type,
                           Document *header)
 {
-   ListDicomDirElem elemList; //FIXME this is going to be a by copy operation
+   ListDicomDirElem elemList;
    ListDicomDirElem::const_iterator it;
    uint16_t tmpGr, tmpEl;
    DictEntry *dictEntry;