Program: gdcm
Module: $RCSfile: gdcmTS.cxx,v $
Language: C++
- Date: $Date: 2004/10/12 04:35:48 $
- Version: $Revision: 1.26 $
+ Date: $Date: 2005/01/06 15:41:28 $
+ Version: $Revision: 1.29 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <string>
#include <iostream>
+// TODO
+// a lot of troubles expected with TS : 1.2.840.113619.5.2
+// Implicit VR - Big Endian
+// see : http://www.gemedicalsystemseurope.com/euen/it_solutions/pdf/lsqxi_rev2.pdf
+//
+
namespace gdcm
{
-
+void FillDefaultTSDict(TSHT & ts);
//-----------------------------------------------------------------------------
// Constructor / Destructor
TS::TS()
{
- std::string filename=DictSet::BuildDictPath() + std::string(DICT_TS);
+ std::string filename = DictSet::BuildDictPath() + DICT_TS;
std::ifstream from(filename.c_str());
- dbg.Error(!from, "TS::TS: can't open dictionary",filename.c_str());
-
- std::string key;
- std::string name;
-
- while (!from.eof())
+ if( !from )
{
- from >> key;
-
- from >> std::ws; // used to be eatwhite(from);
- std::getline(from, name); /// MEMORY LEAK
-
- if(key!="")
+ dbg.Verbose(2, "TS::TS: can't open dictionary", filename.c_str());
+ FillDefaultTSDict( TsMap );
+ }
+ else
+ {
+ TSKey key;
+ TSAtr name;
+
+ while (!from.eof())
{
- ts[key]=name;
+ from >> key;
+ from >> std::ws;
+ std::getline(from, name);
+
+ if(key != "")
+ {
+ TsMap[key] = name;
+ }
}
+ from.close();
}
- from.close();
}
//-----------------------------------------------------------------------------
TS::~TS()
{
- ts.clear();
+ TsMap.clear();
}
//-----------------------------------------------------------------------------
{
std::ostringstream s;
- for (TSHT::iterator it = ts.begin(); it != ts.end(); ++it)
+ for (TSHT::const_iterator it = TsMap.begin(); it != TsMap.end(); ++it)
{
- s << "TS : "<<it->first<<" = "<<it->second<<std::endl;
+ s << "TS : " << it->first << " = " << it->second << std::endl;
}
os << s.str();
}
//-----------------------------------------------------------------------------
// Public
-int TS::Count(TSKey key)
+int TS::Count(TSKey const & key)
{
- return ts.count(key);
+ return TsMap.count(key);
}
-std::string TS::GetValue(TSKey key)
+TSAtr const & TS::GetValue(TSKey const & key)
{
- if (ts.count(key) == 0)
+ TSHT::const_iterator it = TsMap.find(key);
+ if (it == TsMap.end())
{
return GDCM_UNFOUND;
}
- return ts[key];
+ return it->second;
}
//-----------------------------------------------------------------------------