X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDataEntry.cxx;h=c5be15df66e9f811214c995052b298e3c9fa9cb4;hb=c96275c8881429e3d6448fc7c16a2c324ffc4883;hp=97afe0cb24cb22876179ae42ed5039eda4c8336c;hpb=5ac625c72835828d687ebdef878691d0913ae41b;p=gdcm.git

diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx
index 97afe0cb..c5be15df 100644
--- a/src/gdcmDataEntry.cxx
+++ b/src/gdcmDataEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDataEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/11/29 12:48:45 $
-  Version:   $Revision: 1.24 $
+  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,9 @@ 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
  */
 void DataEntry::SetBinArea( uint8_t *area, bool self )  
 { 
@@ -87,7 +95,9 @@ 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 
  */
 void DataEntry::CopyBinArea( uint8_t *area, uint32_t length )
 {
@@ -107,6 +117,11 @@ void DataEntry::CopyBinArea( uint8_t *area, uint32_t length )
    }
 }
 
+/**
+ * \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)
 {
    if( !BinArea )
@@ -151,29 +166,33 @@ 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 ! 
+ *      (when entry is multivaluated), identified by its index.
+ *      Returns 0.0 if index is wrong
+ * @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" )
@@ -184,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
@@ -306,8 +326,34 @@ uint32_t DataEntry::GetValueCount( ) const
    }
    return GetLength();
 }
+
+/**
+ * \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 an Entry, passed as a std::string
+ * \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)
@@ -485,7 +531,7 @@ void DataEntry::WriteContent(std::ofstream *fp, FileType filetype)
       return; //delimitors have NO value
    }
    
-   // --> We only deal with Little Endian writting
+   // --> We only deal with Little Endian writting.
    // --> forget Big Endian Transfer Syntax writting!
    //     Next DICOM version will give it up ...
  
@@ -506,8 +552,8 @@ void DataEntry::WriteContent(std::ofstream *fp, FileType filetype)
         
    uint8_t *data = BinArea; //safe notation
    size_t l = GetLength(); 
-   gdcmDebugMacro ("in DataEntry::WriteContent " << GetKey() 
-             << " : " << Global::GetVR()->GetAtomicElementLength(this->GetVR())
+   gdcmDebugMacro("in DataEntry::WriteContent " << GetKey() << " AtomicLength: "
+              << Global::GetVR()->GetAtomicElementLength(this->GetVR() ) // << " BinArea in :" << &BinArea
              );
    if (BinArea) // the binArea was *actually* loaded
    {
@@ -524,7 +570,6 @@ void DataEntry::WriteContent(std::ofstream *fp, FileType filetype)
          }     
          case 2:
          {
-gdcmDebugMacro ("AtomicLength = 2 found; lgt =" << l); 
             uint16_t *data16 = (uint16_t *)data;
             for(i=0;i<l/vrLgth;i++)
                binary_write( *fp, data16[i]);
@@ -552,18 +597,21 @@ gdcmDebugMacro ("AtomicLength = 2 found; lgt =" << l);
    }
    else
    {
-      // nothing was loaded, but we need to skip space on disc
-      
+      // nothing was loaded, but we need to skip space on disc     
+      if (l != 0)
+      {
       //  --> WARNING : nothing is written; 
       //  --> the initial data (on the the source image) is lost
-      //  --> user is *not* informed !
-      
-      fp->seekp(l, std::ios::cur);
+      //  --> 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); // 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
 }
 
 /**
@@ -578,7 +626,7 @@ uint32_t DataEntry::ComputeFullLength()
 //-----------------------------------------------------------------------------
 // Protected
 /// \brief Creates a DataEntry owned BinArea (remove previous one if any)
-void DataEntry::NewBinArea(void)
+void DataEntry::NewBinArea( )
 {
    DeleteBinArea();
    if( GetLength() > 0 )
@@ -624,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
       {