X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=166fd40a7e93247d13bed96db53da4365ecf0cb0;hb=c03bc9b5e7d49126a10d49f78682410a5500c412;hp=d34f7a9d640f622dd96e8f83d9783bea1d54ac7b;hpb=179f2dccd14c31668ef175e8e3373bf8b3121bd1;p=gdcm.git diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index d34f7a9d..166fd40a 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/07/17 22:47:01 $ - Version: $Revision: 1.21 $ + Date: $Date: 2004/11/10 18:27:23 $ + Version: $Revision: 1.36 $ 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 @@ -22,33 +22,35 @@ #include "gdcmBinEntry.h" #include "gdcmGlobal.h" #include "gdcmUtil.h" - #include "gdcmDebug.h" +#include - +namespace gdcm +{ //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \ingroup gdcmSQItem - * \brief Constructor from a given gdcmSQItem + * \ingroup SQItem + * \brief Constructor from a given SQItem */ -gdcmSQItem::gdcmSQItem(int depthLevel ) - : gdcmDocEntrySet(depthLevel) { - SQDepthLevel = depthLevel +1; +SQItem::SQItem(int depthLevel ) + : DocEntrySet( ) +{ + SQDepthLevel = depthLevel; } /** * \brief Canonical destructor. */ -gdcmSQItem::~gdcmSQItem() +SQItem::~SQItem() { - for(ListDocEntry::iterator cc = docEntries.begin(); - cc != docEntries.end(); - ++cc) + for(ListDocEntry::iterator cc = DocEntries.begin(); + cc != DocEntries.end(); + ++cc) { - delete (*cc); + delete *cc; } - docEntries.clear(); + DocEntries.clear(); } //----------------------------------------------------------------------------- @@ -56,62 +58,86 @@ gdcmSQItem::~gdcmSQItem() /* * \brief canonical Printer */ - void gdcmSQItem::Print(std::ostream & os) { + void SQItem::Print(std::ostream& os) + { std::ostringstream s; - if (SQDepthLevel>0) + if (SQDepthLevel > 0) { - for (int i=0;iSetPrintLevel(2); - Entry->Print(os); - if ( gdcmSeqEntry* SeqEntry = dynamic_cast(Entry) ) + Entry->Print(os); + if ( SeqEntry* seqEntry = dynamic_cast(Entry) ) { - (void)SeqEntry; //not used + (void)seqEntry; //not used PrintEndLine = false; } if (PrintEndLine) + { os << std::endl; + } } } /* - * \ingroup gdcmSQItem + * \ingroup SQItem * \brief canonical Writer */ -void gdcmSQItem::Write(FILE *fp,FileType filetype) +void SQItem::Write(std::ofstream* fp, FileType filetype) { - for (ListDocEntry::iterator i = docEntries.begin(); - i != docEntries.end(); - ++i) + int j; + uint16_t item[4] = { 0xfffe, 0xe000, 0xffff, 0xffff }; + uint16_t itemt[4]= { 0xfffe, 0xe00d, 0xffff, 0xffff }; + + //we force the writting of an 'Item' Start Element + // because we want to write the Item as a 'no Length' item + for(j=0;j<4;++j) { - // Item Delimitor Item IS the last one of a 'no length' SQItem - // (when it exists) we don't write it right now - // It will be written outside, because ALL the SQItems are written - // as 'no length' - if ( (*i)->isItemDelimitor() ) - break; + binary_write( *fp, item[j]); // fffe e000 ffff ffff + } + + 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; + } // 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 ( ((*i)->GetGroup() == 0xfffe) && ((*i)->GetElement() == 0x0000) ) - break; + if ( (*it)->GetGroup() == 0xfffe && (*it)->GetElement() == 0x0000 ) + { + break; // FIXME : continue; ?!? + } - // It's up to the gdcmDocEntry Writter to write the SQItem begin element - // (fffe|e000) as a 'no length' one - (*i)->Write(fp, filetype); - } + (*it)->Write(fp, filetype); + } + + //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) + { + binary_write( *fp, itemt[j]); // fffe e000 ffff ffff + } + } //----------------------------------------------------------------------------- @@ -119,9 +145,9 @@ void gdcmSQItem::Write(FILE *fp,FileType filetype) /** * \brief adds any Entry (Dicom Element) to the Sequence Item */ -bool gdcmSQItem::AddEntry(gdcmDocEntry *entry) +bool SQItem::AddEntry(DocEntry* entry) { - docEntries.push_back(entry); + DocEntries.push_back(entry); //TODO : check if it worked return true; } @@ -139,60 +165,71 @@ bool gdcmSQItem::AddEntry(gdcmDocEntry *entry) * @return true if element was found or created successfully */ -bool gdcmSQItem::SetEntryByNumber(std::string val,uint16_t group, - uint16_t element) +bool SQItem::SetEntryByNumber(std::string const & val, uint16_t group, + uint16_t element) { - for(ListDocEntry::iterator i=docEntries.begin();i!=docEntries.end();++i) + 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()) ) { // instead of ReplaceOrCreateByNumber - // that is a method of gdcmDocument :-( - gdcmValEntry* Entry = (gdcmValEntry*)0; - gdcmTagKey key = gdcmDictEntry::TranslateToKey(group, element); + // that is a method of Document :-( + ValEntry* entry = 0; + TagKey key = DictEntry::TranslateToKey(group, element); - if ( ! ptagHT->count(key)) + if ( ! PtagHT->count(key)) { // we assume a Public Dictionnary *is* loaded - gdcmDict *PubDict = gdcmGlobal::GetDicts()->GetDefaultPubDict(); + Dict *pubDict = Global::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 *dictEntry = pubDict->GetDictEntryByNumber(group, element); + if (dictEntry == NULL) { - DictEntry=gdcmGlobal::GetDicts()->NewVirtualDictEntry(group, - element, - "UN", - "??","??"); + dictEntry = + Global::GetDicts()->NewVirtualDictEntry(group, element, + "UN", "??", "??"); } // we assume the constructor didn't fail - Entry = new gdcmValEntry(DictEntry); + entry = new ValEntry(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"); + /// SQItem is now used to describe any DICOMDIR related object + } + else + { + DocEntry* foundEntry = PtagHT->find(key)->second; + entry = dynamic_cast(foundEntry); + if (!entry) + { + dbg.Verbose(0, "SQItem::SetEntryByNumber: docEntries" + " contains non ValEntry occurences"); + } + } + if (entry) + { + entry->SetValue(val); } - if (Entry) - Entry->SetValue(val); - Entry->SetLength(val.length()); - docEntries.insert(i,Entry); + entry->SetLength(val.length()); + DocEntries.insert(i,entry); + return true; } if (group == (*i)->GetGroup() && element == (*i)->GetElement() ) { - if ( gdcmValEntry* Entry = dynamic_cast(*i) ) - Entry->SetValue(val); + if ( ValEntry* entry = dynamic_cast(*i) ) + { + entry->SetValue(val); + } (*i)->SetLength(val.length()); return true; } @@ -207,16 +244,17 @@ bool gdcmSQItem::SetEntryByNumber(std::string val,uint16_t group, * \brief Gets a Dicom Element inside a SQ Item Entry, by number * @return */ -gdcmDocEntry *gdcmSQItem::GetDocEntryByNumber(uint16_t group, uint16_t element) +DocEntry* SQItem::GetDocEntryByNumber(uint16_t group, uint16_t element) { - for(ListDocEntry::iterator i=docEntries.begin();i!=docEntries.end();++i) + for(ListDocEntry::iterator i = DocEntries.begin(); + i != DocEntries.end(); ++i) { - if ( (*i)->GetGroup()==group && (*i)->GetElement()==element) + if ( (*i)->GetGroup() == group && (*i)->GetElement() == element ) { - return (*i); + return *i; } - } - return NULL; + } + return 0; } /** @@ -224,15 +262,16 @@ gdcmDocEntry *gdcmSQItem::GetDocEntryByNumber(uint16_t group, uint16_t element) * @return */ -std::string gdcmSQItem::GetEntryByNumber(uint16_t group, uint16_t element) -{ - for(ListDocEntry::iterator i=docEntries.begin();i!=docEntries.end();++i) +std::string SQItem::GetEntryByNumber(uint16_t group, uint16_t element) +{ + for(ListDocEntry::iterator i = DocEntries.begin(); + i != DocEntries.end(); ++i) { - if ( (*i)->GetGroup()==group && (*i)->GetElement()==element) + if ( (*i)->GetGroup() == group && (*i)->GetElement() == element) { - return ((gdcmValEntry *)(*i))->GetValue(); + return ((ValEntry *)(*i))->GetValue(); //FIXME } - } + } return GDCM_UNFOUND; } //----------------------------------------------------------------------------- @@ -240,3 +279,5 @@ std::string gdcmSQItem::GetEntryByNumber(uint16_t group, uint16_t element) //----------------------------------------------------------------------------- + +} // end namespace gdcm