ENH: Put back old Name, for once the pdf was correct (my mistake), thanks to JP for...

[gdcm.git] / src / gdcmDataEntry.cxx

diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx
index 9930924a3e3e064881454cfa17101c729bca7199..1ae42af4e01bd6a871cd76cd8d5e0f6adeac55a6 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/10/27 17:07:24 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2005/11/14 18:54:04 $
+  Version:   $Revision: 1.21 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -234,17 +234,19 @@ double DataEntry::GetValue(const uint32_t &id) const
  */
 bool DataEntry::IsValueCountValid() const
 {
-  bool valid;
   uint32_t vm;
   const std::string &strVM = GetVM();
   uint32_t vc = GetValueCount();
+  bool valid = vc == 0;
+  if( valid )
+    return true;
   
   // FIXME : what shall we do with VM = "2-n", "3-n", etc
   
   if( strVM == "1-n" )
   {
-    // make sure it is at least one ??? FIXME
-    valid = vc >= 1 || vc == 0;
+    // make sure there is at least one ??? FIXME
+    valid = vc >= 1;
   }
   else
   {
@@ -252,7 +254,7 @@ bool DataEntry::IsValueCountValid() const
     os.str( strVM );
     os >> vm;
     // Two cases:
-    // vm respect the one from the dict
+    // vm respects the one from the dict
     // vm is 0 (we need to check if this element is allowed to be empty) FIXME
 
     // note  (JPR)
@@ -269,7 +271,7 @@ bool DataEntry::IsValueCountValid() const
     // Problem : entry type may depend on the modality and/or the Sequence
     //           it's embedded in !
     //          (Get the information in the 'Conformance Statements' ...)  
-    valid = vc == vm || vc == 0;
+    valid = vc == vm;
   }
   return valid;
 }
@@ -365,21 +367,9 @@ void DataEntry::SetString(std::string const &value)
    {
       if( value.size() > 0 )
       {
-         // FIXME : should be quicker if we don't create one more std::string
-         //         just to make even the length of a char array ...
-
-         /*
-         std::string finalVal = Util::DicomString( value.c_str() );
-         SetLength(finalVal.size());
-         NewBinArea();
-
-         memcpy(BinArea, &(finalVal[0]), finalVal.size());
-         */
-
          size_t l =  value.size();    
          SetLength(l + l%2);
          NewBinArea();
-         //memcpy(BinArea, &(value[0]), l);
          memcpy(BinArea, value.c_str(), l);
          if (l%2)
             BinArea[l] = '\0';
@@ -454,8 +444,12 @@ std::string const &DataEntry::GetString() const
       StrArea=s.str();
    }
    else
+   {
       StrArea.append((const char *)BinArea,GetLength());
-
+      // to avoid gdcm propagate oddities in lengthes
+      if ( GetLength()%2)
+         StrArea.append(" ",1);  
+   }
    return StrArea;
 }
 /**
@@ -475,7 +469,7 @@ void DataEntry::Copy(DocEntry *doc)
    }
 }
 /**
- * \brief   Writes the value of a DataEntry
+ * \brief   Writes the 'value' area of a DataEntry
  * @param fp already open ofstream pointer
  * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
  */
@@ -492,7 +486,7 @@ void DataEntry::WriteContent(std::ofstream *fp, FileType filetype)
    // --> forget Big Endian Transfer Syntax writting!
    //     Next DICOM version will give it up ...
  
-   // WARNING - Implicit VR private element :
+   // WARNING - For Implicit VR private element,
    //           we have *no choice* but considering them as
    //           something like 'OB' values.
    //           we rewrite them as we found them on disc.
@@ -502,13 +496,16 @@ void DataEntry::WriteContent(std::ofstream *fp, FileType filetype)
    //           on Little endian based processor
    //           and, later on, somebody needs
    //           this 'OW' Implicit VR private element (?!?)
+   //           (Same stuff, mutatis mutandis, for Little/Big)
  
- 
-   // 8/16 bits Pixels problem should be solve automatiquely,
-   // since we ensure the VR is conform to Pixel size.
+   // 8/16 bits Pixels problem should be solved automatiquely,
+   // since we ensure the VR (OB vs OW) is conform to Pixel size.
         
    uint8_t *data = BinArea; //safe notation
    size_t l = GetLength(); 
+   gdcmDebugMacro ("in DataEntry::WriteContent " << GetKey() 
+             << " : " << Global::GetVR()->GetAtomicElementLength(this->GetVR())
+             );
    if (BinArea) // the binArea was *actually* loaded
    {
 #if defined(GDCM_WORDS_BIGENDIAN) || defined(GDCM_FORCE_BIGENDIAN_EMULATION)
@@ -524,6 +521,7 @@ 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]);
@@ -559,6 +557,19 @@ void DataEntry::WriteContent(std::ofstream *fp, FileType filetype)
       
       fp->seekp(l, std::ios::cur);
    }
+   // to avoid gdcm to propagate oddities
+   // (length was already modified)  
+   if (l%2)
+      fp->seekp(1, std::ios::cur);  
+}
+
+/**
+ * \brief   Compute the full length of the elementary DataEntry (not only value
+ *          length) depending on the VR.
+ */
+uint32_t DataEntry::ComputeFullLength()
+{
+   return GetFullLength();
 }
 
 //-----------------------------------------------------------------------------