ENH: minor cleanup patch, use TagName instead of std:string for clarification. Don...

[gdcm.git] / src / gdcmTS.cxx

diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx
index 29ab1be0a9c6d52731fd5d3e7ad488c765ccc785..4f87ab6c947e227336c747c8b05d9b47fd0363a3 100644 (file)
--- a/src/gdcmTS.cxx
+++ b/src/gdcmTS.cxx
@@ -1,31 +1,50 @@
-// gdcmTS.cxx
-
-#include <fstream>
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmTS.cxx,v $
+  Language:  C++
+  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.html 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 "gdcmTS.h"
+#include "gdcmDebug.h"
 #include "gdcmUtil.h"
+#include "gdcmDictSet.h"
+
+#include <fstream>
+#include <string>
+#include <iostream>
 
-#ifndef PUB_DICT_PATH
-#  define PUB_DICT_PATH     "../Dicts/"
-#endif
-#define DICT_TS "dicomTS.dic"
+namespace gdcm 
+{
 
-gdcmTS::gdcmTS(void) {
-   std::string filename=gdcmDictSet::BuildDictPath() + std::string(DICT_TS);
+//-----------------------------------------------------------------------------
+// Constructor / Destructor
+TS::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];
    std::string key;
    std::string name;
 
-   while (!from.eof()) {
-      eatwhite(from);
-      from.getline(buff, 1024, ' ');
-      key = buff;
-      eatwhite(from);
-      from.getline(buff, 1024, '\n');
-      name = buff;
+   while (!from.eof())
+   {
+      from >> key;
+
+      from >> std::ws; // used to be eatwhite(from);
+      std::getline(from, name);    /// MEMORY LEAK
 
       if(key!="")
       {
@@ -35,16 +54,52 @@ gdcmTS::gdcmTS(void) {
    from.close();
 }
 
-gdcmTS::~gdcmTS() {
+//-----------------------------------------------------------------------------
+TS::~TS() 
+{
    ts.clear();
 }
 
-int gdcmTS::Count(TSKey key) {
+//-----------------------------------------------------------------------------
+// Print
+/**
+ * \ingroup VR
+ * \brief   Print all 
+ * @param   os The output stream to be written to.
+ */
+void TS::Print(std::ostream &os) 
+{
+   std::ostringstream s;
+
+   for (TSHT::iterator it = ts.begin(); it != ts.end(); ++it)
+   {
+      s << "TS : "<<it->first<<" = "<<it->second<<std::endl;
+   }
+   os << s.str();
+}
+
+//-----------------------------------------------------------------------------
+// Public
+int TS::Count(TSKey key) 
+{
    return ts.count(key);
 }
 
-std::string gdcmTS::GetValue(TSKey key) {
-   if (ts.count(key) == 0) 
-      return (GDCM_UNFOUND);
+std::string TS::GetValue(TSKey key) 
+{
+   if (ts.count(key) == 0)
+   {
+      return GDCM_UNFOUND;
+   }
    return ts[key];
 }
+
+//-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+// Private
+
+//-----------------------------------------------------------------------------
+
+} // end namespace gdcm