ENH : method gdcmValEntry::Write doesn't need the filetype parameter (onlu

PrintCommonPart does)

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index a31ca8d20cde80603443e5be99c2230010998165..95cea960349661b6f3252676549d6f7dd256e0cd 100644 (file)
--- a/src/gdcmElementSet.cxx
+++ b/src/gdcmElementSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/22 14:03:30 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2004/06/22 14:37:04 $
+  Version:   $Revision: 1.11 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -81,26 +81,26 @@ void gdcmElementSet::Write(FILE *fp, FileType filetype) {
    gdcmDocEntry *e;
    for (TagDocEntryHT::iterator i = tagHT.begin(); i != tagHT.end(); ++i)  
    {
-      e=i->second;     
-          e->WriteCommonPart(fp, filetype);
-               std::cout<<e->GetKey() << " " << std::hex << e->GetVR() << " " 
-                        << e->GetName()
-                        << std::endl;
-                                       
-//              e->Write(fp,filetype); // This will be the right way to proceed !
-               
+      e=i->second;
+      e->WriteCommonPart(fp, filetype);
+      std::cout<<e->GetKey() << " " << std::hex << e->GetVR() << " " 
+               << e->GetName()
+               << std::endl;
+
+// e->Write(fp,filetype); // This will be the right way to proceed !
+
       if (gdcmBinEntry* BinEntry = dynamic_cast< gdcmBinEntry* >(e) ) {
          BinEntry->Write(fp,filetype);
-                       continue;
+         continue;
       }
-               if (gdcmValEntry* ValEntry = dynamic_cast< gdcmValEntry* >(e) ) {
-         ValEntry->Write(fp,filetype);
-                       continue;
+     if (gdcmValEntry* ValEntry = dynamic_cast< gdcmValEntry* >(e) ) {
+         ValEntry->Write(fp);
+         continue;
       }
 
       if (gdcmSeqEntry* SeqEntry = dynamic_cast< gdcmSeqEntry* >(e) ) {
          SeqEntry->Write(fp,filetype);
-                       continue;
+         continue;
       } 
    } 
 }

diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx
index 5e4812f28e8db2f67aa3c1e6c25b41e94bea3e20..603bb256cc43843556073b301eaefcca595ebbe7 100644 (file)
--- a/src/gdcmSQItem.cxx
+++ b/src/gdcmSQItem.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSQItem.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/22 14:16:45 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2004/06/22 14:37:04 $
+  Version:   $Revision: 1.13 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -94,7 +94,7 @@ gdcmSQItem::~gdcmSQItem()
          return;
       }
       if (gdcmValEntry* ValEntry = dynamic_cast< gdcmValEntry* >(Entry) ) {
-         ValEntry->Write(fp,filetype);
+         ValEntry->Write(fp);
          return;
       }
       if (gdcmSeqEntry* SeqEntry = dynamic_cast< gdcmSeqEntry* >(Entry) ) {

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index ee0b42b8ebd44a1182bdfb84244c682e6dbe89c8..b5575cfe24c2e2cad30f81a57971f064b9a8d590 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: 2004/06/22 14:03:30 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2004/06/22 14:37:04 $
+  Version:   $Revision: 1.12 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -137,7 +137,7 @@ void gdcmValEntry::Print(std::ostream & os)
 /*
  * \brief   canonical Writer
  */
-void gdcmValEntry::Write(FILE *fp, FileType filetype) {
+void gdcmValEntry::Write(FILE *fp) {
       std::string vr=GetVR();
       int lgr=GetLength();
       if (vr == "US" || vr == "SS") {

diff --git a/src/gdcmValEntry.h b/src/gdcmValEntry.h
index e08a18fb3bf4bee16b83146164197b0c33093db4..eeecd5d5f2c1939a03746d09989bf70f72d03d4d 100644 (file)
--- a/src/gdcmValEntry.h
+++ b/src/gdcmValEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.h,v $
   Language:  C++
-  Date:      $Date: 2004/06/22 13:47:33 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2004/06/22 14:37:04 $
+  Version:   $Revision: 1.14 $
                                                                                 
   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:
    inline void SetValue(std::string val)  { value = val;  };
    
    virtual void Print(std::ostream &os = std::cout); 
-   virtual void gdcmValEntry::Write(FILE *fp, FileType filetype);           
+   virtual void gdcmValEntry::Write(FILE *fp);           
 protected:
 
    /// \brief for 'non string' values. Will be move to gdcmBinEntry, later