X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDictSet.cxx;h=5262e30de29e1331d03867b8f8a4458e88fb8872;hb=47438101c70c750ccdcb19df4816169a87fc6c1d;hp=56482cb300f1d2e505c96d93873bbc5dc6c9f05a;hpb=d84a0a9e04fe65dc2ff732d75731fa403d0e02b8;p=gdcm.git

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index 56482cb3..5262e30d 100644
--- a/src/gdcmDictSet.cxx
+++ b/src/gdcmDictSet.cxx
@@ -2,8 +2,9 @@
 
 #include <fstream>
 #include <stdlib.h>  // For getenv
-#include "gdcm.h"
 #include "gdcmUtil.h"
+#include "gdcmDictSet.h"
+using namespace std;
 
 #define PUB_DICT_NAME     "DicomV3Dict"
 #ifndef PUB_DICT_PATH
@@ -11,9 +12,6 @@
 #endif
 #define PUB_DICT_FILENAME "dicomV3.dic"
 
-string gdcmDictSet::DictPath = gdcmDictSet::BuildDictPath();
-gdcmDict* gdcmDictSet::DefaultPubDict = gdcmDictSet::LoadDefaultPubDict();
-
 /** 
  * \ingroup gdcmDictSet
  * \brief   Consider all the entries of the public dicom dictionnary. 
@@ -23,7 +21,7 @@ gdcmDict* gdcmDictSet::DefaultPubDict = gdcmDictSet::LoadDefaultPubDict();
  */
 list<string> * gdcmDictSet::GetPubDictTagNames(void) {
    list<string> * Result = new list<string>;
-   TagKeyHT entries = gdcmDictSet::DefaultPubDict->GetEntries();
+   TagKeyHT entries = GetDefaultPubDict()->GetEntries();
    
    for (TagKeyHT::iterator tag = entries.begin(); tag != entries.end(); ++tag){
       Result->push_back( tag->second->GetName() );
@@ -48,7 +46,7 @@ list<string> * gdcmDictSet::GetPubDictTagNames(void) {
  */
 map<string, list<string> > * gdcmDictSet::GetPubDictTagNamesByCategory(void) {
    map<string, list<string> > * Result = new map<string, list<string> >;
-   TagKeyHT entries = gdcmDictSet::DefaultPubDict->GetEntries();
+   TagKeyHT entries = GetDefaultPubDict()->GetEntries();
 
    for (TagKeyHT::iterator tag = entries.begin(); tag != entries.end(); ++tag){
       (*Result)[tag->second->GetFourth()].push_back(tag->second->GetName());
@@ -78,37 +76,70 @@ string gdcmDictSet::BuildDictPath(void) {
    return ResultPath;
 }
 
-gdcmDict* gdcmDictSet::LoadDefaultPubDict(void) {
-   string PubDictFile = gdcmDictSet::DictPath + PUB_DICT_FILENAME;
-   return new gdcmDict(PubDictFile.c_str());
-}
-
 /** 
  * \ingroup gdcmDictSet
  * \brief   The Dictionnary Set obtained with this constructor simply
  *          contains the Default Public dictionnary.
  */
 gdcmDictSet::gdcmDictSet(void) {
-   dicts[PUB_DICT_NAME] = DefaultPubDict;
+   DictPath = BuildDictPath();
+   string PubDictFile = DictPath + PUB_DICT_FILENAME;
+   Dicts[PUB_DICT_NAME] = new gdcmDict(PubDictFile);
 }
 
+gdcmDictSet::~gdcmDictSet() {
+   for (DictSetHT::iterator tag = Dicts.begin(); tag != Dicts.end(); ++tag) {
+      gdcmDict* EntryToDelete = tag->second;
+      if ( EntryToDelete )
+         delete EntryToDelete;
+   }
+   Dicts.clear();
+}
+
+/**
+ * \ingroup gdcmDictSet
+ * \brief   Loads a dictionary from a specified file, and add it
+ *          to allready the existing ones contained in this gdcmDictSet.
+ * @param   FileName Absolute or relative filename containing the
+ *          dictionary to load.
+ * @param   Name Symbolic name that be used as identifier of the newly 
+ *          created dictionary.
+ */
 void gdcmDictSet::LoadDictFromFile(string FileName, DictKey Name) {
-   gdcmDict *NewDict = new gdcmDict(FileName.c_str());
-   dicts[Name] = NewDict;
+   gdcmDict *NewDict = new gdcmDict(FileName);
+   Dicts[Name] = NewDict;
 }
 
+/**
+ * \ingroup gdcmDictSet
+ * \brief   Print, in an informal fashion, the list of all the dictionaries
+ *          contained is this gdcmDictSet, along with their respective content.
+ * @param   os Output stream used for printing.
+ */
 void gdcmDictSet::Print(ostream& os) {
-   for (DictSetHT::iterator dict = dicts.begin(); dict != dicts.end(); ++dict){
+   for (DictSetHT::iterator dict = Dicts.begin(); dict != Dicts.end(); ++dict){
       os << "Printing dictionary " << dict->first << " \n";
       dict->second->Print(os);
    }
 }
 
+/**
+ * \ingroup gdcmDictSet
+ * \brief   Retrieve the specified dictionary (when existing) from this
+ *          gdcmDictSet.
+ * @param   DictName The synbolic name of the searched dictionary.
+ * \result  The retrieved dictionary.
+ */
 gdcmDict * gdcmDictSet::GetDict(DictKey DictName) {
-   DictSetHT::iterator dict = dicts.find(DictName);
+   DictSetHT::iterator dict = Dicts.find(DictName);
    return dict->second;
 }
 
+/**
+ * \ingroup gdcmDictSet
+ * \brief   Retrieve the default reference DICOM V3 public dictionary.
+ * \result  The retrieved default dictionary.
+ */
 gdcmDict * gdcmDictSet::GetDefaultPubDict() {
    return GetDict(PUB_DICT_NAME);
 }