X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmTS.cxx;h=26c672df9f9107b02e145d1c724742415cd56218;hb=7476af29bb3b4ef233bb4f284b26322432f07e49;hp=152aaebb91b9b4f7d09fbd995b4b02d9ab318513;hpb=fd37aa842b5d31ca266b6bda8a77f3201d02338d;p=gdcm.git

diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx
index 152aaebb..26c672df 100644
--- a/src/gdcmTS.cxx
+++ b/src/gdcmTS.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmTS.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/09/27 08:39:07 $
-  Version:   $Revision: 1.24 $
+  Date:      $Date: 2004/11/03 18:08:56 $
+  Version:   $Revision: 1.28 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,77 +16,88 @@
                                                                                 
 =========================================================================*/
 
-#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 
+{
+void FillDefaultTSDict(TSHT & ts);
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
-gdcmTS::gdcmTS(void) 
+TS::TS() 
 {
-   std::string filename=gdcmDictSet::BuildDictPath() + std::string(DICT_TS);
+   std::string filename = DictSet::BuildDictPath() + DICT_TS;
    std::ifstream from(filename.c_str());
-   dbg.Error(!from, "gdcmTS::gdcmTS: can't open dictionary",filename.c_str());
-
-   std::string key;
-   std::string name;
-
-   while (!from.eof()) {
-      from >> key;
-
-      eatwhite(from);
-      std::getline(from, name);    /// MEMORY LEAK
-
-      if(key!="") 
+   if( !from )
+   {
+      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();
 }
 
-gdcmTS::~gdcmTS() 
+//-----------------------------------------------------------------------------
+TS::~TS() 
 {
-   ts.clear();
+   TsMap.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;
 
-   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 gdcmTS::Count(TSKey key) 
+int TS::Count(TSKey const & key) 
 {
-   return ts.count(key);
+   return TsMap.count(key);
 }
 
-std::string gdcmTS::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;
 }
 
 //-----------------------------------------------------------------------------
@@ -96,3 +107,5 @@ std::string gdcmTS::GetValue(TSKey key)
 // Private
 
 //-----------------------------------------------------------------------------
+
+} // end namespace gdcm