X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictGroupName.cxx;h=bc6477d802920811c41c4ecd58fcdfc6e19f318b;hb=df832cf7f90b4ca5aca2f628c1756fb276779fac;hp=3095a4388dbfc0f333d2a6e13aa2071ae00e51a9;hpb=bffe262ccd235da9f1df5c204b4b97df74757994;p=gdcm.git

diff --git a/src/gdcmDictGroupName.cxx b/src/gdcmDictGroupName.cxx
index 3095a438..bc6477d8 100644
--- a/src/gdcmDictGroupName.cxx
+++ b/src/gdcmDictGroupName.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictGroupName.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/04/06 08:59:46 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2007/05/23 14:18:09 $
+  Version:   $Revision: 1.8 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -25,10 +25,10 @@
 #include <iostream>
 #include <iomanip>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
-/// \brief auto generated function, to fill up the 'Value Representation'
+/// \brief auto generated function, to fill up the 'Group Name'
 ///        Dictionnary, if relevant file is not found on user's disk
 void FillDefaultDictGroupName(DictGroupNameHT &groupName);
 
@@ -41,7 +41,7 @@ DictGroupName::DictGroupName()
 {
    std::string filename = DictSet::BuildDictPath() + DICT_GROUP_NAME;
    std::ifstream from(filename.c_str());
-   if(!from)
+   if ( !from )
    {
       gdcmWarningMacro("Can't open dictionary" << filename.c_str());
       FillDefaultDictGroupName(groupName);
@@ -50,7 +50,7 @@ DictGroupName::DictGroupName()
    {
       char buff[1024];
       uint16_t key;
-      GroupName value;
+      TagName value;
    
       while (!from.eof()) 
       {
@@ -61,7 +61,7 @@ DictGroupName::DictGroupName()
          from.getline(buff, 1024, '"');
          from.getline(buff, 1024, '"');
          value = buff;
-         if(!from.eof())
+         if ( !from.eof() )
             groupName[key] = value;
 
          from.getline(buff, 1024, '\n');
@@ -80,10 +80,11 @@ DictGroupName::~DictGroupName()
 
 //-----------------------------------------------------------------------------
 // Public
-const GroupName &DictGroupName::GetName(uint16_t group)
+/// \returns the formerly NIH defined ACR-NEMA group name
+const TagName &DictGroupName::GetName(uint16_t group)
 {
    DictGroupNameHT::const_iterator it = groupName.find(group);
-   if (it == groupName.end())
+   if ( it == groupName.end() )
    {
       return GDCM_UNFOUND;
    }
@@ -102,7 +103,7 @@ const GroupName &DictGroupName::GetName(uint16_t group)
  * \brief   Print all 
  * @param   os The output stream to be written to.
  */
-void DictGroupName::Print(std::ostream &os) 
+void DictGroupName::Print(std::ostream &os,std::string const &) 
 {
    std::ostringstream s;