X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValEntry.cxx;h=d6d7b89dfa23f7a20debac870ddd46f93eecc639;hb=8d10ccb6794a0f22234983990e2181a24625fbd8;hp=66fc32a78b880c208240aee4f3a29496c55a0e19;hpb=fd37aa842b5d31ca266b6bda8a77f3201d02338d;p=gdcm.git

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index 66fc32a7..d6d7b89d 100644
--- a/src/gdcmValEntry.cxx
+++ b/src/gdcmValEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/09/27 08:39:08 $
-  Version:   $Revision: 1.27 $
+  Date:      $Date: 2004/11/25 15:46:12 $
+  Version:   $Revision: 1.38 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,25 +21,30 @@
 #include "gdcmGlobal.h"
 #include "gdcmUtil.h"
 
+#include <fstream>
+
+namespace gdcm 
+{
+
 // CLEAN ME
 #define MAX_SIZE_PRINT_ELEMENT_VALUE 128
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \brief   Constructor from a given gdcmDictEntry
+ * \brief   Constructor from a given DictEntry
  * @param   e Pointer to existing dictionary entry
  */
-gdcmValEntry::gdcmValEntry(gdcmDictEntry* e) : gdcmDocEntry(e)
+ValEntry::ValEntry(DictEntry* e) : DocEntry(e)
 {
 }
 
 /**
- * \brief   Constructor from a given gdcmDocEntry
+ * \brief   Constructor from a given DocEntry
  * @param   e Pointer to existing Doc entry
  */
-gdcmValEntry::gdcmValEntry(gdcmDocEntry* e)
-             : gdcmDocEntry(e->GetDictEntry())
+ValEntry::ValEntry(DocEntry* e)
+             : DocEntry(e->GetDictEntry())
 {
    UsableLength = e->GetLength();
    ReadLength   = e->GetReadLength();
@@ -52,7 +57,7 @@ gdcmValEntry::gdcmValEntry(gdcmDocEntry* e)
 /**
  * \brief   Canonical destructor.
  */
-gdcmValEntry::~gdcmValEntry ()
+ValEntry::~ValEntry ()
 {
 }
 
@@ -61,17 +66,18 @@ gdcmValEntry::~gdcmValEntry ()
 /**
  * \brief   canonical Printer
  */
-void gdcmValEntry::Print(std::ostream & os)
+void ValEntry::Print(std::ostream & os)
 {
    uint16_t g = GetGroup();
    uint16_t e = GetElement();
    std::string vr = GetVR();
    std::ostringstream s; 
-   char st[20];
+   std::string st;
    TSKey v;
    std::string d2;
      
-   gdcmDocEntry::Print(os); 
+   os << "V ";
+   DocEntry::Print(os); 
 
    if (g == 0xfffe)
    {
@@ -79,10 +85,10 @@ void gdcmValEntry::Print(std::ostream & os)
       return;
    }
    
-   gdcmTS * ts = gdcmGlobal::GetTS();
+   TS * ts = Global::GetTS();
     
    v  = GetValue();  // not applicable for SQ ...     
-   d2 = CreateCleanString(v);  // replace non printable characters by '.'            
+   d2 = Util::CreateCleanString(v);  // replace non printable characters by '.'            
    if( (GetLength()<=MAX_SIZE_PRINT_ELEMENT_VALUE) || 
        //(PrintLevel>=3)  || (d2.find("gdcm::NotLoaded.") < d2.length()) )
        (PrintLevel>=3)  || (d2.find(GDCM_NOTLOADED) < d2.length()) )
@@ -103,7 +109,7 @@ void gdcmValEntry::Print(std::ostream & os)
       {
          if ( v.length() != 0 )  // for brain damaged headers
          {
-            if ( ! isdigit(v[v.length()-1]) )
+            if ( ! isdigit((unsigned char)v[v.length()-1]) )
             {
                v.erase(v.length()-1, 1);
             }
@@ -119,7 +125,7 @@ void gdcmValEntry::Print(std::ostream & os)
          {
             if ( v.length() != 0 )  // for brain damaged headers
             {
-               if ( ! isdigit(v[v.length()-1]) )
+               if ( ! isdigit((unsigned char)v[v.length()-1]) )
                {
                   v.erase(v.length()-1, 1);
                }
@@ -135,7 +141,7 @@ void gdcmValEntry::Print(std::ostream & os)
             {
                if ( v.length() != 0 )  // for brain damaged headers  
                {
-                  if ( ! isdigit(v[v.length()-1]) )
+                  if ( ! isdigit((unsigned char)v[v.length()-1]) )
                   {
                      v.erase(v.length()-1, 1);  
                   }
@@ -150,17 +156,17 @@ void gdcmValEntry::Print(std::ostream & os)
    {
       if (v == "4294967295") // to avoid troubles in convertion 
       {
-         sprintf (st," x(ffffffff)");
+         st = Util::Format(" x(ffffffff)");
       }
       else
       {
          if ( GetLength() !=0 )
          {
-            sprintf(st," x(%x)", atoi(v.c_str()));//FIXME
+            st = Util::Format(" x(%x)", atoi(v.c_str()));//FIXME
          }
          else
          {
-            sprintf(st," ");
+            st = Util::Format(" ");
          }
       }
       s << st;
@@ -171,9 +177,9 @@ void gdcmValEntry::Print(std::ostream & os)
 /*
  * \brief   canonical Writer
  */
-void gdcmValEntry::Write(FILE* fp, FileType filetype)
+void ValEntry::WriteContent(std::ofstream* fp, FileType filetype)
 {
-   gdcmDocEntry::Write(fp, filetype);
+   DocEntry::WriteContent(fp, filetype);
 
    //std::cout << "=====================================" << GetVR() << std::endl;
       
@@ -183,7 +189,7 @@ void gdcmValEntry::Write(FILE* fp, FileType filetype)
    }
       
    std::string vr = GetVR();
-   int lgr = GetReadLength();
+   unsigned int lgr = GetReadLength();
    if (vr == "US" || vr == "SS")
    {
       // some 'Short integer' fields may be mulivaluated
@@ -191,12 +197,11 @@ void gdcmValEntry::Write(FILE* fp, FileType filetype)
       // we split the string and write each value as a short int
       std::vector<std::string> tokens;
       tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
-      Tokenize (GetValue(), tokens, "\\");
+      Util::Tokenize (GetValue(), tokens, "\\");
       for (unsigned int i=0; i<tokens.size();i++)
       {
          uint16_t val_uint16 = atoi(tokens[i].c_str());
-         void* ptr = &val_uint16;
-         fwrite ( ptr,(size_t)2 ,(size_t)1 ,fp);
+         binary_write( *fp, val_uint16);
       }
       tokens.clear();
       return;
@@ -209,18 +214,18 @@ void gdcmValEntry::Write(FILE* fp, FileType filetype)
       // along the '\' and write each value as an int:
       std::vector<std::string> tokens;
       tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
-      Tokenize (GetValue(), tokens, "\\");
+      Util::Tokenize (GetValue(), tokens, "\\");
       for (unsigned int i=0; i<tokens.size();i++)
       {
          uint32_t val_uint32 = atoi(tokens[i].c_str());
-         void* ptr = &val_uint32;
-         fwrite ( ptr,(size_t)4 ,(size_t)1 ,fp);
+         binary_write( *fp, val_uint32);
       }
       tokens.clear();
       return;
    } 
-          
-   fwrite (GetValue().c_str(), (size_t)lgr ,(size_t)1, fp); // Elem value
+
+   assert( lgr == GetValue().size() ); 
+   binary_write(*fp, GetValue());
 } 
 
 //-----------------------------------------------------------------------------
@@ -233,3 +238,5 @@ void gdcmValEntry::Write(FILE* fp, FileType filetype)
 // Private
 
 //-----------------------------------------------------------------------------
+} // end namespace gdcm
+