Program: gdcm
Module: $RCSfile: gdcmSQItem.cxx,v $
Language: C++
- Date: $Date: 2004/12/03 17:13:18 $
- Version: $Revision: 1.39 $
+ Date: $Date: 2005/01/05 15:38:28 $
+ Version: $Revision: 1.44 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmValEntry.h"
#include "gdcmBinEntry.h"
#include "gdcmGlobal.h"
+#include "gdcmDictSet.h"
#include "gdcmUtil.h"
#include "gdcmDebug.h"
+
#include <fstream>
namespace gdcm
/*
* \brief canonical Printer
*/
- void SQItem::Print(std::ostream& os)
- {
- os << "S ";
+void SQItem::Print(std::ostream& os)
+{
std::ostringstream s;
if (SQDepthLevel > 0)
bool PrintEndLine = true;
os << s.str();
- Entry->SetPrintLevel(2);
+ Entry->SetPrintLevel(PrintLevel);
Entry->Print(os);
if ( SeqEntry* seqEntry = dynamic_cast<SeqEntry*>(Entry) )
{
continue;
}
- if ( ( group < (*i)->GetGroup() )
+ if ( ( group < (*i)->GetGroup() )
||( group == (*i)->GetGroup() && element < (*i)->GetElement()) )
{
// instead of ReplaceOrCreateByNumber
ValEntry* entry = 0;
TagKey key = DictEntry::TranslateToKey(group, element);
- if ( ! PtagHT->count(key))
+ // we assume a Public Dictionnary *is* loaded
+ Dict *pubDict = Global::GetDicts()->GetDefaultPubDict();
+ // if the invoked (group,elem) doesn't exist inside the Dictionary
+ // we create a VirtualDictEntry
+ DictEntry *dictEntry = pubDict->GetDictEntryByNumber(group, element);
+ if (dictEntry == NULL)
{
- // we assume a Public Dictionnary *is* loaded
- Dict *pubDict = Global::GetDicts()->GetDefaultPubDict();
- // if the invoked (group,elem) doesn't exist inside the Dictionary
- // we create a VirtualDictEntry
- DictEntry *dictEntry = pubDict->GetDictEntryByNumber(group, element);
- if (dictEntry == NULL)
- {
- dictEntry =
- Global::GetDicts()->NewVirtualDictEntry(group, element,
- "UN", "??", "??");
- }
- // we assume the constructor didn't fail
- entry = new ValEntry(dictEntry);
- /// \todo
- /// ----
- /// better we don't assume too much !
- /// SQItem is now used to describe any DICOMDIR related object
- }
- else
- {
- DocEntry* foundEntry = PtagHT->find(key)->second;
- entry = dynamic_cast<ValEntry*>(foundEntry);
- if (!entry)
- {
- dbg.Verbose(0, "SQItem::SetEntryByNumber: docEntries"
- " contains non ValEntry occurences");
- }
- }
+ dictEntry =
+ Global::GetDicts()->NewVirtualDictEntry(group, element,
+ "UN", GDCM_UNKNOWN, GDCM_UNKNOWN);
+ }
+ // we assume the constructor didn't fail
+ entry = new ValEntry(dictEntry);
if (entry)
{
entry->SetValue(val);
}
- entry->SetLength(val.length());
DocEntries.insert(i,entry);
return true;
{
entry->SetValue(val);
}
- (*i)->SetLength(val.length());
return true;
}
}