Fix bug (Thx, Manu)

[gdcm.git] / src / gdcmDataEntry.cxx

diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx
index a57cb406a7a8cf3e4f0233f4e5fac6a31fa87fd3..e318600b245f02cd530f2854b4c410b92189823d 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/11/21 09:46:24 $
-  Version:   $Revision: 1.22 $
+  Date:      $Date: 2005/12/09 12:23:38 $
+  Version:   $Revision: 1.25 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -76,6 +76,8 @@ DataEntry::~DataEntry ()
 // Public
 /**
  * \brief Sets the value (non string) of the current Dicom Header Entry
+ * @param area area
+ * @param self self
  */
 void DataEntry::SetBinArea( uint8_t *area, bool self )  
 { 
@@ -88,6 +90,8 @@ void DataEntry::SetBinArea( uint8_t *area, bool self )
 }
 /**
  * \brief Inserts the value (non string) into the current Dicom Header Entry
+ * @param area area
+ * @param length length 
  */
 void DataEntry::CopyBinArea( uint8_t *area, uint32_t length )
 {
@@ -107,6 +111,11 @@ 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 
+ */
 void DataEntry::SetValue(const uint32_t &id, const double &val)
 {
    if( !BinArea )
@@ -151,9 +160,10 @@ 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
+ *     FIXME : warn the user there was a problem ! 
+ * @param id id
  */
 double DataEntry::GetValue(const uint32_t &id) const
 {
@@ -286,14 +296,15 @@ uint32_t DataEntry::GetValueCount( ) const
       return GetLength()/sizeof(uint16_t);
    else if( vr == "UL" || vr == "SL" )
       return GetLength()/sizeof(uint32_t);
-   else if( vr == "FL" )
-      return GetLength()/sizeof(float);
+   else if( vr == "FL" || vr == "OF" )
+      return GetLength()/4 ; // FL has a *4* length! sizeof(float);
    else if( vr == "FD" )
-      return GetLength()/sizeof(double);
+      return GetLength()/8;  // FD has a *8* length! sizeof(double);
    else if( Global::GetVR()->IsVROfStringRepresentable(vr) )
    {
       // Some element in DICOM are allowed to be empty
-      if( !GetLength() ) return 0;
+      if( !GetLength() ) 
+         return 0;
       // Don't use std::string to accelerate processing
       uint32_t count = 1;
       for(uint32_t i=0;i<GetLength();i++)
@@ -303,7 +314,6 @@ uint32_t DataEntry::GetValueCount( ) const
       }
       return count;
    }
-
    return GetLength();
 }
 /**
@@ -452,9 +462,11 @@ std::string const &DataEntry::GetString() const
    }
    return StrArea;
 }
+
 /**
- * \brief   Copies all the attributes from an other DocEntry 
+ * \brief Copies all the attributes from an other DocEntry 
  * @param doc entry to copy from
+ * @remarks The content BinArea is copied too
  */
 void DataEntry::Copy(DocEntry *doc)
 {
@@ -468,6 +480,7 @@ void DataEntry::Copy(DocEntry *doc)
       CopyBinArea(entry->BinArea,entry->GetLength());
    }
 }
+
 /**
  * \brief   Writes the 'value' area of a DataEntry
  * @param fp already open ofstream pointer
@@ -575,7 +588,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 )