* Testing/TestAllReadCompareDicom.cxx : now use test files (invented file

[gdcm.git] / src / gdcmValEntry.cxx

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index 4fddd8831b4bbfffdabf2b808e8ef0ac3e937264..b310e37e5386ba53d3ecae0cf8ed52d347f013f5 100644 (file)
--- a/src/gdcmValEntry.cxx
+++ b/src/gdcmValEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/02 16:18:49 $
-  Version:   $Revision: 1.56 $
+  Date:      $Date: 2005/03/22 11:39:04 $
+  Version:   $Revision: 1.59 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -22,14 +22,15 @@
 #include "gdcmGlobal.h"
 #include "gdcmUtil.h"
 #include "gdcmDebug.h"
+#include "gdcmDocument.h"
 
 #include <fstream>
 
 namespace gdcm 
 {
 //-----------------------------------------------------------------------------
-#define MAX_SIZE_PRINT_ELEMENT_VALUE 128
-
+#define MAX_SIZE_PRINT_ELEMENT_VALUE 0x7fffffff;
+uint32_t ValEntry::MaxSizePrintEntry = MAX_SIZE_PRINT_ELEMENT_VALUE;
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
@@ -75,7 +76,7 @@ void ValEntry::WriteContent(std::ofstream *fp, FileType filetype)
    }
 
    const VRKey &vr = GetVR();
-   unsigned int lgr = GetLength();
+   unsigned int lgth = GetLength();
    if (vr == "US" || vr == "SS")
    {
       // some 'Short integer' fields may be multivaluated
@@ -110,10 +111,30 @@ void ValEntry::WriteContent(std::ofstream *fp, FileType filetype)
       return;
    } 
 
-   gdcmAssertMacro( lgr == GetValue().length() );
+   gdcmAssertMacro( lgth == GetValue().length() );
    binary_write(*fp, GetValue());
 } 
 
+
+/**
+ * \brief Header Elements too long will not be printed
+ * @param newSize new size
+ */ 
+void ValEntry::SetMaxSizePrintEntry(long newSize) 
+{
+   if ( newSize < 0 )
+   {
+      return;
+   }
+   if ((uint32_t)newSize >= (uint32_t)0xffffffff )
+   {
+      ValEntry::MaxSizePrintEntry = 0xffffffff;
+      return;
+   }
+   ValEntry::MaxSizePrintEntry = newSize;
+}
+
+
 /**
  * \brief   Sets the std::string representable' value of a ValEntry
  * @param  val value to set 
@@ -191,9 +212,9 @@ void ValEntry::Print(std::ostream &os, std::string const &)
    
    TS *ts = Global::GetTS();
     
-   TSAtr v  = GetValue();  // not applicable for SQ ...     
+   TSAtr v  = GetValue();     
    d2 = Util::CreateCleanString(v);  // replace non printable characters by '.'            
-   if( GetLength() <= MAX_SIZE_PRINT_ELEMENT_VALUE
+   if( (long)GetLength() <= ValEntry::GetMaxSizePrintEntry()
     || PrintLevel >= 3
     || d2.find(GDCM_NOTLOADED) < d2.length() )
    {