upgrades for 4DSplitter

[gdcm.git] / src / gdcmDataEntry.h

diff --git a/src/gdcmDataEntry.h b/src/gdcmDataEntry.h
index 1b9aba72dc86437a185a52ff689a6a7effd6d1e6..a4f25424ffcc6d3dc01c7d3be332a1dc3d5b64ea 100644 (file)
--- a/src/gdcmDataEntry.h
+++ b/src/gdcmDataEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDataEntry.h,v $
   Language:  C++
-  Date:      $Date: 2006/04/11 16:03:26 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2011/03/29 07:36:00 $
+  Version:   $Revision: 1.23 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,16 +15,16 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-
-#ifndef GDCMDATAENTRY_H
-#define GDCMDATAENTRY_H
+ 
+#ifndef _GDCMDATAENTRY_H_
+#define _GDCMDATAENTRY_H_
 
 #include "gdcmDocEntry.h"
 
 #include <vector> // for GetDSValue
 #include <iostream>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 /**
@@ -51,7 +51,8 @@ public:
    void Print(std::ostream &os = std::cout, std::string const &indent = "");
 
 // Write
-   virtual void WriteContent(std::ofstream *fp, FileType filetype);
+   virtual void WriteContent(std::ofstream *fp, FileType filetype,
+                               bool insideMetaElements, bool insideSequence);
    uint32_t ComputeFullLength();
    
 // Set/Get data
@@ -72,6 +73,11 @@ public:
    void SetString(std::string const &value);
    std::string const &GetString() const;
 
+   std::string const &GetHexaRepresentation() const;
+
+   bool IsNumerical();
+   bool GetNumerical(std::vector <double> &valueVector);
+    
    /// \brief Sets SelfArea
    void SetSelfArea(bool area) { SelfArea = area; }
    /// \brief True if Entry owns its BinArea
@@ -97,7 +103,7 @@ public:
    /// \brief Sets the state (Loaded, NotLoaded, UnFound, ...) of the DataEntry
    void SetState(const TValueState &state) { State = state; }
    /// \brief Returns the state (Loaded, NotLoaded, ...) of the DataEntry
-      const TValueState &GetState() const { return State; }
+   const TValueState &GetState() const { return State; }
    /// \brief true when value Entry not loaded  
    bool IsNotLoaded() { return State == STATE_NOTLOADED; }
    /// \brief true if Entry not found  
@@ -144,8 +150,11 @@ protected:
    bool SelfArea;
    /// \brief  std::string representable value of the Entry. 
    ///        Parts of a multivaluated data are separated by back-slash
-   mutable std::string StrArea;
+   mutable std::string *StrArea; // to avoid allocating useless std::string
 
+   /// \brief  std::string Hexadecimal represention of the value Entry. 
+   ///        Parts of a multivaluated data are separated by back-slash
+   mutable std::string *StrHexaArea; // to avoid allocating useless std::string
 private:
    /// \brief 0 for straight entries, FLAG_PIXELDATA for Pixel Data entries
    TValueFlag Flag;