-// gdcmDict.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+
+ Program: gdcm
+ Module: $RCSfile: gdcmDict.cxx,v $
+ Language: C++
+ Date: $Date: 2004/06/22 13:47:33 $
+ Version: $Revision: 1.37 $
+
+ 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 <fstream>
-#ifdef GDCM_NO_ANSI_STRING_STREAM
-# include <strstream>
-# define ostringstream ostrstream
-# else
-# include <sstream>
-#endif
+#include <iostream>
+#include <iomanip>
//-----------------------------------------------------------------------------
// 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;
+ //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;
- eatwhite(from);
- from.getline(buff, 256, ' ');
- fourth = buff;
- from.getline(buff, 256, '\n');
- name = buff;
+ from >> std::hex;
+ from >> group; /// MEMORY LEAK in std::istream::operator>>
+ from >> element;
+ from >> vr;
+ from >> fourth;
+ eatwhite(from);
+ 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() {
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.
* @param os The output stream to be written to.
*/
void gdcmDict::Print(std::ostream &os) {
+ os<<"Dict file name : "<<filename<<std::endl;
PrintByKey(os);
}
/**
- * \ingroup gdcmDict
* \brief Print all the dictionary entries contained in this dictionary.
* Entries will be sorted by tag i.e. the couple (group, element).
* @param os The output stream to be written to.
std::ostringstream s;
for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag){
- s << "Tag : ";
- s << "(" << std::hex << tag->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;
}
/**
- * \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.
*/
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();
}
/**
* \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;
key = NewEntry->GetKey();
-
+
if(KeyHt.count(key) == 1)
{
dbg.Verbose(1, "gdcmDict::AddNewEntry already present", key.c_str());
else
{
KeyHt[NewEntry->GetKey()] = NewEntry;
- NameHt[NewEntry->GetName()] = NewEntry;
+ NameHt[NewEntry->GetName()] = NewEntry; /// MEMORY LEAK in
+ /// std::map<>::operator[]
return(true);
}
}
/**
* \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) {
/**
* \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
* 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.
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff