X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDict.cxx;h=7d9585cdc1ff65d78682e514fc8b91a5c5077eac;hb=cdc3f89e3291dfdc5cfa60dea19558635d2f8755;hp=9f2d3882bb2550405953c26b3b998644dbe223d6;hpb=65467b71ee500909b0ef7c31d442ca0c160d6a15;p=gdcm.git

diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx
index 9f2d3882..7d9585cd 100644
--- a/src/gdcmDict.cxx
+++ b/src/gdcmDict.cxx
@@ -2,33 +2,29 @@
 //-----------------------------------------------------------------------------
 #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;
    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,17 +35,17 @@ 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;
+                                                   vr, fourth, name);
+      AddNewEntry(newEntry);
    }
    from.close();
+
+   filename=FileName;
 }
 
 /**
- * \ingroup gdcmDict
  * \brief  Destructor 
  */
 gdcmDict::~gdcmDict() {
@@ -58,7 +54,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,11 +69,11 @@ gdcmDict::~gdcmDict() {
  * @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.
@@ -87,9 +82,9 @@ void gdcmDict::PrintByKey(std::ostream &os) {
    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;
@@ -98,10 +93,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 +103,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 +119,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;
    key = NewEntry->GetKey();
-	
+
    if(KeyHt.count(key) == 1)
    {
       dbg.Verbose(1, "gdcmDict::AddNewEntry already present", key.c_str());
@@ -148,7 +143,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 +187,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
@@ -267,7 +261,7 @@ std::list<std::string> *gdcmDict::GetDictEntryNames(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.