X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomEntry.h;h=090801d10d0b6a1158c82f6c9ee101387918b4bd;hb=80075429b6ab9db9e885b9bb9ae1427530c7bef8;hp=ddd9eaa708db047883b61f4860563b8133105305;hpb=6a7c2fbcb5bfc240a3b9875ad4836f5dc058e069;p=gdcm.git

diff --git a/src/gdcmDicomEntry.h b/src/gdcmDicomEntry.h
index ddd9eaa7..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/10/20 15:24:08 $
-  Version:   $Revision: 1.2 $
+  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,31 +16,31 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDICOMENTRY_H
-#define GDCMDICOMENTRY_H
+#ifndef _GDCMDICOMENTRY_H_
+#define _GDCMDICOMENTRY_H_
 
 #include "gdcmCommon.h"
 #include "gdcmRefCounter.h"
 #include "gdcmVRKey.h"
 #include "gdcmTagKey.h"
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE
 {
 //-----------------------------------------------------------------------------
 /**
  * \brief
- * the DicomEntry in an element contained by the Dict.
+ * a DicomEntry is an element contained by the Dict.
  * It contains :
- *  - the key referenced by the DICOM norm or the constructor (for private keys)
- *    i.e. the Group number
- *         the Element number
+ *  - the key referenced by the DICOM norm or the manufacturer(for private keys)
+ *    i.e. 
+ *    - - the Group number
+ *    - - the Element number
  *  - the VR (Value Representation)
- *  - the VM (Value Multplicity)
+ *  - the VM (Value Multiplicity)
  *  - the corresponding name in english
  */
 class GDCM_EXPORT DicomEntry : public RefCounter
 {
-public:
    gdcmTypeMacro(DicomEntry);
 
 public:
@@ -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,13 +81,13 @@ protected:
    ~DicomEntry();
 
 private:
-   /// Dicom \ref TagKey. Contains DicomGroup number and DicomElement 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)
-   ///        "PN" short for "Person Name"       
+   ///        - "FD" short for "Floating Point Double"(see  VR)
+   ///        - "PN" short for "Person Name"       
    VRKey VR;
 };
 } // end namespace gdcm