X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDataEntry.cxx;h=1d8ade9fe3db1dc53094fa0f921db178f2c3e6fd;hb=81442de19fe2579875ffc0798d76e0cb72d5f0a0;hp=1ae42af4e01bd6a871cd76cd8d5e0f6adeac55a6;hpb=1cb2c2138ee52f3081d243b5a798134e860a4019;p=gdcm.git

diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx
index 1ae42af4..1d8ade9f 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/14 18:54:04 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2006/01/20 09:17:25 $
+  Version:   $Revision: 1.28 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -75,7 +75,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 +89,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 +111,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,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,11 +314,10 @@ uint32_t DataEntry::GetValueCount( ) const
       }
       return count;
    }
-
    return GetLength();
 }
 /**
- * \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)
@@ -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
@@ -482,7 +495,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 ...
  
@@ -503,8 +516,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
    {
@@ -521,7 +534,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]);
@@ -549,13 +561,16 @@ 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);
+      }
    }
    // to avoid gdcm to propagate oddities
    // (length was already modified)  
@@ -574,14 +589,15 @@ uint32_t DataEntry::ComputeFullLength()
 
 //-----------------------------------------------------------------------------
 // Protected
-void DataEntry::NewBinArea(void)
+/// \brief Creates a DataEntry owned BinArea (remove previous one if any)
+void DataEntry::NewBinArea( )
 {
    DeleteBinArea();
    if( GetLength() > 0 )
       BinArea = new uint8_t[GetLength()];
    SelfArea = true;
 }
-
+/// \brief Removes the BinArea, if owned by the DataEntry
 void DataEntry::DeleteBinArea(void)
 {
    if (BinArea && SelfArea)