// gdcmDict.cxx
-#include <fstream>
#include "gdcmDict.h"
#include "gdcmUtil.h"
-using namespace std;
+#include <fstream>
+#ifdef GDCM_NO_ANSI_STRING_STREAM
+# include <strstream>
+# define ostringstream ostrstream
+# else
+# include <sstream>
+#endif
/**
* \ingroup gdcmDict
TagName vr;
TagName fourth;
TagName name;
+
while (!from.eof()) {
from >> std::hex >> group >> element;
eatwhite(from);
from.getline(buff, 256, '\n');
name = buff;
gdcmDictEntry * newEntry = new gdcmDictEntry(group, element,
- vr, fourth, name);
+ vr, fourth, name);
// FIXME: use AddNewEntry
NameHt[name] = newEntry;
KeyHt[gdcmDictEntry::TranslateToKey(group, element)] = newEntry;
}
KeyHt.clear();
// Since AddNewEntry adds symetrical in both KeyHt and NameHT we can
- // assume all the pointed gdcmDictEntries are allready cleaned-up when
+ // assume all the pointed gdcmDictEntries are already cleaned-up when
// we cleaned KeyHt.
NameHt.clear();
}
* @param os The output stream to be written to.
*/
void gdcmDict::PrintByKey(std::ostream& os) {
+ std::ostringstream s;
+
for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag){
- os << "Tag : ";
- os << "(" << hex << tag->second->GetGroup() << ',';
- os << hex << tag->second->GetElement() << ") = " << dec;
- os << tag->second->GetVR() << ", ";
- os << tag->second->GetFourth() << ", ";
- os << tag->second->GetName() << "." << endl;
+ s << "Tag : ";
+ s << "(" << std::hex << tag->second->GetGroup() << ',';
+ s << std::hex << tag->second->GetElement() << ") = " << std::dec;
+ s << tag->second->GetVR() << ", ";
+ s << tag->second->GetFourth() << ", ";
+ s << tag->second->GetName() << "." << std::endl;
}
+ os << s.str();
}
/**
* @param os The output stream to be written to.
*/
void gdcmDict::PrintByName(std::ostream& os) {
+ std::ostringstream s;
+
for (TagNameHT::iterator tag = NameHt.begin(); tag != NameHt.end(); ++tag){
- os << "Tag : ";
- os << tag->second->GetName() << ",";
- os << tag->second->GetVR() << ", ";
- os << tag->second->GetFourth() << ", ";
- os << "(" << std::hex << tag->second->GetGroup() << ',';
- os << std::hex << tag->second->GetElement() << ") = " << dec << std::endl;
+ s << "Tag : ";
+ 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;
}
+ os << s.str();
}
/**
key = NewEntry->GetKey();
if(KeyHt.count(key) == 1) {
- dbg.Verbose(1, "gdcmDict::AddNewEntry allready present", key.c_str());
+ dbg.Verbose(1, "gdcmDict::AddNewEntry already present", key.c_str());
return(0);
} else {
KeyHt[NewEntry->GetKey()] = NewEntry;