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

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index dec2adf9..94b3f9bc 100644
--- a/src/gdcmSeqEntry.cxx
+++ b/src/gdcmSeqEntry.cxx
@@ -1,6 +1,21 @@
-// gdcmSeqEntry.cxx
-//-----------------------------------------------------------------------------
-//
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmSeqEntry.cxx,v $
+  Language:  C++
+  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
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #include "gdcmSeqEntry.h"
 #include "gdcmSQItem.h"
 #include "gdcmTS.h"
@@ -20,7 +35,7 @@ gdcmSeqEntry::gdcmSeqEntry(gdcmDictEntry* e, int depth)
 {
    delimitor_mode = false;
    seq_term  = NULL;
-   SQDepthLevel = depth; // +1; // ??
+   SQDepthLevel = depth;
 }
 
 /**
@@ -31,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;
@@ -39,35 +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)->SetPrintLevel(GetPrintLevel()); aurait-ce un sens ?
+   {
       (*cc)->Print(os);   
    }
-   // at end, print the sequence terminator item, if any
 
+   // at end, print the sequence terminator item, if any
    if (delimitor_mode) {
-      s2 << "   | " ;   
+      for (int i=0;i<SQDepthLevel+1;i++)
+         s2 << "   | " ;
       os << s2.str();
       if (seq_term != NULL) {
          seq_term->Print(os);
@@ -79,11 +91,24 @@ 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
 
  /// \brief   adds the passed ITEM to the ITEM chained List for this SeQuence.      
-void gdcmSeqEntry::AddEntry(gdcmSQItem *sqItem) {
+void gdcmSeqEntry::AddEntry(gdcmSQItem *sqItem, int itemNumber) {
+   sqItem->SetSQItemNumber(itemNumber);
    items.push_back(sqItem);
 }
 
@@ -92,6 +117,22 @@ void gdcmSeqEntry::SetDepthLevel(int depth) {
    SQDepthLevel = depth;
 }
 
+/// \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 ;
+   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
+}
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -99,31 +140,4 @@ void gdcmSeqEntry::SetDepthLevel(int depth) {
 //-----------------------------------------------------------------------------
 // Private
 
-// end-user intended : the guy *wants* to create his own SeQuence ?!?
-
-/// \brief to be written, if really usefull
-gdcmDocEntry *gdcmSeqEntry::NewDocEntryByNumber(guint16 group,
-                                                guint16 element) {
-// TODO
-   std::cout << "TODO : gdcmSeqEntry::NewDocEntryByNumber " << std::endl;
-   gdcmDocEntry *a;   
-   return a;
-}
-
-/// \brief to be written, if really usefull
-gdcmDocEntry *gdcmSeqEntry::NewDocEntryByName  (std::string Name) {
-// TODO
-   std::cout << "TODO : gdcmSeqEntry::NewDocEntryByName " << std::endl;
-   gdcmDocEntry *a;   
-   return a;   
-}
-
-/// \brief to be written, if really usefull
-gdcmDocEntry *gdcmSeqEntry::GetDocEntryByNumber(guint16 group,
-                                                guint16 element) {
-// TODO
-   std::cout << "TODO : gdcmSeqEntry::GetDocEntryByNumber " << std::endl;
-   gdcmDocEntry *a;   
-   return a;
-}
 //-----------------------------------------------------------------------------