X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomEntry.h;h=090801d10d0b6a1158c82f6c9ee101387918b4bd;hb=b06cbd9177331d793223eac6bf8b2bccf874e7e3;hp=b11e8c379612ecdfddcf7eac9f42310dc37e4fc7;hpb=46afb30d2d016a9b1581c7ee4ca96d614a35203c;p=gdcm.git

diff --git a/src/gdcmDicomEntry.h b/src/gdcmDicomEntry.h
index b11e8c37..090801d1 100644
--- a/src/gdcmDicomEntry.h
+++ b/src/gdcmDicomEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomEntry.h,v $
   Language:  C++
-  Date:      $Date: 2005/11/28 15:20:32 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2007/09/17 12:21:56 $
+  Version:   $Revision: 1.14 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,15 +16,15 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDICOMENTRY_H
-#define GDCMDICOMENTRY_H
+#ifndef _GDCMDICOMENTRY_H_
+#define _GDCMDICOMENTRY_H_
 
 #include "gdcmCommon.h"
-#include "gdcmCommandManager.h"
+#include "gdcmRefCounter.h"
 #include "gdcmVRKey.h"
 #include "gdcmTagKey.h"
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE
 {
 //-----------------------------------------------------------------------------
 /**
@@ -39,7 +39,7 @@ namespace gdcm
  *  - the VM (Value Multiplicity)
  *  - the corresponding name in english
  */
-class GDCM_EXPORT DicomEntry : public CommandManager
+class GDCM_EXPORT DicomEntry : public RefCounter
 {
    gdcmTypeMacro(DicomEntry);
 
@@ -55,6 +55,10 @@ public:
    /// @return the Dicom Element Number
    const uint16_t &GetElement() const { return Tag[1]; }
 
+   /// \brief  Returns the Dicom Tag Key
+   /// @return the Dicom Tag Key
+   const TagKey &GetKey() const { return Tag; }
+   
    /// \brief  Set the Dicom Value Representation 
    /// \param vr the Dicom Value Representation
    virtual void SetVR(VRKey const &vr) { VR = vr; }
@@ -68,7 +72,8 @@ public:
    const TagKey &GetKey() const { return Tag; }
 
 // Key creation
-   static TagKey TranslateToKey(uint16_t group, uint16_t elem);
+   static TagKey TranslateToKey(uint16_t group, uint16_t elem)
+                                { return TagKey(group,elem); }
 
 protected:
    DicomEntry(const uint16_t &group,const uint16_t &elt,
@@ -76,12 +81,12 @@ protected:
    ~DicomEntry();
 
 private:
-   /// Dicom \ref TagKey. Contains Dicom Group number and Dicom Element number
+   /// Dicom  TagKey. Contains Dicom Group number and Dicom Element number
    TagKey Tag;
 
    /// \brief Value Representation i.e. some clue about the nature
    ///        of the data represented e.g. 
-   ///        - "FD" short for "Floating Point Double"(see \ref VR)
+   ///        - "FD" short for "Floating Point Double"(see  VR)
    ///        - "PN" short for "Person Name"       
    VRKey VR;
 };