X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.h;h=a402e279b3fd028ef932564b30927185ce4215a9;hb=eb61ee414dacfa47afb6d1b64bbfb6bac6f86c2f;hp=11f379f9359f89652004cc44ba7632e914f622ca;hpb=33b1eec26f02131242fbfdef52184b24763cf4e6;p=gdcm.git diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h index 11f379f9..a402e279 100644 --- a/src/gdcmDicomDir.h +++ b/src/gdcmDicomDir.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDir.h,v $ Language: C++ - Date: $Date: 2005/11/29 17:21:34 $ - Version: $Revision: 1.73 $ + Date: $Date: 2006/05/30 08:10:19 $ + Version: $Revision: 1.77 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -56,18 +56,19 @@ public: /// \brief Constructs a DicomDir with a RefCounter static DicomDir *New() {return new DicomDir();} +// GDCM_LEGACY( 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) + void SetDirectoryName(std::string const &dirName) { ParseDir = true; if (Filename != dirName) - Filename = dirName, IsDocumentModified = true; } + Filename = dirName, IsDocumentModified = true;} /// Accessor to \ref Filename - virtual void SetFileName(std::string const &fileName) + virtual void SetFileName(std::string const &fileName) { ParseDir = false; if (Filename != fileName) Filename = fileName, IsDocumentModified = true;} - + // Informations contained in the parser virtual bool IsReadable(); @@ -111,10 +112,11 @@ public: GDCM_DICOMDIR_VISIT, GDCM_DICOMDIR_IMAGE } DicomDirType; - + protected: - DicomDir(); + DicomDir(); ~DicomDir(); +// GDCM_LEGACY( DicomDir(std::string const &filename, bool parseDir = false) ) void CreateDicomDirChainedList(std::string const &path); @@ -134,7 +136,7 @@ private: void MoveSQItem(DocEntrySet *dst, DocEntrySet *src); static bool HeaderLessThan(Document *header1, Document *header2); - + // Variables /// Pointer on *the* DicomDirObject 'DicomDirMeta Elements'