From bd4a12d577158f01744a793b456ae022810d4a5c Mon Sep 17 00:00:00 2001 From: malaterre Date: Mon, 11 Jul 2005 14:40:40 +0000 Subject: [PATCH] ENH: A TagKey is a TagKey and not a string or TagName... --- src/gdcmDicomDirElement.cxx | 6 +++--- src/gdcmDictEntry.h | 8 ++++---- src/gdcmDocEntry.h | 7 ++++--- src/gdcmDocEntryArchive.cxx | 12 ++++++------ src/gdcmDocEntrySet.h | 6 +++--- 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/gdcmDicomDirElement.cxx b/src/gdcmDicomDirElement.cxx index 0545ddf3..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/24 10:55:58 $ - Version: $Revision: 1.38 $ + 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 @@ -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 :"<GetDictEntry()->GetGroup(); uint16_t elem = newEntry->GetDictEntry()->GetElement(); - std::string key = DictEntry::TranslateToKey(group,elem); + TagKey key = DictEntry::TranslateToKey(group,elem); - if ( Archive.find(key)==Archive.end() ) + if ( Archive.find(key) == Archive.end() ) { // Save the old DocEntry if any DocEntry *old = ArchFile->GetDocEntry(group, elem); @@ -86,7 +86,7 @@ bool DocEntryArchive::Push(DocEntry *newEntry) */ bool DocEntryArchive::Push(uint16_t group, uint16_t elem) { - std::string key = DictEntry::TranslateToKey(group, elem); + TagKey key = DictEntry::TranslateToKey(group, elem); if ( Archive.find(key)==Archive.end() ) { @@ -111,7 +111,7 @@ bool DocEntryArchive::Push(uint16_t group, uint16_t elem) */ bool DocEntryArchive::Restore(uint16_t group, uint16_t elem) { - std::string key=DictEntry::TranslateToKey(group, elem); + TagKey key=DictEntry::TranslateToKey(group, elem); TagDocEntryHT::iterator restoreIt=Archive.find(key); if ( restoreIt!=Archive.end() ) diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h index 4a498133..a9a5b0c5 100644 --- a/src/gdcmDocEntrySet.h +++ b/src/gdcmDocEntrySet.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntrySet.h,v $ Language: C++ - Date: $Date: 2005/07/11 12:52:51 $ - Version: $Revision: 1.52 $ + Date: $Date: 2005/07/11 14:40:40 $ + Version: $Revision: 1.53 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -31,7 +31,7 @@ class BinEntry; class SeqEntry; class DictEntry; -typedef std::string BaseTagKey; +typedef TagKey BaseTagKey; //----------------------------------------------------------------------------- /** -- 2.48.1