Some wrecked ACR-NEMA-like images begin by group 0028 (?!?)

[gdcm.git] / src / gdcmDataEntry.cxx

diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx
index 79e6aebe1fefda6dab1567292ecccba2c9a20b6a..5bdfe968afebd336c100987a906cd635fa7bd524 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: 2006/05/30 08:12:51 $
-  Version:   $Revision: 1.38 $
+  Date:      $Date: 2006/07/10 08:27:27 $
+  Version:   $Revision: 1.41 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -26,9 +26,9 @@
 #include <fstream>
 
 #if defined(__BORLANDC__)
- #include <mem.h> // for memcpy
+ #include <mem.h>    // for memcpy
  #include <stdlib.h> // for atof
- #include <ctype.h> // for isdigit
+ #include <ctype.h>  // for isdigit
 #endif
 
 namespace gdcm 
@@ -40,8 +40,10 @@ uint32_t DataEntry::MaxSizePrintEntry = MAX_SIZE_PRINT_ELEMENT_VALUE;
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \brief   Constructor for a given DictEntry
- * @param   e Pointer to existing dictionary entry
+ * \brief   Constructor for a given DataEntry
+ * @param   group group number of the Data Entry to be created
+ * @param   elem element number of the Data Entry to be created
+ * @param   vr Value Representation of the Data Entry to be created 
  */
 DataEntry::DataEntry(uint16_t group,uint16_t elem,
                                      VRKey const &vr) 
@@ -50,6 +52,7 @@ DataEntry::DataEntry(uint16_t group,uint16_t elem,
    State = STATE_LOADED;
    Flag = FLAG_NONE;
 
+   StrArea = 0;
    BinArea = 0;
    SelfArea = true;
 }
@@ -64,6 +67,7 @@ DataEntry::DataEntry(DocEntry *e)
 {
    Flag = FLAG_NONE;
    BinArea = 0;
+   
    SelfArea = true;
 
    Copy(e);
@@ -75,6 +79,7 @@ DataEntry::DataEntry(DocEntry *e)
 DataEntry::~DataEntry ()
 {
    DeleteBinArea();
+   
 }
 
 //-----------------------------------------------------------------------------
@@ -334,7 +339,7 @@ uint32_t DataEntry::GetValueCount( ) const
 
 /**
  * \brief Gets a std::vector <double> holding the value(s) of a DS DataEntry
- * @param valueVector std::vector \<double\> of value(s)
+ * @param valueVector std::vector double of value(s)
  * \return false if VR not "DS" or DataEntry empty
  */
  bool DataEntry::GetDSValue(std::vector <double> &valueVector)
@@ -364,7 +369,6 @@ uint32_t DataEntry::GetValueCount( ) const
 void DataEntry::SetString(std::string const &value)
 {
    DeleteBinArea();
-
    const VRKey &vr = GetVR();
    if ( vr == "US" || vr == "SS" )
    {
@@ -415,16 +419,16 @@ void DataEntry::SetString(std::string const &value)
       tokens.clear();
    }
    else
-   {
-      //if( value.size() > 0 )  // when user sets a string to 0, *do* the job.
-      {
-         size_t l =  value.size();    
-         SetLength(l + l%2);
-         NewBinArea();
-         memcpy(BinArea, value.c_str(), l);
-         if (l%2)
+   {      
+      size_t l =  value.size();    
+      SetLength(l + l%2);
+      NewBinArea();
+      memcpy(BinArea, value.c_str(), l);
+      if (l%2) // padded with blank except for UI
+         if ( vr == "UI" ) 
             BinArea[l] = '\0';
-      }      
+         else
+            BinArea[l] = ' ';                
    }
    State = STATE_LOADED;
 }
@@ -436,10 +440,14 @@ std::string const &DataEntry::GetString() const
   static std::ostringstream s;
   const VRKey &vr = GetVR();
   s.str("");
-  StrArea="";
+  
+  if (!StrArea)
+     StrArea = new std::string();
+  else 
+     *StrArea="";
 
   if( !BinArea )
-     return StrArea;
+     return *StrArea;
       // When short integer(s) are stored, convert the following (n * 2) characters
   // as a displayable string, the values being separated by a back-slash
   if( vr == "US" )
@@ -451,7 +459,7 @@ std::string const &DataEntry::GetString() const
            s << '\\';
         s << data[i];
      }
-     StrArea=s.str();
+     *StrArea=s.str();
   }
   else if (vr == "SS" )
   {
@@ -462,7 +470,7 @@ std::string const &DataEntry::GetString() const
            s << '\\';
         s << data[i];
      }
-     StrArea=s.str();
+     *StrArea=s.str();
   }      // See above comment on multiple short integers (mutatis mutandis).
   else if( vr == "UL" )
   {
@@ -473,7 +481,7 @@ std::string const &DataEntry::GetString() const
            s << '\\';
         s << data[i];
      }
-     StrArea=s.str();
+     *StrArea=s.str();
   }
   else if( vr == "SL" )
   {
@@ -484,7 +492,7 @@ std::string const &DataEntry::GetString() const
            s << '\\';
         s << data[i];
      }
-     StrArea=s.str();
+     *StrArea=s.str();
   }    else if( vr == "FL" )
   {
      float *data=(float *)BinArea;
@@ -494,7 +502,7 @@ std::string const &DataEntry::GetString() const
            s << '\\';
         s << data[i];
      }
-     StrArea=s.str();
+     *StrArea=s.str();
   }
   else if( vr == "FD" )
   {
@@ -505,22 +513,22 @@ std::string const &DataEntry::GetString() const
            s << '\\';
         s << data[i];
      }
-     StrArea=s.str();
+     *StrArea=s.str();
   }
   else
   {
-     StrArea.append((const char *)BinArea,GetLength());
+     StrArea->append((const char *)BinArea,GetLength());
      // to avoid gdcm to propagate oddities in lengthes
      if ( GetLength()%2)
-        StrArea.append(" ",1);   }
-  return StrArea;
+        StrArea->append(" ",1);   }
+  return *StrArea;
 }
 
 
 /**
  * \brief Copies all the attributes from an other DocEntry 
  * @param doc entry to copy from
- * @remarks The content BinArea is copied too
+ * @remarks The content BinArea is copied too (StrArea is not)
  */
 void DataEntry::Copy(DocEntry *doc)
 {
@@ -531,7 +539,7 @@ void DataEntry::Copy(DocEntry *doc)
    {
       State = entry->State;
       Flag = entry->Flag;
-      CopyBinArea(entry->BinArea,entry->GetLength());
+      CopyBinArea(entry->BinArea,entry->GetLength());      
    }
 }
 
@@ -643,7 +651,8 @@ uint32_t DataEntry::ComputeFullLength()
 
 //-----------------------------------------------------------------------------
 // Protected
-/// \brief Creates a DataEntry owned BinArea (remove previous one if any)
+/// \brief Creates a DataEntry owned BinArea 
+///       (remove previous one if any and relevant StrArea if any)
 void DataEntry::NewBinArea( )
 {
    DeleteBinArea();
@@ -651,7 +660,8 @@ void DataEntry::NewBinArea( )
       BinArea = new uint8_t[GetLength()];
    SelfArea = true;
 }
-/// \brief Removes the BinArea, if owned by the DataEntry
+/// \brief Removes the BinArea, if owned by the DataEntry, 
+///        and the relevant StrArea if any
 void DataEntry::DeleteBinArea(void)
 {
    if (BinArea && SelfArea)
@@ -659,6 +669,11 @@ void DataEntry::DeleteBinArea(void)
       delete[] BinArea;
       BinArea = NULL;
    }
+   if (StrArea)
+   {
+      delete StrArea;
+      StrArea = 0;
+   }
 }
 
 //-----------------------------------------------------------------------------