X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.cxx;h=99b890200da1d523d2590459992389715e78b44b;hb=13fd600696872f088e41161308fe4e37df1a57bd;hp=ace75222b3241d7624543308938177bc7f4fcdf5;hpb=541ed5b2824ff14630565a474b1406e58b677662;p=gdcm.git

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index ace75222..99b89020 100644
--- a/src/gdcmDictSet.cxx
+++ b/src/gdcmDictSet.cxx
@@ -1,9 +1,9 @@
 // gdcmDictEntry
 
+#include "gdcmDictSet.h"
+#include "gdcmUtil.h"
 #include <fstream>
 #include <stdlib.h>  // For getenv
-#include "gdcmUtil.h"
-#include "gdcmDictSet.h"
 
 #define PUB_DICT_NAME     "DicomV3Dict"
 #ifndef PUB_DICT_PATH
@@ -11,9 +11,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. 
@@ -21,9 +18,9 @@ gdcmDict* gdcmDictSet::DefaultPubDict = gdcmDictSet::LoadDefaultPubDict();
  * \sa      gdcmDictSet::GetPubDictTagNamesByCategory
  * @return  A list of all entries of the public dicom dictionnary.
  */
-list<string> * gdcmDictSet::GetPubDictTagNames(void) {
-   list<string> * Result = new list<string>;
-   TagKeyHT entries = gdcmDictSet::DefaultPubDict->GetEntries();
+std::list<std::string> * gdcmDictSet::GetPubDictTagNames(void) {
+   std::list<std::string> * Result = new std::list<std::string>;
+   TagKeyHT entries = GetDefaultPubDict()->GetEntries();
    
    for (TagKeyHT::iterator tag = entries.begin(); tag != entries.end(); ++tag){
       Result->push_back( tag->second->GetName() );
@@ -42,13 +39,22 @@ list<string> * gdcmDictSet::GetPubDictTagNames(void) {
  *          A typical usage of this method would be to enable a dynamic
  *          configuration of a Dicom file browser: the admin/user can
  *          select in the interface which Dicom tags should be displayed.
+ * \warning Dicom *doesn't* define any name for any 'categorie'
+ *          (the dictionnary fourth field was formerly NIH defined
+ *           - and no longer he is-
+ *           and will be removed when Dicom provides us a text file
+ *           with the 'official' Dictionnary, that would be more friendly
+ *           than asking us to perform a line by line check od thhe 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.
  */
-map<string, list<string> > * gdcmDictSet::GetPubDictTagNamesByCategory(void) {
-   map<string, list<string> > * Result = new map<string, list<string> >;
-   TagKeyHT entries = gdcmDictSet::DefaultPubDict->GetEntries();
+std::map<std::string, std::list<std::string> > * gdcmDictSet::GetPubDictTagNamesByCategory(void) {
+   std::map<std::string, std::list<std::string> > * Result = new std::map<std::string, std::list<std::string> >;
+   TagKeyHT entries = GetDefaultPubDict()->GetEntries();
 
    for (TagKeyHT::iterator tag = entries.begin(); tag != entries.end(); ++tag){
       (*Result)[tag->second->GetFourth()].push_back(tag->second->GetName());
@@ -63,8 +69,8 @@ map<string, list<string> > * gdcmDictSet::GetPubDictTagNamesByCategory(void) {
  *          the environnement variable is absent the path is defaulted
  *          to "../Dicts/".
  */
-string gdcmDictSet::BuildDictPath(void) {
-   string ResultPath;
+std::string gdcmDictSet::BuildDictPath(void) {
+   std::string ResultPath;
    const char* EnvPath = (char*)0;
    EnvPath = getenv("GDCM_DICT_PATH");
    if (EnvPath && (strlen(EnvPath) != 0)) {
@@ -78,42 +84,38 @@ string gdcmDictSet::BuildDictPath(void) {
    return ResultPath;
 }
 
-/**
- * \ingroup gdcmDictSet
- * \brief   Loads the default public DICOM V3 dictionary as a gdcmDict.
- * \return  The newly build reference public dictionary.
- */
-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();
+   std::string PubDictFile = DictPath + PUB_DICT_FILENAME;
+   Dicts[PUB_DICT_NAME] = new gdcmDict(PubDictFile);
 }
 
 gdcmDictSet::~gdcmDictSet() {
-   //FIXME : first destroy pointed dictionaries before trashing hash table.
-   dicts.clear();
+   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.
+ *          to already 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;
+void gdcmDictSet::LoadDictFromFile(std::string FileName, DictKey Name) {
+   gdcmDict *NewDict = new gdcmDict(FileName);
+   Dicts[Name] = NewDict;
 }
 
 /**
@@ -122,9 +124,9 @@ void gdcmDictSet::LoadDictFromFile(string FileName, DictKey Name) {
  *          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){
-      os << "Printing dictionary " << dict->first << " \n";
+void gdcmDictSet::Print(std::ostream& os) {
+   for (DictSetHT::iterator dict = Dicts.begin(); dict != Dicts.end(); ++dict){
+      os << "Printing dictionary " << dict->first << std::endl;
       dict->second->Print(os);
    }
 }
@@ -137,7 +139,7 @@ void gdcmDictSet::Print(ostream& os) {
  * \result  The retrieved dictionary.
  */
 gdcmDict * gdcmDictSet::GetDict(DictKey DictName) {
-   DictSetHT::iterator dict = dicts.find(DictName);
+   DictSetHT::iterator dict = Dicts.find(DictName);
    return dict->second;
 }