X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=eb4f9d124b8893347e5cf31d7b7528bb5135719d;hb=713d0f3d28a6176fab6d57e031633061dc7354a7;hp=9b8becbaa52cae97612b83cc87747cfb95be99c6;hpb=95e43356511d138225d8f718f632b3e7a8fcc106;p=gdcm.git diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx index 9b8becba..eb4f9d12 100644 --- a/src/gdcmElementSet.cxx +++ b/src/gdcmElementSet.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmElementSet.cxx,v $ Language: C++ - Date: $Date: 2005/02/05 01:37:08 $ - Version: $Revision: 1.56 $ + Date: $Date: 2007/10/19 14:47:18 $ + Version: $Revision: 1.79 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -18,22 +18,19 @@ #include "gdcmElementSet.h" #include "gdcmDebug.h" -#include "gdcmValEntry.h" -#include "gdcmBinEntry.h" #include "gdcmSeqEntry.h" +#include "gdcmDataEntry.h" -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- // Constructor / Destructor /** * \brief Constructor for a given ElementSet */ -//BOZ depthLevel is not usefull anymore -ElementSet::ElementSet(int depthLevel) - : DocEntrySet() +ElementSet::ElementSet() + : DocEntrySet() { - (void)depthLevel; } /** @@ -50,15 +47,51 @@ ElementSet::~ElementSet() * \brief Writes the Header Entries (Dicom Elements) * from the H Table * @param fp ofstream to write to - * @param filetype filetype + * @param filetype ExplicitVR/ImplicitVR/ACR/ACR_LIBIDO/JPEG/JPEG2000/... */ -void ElementSet::WriteContent(std::ofstream *fp, FileType filetype) +void ElementSet::WriteContent(std::ofstream *fp, FileType filetype, bool dummy, bool dummy2) { + bool insideMetaElements = false; + bool yetOutsideMetaElements = false; + for (TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i) { - i->second->WriteContent(fp, filetype); + int group = (i->second)->GetGroup(); + + if (yetOutsideMetaElements==false && group == 0x0002) + insideMetaElements = true; + + if (insideMetaElements == true && group != 0x0002) + { + yetOutsideMetaElements = true; + insideMetaElements = false; + } + + // depending on the gdcm::Document type + // (gdcm::File; gdcm::DicomDir, (more to come ?) + // some groups *cannot* be present. + // We hereby protect gdcm for writting stupid things + // if they were found in the original document. + if ( !MayIWrite( group ) ) + continue; + + // Skip 'Group Length' element, since it may be wrong. + // except for Group 0x0002 + // ( keep it as well for Group 0x0008 of ACR Files, + // since some ACR readers *need* it ) + + if ( (i->second)->GetElement() != 0x0000 + || + ( (i->second)->GetGroup() == 0x0002 + ||( (filetype == ACR || filetype == ACR_LIBIDO ) && (i->second)->GetGroup() == 0x0008 ) ) + ) + { + // There are DocEntries, written recursively + // false : we are outside any Sequence + i->second->WriteContent(fp, filetype, insideMetaElements, false ); + } } } @@ -70,14 +103,15 @@ bool ElementSet::AddEntry(DocEntry *newEntry) { const TagKey &key = newEntry->GetKey(); - if( TagHT.count(key) == 1 ) + if ( TagHT.count(key) == 1 ) { - gdcmWarningMacro( "Key already present: " << key.c_str()); + gdcmWarningMacro( "Key already present: " << key ); return false; } else { TagHT.insert(TagDocEntryHT::value_type(newEntry->GetKey(), newEntry)); + newEntry->Register(); return true; } } @@ -89,33 +123,14 @@ bool ElementSet::AddEntry(DocEntry *newEntry) bool ElementSet::RemoveEntry( DocEntry *entryToRemove) { const TagKey &key = entryToRemove->GetKey(); - if( TagHT.count(key) == 1 ) + if ( TagHT.count(key) == 1 ) { TagHT.erase(key); - //gdcmWarningMacro( "One element erased."); - delete entryToRemove; + entryToRemove->Unregister(); return true; } - gdcmWarningMacro( "Key not present"); - return false ; -} - -/** - * \brief Clear the hash table from given entry BUT keep the entry. - * @param entryToRemove Entry to remove. - */ -bool ElementSet::RemoveEntryNoDestroy(DocEntry *entryToRemove) -{ - const TagKey &key = entryToRemove->GetKey(); - if( TagHT.count(key) == 1 ) - { - TagHT.erase(key); - //gdcmWarningMacro( "One element erased."); - return true; - } - - gdcmWarningMacro( "Key not present"); + gdcmWarningMacro( "Key not present : " << key); return false ; } @@ -128,7 +143,7 @@ void ElementSet::ClearEntry() { if ( cc->second ) { - delete cc->second; + cc->second->Unregister(); } } TagHT.clear(); @@ -164,60 +179,89 @@ DocEntry *ElementSet::GetNextEntry() } /** - * \brief Get the first ValEntry while visiting *the* 'zero level' DocEntrySet - * (DocEntries out of any Sequence) - * This method is designed for Python users - * \return The first ValEntry if found, otherwhise NULL + * \brief retrieves a Dicom Element using (group, element) + * @param group Group number of the searched Dicom Element + * @param elem Element number of the searched Dicom Element + * @return */ -ValEntry *ElementSet::GetFirstValEntry() +DocEntry *ElementSet::GetDocEntry(uint16_t group, uint16_t elem) { - gdcm::ValEntry *valEntry; - gdcm::DocEntry *d = GetFirstEntry(); - // an other iterator is needed to allow user iterate - // at the same time both on DocEntries and ValEntries - ItValEntryTagHT = ItTagHT; - if ( (valEntry = dynamic_cast(d))) - return valEntry; - return GetNextValEntry(); + TagKey key = DictEntry::TranslateToKey(group, elem); + TagDocEntryHT::iterator it = TagHT.find(key); + + if ( it!=TagHT.end() ) + return it->second; + return NULL; } /** - * \brief Get the next ValEntry while visiting *the* 'zero level' DocEntrySet - * (DocEntries out of any Sequence) - * \note : meaningfull only if GetFirstValEntry already called - * \return The next ValEntry if found, otherwhise NULL + * \brief Copies all the attributes from an other DocEntrySet + * @param set entry to copy from + * @remarks The contained DocEntries a not copied, only referenced */ -ValEntry *ElementSet::GetNextValEntry() +void ElementSet::Copy(DocEntrySet *set) { - gdcm::ValEntry *valEntry; - gdcm::DocEntry *d = ItValEntryTagHT->second; - ++ItValEntryTagHT; - while( d ) + // Remove all previous entries + ClearEntry(); + + DocEntrySet::Copy(set); + + ElementSet *eltSet = dynamic_cast(set); + if( eltSet ) { - if ( (valEntry = dynamic_cast(d))) - return valEntry; - else - return GetNextValEntry(); + TagHT = eltSet->TagHT; + for(ItTagHT = TagHT.begin();ItTagHT != TagHT.end();++ItTagHT) + { + (ItTagHT->second)->Register(); + } } - return 0; } /** - * \brief retrieves a Dicom Element using (group, element) - * @param group Group number of the searched Dicom Element - * @param elem Element number of the searched Dicom Element - * @return + * \brief Checks whether *all* the DataEntries of the group have all + * the same type for VR (ImplicitVR or ExplicitVR) + * @param group group number to be checked + * @return 1:ImplicitVR 2:ExplicitVR -1:NotCoherent */ -DocEntry *ElementSet::GetDocEntry(uint16_t group, uint16_t elem) +int ElementSet::IsVRCoherent( uint16_t group ) { - TagKey key = DictEntry::TranslateToKey(group, elem); - TagDocEntryHT::iterator it = TagHT.find(key); + uint16_t currentGroup; + int codeVR = -1; + int currentCodeVR; + for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc) + { + currentGroup = cc->second->GetGroup(); - if ( it!=TagHT.end() ) - return it->second; - return NULL; + if ( currentGroup < group ) + continue; + if ( currentGroup > group ) + break; + // currentGroup == group + if (codeVR == -1) + { + if (cc->second->IsImplicitVR() ) + codeVR = 1; + else + codeVR = 2; + continue; + } + else + { + if (cc->second->IsImplicitVR() ) + currentCodeVR = 1; //Implicit + else + currentCodeVR = 2; // Explicit + + if ( currentCodeVR == codeVR ) + continue; + else + return -1; // -1 : not coherent + } + } + return codeVR; } + //----------------------------------------------------------------------------- // Protected @@ -233,9 +277,17 @@ DocEntry *ElementSet::GetDocEntry(uint16_t group, uint16_t elem) */ void ElementSet::Print(std::ostream &os, std::string const & ) { + // Let's change the 'warning value' for Pixel Data, + // to avoid human reader to be confused by 'gdcm::NotLoaded'. + DataEntry *pixelElement = GetDataEntry(0x7fe0,0x0010); + if ( pixelElement != 0 ) + { + pixelElement->SetFlag( DataEntry::FLAG_PIXELDATA ); + } + for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i) { - DocEntry* entry = i->second; + DocEntry *entry = i->second; entry->SetPrintLevel(PrintLevel); entry->Print(os);