X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=ca6e13055ef178074d8f2930b5f2ca2f5fdeac88;hb=ddf499835a21348b252936d10fbf4305d3c1e3ad;hp=0955a1b4601b21ceb171b319b6b392d32aaa6d48;hpb=858bf5f07677c76676725033bca9638462666329;p=gdcm.git diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx index 0955a1b4..ca6e1305 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/08/31 14:24:47 $ + Version: $Revision: 1.26 $ + + 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,15 +30,31 @@ * \ingroup gdcmSeqEntry * \brief Constructor from a given gdcmSeqEntry */ -gdcmSeqEntry::gdcmSeqEntry(gdcmDictEntry* e) +gdcmSeqEntry::gdcmSeqEntry(gdcmDictEntry* e, int depth) : gdcmDocEntry(e) { delimitor_mode = false; - seq_term = NULL; + seq_term = NULL; + SQDepthLevel = depth; + UsableLength = 0; + ReadLength = 0xffffffff; } /** - * \ingroup gdcmSeqEntry + * \brief Constructor from a given gdcmSeqEntry + * @param e Pointer to existing Doc entry + * @param depth depth level of the current Seq entry + */ +gdcmSeqEntry::gdcmSeqEntry(gdcmDocEntry* e, int depth) : gdcmDocEntry(e->GetDictEntry()) +{ + this->UsableLength = 0; + this->ReadLength = 0xffffffff; + this->ImplicitVR = e->IsImplicitVR(); + this->Offset = e->GetOffset(); + //this->printLevel = e->GetPrintLevel(); // no longer exists ?!? + this->SQDepthLevel = depth; +} +/** * \brief Canonical destructor. */ gdcmSeqEntry::~gdcmSeqEntry() { @@ -35,94 +66,96 @@ gdcmSeqEntry::~gdcmSeqEntry() { 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;iPrint(os); + os << std::endl; + } + else + // fusible + os << " -------------- should have a sequence terminator item"; + } +} - s << std::endl; - os << s.str(); +/* + * \brief canonical Writer + */ +void gdcmSeqEntry::Write(FILE *fp, FileType filetype) +{ + uint16_t seq_term_gr = 0xfffe; + uint16_t seq_term_el = 0xe0dd; + uint32_t seq_term_lg = 0xffffffff; - - // 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); + //uint16_t item_term_gr = 0xfffe; + //uint16_t item_term_el = 0xe00d; + + gdcmDocEntry::Write(fp, filetype); + for(ListSQItem::iterator cc = GetSQItems().begin(); + cc != GetSQItems().end(); + ++cc) + { + (*cc)->Write(fp, filetype); } - // 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); - } - */ - } + + //we force the writting of a Sequence Delimitation 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 @@ -130,17 +163,4 @@ 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; -} //-----------------------------------------------------------------------------