X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValEntry.cxx;h=e2dad4e68f9b9d1f4c1d5cb85a260e052a0421b4;hb=0e0403151bbff57175d2b974ee2d14b8195f9234;hp=ee0b42b8ebd44a1182bdfb84244c682e6dbe89c8;hpb=3b48ae81d6c358b352e726fa283296c496f35437;p=gdcm.git

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index ee0b42b8..e2dad4e6 100644
--- a/src/gdcmValEntry.cxx
+++ b/src/gdcmValEntry.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/22 14:03:30 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2005/01/30 17:30:57 $
+  Version:   $Revision: 1.53 $
                                                                                 
   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
@@ -17,9 +17,16 @@
 =========================================================================*/
 
 #include "gdcmValEntry.h"
+#include "gdcmVR.h"
 #include "gdcmTS.h"
 #include "gdcmGlobal.h"
 #include "gdcmUtil.h"
+#include "gdcmDebug.h"
+
+#include <fstream>
+
+namespace gdcm 
+{
 
 // CLEAN ME
 #define MAX_SIZE_PRINT_ELEMENT_VALUE 128
@@ -27,72 +34,62 @@
 //-----------------------------------------------------------------------------
 // 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) : ContentEntry(e)
 {
-   voidArea = NULL; // will be in BinEntry ?
 }
 
 /**
- * \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)
+             : ContentEntry(e->GetDictEntry())
 {
-   this->UsableLength = e->GetLength();
-   this->ReadLength   = e->GetReadLength();
-   this->ImplicitVR   = e->IsImplicitVR();
-   this->Offset       = e->GetOffset();
-   this->printLevel   = e->GetPrintLevel();
-   this->SQDepthLevel = e->GetDepthLevel();
-
-   this->voidArea = NULL; // will be in BinEntry ?
+   Copy(e);
 }
 
-
 /**
  * \brief   Canonical destructor.
  */
-gdcmValEntry::~gdcmValEntry (void)
+ValEntry::~ValEntry ()
 {
-   if (!voidArea)  // will be in BinEntry
-      free(voidArea);
 }
 
-
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \brief   canonical Printer
+ * \brief   Prints the 'std::string representable' value of ValEntry
+ * @param   os ostream we want to print in
+ * @param indent Indentation string to be prepended during printing
  */
-void gdcmValEntry::Print(std::ostream & os)
+void ValEntry::Print(std::ostream &os, std::string const &)
 {
+   uint16_t g = GetGroup();
+   uint16_t e = GetElement();
+   VRKey vr = GetVR();
    std::ostringstream s; 
-   unsigned short int g, e;
-   char st[20];
-   TSKey v;
-   std::string d2, vr;
+   std::string st;
+   std::string d2;
      
-   PrintCommonPart(os); 
+   os << "V ";
+   DocEntry::Print(os); 
 
-   g  = GetGroup();
-   
-   if (g == 0xfffe) {
-      s << std::endl;
-      os << s.str(); 
-      return;  // just to avoid identing all the remaining code     
+   if (g == 0xfffe) // delimiters have NO value
+   {
+      // just to avoid identing all the remaining code     
+      return;
    }
    
-   e  = GetElement();
-   vr = GetVR();
-   gdcmTS * ts = gdcmGlobal::GetTS();
+   TS * ts = Global::GetTS();
     
-   v  = GetValue();  // not applicable for SQ ...     
-   d2 = CreateCleanString(v);  // replace non printable characters by '.'            
-   if( (GetLength()<=MAX_SIZE_PRINT_ELEMENT_VALUE) || 
-       (printLevel>=3)  || (d2.find("gdcm::NotLoaded.") < d2.length()) )
+   TSAtr v  = GetValue();  // not applicable for SQ ...     
+   d2 = Util::CreateCleanString(v);  // replace non printable characters by '.'            
+   if( GetLength() <= MAX_SIZE_PRINT_ELEMENT_VALUE
+    || PrintLevel >= 3
+    || d2.find(GDCM_NOTLOADED) < d2.length() )
    {
       s << " [" << d2 << "]";
    }
@@ -101,82 +98,180 @@ void gdcmValEntry::Print(std::ostream & os)
       s << " [gdcm::too long for print (" << GetLength() << ") ]";
    }
    
-   // Display the UID value (instead of displaying only the rough code)  
-   if (g == 0x0002) {  // Any more to be displayed ?
-      if ( (e == 0x0010) || (e == 0x0002) )
+   // Display the UID value (instead of displaying only the rough code)
+   // First 'clean' trailing character (space or zero) 
+   if (g == 0x0002)
+   {
+      // Any more to be displayed ?
+      if ( e == 0x0010 || e == 0x0002 )
+      {
+         if ( v.length() != 0 )  // for brain damaged headers
+         {
+            if ( ! isdigit((unsigned char)v[v.length()-1]) )
+            {
+               v.erase(v.length()-1, 1);
+            }
+         }
          s << "  ==>\t[" << ts->GetValue(v) << "]";
-   } else {
-      if (g == 0x0008) {
-         if ( (e == 0x0016) || (e == 0x1150)  )
+      }
+   }
+   else
+   {
+      if (g == 0x0008)
+      {
+         if ( e == 0x0016 || e == 0x1150 )
+         {
+            if ( v.length() != 0 )  // for brain damaged headers
+            {
+               if ( ! isdigit((unsigned char)v[v.length()-1]) )
+               {
+                  v.erase(v.length()-1, 1);
+               }
+            }
             s << "  ==>\t[" << ts->GetValue(v) << "]";
-      } else {
-         if (g == 0x0004) {
-           if ( (e == 0x1510) || (e == 0x1512)  )
+         }
+      }
+      else
+      {
+         if (g == 0x0004)
+         {
+            if ( e == 0x1510 || e == 0x1512  )
+            {
+               if ( v.length() != 0 )  // for brain damaged headers  
+               {
+                  if ( ! isdigit((unsigned char)v[v.length()-1]) )
+                  {
+                     v.erase(v.length()-1, 1);  
+                  }
+               }
               s << "  ==>\t[" << ts->GetValue(v) << "]";
+            }
          }     
       }
    }
    //if (e == 0x0000) {        // elem 0x0000 --> group length 
-   if ( (vr == "UL") || (vr == "US") || (vr == "SL") || (vr == "SS") ) {
+   if ( vr == "UL" || vr == "US" || vr == "SL" || vr == "SS" )
+   {
       if (v == "4294967295") // to avoid troubles in convertion 
-         sprintf (st," x(ffffffff)");
-      else {
-         if ( GetLength() !=0 )        
-            sprintf(st," x(%x)", atoi(v.c_str()));//FIXME
-        else
-            sprintf(st," "); 
+      {
+         st = Util::Format(" x(ffffffff)");
+      }
+      else
+      {
+         if ( GetLength() != 0 )
+         {
+            st = Util::Format(" x(%x)", atoi(v.c_str()));//FIXME
+         }
+         else
+         {
+            st = Util::Format(" ");
+         }
       }
       s << st;
    }
-        
-   s << std::endl;
-   os << s.str();   
+   os << s.str();
 }
 
+//-----------------------------------------------------------------------------
+// Public
 
-/*
- * \brief   canonical Writer
+/**
+ * \brief   Sets the std::string representable' value of a ValEntry
+ * @param  val value to set 
  */
-void gdcmValEntry::Write(FILE *fp, FileType filetype) {
-      std::string vr=GetVR();
-      int lgr=GetLength();
-      if (vr == "US" || vr == "SS") {
-         // some 'Short integer' fields may be mulivaluated
-         // each single value is separated from the next one by '\'
-         // 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, "\\");
-         for (unsigned int i=0; i<tokens.size();i++) {
-            guint16 val_uint16 = atoi(tokens[i].c_str());
-            void *ptr = &val_uint16;
-            fwrite ( ptr,(size_t)2 ,(size_t)1 ,fp);
-         }
-         tokens.clear();
-         return;
+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
+   {   
+      const VRKey &vr = GetVR();
+      if( vr == "US" || vr == "SS" )
+      {
+         // for multivaluated items
+         l = (Util::CountSubstring(val, "\\") + 1) * 2;
+         ContentEntry::SetValue(val);
       }
-      if (vr == "UL" || vr == "SL") {
-         // Some 'Integer' fields may be multivaluated (multiple instances 
-         // of integers). But each single integer value is separated from the
-         // next one by '\' (backslash character). Hence we split the string
-         // 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, "\\");
-         for (unsigned int i=0; i<tokens.size();i++){
-            guint32 val_uint32 = atoi(tokens[i].c_str());
-            void *ptr = &val_uint32;
-            fwrite ( ptr,(size_t)4 ,(size_t)1 ,fp);
-         }
-         tokens.clear();
-         return;
-      }           
-      fwrite (GetValue().c_str(),
-              (size_t)lgr ,(size_t)1, fp); // Elem value
-} 
+      else if( vr == "UL" || vr == "SL" )
+      {
+         // for multivaluated items
+         l = (Util::CountSubstring(val, "\\") + 1) * 4;;
+         ContentEntry::SetValue(val);
+      }
+      else
+      {
+         std::string finalVal = Util::DicomString( val.c_str() );
+         gdcmAssertMacro( !(finalVal.size() % 2) );
 
-//-----------------------------------------------------------------------------
-// Public
+         l = finalVal.length();
+         ContentEntry::SetValue(finalVal);
+      }
+   }
+   else
+   {
+      std::string finalVal = Util::DicomString( val.c_str() );
+      gdcmAssertMacro( !(finalVal.size() % 2) );
+
+      l = finalVal.length();
+      ContentEntry::SetValue(finalVal);
+   }
+
+   SetLength(l);
+}
+
+/**
+ * \brief   Writes the std::string representable' value of a ValEntry
+ * @param fp already open ofstream pointer
+ * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
+ */
+void ValEntry::WriteContent(std::ofstream *fp, FileType filetype)
+{
+   DocEntry::WriteContent(fp, filetype);
+
+   if ( GetGroup() == 0xfffe )
+   {
+      return; //delimitors have NO value
+   }
+
+   const VRKey &vr = GetVR();
+   unsigned int lgr = GetLength();
+   if (vr == "US" || vr == "SS")
+   {
+      // some 'Short integer' fields may be multivaluated
+      // each single value is separated from the next one by '\'
+      // 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
+      Util::Tokenize (GetValue(), tokens, "\\");
+      for (unsigned int i=0; i<tokens.size();i++)
+      {
+         uint16_t val_uint16 = atoi(tokens[i].c_str());
+         binary_write( *fp, val_uint16);
+      }
+      tokens.clear();
+      return;
+   }
+   if (vr == "UL" || vr == "SL")
+   {
+      // Some 'Integer' fields may be multivaluated (multiple instances 
+      // of integer). But each single integer value is separated from the
+      // next one by '\' (backslash character). Hence we split the string
+      // along the '\' and write each value as an int:
+      std::vector<std::string> tokens;
+      tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
+      Util::Tokenize (GetValue(), tokens, "\\");
+      for (unsigned int i=0; i<tokens.size();i++)
+      {
+         uint32_t val_uint32 = atoi(tokens[i].c_str());
+         binary_write( *fp, val_uint32);
+      }
+      tokens.clear();
+      return;
+   } 
+
+   gdcmAssertMacro( lgr == GetValue().length() );
+   binary_write(*fp, GetValue());
+} 
 
 //-----------------------------------------------------------------------------
 // Protected
@@ -185,3 +280,5 @@ void gdcmValEntry::Write(FILE *fp, FileType filetype) {
 // Private
 
 //-----------------------------------------------------------------------------
+} // end namespace gdcm
+