X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=2a7d748d3de136437ca9bbad6a4a9ffe7de5edfa;hb=d01d35846e6b6918f2e11b2f15e13555e78a39b6;hp=41b2b30afe7926141938e472f319ea0ffe047479;hpb=1d69b92978803204089d270599133917d944c651;p=gdcm.git

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index 41b2b30a..2a7d748d 100644
--- a/src/gdcmSeqEntry.cxx
+++ b/src/gdcmSeqEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSeqEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/12 04:35:48 $
-  Version:   $Revision: 1.31 $
+  Date:      $Date: 2004/11/19 12:44:00 $
+  Version:   $Revision: 1.36 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -24,6 +24,7 @@
 
 #include <iostream>
 #include <iomanip>
+#include <fstream>
 
 namespace gdcm 
 {
@@ -41,8 +42,8 @@ SeqEntry::SeqEntry( DictEntry* e )
    ReadLength = 0xffffffff;
    SQDepthLevel = -1;
 
-   delimitor_mode = false;
-   seq_term  = NULL;
+   DelimitorMode = false;
+   SeqTerm  = NULL;
 }
 
 /**
@@ -53,24 +54,28 @@ SeqEntry::SeqEntry( DictEntry* e )
 SeqEntry::SeqEntry( DocEntry* e, int depth )
              : DocEntry( e->GetDictEntry() )
 {
-   this->UsableLength = 0;
-   this->ReadLength   = 0xffffffff;
+   UsableLength = 0;
+   ReadLength   = 0xffffffff;
    SQDepthLevel = depth;
 
-   this->ImplicitVR   = e->IsImplicitVR();
-   this->Offset       = e->GetOffset();
+   ImplicitVR   = e->IsImplicitVR();
+   Offset       = e->GetOffset();
+   SeqTerm = NULL;
 }
 
 /**
  * \brief   Canonical destructor.
  */
-SeqEntry::~SeqEntry() {
-   for(ListSQItem::iterator cc = items.begin();cc != items.end();++cc)
+SeqEntry::~SeqEntry()
+{
+   for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc)
    {
       delete *cc;
    }
-   if (!seq_term)
-      delete seq_term;
+   if (!SeqTerm)
+   {
+      delete SeqTerm;
+   }
 }
 
 /**
@@ -87,20 +92,21 @@ void SeqEntry::Print( std::ostream &os )
       return;
 
    // Then, Print each SQ Item   
-   for(ListSQItem::iterator cc = items.begin();cc != items.end();++cc)
+   for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc)
    {
       (*cc)->Print(os);   
    }
 
    // at end, print the sequence terminator item, if any
-   if (delimitor_mode) {
+   if (DelimitorMode)
+   {
       for ( int i = 0; i < SQDepthLevel; i++ )
       {
          os << "   | " ;
       }
-      if (seq_term != NULL)
+      if (SeqTerm != NULL)
       {
-         seq_term->Print(os);
+         SeqTerm->Print(os);
          os << std::endl;
       } 
       else 
@@ -114,7 +120,7 @@ void SeqEntry::Print( std::ostream &os )
 /*
  * \brief   canonical Writer
  */
-void SeqEntry::Write(FILE* fp, FileType filetype)
+void SeqEntry::Write(std::ofstream* fp, FileType filetype)
 {
    uint16_t seq_term_gr = 0xfffe;
    uint16_t seq_term_el = 0xe0dd;
@@ -124,8 +130,8 @@ void SeqEntry::Write(FILE* fp, FileType filetype)
    //uint16_t item_term_el = 0xe00d;
    
    DocEntry::Write(fp, filetype);
-   for(ListSQItem::iterator cc  = GetSQItems().begin();
-                            cc != GetSQItems().end();
+   for(ListSQItem::iterator cc  = Items.begin();
+                            cc != Items.end();
                           ++cc)
    {        
       (*cc)->Write(fp, filetype);
@@ -133,9 +139,9 @@ void SeqEntry::Write(FILE* fp, FileType filetype)
    
    // we force the writting of a Sequence Delimitation item
    // because we wrote the Sequence as a 'no Length' sequence
-   fwrite ( &seq_term_gr,(size_t)2 ,(size_t)1 ,fp);
-   fwrite ( &seq_term_el,(size_t)2 ,(size_t)1 ,fp);
-   fwrite ( &seq_term_lg,(size_t)4 ,(size_t)1 ,fp); 
+   binary_write(*fp, seq_term_gr);
+   binary_write(*fp, seq_term_el);
+   binary_write(*fp, seq_term_lg);
 }
 
 //-----------------------------------------------------------------------------
@@ -145,7 +151,7 @@ void SeqEntry::Write(FILE* fp, FileType filetype)
 void SeqEntry::AddEntry(SQItem *sqItem, int itemNumber)
 {
    sqItem->SetSQItemNumber(itemNumber);
-   items.push_back(sqItem);
+   Items.push_back(sqItem);
 }
 
 /**
@@ -157,15 +163,20 @@ void SeqEntry::AddEntry(SQItem *sqItem, int itemNumber)
 SQItem* SeqEntry::GetSQItemByOrdinalNumber(int nb)
 {
    if (nb<0)
-      return (*(items.begin()));
+   {
+      return *(Items.begin());
+   }
    int count = 0 ;
-   for(ListSQItem::iterator cc = items.begin();
-       cc != items.end();
-       count ++, ++cc){
-      if (count==nb)
+   for(ListSQItem::iterator cc = Items.begin();
+                           cc != Items.end();
+                           count ++, ++cc)
+   {
+      if (count == nb)
+      {
          return *cc;
+      }
    }
-   return (*(items.end())); // Euhhhhh ?!? Is this the last one . FIXME
+   return *(Items.end()); // Euhhhhh ?!? Is this the last one . FIXME
 }
 //-----------------------------------------------------------------------------
 // Protected