Program: gdcm
Module: $RCSfile: gdcmDict.cxx,v $
Language: C++
- Date: $Date: 2004/10/28 19:53:28 $
- Version: $Revision: 1.50 $
+ Date: $Date: 2004/11/16 02:54:35 $
+ Version: $Revision: 1.52 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
namespace gdcm
{
-
+void FillDefaultDataDict(Dict *d);
//-----------------------------------------------------------------------------
// Constructor / Destructor
/**
TagName name;
std::ifstream from( filename.c_str() );
- dbg.Error(!from, "Dict::Dict: can't open dictionary",
- filename.c_str());
-
- while (!from.eof())
+ if( !from )
{
- from >> std::hex;
- from >> group;
- from >> element;
- from >> vr;
- from >> fourth;
- from >> std::ws; //remove white space
- std::getline(from, name);
+ dbg.Verbose(2,"Dict::Dict: can't open dictionary", filename.c_str());
+ // Using default embeded one:
+ FillDefaultDataDict( this );
+ }
+ else
+ {
+ while (!from.eof())
+ {
+ from >> std::hex;
+ from >> group;
+ from >> element;
+ from >> vr;
+ from >> fourth;
+ from >> std::ws; //remove white space
+ std::getline(from, name);
+
+ const DictEntry newEntry(group, element, vr, fourth, name);
+ AddNewEntry(newEntry);
+ }
- DictEntry newEntry(group, element, vr, fourth, name);
- AddNewEntry(newEntry);
+ Filename = filename;
}
from.close();
-
- Filename = filename;
}
/**
}
else
{
- KeyHt.insert(
- std::map<TagKey, DictEntry>::value_type
- (newEntry.GetKey(), newEntry));
- NameHt.insert(
- std::map<TagName, DictEntry>::value_type
- (newEntry.GetName(), newEntry ));
+ KeyHt.insert( TagKeyHT::value_type(newEntry.GetKey(), newEntry));
+ NameHt.insert( TagNameHT::value_type(newEntry.GetName(), newEntry ));
return true;
}
}
{
if ( RemoveEntry(newEntry.GetKey()) )
{
- KeyHt.insert(
- std::map<TagKey, DictEntry>::value_type
- (newEntry.GetKey(), newEntry));
- NameHt.insert(
- std::map<TagName, DictEntry>::value_type
- (newEntry.GetName(), newEntry ));
+ KeyHt.insert( TagKeyHT::value_type(newEntry.GetKey(), newEntry));
+ NameHt.insert( TagNameHT::value_type(newEntry.GetName(), newEntry ));
return true;
}
return false;
TagKeyHT::const_iterator it = KeyHt.find(key);
if(it != KeyHt.end())
{
- const DictEntry & entryToDelete = it->second;
+ const DictEntry& entryToDelete = it->second;
NameHt.erase(entryToDelete.GetName());
KeyHt.erase(key);