Update Doc (old UML diagram was displayed)

[gdcm.git] / src / gdcmDataEntry.cxx

diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx
index 3e4b3ca6a6a67dff866ac0d1d06cb56e6c191546..c5be15df66e9f811214c995052b298e3c9fa9cb4 100644 (file)
--- a/src/gdcmDataEntry.cxx
+++ b/src/gdcmDataEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDataEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/12/23 10:26:41 $
-  Version:   $Revision: 1.27 $
+  Date:      $Date: 2006/03/13 14:44:07 $
+  Version:   $Revision: 1.33 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -25,6 +25,12 @@
 
 #include <fstream>
 
+#if defined(__BORLANDC__)
+ #include <mem.h> // for memcpy
+ #include <stdlib.h> // for atof
+ #include <ctype.h> // for isdigit
+#endif
+
 namespace gdcm 
 {
 //-----------------------------------------------------------------------------
@@ -75,7 +81,7 @@ DataEntry::~DataEntry ()
 //-----------------------------------------------------------------------------
 // Public
 /**
- * \brief Sets the value (non string) of the current Dicom Header Entry
+ * \brief Sets the value (non string) of the current DataEntry
  * @param area area
  * @param self self
  */
@@ -89,7 +95,7 @@ void DataEntry::SetBinArea( uint8_t *area, bool self )
    State = STATE_LOADED;
 }
 /**
- * \brief Inserts the value (non string) into the current Dicom Header Entry
+ * \brief Inserts the value (non string) into the current DataEntry
  * @param area area
  * @param length length 
  */
@@ -112,9 +118,9 @@ void DataEntry::CopyBinArea( uint8_t *area, uint32_t length )
 }
 
 /**
- * \brief Inserts the value (non string) into the current Dicom Header Entry
- * @param id id
- * @param val val 
+ * \brief Inserts the elementary (non string) value into the current DataEntry
+ * @param id index of the elementary value to be set
+ * @param val value, passed as a double 
  */
 void DataEntry::SetValue(const uint32_t &id, const double &val)
 {
@@ -162,28 +168,31 @@ void DataEntry::SetValue(const uint32_t &id, const double &val)
  * \brief returns, as a double (?!?) one of the values 
  *      (when entry is multivaluated), identified by its index.
  *      Returns 0.0 if index is wrong
- *     FIXME : warn the user there was a problem ! 
  * @param id id
  */
 double DataEntry::GetValue(const uint32_t &id) const
 {
    if( !BinArea )
    {
-      gdcmErrorMacro("BinArea not set. Can't get the value");
+   /// \todo warn the user there was a problem !
+      gdcmErrorMacro("BinArea not set" << std::hex << GetGroup() << " " << GetElement() << " Can't get the value");
       return 0.0;
    }
 
    uint32_t count = GetValueCount();
    if( id > count )
    {
-      gdcmErrorMacro("Index (" << id << ")is greater than the data size");
+      gdcmErrorMacro("Index (" << id << ") is greater than the data size");
       return 0.0;
    }
 
-   // FIX the API : user *knows* that entry contains a US
-   //               and he receives a double ?!?
+   /// \todo FIX the API : user *knows* that entry contains a US
+   ///               and he receives a double ?!?
    
    const VRKey &vr = GetVR();
+   /// \todo FIX the API : user *knows* that entry contains a US,
+   ///       the method is supposed to return a double
+   ///       but sends a US ?!? 
    if( vr == "US" || vr == "SS" )
       return ((uint16_t *)BinArea)[id];
    else if( vr == "UL" || vr == "SL" )
@@ -194,6 +203,7 @@ double DataEntry::GetValue(const uint32_t &id) const
       return ((double *)BinArea)[id];
    else if( Global::GetVR()->IsVROfStringRepresentable(vr) )
    {
+      // this is for VR = "DS", ...
       if( GetLength() )
       {
          // Don't use std::string to accelerate processing
@@ -316,8 +326,34 @@ uint32_t DataEntry::GetValueCount( ) const
    }
    return GetLength();
 }
+
 /**
- * \brief Sets the 'value' of an Entry, passed as a std::string
+ * \brief Gets a std::vector <double> holding the value(s) of a DS DataEntry
+ * @param valueVector std::vector <double> of value(s)
+ * \return false if VR not "DS" or DataEntry empty
+ */
+ bool DataEntry::GetDSValue(std::vector <double> &valueVector)
+ {
+    /// \todo rewrite the whole method, in order *not to use* std::string !
+    std::vector<std::string> tokens;
+    
+    if (GetVR() != "DS") // never trust a user !
+       return false;    
+       
+    Util::Tokenize ( GetString().c_str(), tokens, "\\" );
+        
+    int nbValues= tokens.size();
+    if (nbValues == 0)
+       return false;
+               
+    for (int loop=0; loop<nbValues; loop++) 
+       valueVector.push_back(atof(tokens[loop].c_str()));
+    
+    return true;  
+ }
+ 
+/**
+ * \brief Sets the 'value' of a DataEntry, passed as a std::string
  * @param value string representation of the value to be set
  */ 
 void DataEntry::SetString(std::string const &value)
@@ -569,13 +605,13 @@ void DataEntry::WriteContent(std::ofstream *fp, FileType filetype)
       //  --> user is *not* informed !      
          gdcmDebugMacro ("Nothing was loaded, but we need to skip space on disc. "
                       << "Length =" << l << " for " << GetKey() );   
-         fp->seekp(l, std::ios::cur);
+         fp->seekp(l, std::ios::cur); // At Write time, for unloaded elems
       }
    }
    // to avoid gdcm to propagate oddities
    // (length was already modified)  
    if (l%2)
-      fp->seekp(1, std::ios::cur);  
+      fp->seekp(1, std::ios::cur);  // At Write time, for non even length elems
 }
 
 /**
@@ -636,13 +672,8 @@ void DataEntry::Print(std::ostream &os, std::string const & )
       v = GetString();
       const VRKey &vr = GetVR();
 
-      if( vr == "US" || vr == "SS" )
-         s << " [" << GetString() << "]";
-      else if( vr == "UL" || vr == "SL" )
-         s << " [" << GetString() << "]";
-      else if ( vr == "FL" )
-         s << " [" << GetString() << "]";
-      else if ( vr == "FD" )
+      if( vr == "US" || vr == "SS" || vr == "UL" || vr == "SL" 
+       || vr == "FL" || vr == "FD")
          s << " [" << GetString() << "]";
       else
       {