From: jpr <jpr>
Date: Tue, 22 Mar 2005 11:39:04 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: Version1.2.bp~813
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=09eb38b5b2fe392e64390b7c2eadf822541f92ba;p=gdcm.git

*** empty log message ***
---

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index 66198701..b310e37e 100644
--- 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/14 10:45:47 $
-  Version:   $Revision: 1.58 $
+  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
 /**
@@ -114,6 +115,26 @@ void ValEntry::WriteContent(std::ofstream *fp, FileType filetype)
    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 
@@ -193,7 +214,7 @@ void ValEntry::Print(std::ostream &os, std::string const &)
     
    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() )
    {
diff --git a/src/gdcmValEntry.h b/src/gdcmValEntry.h
index f1b256d4..aeca4b40 100644
--- a/src/gdcmValEntry.h
+++ b/src/gdcmValEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.h,v $
   Language:  C++
-  Date:      $Date: 2005/02/21 17:47:20 $
-  Version:   $Revision: 1.40 $
+  Date:      $Date: 2005/03/22 11:39:04 $
+  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
@@ -48,7 +48,7 @@ public:
 
    // Other accessors are inherited from gdcm::ContentEntry
 
-   void Print(std::ostream &os = std::cout,std::string const &indent = ""); 
+   void Print(std::ostream &os = std::cout, std::string const &indent = ""); 
 
    void WriteContent(std::ofstream *fp, FileType filetype); 
    
@@ -56,10 +56,22 @@ public:
    /// The size is updated
    void SetValue(std::string const &val);
 
+
+   /// \brief returns the size threshold above which an element value 
+   ///        will NOT be *printed* in order no to polute the screen output
+   static long GetMaxSizePrintEntry() { return ValEntry::MaxSizePrintEntry; };
+
+   static void SetMaxSizePrintEntry(long);
+
 protected:
    
 private:
 
+   /// \brief Size threshold above which an element val
+   ///        By default, this upper bound is fixed to 64 bytes.
+
+   static uint32_t MaxSizePrintEntry;   
+
 };
 
 } // end namespace gdcm