X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=2af9aaf2b5825d8b469ea27fb8c5420f4dbef67d;hb=50f4e4eb84995ab5900b33397a2004a0eb86c6e9;hp=d8e60efe966f7bc517b955ae8f8da74b01ab6d17;hpb=b746b4a0b5182b37104616c263f381d78e1af10f;p=gdcm.git

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index d8e60efe..2af9aaf2 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/05/03 09:43:04 $
-  Version:   $Revision: 1.138 $
+  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
@@ -60,17 +60,18 @@
 //  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
@@ -89,6 +90,8 @@
 // RAW DATA
 // REGISTRATION
 // FIDUCIAL
+// PRIVATE
+// ENCAP DOC
 // 
 // ----------------------
 // The current gdcm version only deals with :
@@ -133,7 +136,7 @@ DicomDir::DicomDir(std::string const &fileName, bool parseDir ):
    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)
 
@@ -208,6 +211,7 @@ bool DicomDir::Load(std::string const &fileName )
       }
       NewMeta();
       gdcmWarningMacro( "Parse directory and create the DicomDir : " << Filename );
+
       ParseDirectory();
    }
    return true;
@@ -526,14 +530,6 @@ bool DicomDir::AnonymizeDicomDir()
    return true;
 }
 
-
-
-
-
-
-
-
-
 //-----------------------------------------------------------------------------
 // Protected
 /**