X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValEntry.cxx;h=6b81bad9ba9346e0e75a2011fb86dea211c53b93;hb=43f675c5d192ff4b28c42397d36beee5988419de;hp=270fdd3a047f92553a2f3d5681ed19b14691c87d;hpb=d31dacbd4792e49cccecc51ffd9d93fd71541561;p=gdcm.git

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index 270fdd3a..6b81bad9 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/12/07 13:39:33 $
-  Version:   $Revision: 1.39 $
+  Date:      $Date: 2005/01/06 20:03:28 $
+  Version:   $Revision: 1.42 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -36,7 +36,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)
 {
 }
 
@@ -44,14 +44,13 @@ 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();
 }
 
 
@@ -67,7 +66,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();
@@ -177,7 +176,7 @@ void ValEntry::Print(std::ostream & os)
 
 //-----------------------------------------------------------------------------
 // Public
-void ValEntry::SetValue(std::string const & val)
+void ValEntry::SetValue(std::string const &val)
 {
    // Integers have a special treatement for their length:
    int l = val.length();
@@ -188,13 +187,22 @@ void ValEntry::SetValue(std::string const & val)
       {
          // 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() );
+         assert( !(finalVal.size() % 2) );
+
+         l = finalVal.length();
+         SetValueOnly(finalVal);
       }
-      SetValueOnly(val);
    }
    else
    {
@@ -211,7 +219,7 @@ void ValEntry::SetValue(std::string const & val)
 /*
  * \brief   canonical Writer
  */
-void ValEntry::WriteContent(std::ofstream* fp, FileType filetype)
+void ValEntry::WriteContent(std::ofstream *fp, FileType filetype)
 {
    DocEntry::WriteContent(fp, filetype);