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 22029469235ee51bf004e43e92d8b82c50e742d6..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/19 15:58:01 $
-  Version:   $Revision: 1.48 $
+  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,12 +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);
 }
 
-
 /**
  * \brief   Canonical destructor.
  */
@@ -62,7 +61,9 @@ 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 &)
 {
@@ -76,7 +77,7 @@ void ValEntry::Print(std::ostream &os, std::string const &)
    os << "V ";
    DocEntry::Print(os); 
 
-   if (g == 0xfffe)
+   if (g == 0xfffe) // delimiters have NO value
    {
       // just to avoid identing all the remaining code     
       return;
@@ -173,6 +174,11 @@ 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:
@@ -184,13 +190,13 @@ void ValEntry::SetValue(std::string const &val)
       {
          // 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
       {
@@ -198,7 +204,7 @@ void ValEntry::SetValue(std::string const &val)
          gdcmAssertMacro( !(finalVal.size() % 2) );
 
          l = finalVal.length();
-         SetValueOnly(finalVal);
+         ContentEntry::SetValue(finalVal);
       }
    }
    else
@@ -207,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)
 {
@@ -227,10 +235,9 @@ void ValEntry::WriteContent(std::ofstream *fp, FileType filetype)
 
    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;
@@ -247,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;