Program: gdcm
Module: $RCSfile: gdcmTS.cxx,v $
Language: C++
- Date: $Date: 2004/06/23 03:36:24 $
- Version: $Revision: 1.21 $
+ Date: $Date: 2004/10/12 04:35:48 $
+ Version: $Revision: 1.26 $
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.
+ 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
=========================================================================*/
-#include <fstream>
-#include <string>
-#include <iostream>
-
#include "gdcmTS.h"
#include "gdcmDebug.h"
#include "gdcmUtil.h"
#include "gdcmDictSet.h"
+#include <fstream>
+#include <string>
+#include <iostream>
+namespace gdcm
+{
//-----------------------------------------------------------------------------
// Constructor / Destructor
-gdcmTS::gdcmTS(void)
+TS::TS()
{
- std::string filename=gdcmDictSet::BuildDictPath() + std::string(DICT_TS);
+ std::string filename=DictSet::BuildDictPath() + std::string(DICT_TS);
std::ifstream from(filename.c_str());
- dbg.Error(!from, "gdcmTS::gdcmTS: can't open dictionary",filename.c_str());
+ dbg.Error(!from, "TS::TS: can't open dictionary",filename.c_str());
- //char buff[1024]; //not used
std::string key;
std::string name;
- while (!from.eof()) {
+ while (!from.eof())
+ {
from >> key;
- eatwhite(from);
- getline(from, name); /// MEMORY LEAK
+ from >> std::ws; // used to be eatwhite(from);
+ std::getline(from, name); /// MEMORY LEAK
- if(key!="")
+ if(key!="")
{
ts[key]=name;
}
from.close();
}
-gdcmTS::~gdcmTS()
+//-----------------------------------------------------------------------------
+TS::~TS()
{
ts.clear();
}
//-----------------------------------------------------------------------------
// Print
/**
- * \ingroup gdcmVR
+ * \ingroup VR
* \brief Print all
* @param os The output stream to be written to.
*/
-void gdcmTS::Print(std::ostream &os)
+void TS::Print(std::ostream &os)
{
std::ostringstream s;
//-----------------------------------------------------------------------------
// Public
-int gdcmTS::Count(TSKey key)
+int TS::Count(TSKey key)
{
return ts.count(key);
}
-std::string gdcmTS::GetValue(TSKey key)
+std::string TS::GetValue(TSKey key)
{
- if (ts.count(key) == 0)
+ if (ts.count(key) == 0)
+ {
return GDCM_UNFOUND;
+ }
return ts[key];
}
// Private
//-----------------------------------------------------------------------------
+
+} // end namespace gdcm