X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.h;h=35271f9c647a313e0aa7658b2488a45a2efc690f;hb=588a2e8541f97dde1eba9fc55a43d8925a17b443;hp=9793a5118b7f2df82a0323f97b361ae45b559c08;hpb=a585fafed1e72e092c6a1942c8692991c1688e7f;p=gdcm.git diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h index 9793a511..35271f9c 100644 --- a/src/gdcmDocument.h +++ b/src/gdcmDocument.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.h,v $ Language: C++ - Date: $Date: 2005/11/21 09:46:26 $ - Version: $Revision: 1.132 $ + Date: $Date: 2005/11/29 17:21:34 $ + Version: $Revision: 1.137 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -24,6 +24,7 @@ #include "gdcmElementSet.h" #include "gdcmException.h" #include "gdcmDebug.h" // for LEGACY +#include "gdcmCommandManager.h" #include #include @@ -48,6 +49,7 @@ public: // Loading //Deprecated : use SetFileName() + Load() //GDCM_LEGACY( virtual bool Load( std::string const &filename ) ); + //virtual bool Load( std::string const &filename ); virtual bool Load( ); // Dictionaries @@ -111,7 +113,11 @@ protected: // gdcm::DicomDir are meaningfull). Document(); virtual ~Document(); - + + virtual void CallStartMethod(); + virtual void CallProgressMethod(); + virtual void CallEndMethod(); + uint16_t ReadInt16() throw ( FormatError ); uint32_t ReadInt32() throw ( FormatError ); void SkipBytes(uint32_t); @@ -217,6 +223,11 @@ private: DocEntry *Backtrack(DocEntry *docEntry); // Variables +protected: + /// value of the ??? for any progress bar + float Progress; + mutable bool Abort; + /// Public dictionary used to parse this header Dict *RefPubDict; /// \brief Optional "shadow dictionary" (private elements) used to parse