X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.cxx;h=75834e1f76ea3f8a82b836d97241470cafcd9627;hb=22f785a2627d1e7823701193bd7624739a3e033b;hp=085de51420dd22073027ba550f68acf215677c66;hpb=1e74cf45bc96f14c342cc404f0f91dfffe0810b9;p=gdcm.git diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx index 085de514..75834e1f 100644 --- a/src/gdcmDict.cxx +++ b/src/gdcmDict.cxx @@ -2,7 +2,11 @@ //----------------------------------------------------------------------------- #include "gdcmDict.h" #include "gdcmUtil.h" + #include +#include +#include + #ifdef GDCM_NO_ANSI_STRING_STREAM # include # define ostringstream ostrstream @@ -18,17 +22,16 @@ * @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; 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); @@ -39,13 +42,14 @@ gdcmDict::gdcmDict(std::string & FileName) { fourth = buff; from.getline(buff, 256, '\n'); name = buff; + gdcmDictEntry * newEntry = new gdcmDictEntry(group, element, vr, fourth, name); - // FIXME: use AddNewEntry - NameHt[name] = newEntry; - KeyHt[gdcmDictEntry::TranslateToKey(group, element)] = newEntry; + AddNewEntry(newEntry); } from.close(); + + filename=FileName; } /** @@ -58,7 +62,6 @@ gdcmDict::~gdcmDict() { 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,6 +77,7 @@ 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; + 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; @@ -101,7 +105,7 @@ 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 +113,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,8 +129,8 @@ 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) { @@ -148,7 +153,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) { @@ -192,8 +197,7 @@ 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 @@ -211,7 +215,7 @@ 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; @@ -224,7 +228,7 @@ gdcmDictEntry *gdcmDict::GetTagByName(TagName name) { * @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) { +gdcmDictEntry *gdcmDict::GetDictEntryByNumber(guint16 group, guint16 element) { TagKey key = gdcmDictEntry::TranslateToKey(group, element); if ( ! KeyHt.count(key)) return NULL; @@ -238,7 +242,7 @@ gdcmDictEntry *gdcmDict::GetTagByNumber(guint16 group, guint16 element) { * \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 +271,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 >;