X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=94b3f9bcc670fc61e93fc1ab26b1ce6a01f54179;hb=45a9005ae5c1975bbe932e43c8080a83c9daf29e;hp=11f048daf885dd33cadeb71a15957360d7fcccca;hpb=2012716d624d631dcdb825fdd4470908e115a717;p=gdcm.git

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index 11f048da..94b3f9bc 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/06/20 18:08:48 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2004/06/23 03:36:24 $
+  Version:   $Revision: 1.17 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -46,6 +46,7 @@ gdcmSeqEntry::~gdcmSeqEntry() {
    for(ListSQItem::iterator cc = items.begin();cc != items.end();++cc)
    {
       delete *cc;
+     std::cout << "delete SQItem" <<std:: endl;
    }
    if (!seq_term)
       delete seq_term;
@@ -54,37 +55,31 @@ gdcmSeqEntry::~gdcmSeqEntry() {
 //-----------------------------------------------------------------------------
 // Print
 /*
- * \ingroup gdcmSeqEntry
  * \brief   canonical Printer
  */
 void gdcmSeqEntry::Print(std::ostream &os){
 
    std::ostringstream s,s2;
    std::string vr;
-   unsigned short int g, e;
-   long lgth;
-   size_t o;    
-   char greltag[10];  //group element tag
-   char st[20]; 
-
    // First, Print the Dicom Element itself.
    SetPrintLevel(2);   
    PrintCommonPart(os);
    s << std::endl;
    os << s.str();   
- 
+
+    if (GetReadLength() == 0)
+       return;
+
     // Then, Print each SQ Item   
      for(ListSQItem::iterator cc = items.begin();cc != items.end();++cc)
-   {				
+   {
       (*cc)->Print(os);   
    }
-   // at end, print the sequence terminator item, if any
 
+   // at end, print the sequence terminator item, if any
    if (delimitor_mode) {
-      if (SQDepthLevel>0) {
-         for (int i=0;i<SQDepthLevel;i++)
-            s2 << "   | " ;
-      }		
+      for (int i=0;i<SQDepthLevel+1;i++)
+         s2 << "   | " ;
       os << s2.str();
       if (seq_term != NULL) {
          seq_term->Print(os);
@@ -96,6 +91,18 @@ void gdcmSeqEntry::Print(std::ostream &os){
    }                    
  }
 
+
+/*
+ * \brief   canonical Writer
+ */
+void gdcmSeqEntry::Write(FILE *fp, FileType filetype) {
+  for(ListSQItem::iterator cc  = GetSQItems().begin();
+                           cc != GetSQItems().end();
+                         ++cc) {
+      std::cout << "Et un SQItem !" << std::endl;
+      (*cc)->Write(fp, filetype);  // Don't remove param filetype !
+   }  
+}
 //-----------------------------------------------------------------------------
 // Public
 
@@ -110,21 +117,21 @@ void gdcmSeqEntry::SetDepthLevel(int depth) {
    SQDepthLevel = depth;
 }
 
-/// \brief return a pointer to th SQItem referenced by its ordinal number
+/// \brief return a pointer to the SQItem referenced by its ordinal number
 /// (returns the first one if ordinal number is <0
 ///  returns the last  one if ordinal number is > item number
 
 gdcmSQItem *gdcmSeqEntry::GetSQItemByOrdinalNumber(int nb) {
    if (nb<0)
-		return (*(items.begin()));
-	int count = 0 ;
+      return (*(items.begin()));
+   int count = 0 ;
    for(ListSQItem::iterator cc = items.begin();
-	    cc != items.end();
-		 count ++, ++cc){	
+       cc != items.end();
+       count ++, ++cc){
       if (count==nb)
-		   return (*cc);      
+         return *cc;
    }
-	return (*(items.end()));		 
+   return (*(items.end())); // Euhhhhh ?!? Is this the last one . FIXME
 }
 //-----------------------------------------------------------------------------
 // Protected