X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.cxx;h=e15f6a7f1a9a07e8c852d0542b3eb97946191aec;hb=3b48ae81d6c358b352e726fa283296c496f35437;hp=24a3eafb1d5b8594283875f561dba91339925f4d;hpb=43cf193ac4e7395e1406e1867d76a6125c257a8b;p=gdcm.git diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx index 24a3eafb..e15f6a7f 100644 --- a/src/gdcmDictSet.cxx +++ b/src/gdcmDictSet.cxx @@ -1,16 +1,26 @@ -// gdcmDictEntry -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDictSet.cxx,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.31 $ + + 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.htm 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 "gdcmUtil.h" +#include "gdcmDebug.h" #include #include // For getenv -#define PUB_DICT_NAME "DicomV3Dict" -#ifndef PUB_DICT_PATH -# define PUB_DICT_PATH "../Dicts/" -#endif -#define PUB_DICT_FILENAME "dicomV3.dic" - //----------------------------------------------------------------------------- // Constructor / Destructor /** @@ -21,7 +31,8 @@ gdcmDictSet::gdcmDictSet(void) { DictPath = BuildDictPath(); - std::string PubDictFile = DictPath + PUB_DICT_FILENAME; + std::string PubDictFile(DictPath); + PubDictFile += PUB_DICT_FILENAME; /// MEMORY LEAK std::string::operator+= Dicts[PUB_DICT_NAME] = new gdcmDict(PubDictFile); } @@ -85,8 +96,9 @@ std::list *gdcmDictSet::GetPubDictEntryNames(void) /** * \ingroup gdcmDictSet - * \brief - Consider all the entries of the public dicom dictionnary. - * Build an hashtable whose keys are the names of the groups + * \brief + * - Consider all the entries of the public dicom dictionnary. + * - Build an hashtable whose keys are the names of the groups * (fourth field in each line of dictionary) and whose corresponding * values are lists of all the dictionnary entries among that * group. Note that apparently the Dicom standard doesn't explicitely