* Change the DocEntry inheritance to RefCounter

[gdcm.git] / src / gdcmDicomDir.cxx

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index 67195605e1710b55bd2605fbe2c6191e3fe8568b..f002e6f7ca0f174888cb41ba9c165f2ec073916d 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/10/18 08:35:49 $
-  Version:   $Revision: 1.160 $
+  Date:      $Date: 2005/10/24 16:00:47 $
+  Version:   $Revision: 1.165 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -125,18 +125,18 @@ DicomDir::DicomDir()
 }
 
 #ifndef GDCM_LEGACY_REMOVE
-/**
- * \brief Constructor Parses recursively the directory and creates the DicomDir
+/* *
+ * \ brief Constructor Parses recursively the directory and creates the DicomDir
  *        or uses an already built DICOMDIR, depending on 'parseDir' value.
- * @param fileName  name 
+ * @ param fileName  name 
  *                      - of the root directory (parseDir = true)
  *                      - of the DICOMDIR       (parseDir = false)
- * @param parseDir boolean
+ * @ param parseDir boolean
  *                      - true if user passed an entry point 
  *                        and wants to explore recursively the directories
  *                      - false if user passed an already built DICOMDIR file
  *                        and wants to use it 
- * @deprecated use : new DicomDir() + [ SetLoadMode(lm) + ] SetDirectoryName(name)
+ * @ deprecated use : new DicomDir() + [ SetLoadMode(lm) + ] SetDirectoryName(name)
  *              or : new DicomDir() + SetFileName(name)
  */
 DicomDir::DicomDir(std::string const &fileName, bool parseDir ):
@@ -181,9 +181,6 @@ DicomDir::~DicomDir()
  */
 bool DicomDir::Load( ) 
 {
-   // We should clean out anything that already exists.
-   Initialize();  // sets all private fields to NULL
-
    if (!ParseDir)
    {
       if ( ! this->Document::Load( ) )
@@ -193,29 +190,21 @@ bool DicomDir::Load( )
 }
 
 #ifndef GDCM_LEGACY_REMOVE
-/**
- * \brief   Loader. (DEPRECATED : kept not to break the API)
- * @param   fileName file to be open for parsing
- * @return false if file cannot be open or no swap info was found,
+/* *
+ * \ brief   Loader. (DEPRECATED : kept not to break the API)
+ * @ param   fileName file to be open for parsing
+ * @ return false if file cannot be open or no swap info was found,
  *         or no tag was found.
- * @deprecated use SetFileName(n) + Load() instead
+ * @ deprecated use SetFileName(n) + Load() instead
  */
 bool DicomDir::Load(std::string const &fileName ) 
 {
-   // We should clean out anything that already exists.
-   Initialize();  // sets all private fields to NULL
-
-   SetFileName( fileName );
-   if (!ParseDir)
-   {
-      if ( ! this->Document::Load( ) )
-         return false;
-   }
-   return DoTheLoadingJob( );
+   SetFileName(fileName);
+   return Load();
 }
 
 /// DEPRECATED : use SetDirectoryName(dname) instead
-/**
+/* *
  * \brief   Loader. (DEPRECATED : kept not to break the API)
  * @param   paseDir Parse Dir
  * @deprecated use SetDirectoryName(dname) instead
@@ -233,18 +222,14 @@ void DicomDir::SetParseDir(bool parseDir)
  */
 bool DicomDir::DoTheLoadingJob( ) 
 {
-   // We should clean out anything that already exists.
-   Initialize();  // sets all private fields to NULL
+   Progress = 0.0f;
+   Abort = false;
 
    if (!ParseDir)
    {
    // Only if user passed a DICOMDIR
    // ------------------------------
       Fp = 0;
-      if ( !OpenFile() )
-      {
-         return false;
-      }
       if (!Document::Load() )
       {
          return false;
@@ -334,7 +319,7 @@ DicomDirMeta *DicomDir::NewMeta()
          if ( dynamic_cast<SeqEntry *>(entry) )
             break;
 
-         RemoveEntryNoDestroy(entry);
+         RemoveEntry(entry);
          MetaElems->AddEntry(entry);
 
          entry = GetFirstEntry();
@@ -752,6 +737,7 @@ void DicomDir::CreateDicomDir()
    //  3 - we find an other tag
    //       + we create the object for the precedent tag
    //       + loop to 1 -
+   gdcmDebugMacro("Create DicomDir");
 
    // Directory record sequence
    DocEntry *e = GetDocEntry(0x0004, 0x1220);
@@ -855,8 +841,6 @@ void DicomDir::CreateDicomDir()
         continue;
       }
       if ( si )
-         //MoveSQItem(si,tmpSI); // Old code : Copies each Entry
-                                 //  -and then removes the source-
          si->MoveObject(tmpSI);  // New code : Copies the List
 
       tmpSI=s->GetNextSQItem();
@@ -1080,14 +1064,14 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type,
          }
          break;
       case GDCM_DICOMDIR_META:
-         elemList = Global::GetDicomDirElements()->GetDicomDirMetaElements();
-         si = new DicomDirMeta(true);
          if ( MetaElems )
          {
             delete MetaElems;
             gdcmErrorMacro( "MetaElements already exist, they will be destroyed");
          }
-         MetaElems = static_cast<DicomDirMeta *>(si);
+         elemList = Global::GetDicomDirElements()->GetDicomDirMetaElements();
+         MetaElems = new DicomDirMeta(true);
+         si = MetaElems;
          break;
       default:
          return;
@@ -1109,7 +1093,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type,
       tmpEl     = it->Elem;
       dictEntry = GetPubDict()->GetEntry(tmpGr, tmpEl);
 
-      entry     = new DataEntry( dictEntry ); // Be sure it's never a DataEntry !
+      entry     = DataEntry::New( dictEntry ); // Be sure it's never a DataEntry !
 
       entry->SetOffset(0); // just to avoid further missprinting
 
@@ -1161,6 +1145,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type,
          gdcmWarningMacro("GDCM_DICOMDIR_META ?!? should never print that");
       }
       si->AddEntry(entry);
+      entry->Delete();
    }
 }
 
@@ -1177,7 +1162,7 @@ void DicomDir::MoveSQItem(DocEntrySet *dst,DocEntrySet *src)
    entry = src->GetFirstEntry();
    while(entry)
    {
-      src->RemoveEntryNoDestroy(entry);
+      src->RemoveEntry(entry);
       dst->AddEntry(entry);
       // we destroyed -> the current iterator is not longer valid
       entry = src->GetFirstEntry();