ENH: Adding 'gdcm' namespace. Be nice with me this was a ~13000 lines patch. Also...

[gdcm.git] / src / gdcmTS.cxx

diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx
index 4a8fffbdf4b5c8886130d28357b139885d0b33ad..4f87ab6c947e227336c747c8b05d9b47fd0363a3 100644 (file)
--- a/src/gdcmTS.cxx
+++ b/src/gdcmTS.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmTS.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/22 13:47:33 $
-  Version:   $Revision: 1.20 $
+  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
@@ -16,36 +16,37 @@
                                                                                 
 =========================================================================*/
 
-#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;
       }
@@ -53,7 +54,8 @@ gdcmTS::gdcmTS(void)
    from.close();
 }
 
-gdcmTS::~gdcmTS() 
+//-----------------------------------------------------------------------------
+TS::~TS() 
 {
    ts.clear();
 }
@@ -61,11 +63,11 @@ gdcmTS::~gdcmTS()
 //-----------------------------------------------------------------------------
 // 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;
 
@@ -78,15 +80,17 @@ void gdcmTS::Print(std::ostream &os)
 
 //-----------------------------------------------------------------------------
 // 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) 
-      return (GDCM_UNFOUND);
+   if (ts.count(key) == 0)
+   {
+      return GDCM_UNFOUND;
+   }
    return ts[key];
 }
 
@@ -97,3 +101,5 @@ std::string gdcmTS::GetValue(TSKey key)
 // Private
 
 //-----------------------------------------------------------------------------
+
+} // end namespace gdcm