X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmTS.h;h=deb30770ae3d7c3b7539b20a82146978a5ecf501;hb=6278320cc85da00d2d56ffbf07806e84966892c3;hp=60cdd16d85235c25fcf5cbba5fe050d388940073;hpb=46afb30d2d016a9b1581c7ee4ca96d614a35203c;p=gdcm.git diff --git a/src/gdcmTS.h b/src/gdcmTS.h index 60cdd16d..deb30770 100644 --- a/src/gdcmTS.h +++ b/src/gdcmTS.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmTS.h,v $ Language: C++ - Date: $Date: 2005/11/28 15:20:34 $ - Version: $Revision: 1.25 $ + Date: $Date: 2007/08/22 16:14:05 $ + Version: $Revision: 1.30 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -16,16 +16,16 @@ =========================================================================*/ -#ifndef GDCMTS_H -#define GDCMTS_H +#ifndef _GDCMTS_H_ +#define _GDCMTS_H_ -#include "gdcmCommandManager.h" +#include "gdcmRefCounter.h" #include #include #include -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- typedef std::string TSKey; @@ -38,7 +38,7 @@ typedef std::map TSHT; // Transfer Syntax Hash Table * \brief Container for dicom 'Transfer Syntax' Hash Table * \note This is a singleton */ -class GDCM_EXPORT TS : public CommandManager +class GDCM_EXPORT TS : public RefCounter { gdcmTypeMacro(TS); @@ -61,7 +61,11 @@ public: JPEG2000Lossless, JPEG2000, RLELossless, - MPEG2MainProfile, + MPEG2MainProfile, + +// The following are *not* Transfer Syntaxes, but SOP uid + UltrasoundImageStorage_Retired, + UnknownTS }; @@ -70,7 +74,7 @@ public: static TS *New() {return new TS();} virtual void Print(std::ostream &os = std::cout, - std::string const &indent = "" ); + std::string const & = "" ); int Count(TSKey const &key); TSAtr const &GetValue(TSKey const &key); @@ -82,11 +86,14 @@ public: bool IsJPEG(TSKey const &key); bool IsJPEGLS(TSKey const &key); bool IsMPEG(TSKey const &key); - + // This should be deprecated very soon SpecialType GetSpecialTransferSyntax(TSKey const &key); const char* GetSpecialTransferSyntax(SpecialType t); - + + // The following are *not* Transfer Syntaxes. + bool IsUltrasoundImageStorage_Retired(TSKey const &key); + protected: TS(); ~TS();