X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=src%2FgdcmDict.cxx;h=6b2efbec7d564fe2e431fc2ac32fff806453e1b8;hb=0a7355e1aaeeabadba3e464bdef81bcff5777d37;hp=fd3e990c26905caa7c4f9895ae717e90d74ffc8e;hpb=1bc5ccd72098866fc29ca8a786e8bb6852f388ea;p=gdcm.git diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx index fd3e990c..6b2efbec 100644 --- a/src/gdcmDict.cxx +++ b/src/gdcmDict.cxx @@ -1,5 +1,21 @@ -// gdcmDict.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDict.cxx,v $ + Language: C++ + Date: $Date: 2004/07/02 13:55:27 $ + Version: $Revision: 1.38 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmDict.h" #include "gdcmUtil.h" #include "gdcmDebug.h" @@ -8,13 +24,6 @@ #include #include -#ifdef GDCM_NO_ANSI_STRING_STREAM -# include -# define ostringstream ostrstream -# else -# include -#endif - //----------------------------------------------------------------------------- // Constructor / Destructor /** @@ -22,8 +31,9 @@ * @param FileName from which to build the dictionary. */ gdcmDict::gdcmDict(std::string & FileName) { - guint16 group, element; - char buff[1024]; + uint16_t group; + uint16_t element; + //char buff[1024]; TagName vr; TagName fourth; TagName name; @@ -33,15 +43,13 @@ gdcmDict::gdcmDict(std::string & FileName) { FileName.c_str()); while (!from.eof()) { - from >> std::hex >> group >> element; - eatwhite(from); - from.getline(buff, 256, ' '); - vr = buff; + from >> std::hex; + from >> group; /// MEMORY LEAK in std::istream::operator>> + from >> element; + from >> vr; + from >> fourth; eatwhite(from); - from.getline(buff, 256, ' '); - fourth = buff; - from.getline(buff, 256, '\n'); - name = buff; + getline(from, name); /// MEMORY LEAK in std::getline<> gdcmDictEntry * newEntry = new gdcmDictEntry(group, element, vr, fourth, name); @@ -56,7 +64,8 @@ gdcmDict::gdcmDict(std::string & FileName) { * \brief Destructor */ gdcmDict::~gdcmDict() { - for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag) { + for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag) + { gdcmDictEntry* EntryToDelete = tag->second; if ( EntryToDelete ) delete EntryToDelete; @@ -85,13 +94,16 @@ void gdcmDict::Print(std::ostream &os) { * Entries will be sorted by tag i.e. the couple (group, element). * @param os The output stream to be written to. */ -void gdcmDict::PrintByKey(std::ostream &os) { +void gdcmDict::PrintByKey(std::ostream &os) +{ std::ostringstream s; - for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag){ + for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag) + { s << "Entry : "; s << "(" << std::hex << std::setw(4) << tag->second->GetGroup() << ','; - s << std::hex << std::setw(4) << tag->second->GetElement() << ") = " << std::dec; + s << std::hex << std::setw(4) << tag->second->GetElement() << ") = " + << std::dec; s << tag->second->GetVR() << ", "; s << tag->second->GetFourth() << ", "; s << tag->second->GetName() << "." << std::endl; @@ -131,7 +143,7 @@ void gdcmDict::PrintByName(std::ostream& os) { */ bool gdcmDict::AddNewEntry(gdcmDictEntry *NewEntry) { - TagKey key; + gdcmTagKey key; key = NewEntry->GetKey(); if(KeyHt.count(key) == 1) @@ -142,7 +154,8 @@ bool gdcmDict::AddNewEntry(gdcmDictEntry *NewEntry) else { KeyHt[NewEntry->GetKey()] = NewEntry; - NameHt[NewEntry->GetName()] = NewEntry; + NameHt[NewEntry->GetName()] = NewEntry; /// MEMORY LEAK in + /// std::map<>::operator[] return(true); } } @@ -169,7 +182,7 @@ bool gdcmDict::ReplaceEntry(gdcmDictEntry *NewEntry) { * @param key (group|element) * @return false if Dicom Dictionary Entry doesn't exist */ -bool gdcmDict::RemoveEntry(TagKey key) +bool gdcmDict::RemoveEntry(gdcmTagKey key) { if(KeyHt.count(key) == 1) { @@ -192,19 +205,18 @@ bool gdcmDict::RemoveEntry(TagKey key) } /** - * \ingroup gdcmDict * \brief removes an already existing Dicom Dictionary Entry, * identified by its group,element number * @param group Dicom group number of the Dicom Element * @param element Dicom element number of the Dicom Element * @return false if Dicom Dictionary Entry doesn't exist */ -bool gdcmDict::RemoveEntry (guint16 group, guint16 element) { - return( RemoveEntry(gdcmDictEntry::TranslateToKey(group, element)) ); +bool gdcmDict::RemoveEntry (uint16_t group, uint16_t element) +{ + return( RemoveEntry(gdcmDictEntry::TranslateToKey(group, element)) ); } /** - * \ingroup gdcmDict * \brief Get the dictionnary entry identified by it's name. * @param name element of the ElVal to modify * \warning : NEVER use it ! @@ -212,34 +224,33 @@ bool gdcmDict::RemoveEntry (guint16 group, guint16 element) { * the name MAY CHANGE between two versions ! * @return the corresponding dictionnary entry when existing, NULL otherwise */ -gdcmDictEntry *gdcmDict::GetDictEntryByName(TagName name) { +gdcmDictEntry* gdcmDict::GetDictEntryByName(TagName name) { if ( ! NameHt.count(name)) return NULL; return NameHt.find(name)->second; } /** - * \ingroup gdcmDict * \brief Get the dictionnary entry identified by a given tag (group,element) * @param group group of the entry to be found * @param element element of the entry to be found * @return the corresponding dictionnary entry when existing, NULL otherwise */ -gdcmDictEntry *gdcmDict::GetDictEntryByNumber(guint16 group, guint16 element) { - TagKey key = gdcmDictEntry::TranslateToKey(group, element); +gdcmDictEntry* gdcmDict::GetDictEntryByNumber(uint16_t group, uint16_t element) +{ + gdcmTagKey key = gdcmDictEntry::TranslateToKey(group, element); if ( ! KeyHt.count(key)) return NULL; return KeyHt.find(key)->second; } /** - * \ingroup gdcmDict * \brief Consider all the entries of the public dicom dictionnary. * Build all list of all the tag names of all those entries. * \sa gdcmDictSet::GetPubDictTagNamesByCategory * @return A list of all entries of the public dicom dictionnary. */ -std::list *gdcmDict::GetDictEntryNames(void) +std::list* gdcmDict::GetDictEntryNames(void) { std::list *Result = new std::list; for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag)