X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.cxx;h=63c03594624853c48d638dff83d64a0e4e1783ee;hb=17daf7e7caceddf44e73864ee8d366613a1f0c82;hp=814ca802e223811cb31c608db41defeedf6d7bda;hpb=1aa2bb207fb6b9ce78f35e7547dd4c770e516adb;p=gdcm.git

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index 814ca802..63c03594 100644
--- a/src/gdcmDictSet.cxx
+++ b/src/gdcmDictSet.cxx
@@ -1,51 +1,172 @@
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDictSet.cxx,v $
+  Language:  C++
+  Date:      $Date: 2005/11/28 15:20:33 $
+  Version:   $Revision: 1.73 $
+                                                                                
+  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.html 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 "gdcmDictSet.h"
+#include "gdcmDebug.h"
 #include <fstream>
 #include <stdlib.h>  // For getenv
-#include "gdcm.h"
-#include "gdcmUtil.h"
+#include <stdio.h>   // For sprintf
 
-#define PUB_DICT_NAME     "DicomV3Dict"
-#define PUB_DICT_PATH     "../Dicts/"
-#define PUB_DICT_FILENAME "dicomV3.dic"
+namespace gdcm 
+{
 
-gdcmDictSet::gdcmDictSet(void) {
-	SetDictPath();
-	if (! LoadDicomV3Dict())
-			  return;
+//-----------------------------------------------------------------------------
+// Constructor / Destructor
+/** 
+ * \brief   The Dictionary Set obtained with this constructor simply
+ *          contains the Default Public dictionary.
+ */
+DictSet::DictSet() 
+{
+   DictPath = BuildDictPath();
+   std::string pubDictFile(DictPath);
+   pubDictFile += PUB_DICT_FILENAME;
+   Dicts[PUB_DICT_NAME] = Dict::New(pubDictFile);
 }
 
-void gdcmDictSet::SetDictPath(void) {
-	const char* EnvPath = (char*)0;
-	EnvPath = getenv("GDCM_DICT_PATH");
-	if (EnvPath && (strlen(EnvPath) != 0))
-		DictPath = EnvPath;
-	else
-		DictPath = PUB_DICT_PATH;
+/**
+ * \brief  Destructor 
+ */
+DictSet::~DictSet() 
+{
+   // Remove dictionaries
+   for (DictSetHT::iterator tag = Dicts.begin(); tag != Dicts.end(); ++tag) 
+   {
+      if ( tag->second )
+         tag->second->Delete();
+   }
+   Dicts.clear();
 }
 
-int gdcmDictSet::LoadDicomV3Dict(void) {
-	if (dicts.count(PUB_DICT_NAME))
-		return 1;
-	return LoadDictFromFile(DictPath + PUB_DICT_FILENAME, PUB_DICT_NAME);
+//-----------------------------------------------------------------------------
+// Public
+/**
+ * \brief   Loads a dictionary from a specified file, and add it
+ *          to already the existing ones contained in this DictSet.
+ * @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.
+ */
+Dict *DictSet::LoadDictFromFile(std::string const &filename, 
+                                DictKey const &name) 
+{
+   Dict *newDict = Dict::New(filename);
+   Dicts[name] = newDict;
+
+   return newDict;
 }
 
-int gdcmDictSet::LoadDictFromFile(string FileName, DictKey Name) {
-	gdcmDict *NewDict = new gdcmDict(FileName.c_str());
-	dicts[Name] = NewDict;
-	return 0;
+/**
+ * \brief   Retrieve the specified dictionary (when existing) from this
+ *          DictSet.
+ * @param   dictName The symbolic name of the searched dictionary.
+ * \result  The retrieved dictionary.
+ */
+Dict *DictSet::GetDict(DictKey const &dictName) 
+{
+   DictSetHT::iterator dict = Dicts.find(dictName);
+   if ( dict != Dicts.end() )
+   {
+      return dict->second;
+   }
+   return NULL;
 }
 
-void gdcmDictSet::Print(ostream& os) {
-	for (DictSetHT::iterator dict = dicts.begin(); dict != dicts.end(); ++dict){
-		os << "Printing dictionary " << dict->first << " \n";
-		dict->second->Print(os);
-	}
+/**
+ * \brief   Get the first dictionary while visiting the DictSet
+ * \return  The first Dict if found, otherwhise NULL
+ */
+Dict *DictSet::GetFirstDict()
+{
+   ItDictHt = Dicts.begin();
+   if ( ItDictHt != Dicts.end() )
+      return ItDictHt->second;
+   return NULL;
 }
 
-gdcmDict * gdcmDictSet::GetDict(DictKey DictName) {
-	DictSetHT::iterator dict = dicts.find(DictName);
-	return dict->second;
+/**
+ * \brief   Get the next dictionary while visiting the Hash table (DictSetHT)
+ * \note : meaningfull only if GetFirstEntry already called
+ * \return  The next Dict if found, otherwhise NULL
+ */
+Dict *DictSet::GetNextDict()
+{
+   gdcmAssertMacro (ItDictHt != Dicts.end());
+  
+   ++ItDictHt;
+   if ( ItDictHt != Dicts.end() )
+      return ItDictHt->second;
+   return NULL;
 }
 
-gdcmDict * gdcmDictSet::GetDefaultPublicDict() {
-	return GetDict(PUB_DICT_NAME);
+/**
+ * \brief   Obtain from the GDCM_DICT_PATH environnement variable the
+ *          path to directory containing the dictionaries. When
+ *          the environnement variable is absent the path is defaulted
+ *          to "../Dicts/".
+ * @return  path to directory containing the dictionaries
+ */
+std::string DictSet::BuildDictPath() 
+{
+   std::string resultPath;
+   const char *envPath;
+   envPath = getenv("GDCM_DICT_PATH");
+
+   if (envPath && (strlen(envPath) != 0)) 
+   {
+      resultPath = envPath;
+      gdcmStaticWarningMacro( "Dictionary path set from environnement");
+   } 
+   else
+   {
+      resultPath = PUB_DICT_PATH;
+   }
+   if ( resultPath[resultPath.length()-1] != '/' )
+   {
+      resultPath += '/';
+   }
+
+   return resultPath;
 }
+
+//-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+// Private
+
+//-----------------------------------------------------------------------------
+// Print
+/**
+ * \brief   Print, in an informal fashion, the list of all the dictionaries
+ *          contained is this DictSet, along with their respective content.
+ * @param   os Output stream used for printing.
+ * @param indent Indentation string to be prepended during printing
+ */
+void DictSet::Print(std::ostream &os, std::string const & )
+{
+   for (DictSetHT::iterator dict = Dicts.begin(); dict != Dicts.end(); ++dict)
+   {
+      os << "Printing dictionary " << dict->first << std::endl;
+      dict->second->Print(os);
+   }
+}
+
+//-----------------------------------------------------------------------------
+} // end namespace gdcm