Sub-minor fixes on std inclusion... JPR + Frog

[gdcm.git] / src / gdcmSeqEntry.cxx

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index c2864f042b06f5da38701424f829c5c6906a1568..dec2adf9b6b62d38c27a40c2cdc68e41cafec02d 100644 (file)
--- a/src/gdcmSeqEntry.cxx
+++ b/src/gdcmSeqEntry.cxx
@@ -15,12 +15,12 @@
  * \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.
-   // inutile de faire new ?
-      
+   delimitor_mode = false;
+   seq_term  = NULL;
+   SQDepthLevel = depth; // +1; // ??
 }
 
 /**
@@ -32,6 +32,8 @@ gdcmSeqEntry::~gdcmSeqEntry() {
    {
       delete *cc;
    }
+   if (!seq_term)
+      delete seq_term;
 }
 
 //-----------------------------------------------------------------------------
@@ -42,63 +44,39 @@ gdcmSeqEntry::~gdcmSeqEntry() {
  */
 void gdcmSeqEntry::Print(std::ostream &os){
 
-   std::ostringstream s;
-   string vr;
+   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. 
-   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; 
-   }
+   char st[20]; 
 
-   s << "[" << vr  << "] ";
-   if (GetPrintLevel()>=1) {      
-      s.setf(std::ios::left);
-      s << std::setw(66-GetName().length()) << " ";
-   }
-    
-   s << "[" << GetName()<< "]";
+   // First, Print the Dicom Element itself.
+   SetPrintLevel(2);   
+   PrintCommonPart(os);
    s << std::endl;
-   os << s.str();
+   os << s.str();   
  
     // 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);
-   }       
-             
+      (*cc)->Print(os);   
+   }
+   // at end, print the sequence terminator item, if any
+
+   if (delimitor_mode) {
+      s2 << "   | " ;   
+      os << s2.str();
+      if (seq_term != NULL) {
+         seq_term->Print(os);
+      } 
+      else 
+         std::cout
+             << "      -------------- should have a sequence terminator item"
+             << std::endl;      
+   }                    
  }
 
 //-----------------------------------------------------------------------------
@@ -108,23 +86,44 @@ void gdcmSeqEntry::Print(std::ostream &os){
 void gdcmSeqEntry::AddEntry(gdcmSQItem *sqItem) {
    items.push_back(sqItem);
 }
+
+/// \brief Sets the depth level of a Sequence Entry embedded in a SeQuence 
+void gdcmSeqEntry::SetDepthLevel(int depth) {
+   SQDepthLevel = depth;
+}
+
 //-----------------------------------------------------------------------------
 // Protected
 
+
 //-----------------------------------------------------------------------------
 // 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                                  
+// TODO
+   std::cout << "TODO : gdcmSeqEntry::NewDocEntryByNumber " << std::endl;
    gdcmDocEntry *a;   
-   return a;                             
+   return a;
 }
 
+/// \brief to be written, if really usefull
 gdcmDocEntry *gdcmSeqEntry::NewDocEntryByName  (std::string Name) {
-// TODO        :                         
+// 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;
-}      
+}
 //-----------------------------------------------------------------------------