X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValEntry.cxx;h=7b2543a7accdf9110b2f9ff7e48839fdaeab2761;hb=3869544e5153cebbd44ad8778cbaf35883bfb993;hp=9f337bdea15fef6f9fd84aaef8bdbbfaeb3872ce;hpb=fea9426f960497d2d9124ab532d2097f2915678f;p=gdcm.git

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index 9f337bde..7b2543a7 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/10/22 03:05:42 $
-  Version:   $Revision: 1.31 $
+  Date:      $Date: 2005/01/07 22:19:48 $
+  Version:   $Revision: 1.44 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,9 +17,11 @@
 =========================================================================*/
 
 #include "gdcmValEntry.h"
+#include "gdcmVR.h"
 #include "gdcmTS.h"
 #include "gdcmGlobal.h"
 #include "gdcmUtil.h"
+#include "gdcmDebug.h"
 
 #include <fstream>
 
@@ -35,7 +37,7 @@ namespace gdcm
  * \brief   Constructor from a given DictEntry
  * @param   e Pointer to existing dictionary entry
  */
-ValEntry::ValEntry(DictEntry* e) : DocEntry(e)
+ValEntry::ValEntry(DictEntry *e) : DocEntry(e)
 {
 }
 
@@ -43,14 +45,14 @@ ValEntry::ValEntry(DictEntry* e) : DocEntry(e)
  * \brief   Constructor from a given DocEntry
  * @param   e Pointer to existing Doc entry
  */
-ValEntry::ValEntry(DocEntry* e)
+ValEntry::ValEntry(DocEntry *e)
              : DocEntry(e->GetDictEntry())
 {
-   UsableLength = e->GetLength();
-   ReadLength   = e->GetReadLength();
-   ImplicitVR   = e->IsImplicitVR();
-   Offset       = e->GetOffset();
-   PrintLevel   = e->GetPrintLevel();
+   Copy(e);
+/*   Length     = e->GetLength();
+   ReadLength = e->GetReadLength();
+   ImplicitVR = e->IsImplicitVR();
+   Offset     = e->GetOffset();*/
 }
 
 
@@ -66,7 +68,7 @@ ValEntry::~ValEntry ()
 /**
  * \brief   canonical Printer
  */
-void ValEntry::Print(std::ostream & os)
+void ValEntry::Print(std::ostream &os)
 {
    uint16_t g = GetGroup();
    uint16_t e = GetElement();
@@ -76,6 +78,7 @@ void ValEntry::Print(std::ostream & os)
    TSKey v;
    std::string d2;
      
+   os << "V ";
    DocEntry::Print(os); 
 
    if (g == 0xfffe)
@@ -108,7 +111,7 @@ void ValEntry::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);
             }
@@ -124,7 +127,7 @@ void ValEntry::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);
                }
@@ -140,7 +143,7 @@ void ValEntry::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);  
                   }
@@ -173,22 +176,63 @@ void ValEntry::Print(std::ostream & os)
    os << s.str();
 }
 
+//-----------------------------------------------------------------------------
+// Public
+void ValEntry::SetValue(std::string const &val)
+{
+   // Integers have a special treatement for their length:
+   int l = val.length();
+   if ( l != 0) // To avoid to be cheated by 'zero length' integers
+   {   
+      VRKey vr = GetVR();
+      if( vr == "US" || vr == "SS" )
+      {
+         // for multivaluated items
+         l = (Util::CountSubstring(val, "\\") + 1) * 2;
+         SetValueOnly(val);
+      }
+      else if( vr == "UL" || vr == "SL" )
+      {
+         // for multivaluated items
+         l = (Util::CountSubstring(val, "\\") + 1) * 4;;
+         SetValueOnly(val);
+      }
+      else
+      {
+         std::string finalVal = Util::DicomString( val.c_str() );
+         gdcmAssertMacro( !(finalVal.size() % 2) );
+
+         l = finalVal.length();
+         SetValueOnly(finalVal);
+      }
+   }
+   else
+   {
+      std::string finalVal = Util::DicomString( val.c_str() );
+      gdcmAssertMacro( !(finalVal.size() % 2) );
+
+      l = finalVal.length();
+      SetValueOnly(finalVal);
+   }
+
+   SetLength(l);
+}
+
 /*
  * \brief   canonical Writer
  */
-void ValEntry::Write(std::ofstream* fp, FileType filetype)
+void ValEntry::WriteContent(std::ofstream *fp, FileType filetype)
 {
-   DocEntry::Write(fp, filetype);
+   DocEntry::WriteContent(fp, filetype);
 
-   //std::cout << "=====================================" << GetVR() << std::endl;
-      
-   if ( GetGroup() == 0xfffe ) 
+   if ( GetGroup() == 0xfffe )
    {
       return; //delimitors have NO value
    }
-      
+
    std::string vr = GetVR();
-   int lgr = GetReadLength();
+   unsigned int lgr = GetLength();
+   //std::cout<<std::hex<<GetGroup()<<"|"<<GetElement()<<std::dec<<" : "<<GetReadLength()<<" / "<<GetLength()<<"\n";
    if (vr == "US" || vr == "SS")
    {
       // some 'Short integer' fields may be mulivaluated
@@ -200,8 +244,7 @@ void ValEntry::Write(std::ofstream* fp, FileType filetype)
       for (unsigned int i=0; i<tokens.size();i++)
       {
          uint16_t val_uint16 = atoi(tokens[i].c_str());
-         void* ptr = &val_uint16;
-         fp->write ( (char*)ptr,(size_t)2);
+         binary_write( *fp, val_uint16);
       }
       tokens.clear();
       return;
@@ -218,18 +261,15 @@ void ValEntry::Write(std::ofstream* fp, FileType filetype)
       for (unsigned int i=0; i<tokens.size();i++)
       {
          uint32_t val_uint32 = atoi(tokens[i].c_str());
-         void* ptr = &val_uint32;
-         fp->write ( (char*)ptr,(size_t)4 );
+         binary_write( *fp, val_uint32);
       }
       tokens.clear();
       return;
    } 
-          
-   fp->write (GetValue().c_str(), (size_t)lgr ); // Elem value
-} 
 
-//-----------------------------------------------------------------------------
-// Public
+   gdcmAssertMacro( lgr == GetValue().length() );
+   binary_write(*fp, GetValue());
+} 
 
 //-----------------------------------------------------------------------------
 // Protected