X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.cxx;h=d115e0a022fdc6c37f9545c5d441054347db34d7;hb=66553b88cd6daaac48ac62a910199cb2fff276f6;hp=da9423b899341d5c4810826dbd5dd97acc12cef1;hpb=55f3727f18aa712ea6d349de40b6a22ba2b6516d;p=gdcm.git

diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx
index da9423b8..d115e0a0 100644
--- a/src/gdcmDict.cxx
+++ b/src/gdcmDict.cxx
@@ -1,16 +1,25 @@
 // gdcmDict.cxx
 
 #include <fstream>
-#include "gdcm.h"
+#include "gdcmDict.h"
 #include "gdcmUtil.h"
 
-gdcmDict::gdcmDict(const char* FileName) {
-	std::ifstream from(FileName);
-	dbg.Error(!from, "gdcmDict::gdcmDict: can't open dictionary", FileName);
+/**
+ * \ingroup gdcmDict
+ * \brief   Construtor
+ * @param   FileName from which to build the dictionary.
+ */
+gdcmDict::gdcmDict(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, vr, fourth, name;
+	TagKey key;
+	TagName vr;
+	TagName fourth;
+	TagName name;
 	while (!from.eof()) {
 		from >> hex >> group >> element;
 		eatwhite(from);
@@ -23,92 +32,128 @@ gdcmDict::gdcmDict(const char* FileName) {
 		name = buff;
 		gdcmDictEntry * newEntry = new gdcmDictEntry(group, element,
 		                                         vr, fourth, name);
-		entries[gdcmDictEntry::TranslateToKey(group, element)] = newEntry;
+      // FIXME: use AddNewEntry
+		NameHt[name] = newEntry;
+		KeyHt[gdcmDictEntry::TranslateToKey(group, element)] = newEntry;
 	}
-   from.close();
+	from.close();
+}
+
+gdcmDict::~gdcmDict() {
+   for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag) {
+      gdcmDictEntry* EntryToDelete = tag->second;
+      if ( EntryToDelete )
+         delete EntryToDelete;
+   }
+   KeyHt.clear();
+   // Since AddNewEntry adds symetrical in both KeyHt and NameHT we can
+   // assume all the pointed gdcmDictEntries are allready cleaned-up when
+   // we cleaned KeyHt.
+   NameHt.clear();
 }
 
 void gdcmDict::Print(ostream& os) {
-	for (TagHT::iterator tag = entries.begin(); tag != entries.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;
-    }
+	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.
+ */
+void gdcmDict::PrintByKey(ostream& os) {
+	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;
+	}
 }
 
-// renvoie une ligne de Dictionnaire Dicom à partir de (numGroup, numElement)
+/**
+ * \ingroup gdcmDict
+ * \brief   Print all the dictionary entries contained in this dictionary.
+ *          Entries will be sorted by the name of the dictionary entries.
+ * @param   os The output stream to be written to.
+ */
+void gdcmDict::PrintByName(ostream& os) {
+	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 << "(" << hex << tag->second->GetGroup() << ',';
+		os << hex << tag->second->GetElement() << ") = " << dec << endl;
+	}
+}
 
-gdcmDictEntry * gdcmDict::GetTag(guint32 group, guint32 element) {
+/**
+ * \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);
-	if ( ! entries.count(key))
+	if ( ! KeyHt.count(key))
 		return (gdcmDictEntry*)0; 
-	if (entries.count(key) > 1)
-		dbg.Verbose(0, "gdcmDict::GetTag", 
-		            "multiple entries for this key (FIXME) !");
-	return entries.find(key)->second;
+	return KeyHt.find(key)->second;
 }
 
+/**
+ * \ingroup gdcmDict
+ * \brief   Get the dictionnary entry identified by it's name.
+ * @param   name element of the ElVal to modify
+ * @return  the corresponding dictionnary entry when existing, NULL otherwise
+ */
+gdcmDictEntry * gdcmDict::GetTagByName(TagName name) {
+	if ( ! NameHt.count(name))
+		return (gdcmDictEntry*)0; 
+	return NameHt.find(name)->second;
+}
 
 int gdcmDict::ReplaceEntry(gdcmDictEntry* NewEntry) {
-
-	// au cas ou la NewEntry serait incomplete
-	// Question : cela peut-il se produire ?
-	//
-	TagKey key;
-	key = NewEntry->GetKey();
-	if (key =="") {
-		NewEntry->gdcmDictEntry::SetKey(
-				gdcmDictEntry::TranslateToKey(NewEntry->GetGroup(), NewEntry->GetElement())
-				);
-	}
-	
-	entries.erase (NewEntry->gdcmDictEntry::GetKey());
-	entries[ NewEntry->GetKey()] = NewEntry;
-	return (1);
-	// Question : Dans quel cas ça peut planter ?
+   if ( RemoveEntry(NewEntry->gdcmDictEntry::GetKey()) ) {
+       KeyHt[ NewEntry->GetKey()] = NewEntry;
+       return (1);
+   } 
+   return (0);
 }
- 
 
 int gdcmDict::AddNewEntry(gdcmDictEntry* NewEntry) {
 
-	// au cas ou la NewEntry serait incomplete
-	// Question : cela peut-il se produire ?
-	//
-	
 	TagKey key;
 	key = NewEntry->GetKey();
-	if (key =="") {
-		NewEntry->SetKey(
-				gdcmDictEntry::TranslateToKey(NewEntry->GetGroup(), NewEntry->GetElement())
-				);
-	}
-
-	if(entries.count(key) >= 1) {
-		printf("gdcmDict::AddNewEntry %s deja present\n", key.c_str());
+	
+	if(KeyHt.count(key) == 1) {
+		dbg.Verbose(1, "gdcmDict::AddNewEntry allready present", key.c_str());
 		return(0);
 	} else {
-		entries[NewEntry->GetKey()] = NewEntry;
+		KeyHt[NewEntry->GetKey()] = NewEntry;
 		return(1);
 	}
-	}
+}
 
 
-int gdcmDict::RemoveEntry(TagKey key) {	
-	if(entries.count(key) == 1) {
-		entries.erase(key);
-		return (1);
-	} else {
-		printf("gdcmDict::RemoveEntry %s non trouve\n", key.c_str());
-		return (0);
-	}
+int gdcmDict::RemoveEntry(TagKey key) {
+   if(KeyHt.count(key) == 1) {
+      gdcmDictEntry* EntryToDelete = KeyHt.find(key)->second;
+      if ( EntryToDelete )
+         delete EntryToDelete;
+      KeyHt.erase(key);
+      return (1);
+   } else {
+      dbg.Verbose(1, "gdcmDict::RemoveEntry unfound entry", key.c_str());
+      return (0);
+  }
 }
 
 
 int gdcmDict::RemoveEntry (guint16 group, guint16 element) {
-
 	return( RemoveEntry(gdcmDictEntry::TranslateToKey(group, element)) );
 }