ENH: Huge commit to remove the previous implementation for jpeg/fragments/multiframes...

[gdcm.git] / src / gdcmValEntry.cxx

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index 314368d26816a07781e2a4b5fbdf63b6185b1471..e2dad4e68f9b9d1f4c1d5cb85a260e052a0421b4 100644 (file)
--- a/src/gdcmValEntry.cxx
+++ b/src/gdcmValEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/16 04:50:42 $
-  Version:   $Revision: 1.46 $
+  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
@@ -37,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) : ContentEntry(e)
 {
 }
 
@@ -46,16 +46,11 @@ ValEntry::ValEntry(DictEntry *e) : DocEntry(e)
  * @param   e Pointer to existing Doc entry
  */
 ValEntry::ValEntry(DocEntry *e)
-             : DocEntry(e->GetDictEntry())
+             : ContentEntry(e->GetDictEntry())
 {
    Copy(e);
-/*   Length     = e->GetLength();
-   ReadLength = e->GetReadLength();
-   ImplicitVR = e->IsImplicitVR();
-   Offset     = e->GetOffset();*/
 }
 
-
 /**
  * \brief   Canonical destructor.
  */
@@ -66,22 +61,23 @@ ValEntry::~ValEntry ()
 //-----------------------------------------------------------------------------
 // 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 ValEntry::Print(std::ostream &os, std::string const &)
 {
    uint16_t g = GetGroup();
    uint16_t e = GetElement();
-   std::string vr = GetVR();
+   VRKey vr = GetVR();
    std::ostringstream s; 
    std::string st;
-   TSKey v;
    std::string d2;
      
    os << "V ";
    DocEntry::Print(os); 
 
-   if (g == 0xfffe)
+   if (g == 0xfffe) // delimiters have NO value
    {
       // just to avoid identing all the remaining code     
       return;
@@ -89,10 +85,11 @@ void ValEntry::Print(std::ostream &os, std::string const &)
    
    TS * ts = Global::GetTS();
     
-   v  = GetValue();  // not applicable for SQ ...     
+   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()) )
+   if( GetLength() <= MAX_SIZE_PRINT_ELEMENT_VALUE
+    || PrintLevel >= 3
+    || d2.find(GDCM_NOTLOADED) < d2.length() )
    {
       s << " [" << d2 << "]";
    }
@@ -106,7 +103,7 @@ void ValEntry::Print(std::ostream &os, std::string const &)
    if (g == 0x0002)
    {
       // Any more to be displayed ?
-      if ( (e == 0x0010) || (e == 0x0002) )
+      if ( e == 0x0010 || e == 0x0002 )
       {
          if ( v.length() != 0 )  // for brain damaged headers
          {
@@ -138,7 +135,7 @@ void ValEntry::Print(std::ostream &os, std::string const &)
       {
          if (g == 0x0004)
          {
-            if ( (e == 0x1510) || (e == 0x1512)  )
+            if ( e == 0x1510 || e == 0x1512  )
             {
                if ( v.length() != 0 )  // for brain damaged headers  
                {
@@ -153,7 +150,7 @@ void ValEntry::Print(std::ostream &os, std::string const &)
       }
    }
    //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 
       {
@@ -161,7 +158,7 @@ void ValEntry::Print(std::ostream &os, std::string const &)
       }
       else
       {
-         if ( GetLength() !=0 )
+         if ( GetLength() != 0 )
          {
             st = Util::Format(" x(%x)", atoi(v.c_str()));//FIXME
          }
@@ -177,24 +174,29 @@ void ValEntry::Print(std::ostream &os, std::string const &)
 
 //-----------------------------------------------------------------------------
 // Public
+
+/**
+ * \brief   Sets the std::string representable' value of a ValEntry
+ * @param  val value to set 
+ */
 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();
+      const VRKey &vr = GetVR();
       if( vr == "US" || vr == "SS" )
       {
          // for multivaluated items
          l = (Util::CountSubstring(val, "\\") + 1) * 2;
-         SetValueOnly(val);
+         ContentEntry::SetValue(val);
       }
       else if( vr == "UL" || vr == "SL" )
       {
          // for multivaluated items
          l = (Util::CountSubstring(val, "\\") + 1) * 4;;
-         SetValueOnly(val);
+         ContentEntry::SetValue(val);
       }
       else
       {
@@ -202,7 +204,7 @@ void ValEntry::SetValue(std::string const &val)
          gdcmAssertMacro( !(finalVal.size() % 2) );
 
          l = finalVal.length();
-         SetValueOnly(finalVal);
+         ContentEntry::SetValue(finalVal);
       }
    }
    else
@@ -211,14 +213,16 @@ void ValEntry::SetValue(std::string const &val)
       gdcmAssertMacro( !(finalVal.size() % 2) );
 
       l = finalVal.length();
-      SetValueOnly(finalVal);
+      ContentEntry::SetValue(finalVal);
    }
 
    SetLength(l);
 }
 
-/*
- * \brief   canonical Writer
+/**
+ * \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)
 {
@@ -229,12 +233,11 @@ void ValEntry::WriteContent(std::ofstream *fp, FileType filetype)
       return; //delimitors have NO value
    }
 
-   std::string vr = GetVR();
+   const VRKey &vr = GetVR();
    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
+      // 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;
@@ -251,7 +254,7 @@ void ValEntry::WriteContent(std::ofstream *fp, FileType filetype)
    if (vr == "UL" || vr == "SL")
    {
       // Some 'Integer' fields may be multivaluated (multiple instances 
-      // of integers). But each single integer value is separated from the
+      // 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;