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

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index 91458171..05981583 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/07/03 12:45:53 $
+  Version:   $Revision: 1.143 $
   
   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.
+
+   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
@@ -215,17 +227,17 @@ DicomDir::~DicomDir()
  */
 bool DicomDir::IsReadable()
 {
-   if( Filetype == Unknown)
+   if ( Filetype == Unknown )
    {
       gdcmWarningMacro( "Wrong filetype");
       return false;
    }
-   if( !MetaElems )
+   if ( !MetaElems )
    {
       gdcmWarningMacro( "Meta Elements missing in DicomDir");
       return false;
    }
-   if( Patients.size() <= 0 )
+   if ( Patients.size() <= 0 )
    {
       gdcmWarningMacro( "NO Patient in DicomDir");
       return false;
@@ -239,18 +251,18 @@ bool DicomDir::IsReadable()
  */  
 DicomDirMeta *DicomDir::NewMeta()
 {
-   if( MetaElems )
+   if ( MetaElems )
       delete MetaElems;
 
    DocEntry *entry = GetFirstEntry();
-   if( entry )
+   if ( entry )
    { 
-      MetaElems = new DicomDirMeta(true);
+      MetaElems = new DicomDirMeta(true); // true = empty
 
       entry = GetFirstEntry();
       while( entry )
       {
-         if( dynamic_cast<SeqEntry *>(entry) )
+         if ( dynamic_cast<SeqEntry *>(entry) )
             break;
 
          RemoveEntryNoDestroy(entry);
@@ -261,7 +273,7 @@ DicomDirMeta *DicomDir::NewMeta()
    }
    else  // after root directory parsing
    {
-      MetaElems = new DicomDirMeta(false);
+      MetaElems = new DicomDirMeta(false); // false = not empty
    }
    MetaElems->SetSQItemNumber(0); // To avoid further missprinting
    return MetaElems;  
@@ -339,7 +351,7 @@ void DicomDir::ParseDirectory()
 void DicomDir::SetStartMethod( DicomDir::Method *method, void *arg, 
                                DicomDir::Method *argDelete )
 {
-   if( StartArg && StartMethodArgDelete )
+   if ( StartArg && StartMethodArgDelete )
    {
       StartMethodArgDelete( StartArg );
    }
@@ -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
@@ -360,7 +373,7 @@ void DicomDir::SetStartMethod( DicomDir::Method *method, void *arg,
 void DicomDir::SetProgressMethod( DicomDir::Method *method, void *arg, 
                                   DicomDir::Method *argDelete )
 {
-   if( ProgressArg && ProgressMethodArgDelete )
+   if ( ProgressArg && ProgressMethodArgDelete )
    {
       ProgressMethodArgDelete( ProgressArg );
    }
@@ -380,7 +393,7 @@ void DicomDir::SetProgressMethod( DicomDir::Method *method, void *arg,
 void DicomDir::SetEndMethod( DicomDir::Method *method, void *arg, 
                              DicomDir::Method *argDelete )
 {
-   if( EndArg && EndMethodArgDelete )
+   if ( EndArg && EndMethodArgDelete )
    {
       EndMethodArgDelete( EndArg );
    }
@@ -439,7 +452,7 @@ bool DicomDir::WriteDicomDir(std::string const &fileName)
 
    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;
@@ -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();
 
@@ -538,27 +552,30 @@ void DicomDir::CreateDicomDirChainedList(std::string const &path)
    {
       Progress = (float)(count+1)/(float)fileList.size();
       CallProgressMethod();
-      if( Abort )
+      if ( Abort )
       {
          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++;
    }
@@ -585,7 +602,7 @@ void DicomDir::CallStartMethod()
 {
    Progress = 0.0f;
    Abort    = false;
-   if( StartMethod )
+   if ( StartMethod )
    {
       StartMethod( StartArg );
    }
@@ -596,7 +613,7 @@ void DicomDir::CallStartMethod()
  */
 void DicomDir::CallProgressMethod()
 {
-   if( ProgressMethod )
+   if ( ProgressMethod )
    {
       ProgressMethod( ProgressArg );
    }
@@ -608,7 +625,7 @@ void DicomDir::CallProgressMethod()
 void DicomDir::CallEndMethod()
 {
    Progress = 1.0f;
-   if( EndMethod )
+   if ( EndMethod )
    {
       EndMethod( EndArg );
    }
@@ -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()
 {
@@ -685,53 +702,63 @@ void DicomDir::CreateDicomDir()
          continue;
       }
 
-      if( v == "PATIENT " )
+      // A decent DICOMDIR has much more images than series,
+      // more series than studies, and so on.
+      // This is the right order to preform the tests
+
+      if ( v == "IMAGE " ) 
       {
-         si = new DicomDirPatient(true);
-         if( !AddPatientToEnd( static_cast<DicomDirPatient *>(si)) )
+         si = new DicomDirImage(true);
+         if ( !AddImageToEnd( static_cast<DicomDirImage *>(si)) )
          {
             delete si;
             si = NULL;
-            gdcmErrorMacro( "Add PatientToEnd failed");
+            gdcmErrorMacro( "Add AddImageToEnd failed");
          }
       }
-      else if( v == "STUDY " )
+      else if ( v == "SERIES" )
       {
-         si = new DicomDirStudy(true);
-         if( !AddStudyToEnd( static_cast<DicomDirStudy *>(si)) )
+         si = new DicomDirSerie(true);
+         if ( !AddSerieToEnd( static_cast<DicomDirSerie *>(si)) )
          {
             delete si;
             si = NULL;
-            gdcmErrorMacro( "Add AddStudyToEnd failed");
+            gdcmErrorMacro( "Add AddSerieToEnd failed");
          }
       }
-      else if( v == "SERIES" )
+      else if ( v == "STUDY " )
       {
-         si = new DicomDirSerie(true);
-         if( !AddSerieToEnd( static_cast<DicomDirSerie *>(si)) )
+         si = new DicomDirStudy(true);
+         if ( !AddStudyToEnd( static_cast<DicomDirStudy *>(si)) )
          {
             delete si;
             si = NULL;
-            gdcmErrorMacro( "Add AddSerieToEnd failed");
+            gdcmErrorMacro( "Add AddStudyToEnd failed");
          }
       }
-      else if( v == "IMAGE " ) 
+      else if ( v == "PATIENT " )
       {
-         si = new DicomDirImage(true);
-         if( !AddImageToEnd( static_cast<DicomDirImage *>(si)) )
+         si = new DicomDirPatient(true);
+         if ( !AddPatientToEnd( static_cast<DicomDirPatient *>(si)) )
          {
             delete si;
             si = NULL;
-            gdcmErrorMacro( "Add AddImageToEnd failed");
+            gdcmErrorMacro( "Add PatientToEnd failed");
          }
       }
       else
       {
-         // It was not a 'PATIENT', nor a 'STUDY', nor a 'SERIE',
-         // neither an 'IMAGE' SQItem. Skip to next item.
-         continue;
+         // 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 : "
+         << v);
+
+        // FIXME : deal with other item types !
+        tmpSI=s->GetNextSQItem(); // To avoid infinite loop
+        continue;
       }
-      if( si )
+      if ( si )
          MoveSQItem(si,tmpSI);
 
       tmpSI=s->GetNextSQItem();
@@ -755,7 +782,7 @@ bool DicomDir::AddPatientToEnd(DicomDirPatient *dd)
  */
 bool DicomDir::AddStudyToEnd(DicomDirStudy *dd)
 {
-   if( Patients.size() > 0 )
+   if ( Patients.size() > 0 )
    {
       ListDicomDirPatient::iterator itp = Patients.end();
       itp--;
@@ -771,13 +798,13 @@ bool DicomDir::AddStudyToEnd(DicomDirStudy *dd)
  */
 bool DicomDir::AddSerieToEnd(DicomDirSerie *dd)
 {
-   if( Patients.size() > 0 )
+   if ( Patients.size() > 0 )
    {
       ListDicomDirPatient::iterator itp = Patients.end();
       itp--;
 
       DicomDirStudy *study = (*itp)->GetLastStudy();
-      if( study )
+      if ( study )
       {
          study->AddSerie(dd);
          return true;
@@ -792,16 +819,16 @@ bool DicomDir::AddSerieToEnd(DicomDirSerie *dd)
  */
 bool DicomDir::AddImageToEnd(DicomDirImage *dd)
 {
-   if( Patients.size() > 0 )
+   if ( Patients.size() > 0 )
    {
       ListDicomDirPatient::iterator itp = Patients.end();
       itp--;
 
       DicomDirStudy *study = (*itp)->GetLastStudy();
-      if( study )
+      if ( study )
       {
          DicomDirSerie *serie = study->GetLastSerie();
-         if( serie )
+         if ( serie )
          {
             serie->AddImage(dd);
             return true;
@@ -843,22 +870,22 @@ void DicomDir::SetElements(std::string const &path, VectDocument const &list)
       serCurInstanceUID  = (*it)->GetEntryValue(0x0020,0x000e);
       serCurID           = (*it)->GetEntryValue(0x0020,0x0011);
 
-      if( patCurName != patPrevName || patCurID != patPrevID || first )
+      if ( patCurName != patPrevName || patCurID != patPrevID || first )
       {
          SetElement(path, GDCM_DICOMDIR_PATIENT, *it);
          first = true;
       }
 
-      // if new Study Deal with 'STUDY' Elements   
-      if( studCurInstanceUID != studPrevInstanceUID || studCurID != studPrevID 
+      // if new Study, deal with 'STUDY' Elements   
+      if ( studCurInstanceUID != studPrevInstanceUID || studCurID != studPrevID 
          || first )
       {
          SetElement(path, GDCM_DICOMDIR_STUDY, *it);
          first = true;
       }
 
-      // if new Serie Deal with 'SERIE' Elements   
-      if( serCurInstanceUID != serPrevInstanceUID || serCurID != serPrevID
+      // if new Serie, deal with 'SERIE' Elements   
+      if ( serCurInstanceUID != serPrevInstanceUID || serCurID != serPrevID
          || first )
       {
          SetElement(path, GDCM_DICOMDIR_SERIE, *it);
@@ -901,7 +928,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type,
       case GDCM_DICOMDIR_IMAGE:
          elemList = Global::GetDicomDirElements()->GetDicomDirImageElements();
          si = new DicomDirImage(true);
-         if( !AddImageToEnd(static_cast<DicomDirImage *>(si)) )
+         if ( !AddImageToEnd(static_cast<DicomDirImage *>(si)) )
          {
             delete si;
             gdcmErrorMacro( "Add ImageToEnd failed");
@@ -910,7 +937,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type,
       case GDCM_DICOMDIR_SERIE:
          elemList = Global::GetDicomDirElements()->GetDicomDirSerieElements();
          si = new DicomDirSerie(true);
-         if( !AddSerieToEnd(static_cast<DicomDirSerie *>(si)) )
+         if ( !AddSerieToEnd(static_cast<DicomDirSerie *>(si)) )
          {
             delete si;
             gdcmErrorMacro( "Add SerieToEnd failed");
@@ -919,7 +946,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type,
       case GDCM_DICOMDIR_STUDY:
          elemList = Global::GetDicomDirElements()->GetDicomDirStudyElements();
          si = new DicomDirStudy(true);
-         if( !AddStudyToEnd(static_cast<DicomDirStudy *>(si)) )
+         if ( !AddStudyToEnd(static_cast<DicomDirStudy *>(si)) )
          {
             delete si;
             gdcmErrorMacro( "Add StudyToEnd failed");
@@ -928,7 +955,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type,
       case GDCM_DICOMDIR_PATIENT:
          elemList = Global::GetDicomDirElements()->GetDicomDirPatientElements();
          si = new DicomDirPatient(true);
-         if( !AddPatientToEnd(static_cast<DicomDirPatient *>(si)) )
+         if ( !AddPatientToEnd(static_cast<DicomDirPatient *>(si)) )
          {
             delete si;
             gdcmErrorMacro( "Add PatientToEnd failed");
@@ -937,7 +964,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type,
       case GDCM_DICOMDIR_META:
          elemList = Global::GetDicomDirElements()->GetDicomDirMetaElements();
          si = new DicomDirMeta(true);
-         if( MetaElems )
+         if ( MetaElems )
          {
             delete MetaElems;
             gdcmErrorMacro( "MetaElements already exist, they will be destroyed");
@@ -968,7 +995,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type,
 
       entry->SetOffset(0); // just to avoid further missprinting
 
-      if( header )
+      if ( header )
       {
          // NULL when we Build Up (ex nihilo) a DICOMDIR
          //   or when we add the META elems
@@ -979,16 +1006,16 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type,
          val = GDCM_UNFOUND;
       }
 
-      if( val == GDCM_UNFOUND) 
+      if ( val == GDCM_UNFOUND) 
       {
-         if( tmpGr == 0x0004 && tmpEl == 0x1130 ) // File-set ID
+         if ( tmpGr == 0x0004 && tmpEl == 0x1130 ) // File-set ID
          {
            // force to the *end* File Name
            val = Util::GetName( path );
          }
-         else if( tmpGr == 0x0004 && tmpEl == 0x1500 ) // Only used for image
+         else if ( tmpGr == 0x0004 && tmpEl == 0x1500 ) // Only used for image
          {
-            if( header->GetFileName().substr(0, path.length()) != path )
+            if ( header->GetFileName().substr(0, path.length()) != path )
             {
                gdcmWarningMacro( "The base path of file name is incorrect");
                val = header->GetFileName();
@@ -1056,7 +1083,7 @@ bool DicomDir::HeaderLessThan(Document *header1, Document *header2)
  */
 void DicomDir::Print(std::ostream &os, std::string const & )
 {
-   if( MetaElems )
+   if ( MetaElems )
    {
       MetaElems->SetPrintLevel(PrintLevel);
       MetaElems->Print(os);