X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirElement.cxx;h=1757284f4494594566d236ee07bb30fd6796f8ff;hb=06a0fef14384fff540b619069c11e9dfaae2bbc6;hp=b71f0f8ff519e645e0530770f46dc6b5c34d858b;hpb=d5ebba38c596bd5a0514fc9e08fe8ac2a45482f5;p=gdcm.git

diff --git a/src/gdcmDicomDirElement.cxx b/src/gdcmDicomDirElement.cxx
index b71f0f8f..1757284f 100644
--- a/src/gdcmDicomDirElement.cxx
+++ b/src/gdcmDicomDirElement.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirElement.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/11 15:22:18 $
-  Version:   $Revision: 1.36 $
+  Date:      $Date: 2005/07/11 14:40:40 $
+  Version:   $Revision: 1.39 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -41,7 +41,7 @@ DicomDirElement::DicomDirElement()
 {
    std::string filename = DictSet::BuildDictPath() + DICT_ELEM;
    std::ifstream from(filename.c_str());
-   if(!from)
+   if ( !from )
    {
       gdcmWarningMacro( "Can't open DicomDirElement dictionary" 
                         << filename.c_str());
@@ -60,15 +60,15 @@ DicomDirElement::DicomDirElement()
          from.getline(buff, 1024, ' ');
          strType = buff;
 
-         if( strType == "metaElem" )
+         if ( strType == "metaElem" )
             type = DD_META;
-         else if( strType == "patientElem" )
+         else if ( strType == "patientElem" )
             type = DD_PATIENT;
-         else if( strType == "studyElem" )
+         else if ( strType == "studyElem" )
             type = DD_STUDY;
-         else if( strType == "serieElem" )
+         else if ( strType == "serieElem" )
             type = DD_SERIE;
-         else if( strType == "imageElem" )
+         else if ( strType == "imageElem" )
             type = DD_IMAGE;
          else
          {
@@ -77,7 +77,7 @@ DicomDirElement::DicomDirElement()
             type = DD_UNKNOWN;
          }
 
-         if( type!=DD_UNKNOWN )
+         if ( type!=DD_UNKNOWN )
          {
             from >> std::hex >> elem.Group >> elem.Elem;
 
@@ -173,40 +173,40 @@ void DicomDirElement::Print(std::ostream &os)
    std::ostringstream s;
    std::list<Element>::iterator it;
    //char greltag[10];  //group element tag
-   std::string greltag;
+   TagKey greltag;
 
    s << "Meta Elements :"<<std::endl;
    for (it = DicomDirMetaList.begin(); it != DicomDirMetaList.end(); ++it)
    {
-      greltag = Util::Format("%04x|%04x ",it->Group,it->Elem);
+      greltag = DictEntry::TranslateToKey(it->Group,it->Elem);
       s << "   (" << greltag << ") = " << it->Value << std::endl;
    }
 
    s << "Patient Elements :"<<std::endl;
    for (it = DicomDirPatientList.begin(); it != DicomDirPatientList.end(); ++it)
    {
-      greltag = Util::Format("%04x|%04x ",it->Group,it->Elem);
+      greltag = DictEntry::TranslateToKey(it->Group,it->Elem);
       s << "   (" << greltag << ") = " << it->Value << std::endl;
    }
 
    s << "Study Elements :"<<std::endl;
    for (it = DicomDirStudyList.begin(); it != DicomDirStudyList.end(); ++it)
    {
-      greltag = Util::Format("%04x|%04x ", it->Group, it->Elem);
+      greltag = DictEntry::TranslateToKey(it->Group, it->Elem);
       s << "   (" << greltag << ") = " << it->Value << std::endl;
    }
 
    s << "Serie Elements :"<<std::endl;
    for (it = DicomDirSerieList.begin(); it != DicomDirSerieList.end(); ++it)
    {
-      greltag = Util::Format("%04x|%04x ", it->Group, it->Elem);
+      greltag = DictEntry::TranslateToKey( it->Group, it->Elem);
       s << "   (" << greltag << ") = " << it->Value << std::endl;
    }
 
    s << "Image Elements :"<<std::endl;
    for (it = DicomDirImageList.begin(); it != DicomDirImageList.end(); ++it)
    {
-      greltag = Util::Format("%04x|%04x ", it->Group, it->Elem);
+      greltag = DictEntry::TranslateToKey(it->Group, it->Elem);
       s << "   (" << greltag << ") = " << it->Value << std::endl;
    }