X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=fd4d24993c019c7183da9ac5997c1bfa3df3eb66;hb=967978854b861e9b06fbd89b93e77d9ed984cce2;hp=20c2e51a988943463e424614a882a41043cd0b88;hpb=0d33ba5ffb1c6beac21f33bd3e3aad67b7608c9d;p=gdcm.git

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index 20c2e51a..fd4d2499 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/24 18:03:14 $
+  Version:   $Revision: 1.20 $
+                                                                                
+  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"
@@ -15,17 +30,15 @@
  * \ingroup gdcmSeqEntry
  * \brief   Constructor from a given gdcmSeqEntry
  */
-gdcmSeqEntry::gdcmSeqEntry(gdcmDictEntry* e) 
+gdcmSeqEntry::gdcmSeqEntry(gdcmDictEntry* e, int depth) 
              : gdcmDocEntry(e)
 {
-   //ListSQItem items est un *champ* de gdcmSeqEntry.
-   
    delimitor_mode = false;
-   seq_term  = NULL;   
+   seq_term  = NULL;
+   SQDepthLevel = depth;
 }
 
 /**
- * \ingroup gdcmSeqEntry
  * \brief   Canonical destructor.
  */
 gdcmSeqEntry::~gdcmSeqEntry() {
@@ -33,113 +46,108 @@ gdcmSeqEntry::~gdcmSeqEntry() {
    {
       delete *cc;
    }
+   if (!seq_term)
+      delete seq_term;
 }
 
-//-----------------------------------------------------------------------------
-// Print
 /*
- * \ingroup gdcmSeqEntry
  * \brief   canonical Printer
  */
 void gdcmSeqEntry::Print(std::ostream &os){
 
-   std::ostringstream s;
-   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);   
+   gdcmDocEntry::Print(os);
+   os << std::endl;
 
+   if (GetReadLength() == 0)
+      return;
 
-   SetPrintLevel(2);   
-//   PrintCommonPart(os); // FIXME : why doesn't it work ?
-     
-   // First, Print the Dicom Element itself. 
-   g  = GetGroup();
-   e  = GetElement();   
-   o  = GetOffset();
-   vr = GetVR();
-   sprintf(greltag,"%04x|%04x ",g,e);           
-   s << greltag ;
-   if (GetPrintLevel()>=2) { 
-      s << "lg : ";
-      lgth = GetReadLength(); // ReadLength, as opposed to UsableLength
-      if (lgth == 0xffffffff) {
-         sprintf(st,"x(ffff)");  // I said : "x(ffff)" !
-         s.setf(std::ios::left);
-         s << std::setw(10-strlen(st)) << " ";  
-         s << st << " ";
-         s.setf(std::ios::left);
-         s << std::setw(8) << "-1";      
-      } else {
-         sprintf(st,"x(%x)",lgth);
-         s.setf(std::ios::left);
-         s << std::setw(10-strlen(st)) << " ";  
-         s << st << " ";
-         s.setf(std::ios::left);
-         s << std::setw(8) << lgth; 
-      }
-      s << " Off.: ";
-      sprintf(st,"x(%x)",o); 
-      s << std::setw(10-strlen(st)) << " ";
-      s << st << " ";
-      s << std::setw(8) << o; 
+   // Then, Print each SQ Item   
+   for(ListSQItem::iterator cc = items.begin();cc != items.end();++cc)
+   {
+      (*cc)->Print(os);   
    }
 
-   s << "[" << vr  << "] ";
-   if (GetPrintLevel()>=1) {      
-      s.setf(std::ios::left);
-      s << std::setw(66-GetName().length()) << " ";
-   }
-    
-   s << "[" << GetName()<< "]";
+   // at end, print the sequence terminator item, if any
+   if (delimitor_mode) {
+      for (int i=0;i<SQDepthLevel+1;i++)
+         os << "   | " ;
+      if (seq_term != NULL) {
+         seq_term->Print(os);
+         os << std::endl;
+      } 
+      else 
+         // fusible
+         os << "      -------------- should have a sequence terminator item";
+   }                    
+}
+
+/*
+ * \brief   canonical Writer
+ */
+void gdcmSeqEntry::Write(FILE *fp, FileType filetype)
+{
+   guint16 seq_term_gr = 0xfffe;
+   guint16 seq_term_el = 0xe0dd;
+   guint32 seq_term_lg = 0x00000000;
 
-   s << std::endl;
-   os << s.str();
+   guint16 item_term_gr = 0xfffe;
+   guint16 item_term_el = 0xe00d;
 
- 
-    // Then, Print each SQ Item   
-     for(ListSQItem::iterator cc = items.begin();cc != items.end();++cc)
+   gdcmDocEntry::Write(fp, filetype);
+   for(ListSQItem::iterator cc  = GetSQItems().begin();
+                            cc != GetSQItems().end();
+                          ++cc)
    {
-      //(*cc)->SetPrintLevel(GetPrintLevel()); aurait-ce un sens ?
-      (*cc)->Print(os);
+      (*cc)->Write(fp, filetype);
+
+   fwrite ( &item_term_gr,(size_t)2 ,(size_t)1 ,fp);
+   fwrite ( &item_term_el,(size_t)2 ,(size_t)1 ,fp);   
+   fwrite ( &seq_term_lg,(size_t)4 ,(size_t)1 ,fp); 
    }
-   // at end, print the sequence terminator item, if any
-   /*
-   if (delimitor_mode) {
-      s << "   | " ;   
-      os << s.str();
-      if (seq_term = NULL)
-         seq_term->Print(os);      
-   }        
-  */             
- }
+    //we force the writting of a Sequence Delimitaion 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); 
+}
 
 //-----------------------------------------------------------------------------
 // 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);
 }
+
+/// \brief Sets the depth level of a Sequence Entry embedded in a SeQuence 
+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
 
+
 //-----------------------------------------------------------------------------
 // Private
 
-// end-user intended : the guy *wants* to create his own SeQuence ?!?
-gdcmDocEntry *gdcmSeqEntry::NewDocEntryByNumber(guint16 group,
-                                                guint16 element) {
-// TODO				  
-   gdcmDocEntry *a;   
-   return a;				  
-}
-
-gdcmDocEntry *gdcmSeqEntry::NewDocEntryByName  (std::string Name) {
-// TODO	: 			  
-   gdcmDocEntry *a;   
-   return a;
-}	
 //-----------------------------------------------------------------------------