X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomEntry.cxx;h=3f466e447fea39f741473a16f825fb944de98e96;hb=56ad78cdf3b5de32f0a94a38cd32ddc9f403ffc3;hp=785b941c9cb9767d6be8dd9e1cec6966d678e2f5;hpb=9aa702d6397e3e490263a0791dd6c8ed2f3d1e83;p=gdcm.git

diff --git a/src/gdcmDicomEntry.cxx b/src/gdcmDicomEntry.cxx
index 785b941c..3f466e44 100644
--- a/src/gdcmDicomEntry.cxx
+++ b/src/gdcmDicomEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/10/19 13:17:05 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2007/05/23 14:18:09 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,14 +17,14 @@
 =========================================================================*/
 
 #include "gdcmDicomEntry.h"
-#include "gdcmDebug.h"
-#include "gdcmUtil.h"
+//#include "gdcmDebug.h"
+//#include "gdcmUtil.h"
 
-#include <iomanip> // for std::ios::left, ...
+//#include <iomanip> // for std::ios::left, ...
 #include <fstream>
-#include <stdio.h> // for sprintf
+//#include <stdio.h> // for sprintf
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -33,14 +33,13 @@ namespace gdcm
  * @param   group      DICOM-Group Number
  * @param   elem       DICOM-Element Number
  * @param   vr         Value Representation
- * @param   vm         Value Multiplicity 
- * @param   name       description of the element
 */
-DicomEntry::DicomEntry(const uint16_t &group,const uint16_t &elt,
+DicomEntry::DicomEntry(const uint16_t &group,const uint16_t &elem,
                        const VRKey &vr)
 {
-   Tag.SetGroup(group);
-   Tag.SetElement(elt);
+   //Tag.SetGroupElement(group);
+   //Tag.SetElement(elem);
+   Tag.SetGroupElement(group,elem);
    VR = vr;
 }
 
@@ -53,20 +52,6 @@ DicomEntry::~DicomEntry()
 
 //-----------------------------------------------------------------------------
 // Public
-/**
- * \brief   concatenates 2 uint16_t (supposed to be a Dicom group number 
- *                                              and a Dicom element number)
- * @param  group the Dicom group number used to build the tag
- * @param  elem the Dicom element number used to build the tag
- * @return the built tag
- */
-TagKey DicomEntry::TranslateToKey(uint16_t group, uint16_t elem)
-{
-   // according to 'Purify', TranslateToKey is one of the most
-   // time consuming methods.
-   // Let's try to shorten it !
-   return TagKey(group,elem);
-}
 
 //-----------------------------------------------------------------------------
 // Protected
@@ -83,10 +68,8 @@ TagKey DicomEntry::TranslateToKey(uint16_t group, uint16_t elem)
  */
 void DicomEntry::Print(std::ostream &os, std::string const & )
 {
-   std::ostringstream s;
-
-   s << GetKey(); 
-   s << " [" << VR  << "] ";
+   os << GetKey(); 
+   os << " [" << VR  << "] ";
 }
 
 //-----------------------------------------------------------------------------