X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmValEntry.cxx;h=9a7d6538639aceaa38ef3ae85c5d304a9b76c544;hb=3e82e8b67eddf5d4b95b6aa2a2e2615aced4c452;hp=40a36a6d7479a6975ab2f7085fffe682cc26f290;hpb=aaeee7164728ec0749a525f0c74274865712ec37;p=gdcm.git

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index 40a36a6d..9a7d6538 100644
--- 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/24 16:10:53 $
-  Version:   $Revision: 1.50 $
+  Date:      $Date: 2005/02/02 10:02:18 $
+  Version:   $Revision: 1.55 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,8 +27,7 @@
 
 namespace gdcm 
 {
-
-// CLEAN ME
+//-----------------------------------------------------------------------------
 #define MAX_SIZE_PRINT_ELEMENT_VALUE 128
 
 //-----------------------------------------------------------------------------
@@ -37,7 +36,8 @@ 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.
  */
@@ -59,6 +58,112 @@ ValEntry::~ValEntry ()
 {
 }
 
+//-----------------------------------------------------------------------------
+// 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
+   {   
+      const VRKey &vr = GetVR();
+      if( vr == "US" || vr == "SS" )
+      {
+         // for multivaluated items
+         l = (Util::CountSubstring(val, "\\") + 1) * 2;
+         ContentEntry::SetValue(val);
+      }
+      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) );
+
+         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
+
+//-----------------------------------------------------------------------------
+// Private
+
 //-----------------------------------------------------------------------------
 // Print
 /**
@@ -70,7 +175,7 @@ void ValEntry::Print(std::ostream &os, std::string const &)
 {
    uint16_t g = GetGroup();
    uint16_t e = GetElement();
-   VRKey vr = GetVR();
+   VRKey vr   = GetVR();
    std::ostringstream s; 
    std::string st;
    std::string d2;
@@ -84,7 +189,7 @@ void ValEntry::Print(std::ostream &os, std::string const &)
       return;
    }
    
-   TS * ts = Global::GetTS();
+   TS *ts = Global::GetTS();
     
    TSAtr v  = GetValue();  // not applicable for SQ ...     
    d2 = Util::CreateCleanString(v);  // replace non printable characters by '.'            
@@ -173,114 +278,6 @@ void ValEntry::Print(std::ostream &os, std::string const &)
    os << s.str();
 }
 
-//-----------------------------------------------------------------------------
-// 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
-   {   
-      const 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   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
-
-//-----------------------------------------------------------------------------
-// Private
-
 //-----------------------------------------------------------------------------
 } // end namespace gdcm