X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.cxx;h=6b2efbec7d564fe2e431fc2ac32fff806453e1b8;hb=02cee87de17ebbd0920bf78ca470d5360254641e;hp=085de51420dd22073027ba550f68acf215677c66;hpb=1e74cf45bc96f14c342cc404f0f91dfffe0810b9;p=gdcm.git diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx index 085de514..6b2efbec 100644 --- a/src/gdcmDict.cxx +++ b/src/gdcmDict.cxx @@ -1,64 +1,75 @@ -// 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" + #include -#ifdef GDCM_NO_ANSI_STRING_STREAM -# include -# define ostringstream ostrstream -# else -# include -#endif +#include +#include //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \ingroup gdcmDict * \brief Construtor * @param FileName from which to build the dictionary. */ gdcmDict::gdcmDict(std::string & FileName) { - std::ifstream from(FileName.c_str()); - dbg.Error(!from, "gdcmDict::gdcmDict: can't open dictionary", - FileName.c_str()); - guint16 group, element; - // CLEANME : use defines for all those constants - char buff[1024]; - TagKey key; + uint16_t group; + uint16_t element; + //char buff[1024]; TagName vr; TagName fourth; TagName name; + std::ifstream from(FileName.c_str()); + dbg.Error(!from, "gdcmDict::gdcmDict: can't open dictionary", + 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); - // FIXME: use AddNewEntry - NameHt[name] = newEntry; - KeyHt[gdcmDictEntry::TranslateToKey(group, element)] = newEntry; + vr, fourth, name); + AddNewEntry(newEntry); } from.close(); + + filename=FileName; } /** - * \ingroup gdcmDict * \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; } - // Since AddNewEntry adds symetrical in both KeyHt and NameHT we can // assume all the pointed gdcmDictEntries are already cleaned-up when // we cleaned KeyHt. @@ -74,22 +85,25 @@ gdcmDict::~gdcmDict() { * @param os The output stream to be written to. */ void gdcmDict::Print(std::ostream &os) { + os<<"Dict file name : "<second->GetGroup() << ','; - s << std::hex << tag->second->GetElement() << ") = " << std::dec; + 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 << tag->second->GetVR() << ", "; s << tag->second->GetFourth() << ", "; s << tag->second->GetName() << "." << std::endl; @@ -98,10 +112,9 @@ void gdcmDict::PrintByKey(std::ostream &os) { } /** - * \ingroup gdcmDict * \brief Print all the dictionary entries contained in this dictionary. * Entries will be sorted by the name of the dictionary entries. - * \warning AVOID USING IT : the name IS NOT an identifier + * \warning AVOID USING IT : the name IS NOT an identifier; * unpredictable result * @param os The output stream to be written to. */ @@ -109,12 +122,13 @@ void gdcmDict::PrintByName(std::ostream& os) { std::ostringstream s; for (TagNameHT::iterator tag = NameHt.begin(); tag != NameHt.end(); ++tag){ - s << "Tag : "; + s << "Entry : "; s << tag->second->GetName() << ","; s << tag->second->GetVR() << ", "; s << tag->second->GetFourth() << ", "; - s << "(" << std::hex << tag->second->GetGroup() << ','; - s << std::hex << tag->second->GetElement() << ") = " << std::dec << std::endl; + s << "(" << std::hex << std::setw(4) << tag->second->GetGroup() << ','; + s << std::hex << std::setw(4) << tag->second->GetElement() << ") = "; + s << std::dec << std::endl; } os << s.str(); } @@ -124,14 +138,14 @@ void gdcmDict::PrintByName(std::ostream& os) { /** * \ingroup gdcmDict * \brief adds a new Dicom Dictionary Entry - * @param NewEntry - * @return false if Dicom Element already existed + * @param NewEntry entry to add + * @return false if Dicom Element already exists */ bool gdcmDict::AddNewEntry(gdcmDictEntry *NewEntry) { - TagKey key; + gdcmTagKey key; key = NewEntry->GetKey(); - + if(KeyHt.count(key) == 1) { dbg.Verbose(1, "gdcmDict::AddNewEntry already present", key.c_str()); @@ -140,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); } } @@ -148,7 +163,7 @@ bool gdcmDict::AddNewEntry(gdcmDictEntry *NewEntry) /** * \ingroup gdcmDict * \brief replaces an already existing Dicom Element by a new one - * @param NewEntry + * @param NewEntry new entry (overwrites any previous one with same tag) * @return false if Dicom Element doesn't exist */ bool gdcmDict::ReplaceEntry(gdcmDictEntry *NewEntry) { @@ -167,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) { @@ -190,20 +205,18 @@ bool gdcmDict::RemoveEntry(TagKey key) } /** - * \ingroup gdcmDict * \brief removes an already existing Dicom Dictionary Entry, - * identified by its group,element - number + * 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 ! @@ -211,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::GetTagByName(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::GetTagByNumber(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::GetTagNames(void) +std::list* gdcmDict::GetDictEntryNames(void) { std::list *Result = new std::list; for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag) @@ -267,12 +279,12 @@ std::list *gdcmDict::GetTagNames(void) * than asking us to perform a line by line check of the dictionnary * at the beginning of each year to -try to- guess the changes) * Therefore : please NEVER use that fourth field :-( - * * + * * @return An hashtable: whose keys are the names of the groups and whose * corresponding values are lists of all the dictionnary entries * among that group. */ -std::map > *gdcmDict::GetTagNamesByCategory(void) +std::map > *gdcmDict::GetDictEntryNamesByCategory(void) { std::map > *Result = new std::map >;