New features for DicomDir

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index 1226e49598d9b3ca02ef9a6a7d47d7f3d0d8f9ff..60d533666df3716d0c55b59c9040a40afeed9da1 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/07/07 16:37:40 $
-  Version:   $Revision: 1.144 $
+  Date:      $Date: 2005/07/08 10:13:38 $
+  Version:   $Revision: 1.145 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -117,6 +117,7 @@ DicomDir::DicomDir()
          :Document( )
 {
    Initialize();  // sets all private fields to NULL
+   ParseDir = false;
    NewMeta();
 }
 

diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h
index ea066735f51864325dba574ad93adae238cc1355..64b61a3a51eb3098d6f6f8ee4174f162f1307d99 100644 (file)
--- a/src/gdcmDicomDir.h
+++ b/src/gdcmDicomDir.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.h,v $
   Language:  C++
-  Date:      $Date: 2005/07/07 16:37:41 $
-  Version:   $Revision: 1.61 $
+  Date:      $Date: 2005/07/08 10:13:38 $
+  Version:   $Revision: 1.62 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -59,8 +59,19 @@ public:
    bool Load( std::string const &filename );
    bool Load( );
    void Print(std::ostream &os = std::cout, std::string const &indent = "" );
-
+   
+   /// Sets the root Directory name to parse, recursively
+   void SetDirectoryName(std::string const &dirName) 
+        { ParseDir = true; if (Filename != dirName)
+                               Filename = dirName, IsDocumentModified = true; };
+   /// Accessor to \ref Filename
+   virtual void SetFileName(std::string const &fileName) 
+                   { ParseDir = false; if (Filename != fileName)
+                               Filename = fileName, IsDocumentModified = true; }
+
+   /// DEPRECATED : use SetDirectoryName
    void SetParseDir(bool parseDir)  { ParseDir = parseDir; };
+   
    // Informations contained in the parser
    virtual bool IsReadable();
 

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index 852bdcb5eefad77a1146dcf3807131eb3365054b..1562eb4de0500ae779de5882f9840b614cf0be94 100644 (file)
--- a/src/gdcmDocument.h
+++ b/src/gdcmDocument.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.h,v $
   Language:  C++
-  Date:      $Date: 2005/07/07 16:37:41 $
-  Version:   $Revision: 1.114 $
+  Date:      $Date: 2005/07/08 10:13:38 $
+  Version:   $Revision: 1.115 $
  
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -85,8 +85,9 @@ typedef std::list<Element> ListElements;
    /// Accessor to \ref Filename
    const std::string &GetFileName() const { return Filename; }
    /// Accessor to \ref Filename
-   void SetFileName(std::string const &fileName) { if (Filename != fileName)
-                                 Filename = fileName, IsDocumentModified = true; }
+   virtual void SetFileName(std::string const &fileName) 
+                   { if (Filename != fileName)
+                        Filename = fileName, IsDocumentModified = true; }
 
    std::ifstream *OpenFile();
    bool CloseFile();
@@ -111,7 +112,7 @@ typedef std::list<Element> ListElements;
  * @param   mode Load mode to be used    
  */
    void SetLoadMode (int mode) { if (LoadMode != mode) 
-                                   LoadMode = mode, IsDocumentModified = true; }
+                                     LoadMode = mode, IsDocumentModified = true; }
 
 protected:
 // Methods