X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=2af9aaf2b5825d8b469ea27fb8c5420f4dbef67d;hb=dc9e22215d010c85822ee4cf6c89af586e1e5134;hp=9145817176fed5f65f028c9f21af06b5c0dd2ffc;hpb=9eb68526a6b9dbcb217a679cd4764b1e4fa63c01;p=gdcm.git

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index 91458171..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/03/09 19:29:38 $
-  Version:   $Revision: 1.136 $
+  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 :
@@ -130,81 +133,90 @@ DicomDir::DicomDir()
  *                        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.
 
-         gdcmWarningMacro( "Parse directory and create the DicomDir");
-         ParseDirectory();
+   Initialize();  // sets all private fields to NULL
+
+   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
@@ -349,6 +361,7 @@ void DicomDir::SetStartMethod( DicomDir::Method *method, void *arg,
    StartMethodArgDelete = argDelete;
 }
 
+
 /**
  * \brief   Set the progress method to call when the parsing of the
  *          directory progress
@@ -516,6 +529,7 @@ bool DicomDir::AnonymizeDicomDir()
    }
    return true;
 }
+
 //-----------------------------------------------------------------------------
 // Protected
 /**
@@ -528,7 +542,7 @@ void DicomDir::CreateDicomDirChainedList(std::string const &path)
    DirList dirList(path,1); // gets recursively the file list
    unsigned int count = 0;
    VectDocument list;
-   File *header;
+   File *f;
 
    DirListType fileList = dirList.GetFilenames();
 
@@ -543,22 +557,25 @@ void DicomDir::CreateDicomDirChainedList(std::string const &path)
          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++;
    }
@@ -638,7 +655,7 @@ void DicomDir::Initialize()
 }
 
 /**
- * \brief create a 'DicomDir' from a DICOMDIR Header 
+ * \brief create a 'gdcm::DicomDir' from a DICOMDIR Header 
  */
 void DicomDir::CreateDicomDir()
 {