Program: gdcm
Module: $RCSfile: gdcmSQItem.cxx,v $
Language: C++
- Date: $Date: 2004/07/17 22:47:01 $
- Version: $Revision: 1.21 $
+ Date: $Date: 2004/08/27 15:48:44 $
+ Version: $Revision: 1.25 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
* \brief Constructor from a given gdcmSQItem
*/
gdcmSQItem::gdcmSQItem(int depthLevel )
- : gdcmDocEntrySet(depthLevel) {
+ : gdcmDocEntrySet(depthLevel)
+{
SQDepthLevel = depthLevel +1;
}
/*
* \brief canonical Printer
*/
- void gdcmSQItem::Print(std::ostream & os) {
+ void gdcmSQItem::Print(std::ostream & os)
+ {
std::ostringstream s;
- if (SQDepthLevel>0)
+ if (SQDepthLevel > 0)
{
- for (int i=0;i<SQDepthLevel;i++)
+ for (int i = 0; i < SQDepthLevel; ++i)
+ {
s << " | " ;
+ }
}
std::cout << s.str() << " --- SQItem number " << SQItemNumber << std::endl;
- for (ListDocEntry::iterator i = docEntries.begin();
+ for (ListDocEntry::iterator i = docEntries.begin();
i != docEntries.end();
++i)
{
os << s.str();
Entry->SetPrintLevel(2);
- Entry->Print(os);
+ Entry->Print(os);
if ( gdcmSeqEntry* SeqEntry = dynamic_cast<gdcmSeqEntry*>(Entry) )
{
(void)SeqEntry; //not used
PrintEndLine = false;
}
if (PrintEndLine)
+ {
os << std::endl;
+ }
}
}
*/
void gdcmSQItem::Write(FILE *fp,FileType filetype)
{
+ 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
+ fwrite(&item[0],8,1,fp); // fffe e000 ffff ffff
+
for (ListDocEntry::iterator i = docEntries.begin();
i != docEntries.end();
++i)
- {
- // 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;
+ {
+ // we skip delimitors (start and end one) because
+ // we force them as 'no length'
+ if ( (*i)->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 ( (*i)->GetGroup() == 0xfffe && (*i)->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);
- }
+ }
+
+ //we force the writting of an 'Item Delimitation' item
+ // because we wrote the Item as a 'no Length' item
+ fwrite(&itemt[0],8,1,fp); // fffe e000 ffff ffff
+
}
//-----------------------------------------------------------------------------
bool gdcmSQItem::SetEntryByNumber(std::string 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;
+ gdcmValEntry* entry = 0;
gdcmTagKey key = gdcmDictEntry::TranslateToKey(group, element);
- if ( ! ptagHT->count(key))
+ if ( ! PtagHT->count(key))
{
// we assume a Public Dictionnary *is* loaded
- gdcmDict *PubDict = gdcmGlobal::GetDicts()->GetDefaultPubDict();
+ 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,
+ gdcmDictEntry *dictEntry = pubDict->GetDictEntryByNumber(group,
element);
- if (DictEntry == NULL)
+ if (dictEntry == NULL)
{
- DictEntry=gdcmGlobal::GetDicts()->NewVirtualDictEntry(group,
- element,
- "UN",
- "??","??");
+ dictEntry =
+ gdcmGlobal::GetDicts()->NewVirtualDictEntry(group, element,
+ "UN", "??", "??");
}
// we assume the constructor didn't fail
- Entry = new gdcmValEntry(DictEntry);
+ 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<gdcmValEntry*>(FoundEntry);
- if (!Entry)
+ }
+ else
+ {
+ gdcmDocEntry* foundEntry = PtagHT->find(key)->second;
+ entry = dynamic_cast<gdcmValEntry*>(foundEntry);
+ if (!entry)
+ {
dbg.Verbose(0, "gdcmSQItem::SetEntryByNumber: docEntries"
" contains non gdcmValEntry 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<gdcmValEntry*>(*i) )
- Entry->SetValue(val);
+ if ( gdcmValEntry* entry = dynamic_cast<gdcmValEntry*>(*i) )
+ {
+ entry->SetValue(val);
+ }
(*i)->SetLength(val.length());
return true;
}
*/
gdcmDocEntry *gdcmSQItem::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;
}
/**
*/
std::string gdcmSQItem::GetEntryByNumber(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 ((gdcmValEntry *)(*i))->GetValue();
+ return ((gdcmValEntry *)(*i))->GetValue(); //FIXME
}
- }
+ }
return GDCM_UNFOUND;
}
//-----------------------------------------------------------------------------
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff