X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=8a796aac73329ef459037449b138285a16aee393;hb=0bcc188c6d5185375f809253e8b9b97c856d2eac;hp=02ac489c6d2636f36c68412775d147035342562b;hpb=61e1a3e0ce5480990a0d0b844cf0e86d1775306d;p=gdcm.git diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index 02ac489c..8a796aac 100644 --- a/src/gdcmSQItem.cxx +++ b/src/gdcmSQItem.cxx @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmSQItem.cxx,v $ Language: C++ - Date: $Date: 2004/06/19 23:51:04 $ - Version: $Revision: 1.10 $ + Date: $Date: 2007/08/29 15:30:49 $ + Version: $Revision: 1.87 $ 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. + 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 @@ -18,221 +18,300 @@ #include "gdcmSQItem.h" #include "gdcmSeqEntry.h" -#include "gdcmValEntry.h" -#include "gdcmBinEntry.h" #include "gdcmGlobal.h" +#include "gdcmDictSet.h" #include "gdcmUtil.h" #include "gdcmDebug.h" +#include + +namespace GDCM_NAME_SPACE +{ //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \ingroup gdcmSQItem - * \brief Constructor from a given gdcmSQItem + * \brief Constructor from a given SQItem */ -gdcmSQItem::gdcmSQItem(int depthLevel ) - : gdcmDocEntrySet(depthLevel) { - SQDepthLevel = depthLevel +1; +SQItem::SQItem(int depthLevel ) + : DocEntrySet( ) +{ + SQDepthLevel = depthLevel; + SQItemNumber = 0; } /** * \brief Canonical destructor. */ -gdcmSQItem::~gdcmSQItem() +SQItem::~SQItem() { - for(ListDocEntry::iterator cc = docEntries.begin(); - cc != docEntries.end(); - ++cc) - { - delete (*cc); - } - docEntries.clear(); + ClearEntry(); } //----------------------------------------------------------------------------- -// Print +// Public /* - * \brief canonical Printer + * \brief canonical Writer + * @param fp file pointer to an already open file. + * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...) */ - void gdcmSQItem::Print(std::ostream & os) { - std::ostringstream s; +void SQItem::WriteContent(std::ofstream *fp, FileType filetype, + bool insideMetaElements, bool dummy2) +{ + int j; + uint16_t item[4] = { 0xfffe, 0xe000, 0xffff, 0xffff }; + uint16_t itemt[4]= { 0xfffe, 0xe00d, 0x0000, 0x0000 }; - if (SQDepthLevel>0) { - for (int i=0;iGetGroup() == 0xfffe ) + { + continue; + } + + // Fix in order to make some MR PHILIPS images e-film readable + // see gdcmData/gdcm-MR-PHILIPS-16-Multi-Seq.dcm: + // we just *always* ignore spurious fffe|0000 tag ! + if ( (*it)->GetGroup() == 0xfffe && (*it)->GetElement() == 0x0000 ) + { + break; // FIXME : break or continue; ?!? + // --> makes no difference since the only bugged file we have + // contains 'impossible tag' fffe|0000 in last position ! + } + // false : we are not in MetaElements + // true : we are inside a Sequence + (*it)->WriteContent(fp, filetype, false, true); + } + + //we force the writting of an 'Item Delimitation' item + // because we wrote the Item as a 'no Length' item + for(j=0;j<4;++j) { - os << s.str(); - //(*i)->SetPrintLevel(printLevel); //self->GetPrintLevel() ? - (*i)->SetPrintLevel(2); - (*i)->Print(os); + binary_write( *fp, itemt[j]); // fffe e000 0000 0000 } } -//----------------------------------------------------------------------------- -// Public /** - * \brief adds any Entry (Dicom Element) to the Sequence Item + * \brief Compute the full length of the SQItem (not only value length) + * depending on the VR. */ -bool gdcmSQItem::AddEntry(gdcmDocEntry *entry) +uint32_t SQItem::ComputeFullLength() { - docEntries.push_back(entry); - //TODO : check if it worked + uint32_t l = 8; // Item Starter length + for (ListDocEntry::iterator it = DocEntries.begin(); + it != DocEntries.end(); + ++it) + { + // we skip delimitors (start and end one) because + // we force them as 'no length' + if ( (*it)->GetGroup() == 0xfffe ) + { + continue; + } + l += (*it)->ComputeFullLength(); + } + l += 8; // 'Item Delimitation' item + return l; +} + +/** + * \brief Inserts *in the right place* any Entry (Dicom Element) + * into the Sequence Item + * @param entry Entry to add + * @return always true + */ +bool SQItem::AddEntry(DocEntry *entry) +{ + if (DocEntries.empty() ) + { + DocEntries.push_back(entry); + entry->Register(); + return true; + } + + ListDocEntry::iterator insertSpot; + ListDocEntry::iterator it = DocEntries.end(); + do + { + it--; + + if ( (*it)->IsItemDelimitor() ) + { + continue; + } + if ( (*it)->GetGroup() < entry->GetGroup() ) + break; + else + if ( (*it)->GetGroup() == entry->GetGroup() && + (*it)->GetElement() < entry->GetElement() ) + break; + } while (it != DocEntries.begin() ); + + ++it; + insertSpot = it; + DocEntries.insert(insertSpot, entry); + entry->Register(); return true; } /** - * \brief Sets Entry (Dicom Element) value of an element, - * specified by it's tag (Group, Number) - * and the length, too ... inside a SQ Item - * If the Element is not found, it's just created ! - * \warning we suppose, right now, the element belongs to a Public Group - * (NOT a shadow one) - * @param val string value to set - * @param group Group of the searched tag. - * @param element Element of the searched tag. - * @return true if element was found or created successfully + * \brief Clear the std::list from given entry AND delete the entry. + * @param entryToRemove Entry to remove AND delete. + * @return true if the entry was found and removed; false otherwise */ -bool gdcmSQItem::SetEntryByNumber(std::string val,guint16 group, - guint16 element) +bool SQItem::RemoveEntry( DocEntry *entryToRemove ) { - for(ListDocEntry::iterator i=docEntries.begin();i!=docEntries.end();++i) - { - if ( (*i)->GetGroup() == 0xfffe && (*i)->GetElement() == 0xe000 ) - continue; - if ( ( group < (*i)->GetGroup() ) - ||( group == (*i)->GetGroup() && element < (*i)->GetElement()) ) + for(ListDocEntry::iterator it = DocEntries.begin(); + it != DocEntries.end(); + ++it) + { + if ( *it == entryToRemove ) { - // instead of ReplaceOrCreateByNumber - // that is a method of gdcmDocument :-( - gdcmValEntry* Entry = (gdcmValEntry*)0; - TagKey key = gdcmDictEntry::TranslateToKey(group, element); - if ( ! ptagHT->count(key)) - { - // we assume a Public Dictionnary *is* loaded - gdcmDict *PubDict = gdcmGlobal::GetDicts()->GetDefaultPubDict(); - // if the invoked (group,elem) doesn't exist inside the Dictionary - // we create a VirtualDictEntry - gdcmDictEntry *DictEntry = PubDict->GetDictEntryByNumber(group, - element); - if (DictEntry == NULL) - { - DictEntry=gdcmGlobal::GetDicts()->NewVirtualDictEntry(group, - element, - "UN", - "??","??"); - } - // we assume the constructor didn't fail - Entry = new gdcmValEntry(DictEntry); - /// \todo - /// ---- - /// better we don't assume too much ! - /// gdcmSQItem is now used to describe any DICOMDIR related object - } else { - gdcmDocEntry* FoundEntry = ptagHT->find(key)->second; - Entry = dynamic_cast(FoundEntry); - if (!Entry) - dbg.Verbose(0, "gdcmSQItem::SetEntryByNumber: docEntries" - " contains non gdcmValEntry occurences"); - } - if (Entry) - Entry->SetValue(val); - Entry->SetLength(val.length()); - docEntries.insert(i,Entry); + DocEntries.erase(it); + gdcmDebugMacro( "One element erased: " << entryToRemove->GetKey() ); + entryToRemove->Unregister(); return true; } - if (group == (*i)->GetGroup() && element == (*i)->GetElement() ) - { - if ( gdcmValEntry* Entry = dynamic_cast(*i) ) - Entry->SetValue(val); - (*i)->SetLength(val.length()); - return true; - } } + gdcmWarningMacro( "Entry not found: " << entryToRemove->GetKey() ); + return false ; } -//----------------------------------------------------------------------------- -// Protected - -//----------------------------------------------------------------------------- -// Private - -// end-user intended : the guy *wants* to create his own SeQuence ?!? -/// \brief to be written if really usefull -gdcmDocEntry *gdcmSQItem::NewDocEntryByNumber(guint16 group, - guint16 element) { -/// \todo TODO - gdcmDocEntry *a; - std::cout << " gdcmSQItem::NewDocEntryByNumber : TODO" <Unregister(); + } + DocEntries.clear(); } -/// \brief to be written if really usefull -gdcmDocEntry *gdcmSQItem::NewDocEntryByName (std::string Name) { -/// \todo TODO - gdcmDocEntry *a; - std::cout << " gdcmSQItem::NewDocEntryByName : TODO" <GetDefaultPubDict(); - gdcmDictEntry *dictEntry = (*PubDict).GetDictEntryByName(name); - if( dictEntry == NULL) - return NULL; - return GetDocEntryByNumber(dictEntry->GetGroup(),dictEntry->GetElement()); +DocEntry *SQItem::GetNextEntry() +{ + ++ItDocEntries; + if ( ItDocEntries != DocEntries.end() ) + return *ItDocEntries; + return NULL; } /** - * \ingroup gdcmSQItem - * \brief Gets a Dicom Element inside a SQ Item Entry, by number - * @return + * \brief Gets a Dicom Element inside a SQ Item Entry + * @param group Group number of the Entry + * @param elem Element number of the Entry + * @return Entry whose (group,elem) was passed. 0 if not found */ -gdcmDocEntry *gdcmSQItem::GetDocEntryByNumber(guint16 group, guint16 element) { - for(ListDocEntry::iterator i=docEntries.begin();i!=docEntries.end();++i) { - if ( (*i)->GetGroup()==group && (*i)->GetElement()==element) - return (*i); - } - return NULL; +DocEntry *SQItem::GetDocEntry(uint16_t group, uint16_t elem) +{ + for(ListDocEntry::iterator i = DocEntries.begin(); + i != DocEntries.end(); + ++i) + { + if ( (*i)->GetGroup() == group && (*i)->GetElement() == elem ) + return *i; + } + return NULL; } /** - * \ingroup gdcmSQItem - * \brief Get the value of a Dicom Element inside a SQ Item Entry, by number - * @return - */ - -std::string gdcmSQItem::GetEntryByNumber(guint16 group, guint16 element) { - for(ListDocEntry::iterator i=docEntries.begin();i!=docEntries.end();++i) { - if ( (*i)->GetGroup()==group && (*i)->GetElement()==element) { - return ((gdcmValEntry *)(*i))->GetValue(); - } - } - return GDCM_UNFOUND; + * \brief Copies all the attributes from an other DocEntrySet + * @param set entry to copy from + * @remarks The contained DocEntries a not copied, only referenced + */ +void SQItem::Copy(DocEntrySet *set) +{ + // Remove all previous entries + ClearEntry(); + + DocEntrySet::Copy(set); + + SQItem *sq = dynamic_cast(set); + if( sq ) + { + SQDepthLevel = sq->SQDepthLevel; + SQItemNumber = sq->SQItemNumber; + + DocEntries = sq->DocEntries; + for(ItDocEntries = DocEntries.begin();ItDocEntries != DocEntries.end();++ItDocEntries) + (*ItDocEntries)->Register(); + } } -/** - * \ingroup gdcmSQItem - * \brief Get the value of a Dicom Element inside a SQ Item Entry, by name - * @param name : name of the searched element. - * @return - */ - -std::string gdcmSQItem::GetEntryByName(TagName name) { - gdcmDict *PubDict=gdcmGlobal::GetDicts()->GetDefaultPubDict(); - gdcmDictEntry *dictEntry = (*PubDict).GetDictEntryByName(name); - - if( dictEntry == NULL) - return GDCM_UNFOUND; - return GetEntryByNumber(dictEntry->GetGroup(),dictEntry->GetElement()); +//----------------------------------------------------------------------------- +// Protected + +//----------------------------------------------------------------------------- +// Private + +//----------------------------------------------------------------------------- +// Print +/* + * \brief canonical Printer + * @param os Stream to print to. + * @param indent Indentation string to be prepended during printing. + */ +void SQItem::Print(std::ostream &os, std::string const &) +{ + std::ostringstream s; + + if (SQDepthLevel > 0) + { + for (int i = 0; i < SQDepthLevel; ++i) + { + s << " | " ; + } + } + os << s.str() << " --- SQItem number " << SQItemNumber << std::endl; + for (ListDocEntry::iterator i = DocEntries.begin(); + i != DocEntries.end(); + ++i) + { + DocEntry *Entry = *i; + bool PrintEndLine = true; + + os << s.str(); + Entry->SetPrintLevel(PrintLevel); + Entry->Print(os); + if ( dynamic_cast(Entry) ) + { + PrintEndLine = false; + } + if (PrintEndLine) + { + os << std::endl; + } + } } //----------------------------------------------------------------------------- +} // end namespace gdcm