X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirElement.cxx;h=1757284f4494594566d236ee07bb30fd6796f8ff;hb=8fce3ef7e4121ea7a4e5c940b6e38394abcacb07;hp=f6f9004eabecfa3d20f74f74d22eb7c5a37f0930;hpb=2504fedde09a123036ce0f06e11ebd4cb9699e6a;p=gdcm.git diff --git a/src/gdcmDicomDirElement.cxx b/src/gdcmDicomDirElement.cxx index f6f9004e..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/06/07 09:58:29 $ - Version: $Revision: 1.37 $ + 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,7 +173,7 @@ void DicomDirElement::Print(std::ostream &os) std::ostringstream s; std::list::iterator it; //char greltag[10]; //group element tag - std::string greltag; + TagKey greltag; s << "Meta Elements :"<