X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=9f2c4d195f3f622047720f68595af5b92c86cbf4;hb=9d913797d3bf5a18625f4d8d8b42c8f5c8c10d99;hp=0955a1b4601b21ceb171b319b6b392d32aaa6d48;hpb=858bf5f07677c76676725033bca9638462666329;p=gdcm.git diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx index 0955a1b4..9f2c4d19 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: 2005/01/07 16:45:52 $ + Version: $Revision: 1.42 $ + + 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.html 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" @@ -9,119 +24,161 @@ #include #include +#include + +namespace gdcm +{ + //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \ingroup gdcmSeqEntry - * \brief Constructor from a given gdcmSeqEntry + * \ingroup SeqEntry + * \brief Constructor from a given SeqEntry */ -gdcmSeqEntry::gdcmSeqEntry(gdcmDictEntry* e) - : gdcmDocEntry(e) +SeqEntry::SeqEntry( DictEntry *e ) + : DocEntry(e) +{ + Length = 0; + ReadLength = 0xffffffff; + SQDepthLevel = -1; + + DelimitorMode = false; + SeqTerm = NULL; +} + +/** + * \brief Constructor from a given SeqEntry + * @param e Pointer to existing Doc entry + * @param depth depth level of the current Seq entry + */ +SeqEntry::SeqEntry( DocEntry *e, int depth ) + : DocEntry( e->GetDictEntry() ) { - delimitor_mode = false; - seq_term = NULL; + Length = 0; + ReadLength = 0xffffffff; + SQDepthLevel = depth; + + ImplicitVR = e->IsImplicitVR(); + Offset = e->GetOffset(); + SeqTerm = NULL; } /** - * \ingroup gdcmSeqEntry * \brief Canonical destructor. */ -gdcmSeqEntry::~gdcmSeqEntry() { - 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; + } } -//----------------------------------------------------------------------------- -// 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]; - - - 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; - } - - s << "[" << vr << "] "; - if (GetPrintLevel()>=1) { - s.setf(std::ios::left); - s << std::setw(66-GetName().length()) << " "; - } - - s << "[" << GetName()<< "]"; +void SeqEntry::Print( std::ostream &os ) +{ + // First, Print the Dicom Element itself. + os << "S "; + DocEntry::Print(os); + os << std::endl; - 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) + // 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)->SetPrintLevel(PrintLevel); + (*cc)->Print(os); } + // at end, print the sequence terminator item, if any - /* - if (delimitor_mode) { // TODO : find the trick to print it properly - s << " | " ; - os << s.str(); - if (seq_term = NULL) - seq_term->Print(os); - } - */ - } + if (DelimitorMode) + { + for ( int i = 0; i < SQDepthLevel; i++ ) + { + os << " | " ; + } + if (SeqTerm != NULL) + { + SeqTerm->SetPrintLevel(PrintLevel); + SeqTerm->Print(os); + os << std::endl; + } + else + { + // fuse + os << " -------------- should have a sequence terminator item"; + } + } +} + +/* + * \brief canonical Writer + */ +void SeqEntry::WriteContent(std::ofstream *fp, FileType filetype) +{ + uint16_t seq_term_gr = 0xfffe; + uint16_t seq_term_el = 0xe0dd; + uint32_t seq_term_lg = 0xffffffff; + + //uint16_t item_term_gr = 0xfffe; + //uint16_t item_term_el = 0xe00d; + + DocEntry::WriteContent(fp, filetype); + for(ListSQItem::iterator cc = Items.begin(); + cc != Items.end(); + ++cc) + { + (*cc)->WriteContent(fp, filetype); + } + + // we force the writting of a Sequence Delimitation item + // because we wrote the Sequence as a 'no Length' sequence + binary_write(*fp, seq_term_gr); + binary_write(*fp, seq_term_el); + binary_write(*fp, seq_term_lg); +} //----------------------------------------------------------------------------- // Public - /// \brief adds the passed ITEM to the ITEM chained List for this SeQuence. -void gdcmSeqEntry::AddEntry(gdcmSQItem *sqItem) { - items.push_back(sqItem); +/// \brief adds the passed ITEM to the ITEM chained List for this SeQuence. +void SeqEntry::AddEntry(SQItem *sqItem, int itemNumber) +{ + sqItem->SetSQItemNumber(itemNumber); + Items.push_back(sqItem); +} + +/** + * \brief return a pointer to the SQItem referenced by its ordinal number. + * Returns the first item when argument is negative. + * Returns the last item when argument is bigget than the total + * item number. + */ +SQItem *SeqEntry::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 @@ -130,17 +187,6 @@ void gdcmSeqEntry::AddEntry(gdcmSQItem *sqItem) { //----------------------------------------------------------------------------- // 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; -} //----------------------------------------------------------------------------- +} // end namespace gdcm +