X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.cxx;h=4935b4caa4bd261507abdf8af49be813518e3861;hb=befb2f26b6053ac140ffa008e41d7bb8d7eeafc8;hp=2d595c5b09afee99f3d017256e957c8f8bb03e7b;hpb=684a3fbcd85dd433f02b9bb873a9c0a7af759d02;p=gdcm.git diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index 2d595c5b..4935b4ca 100644 --- a/src/gdcmDocument.cxx +++ b/src/gdcmDocument.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.cxx,v $ Language: C++ - Date: $Date: 2005/01/06 09:34:58 $ - Version: $Revision: 1.153 $ + Date: $Date: 2005/01/06 17:16:15 $ + Version: $Revision: 1.160 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -47,7 +47,7 @@ namespace gdcm static const char *TransferSyntaxStrings[] = { // Implicit VR Little Endian "1.2.840.10008.1.2", - // Implicit VR Little Endian DLX G.E? + // Implicit VR Big Endian DLX G.E? "1.2.840.113619.5.2", // Explicit VR Little Endian "1.2.840.10008.1.2.1", @@ -78,7 +78,7 @@ static const char *TransferSyntaxStrings[] = { // Unknown "Unknown Transfer Syntax" }; - + //----------------------------------------------------------------------------- // Refer to Document::CheckSwap() //const unsigned int Document::HEADER_LENGTH_TO_READ = 256; @@ -535,7 +535,7 @@ void Document::WriteContent(std::ofstream* fp, FileType filetype) } /** - * \brief Modifies the value of a given Header Entry (Dicom Element) + * \brief Modifies the value of a given Doc Entry (Dicom Element) * when it exists. Create it with the given value when unexistant. * @param value (string) Value to be set * @param group Group number of the Entry @@ -544,79 +544,53 @@ void Document::WriteContent(std::ofstream* fp, FileType filetype) * \return pointer to the modified/created Header Entry (NULL when creation * failed). */ -ValEntry* Document::ReplaceOrCreateByNumber( - std::string const & value, - uint16_t group, - uint16_t elem, - TagName const & vr ) +ValEntry* Document::ReplaceOrCreateByNumber(std::string const & value, + uint16_t group, + uint16_t elem, + TagName const & vr ) { ValEntry* valEntry = 0; DocEntry* currentEntry = GetDocEntryByNumber( group, elem); - if (!currentEntry) + if (currentEntry) { - // check if (group,element) DictEntry exists - // if it doesn't, create an entry in DictSet::VirtualEntry - // and use it + valEntry = dynamic_cast< ValEntry* >(currentEntry); - // Find out if the tag we received is in the dictionaries: - Dict *pubDict = Global::GetDicts()->GetDefaultPubDict(); - DictEntry* dictEntry = pubDict->GetDictEntryByNumber(group, elem); - if (!dictEntry) - { - currentEntry = NewDocEntryByNumber(group, elem, vr); - } - else - { - currentEntry = NewDocEntryByNumber(group, elem); - } + // Verify the VR + if( valEntry ) + if( valEntry->GetVR()!=vr ) + valEntry=NULL; - if (!currentEntry) + // if currentEntry doesn't correspond to the requested valEntry + if( !valEntry) { - dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: call to" - " NewDocEntryByNumber failed."); - return NULL; + if (!RemoveEntry(currentEntry)) + { + dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: removal" + " of previous DocEntry failed."); + + return NULL; + } } + } - valEntry = new ValEntry(currentEntry); - delete currentEntry; + // Create a new valEntry if necessary + if (!valEntry) + { + valEntry = NewValEntryByNumber(group, elem, vr); if ( !AddEntry(valEntry)) { - delete valEntry; dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: AddEntry" " failed allthough this is a creation."); + + delete valEntry; return NULL; } } - else - { - valEntry = dynamic_cast< ValEntry* >(currentEntry); - if ( !valEntry ) // Euuuuh? It wasn't a ValEntry - // then we change it to a ValEntry ? - // Shouldn't it be considered as an error ? - { - // We need to promote the DocEntry to a ValEntry: - valEntry = new ValEntry(currentEntry); - if (!RemoveEntry(currentEntry)) - { - delete valEntry; - dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: removal" - " of previous DocEntry failed."); - return NULL; - } - if ( !AddEntry(valEntry)) - { - delete valEntry; - dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: adding" - " promoted ValEntry failed."); - return NULL; - } - } - } - - SetEntryByNumber(value, group, elem); + // Set the binEntry value + SetEntry(value, valEntry); return valEntry; } @@ -627,75 +601,58 @@ ValEntry* Document::ReplaceOrCreateByNumber( * @param binArea (binary) value to be set * @param Group Group number of the Entry * @param Elem Element number of the Entry + * @param vr V(alue) R(epresentation) of the Entry -if private Entry- * \return pointer to the modified/created Header Entry (NULL when creation * failed). */ -BinEntry* Document::ReplaceOrCreateByNumber( - uint8_t* binArea, - int lgth, - uint16_t group, - uint16_t elem, - TagName const & vr ) +BinEntry* Document::ReplaceOrCreateByNumber(uint8_t* binArea, + int lgth, + uint16_t group, + uint16_t elem, + TagName const & vr ) { BinEntry* binEntry = 0; DocEntry* currentEntry = GetDocEntryByNumber( group, elem); - if (!currentEntry) - { - // check if (group,element) DictEntry exists - // if it doesn't, create an entry in DictSet::VirtualEntry - // and use it - - // Find out if the tag we received is in the dictionaries: - Dict *pubDict = Global::GetDicts()->GetDefaultPubDict(); - DictEntry *dictEntry = pubDict->GetDictEntryByNumber(group, elem); - - if (!dictEntry) - { - currentEntry = NewDocEntryByNumber(group, elem, vr); - } - else - { - currentEntry = NewDocEntryByNumber(group, elem); - } - if (!currentEntry) - { - dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: call to" - " NewDocEntryByNumber failed."); - return NULL; - } - binEntry = new BinEntry(currentEntry); - if ( !AddEntry(binEntry)) - { - dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: AddEntry" - " failed allthough this is a creation."); - } - delete currentEntry; - } - else + // Verify the currentEntry + if (currentEntry) { binEntry = dynamic_cast< BinEntry* >(currentEntry); - if ( !binEntry ) // Euuuuh? It wasn't a BinEntry - // then we change it to a BinEntry ? - // Shouldn't it be considered as an error ? + + // Verify the VR + if( binEntry ) + if( binEntry->GetVR()!=vr ) + binEntry=NULL; + + // if currentEntry doesn't correspond to the requested valEntry + if( !binEntry) { - // We need to promote the DocEntry to a BinEntry: - binEntry = new BinEntry(currentEntry); if (!RemoveEntry(currentEntry)) { dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: removal" " of previous DocEntry failed."); - return NULL; - } - if ( !AddEntry(binEntry)) - { - dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: adding" - " promoted BinEntry failed."); + return NULL; } } } + // Create a new binEntry if necessary + if (!binEntry) + { + binEntry = NewBinEntryByNumber(group, elem, vr); + + if ( !AddEntry(binEntry)) + { + dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: AddEntry" + " failed allthough this is a creation."); + + delete binEntry; + return NULL; + } + } + + // Set the binEntry value uint8_t *tmpArea; if (lgth>0 && binArea) { @@ -706,7 +663,7 @@ BinEntry* Document::ReplaceOrCreateByNumber( { tmpArea = 0; } - if (!SetEntryByNumber(tmpArea, lgth, group, elem)) + if (!SetEntry(tmpArea,lgth,binEntry)) { if (tmpArea) { @@ -717,7 +674,6 @@ BinEntry* Document::ReplaceOrCreateByNumber( return binEntry; } - /* * \brief Modifies the value of a given Header Entry (Dicom Element) * when it exists. Create it when unexistant. @@ -728,20 +684,48 @@ BinEntry* Document::ReplaceOrCreateByNumber( */ SeqEntry* Document::ReplaceOrCreateByNumber( uint16_t group, uint16_t elem) { - SeqEntry* b = 0; - DocEntry* a = GetDocEntryByNumber( group, elem); - if (!a) + SeqEntry* seqEntry = 0; + DocEntry* currentEntry = GetDocEntryByNumber( group, elem); + + // Verify the currentEntry + if (currentEntry) { - a = NewSeqEntryByNumber(group, elem); - if (!a) + seqEntry = dynamic_cast< SeqEntry* >(currentEntry); + + // Verify the VR + if( seqEntry ) + if( seqEntry->GetVR()!="SQ" ) + seqEntry=NULL; + + // if currentEntry doesn't correspond to the requested valEntry + if( !seqEntry) { - return 0; + if (!RemoveEntry(currentEntry)) + { + dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: removal" + " of previous DocEntry failed."); + + return NULL; + } } + } - b = new SeqEntry(a, 1); // FIXME : 1 (Depth) - AddEntry(b); - } - return b; + // Create a new seqEntry if necessary + if (!seqEntry) + { + seqEntry = NewSeqEntryByNumber(group, elem); + + if ( !AddEntry(seqEntry)) + { + dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: AddEntry" + " failed allthough this is a creation."); + + delete seqEntry; + return NULL; + } + } + + return seqEntry; } /** @@ -917,16 +901,14 @@ bool Document::SetEntryByName( std::string const & content, bool Document::SetEntryByNumber(std::string const& content, uint16_t group, uint16_t element) { - ValEntry* valEntry = GetValEntryByNumber(group, element); - if (!valEntry ) + ValEntry* entry = GetValEntryByNumber(group, element); + if (!entry ) { dbg.Verbose(0, "Document::SetEntryByNumber: no corresponding", " ValEntry (try promotion first)."); return false; } - // Non even content must be padded with a space (020H)... - valEntry->SetValue(content); - return true; + return SetEntry(content,entry); } /** @@ -941,27 +923,58 @@ bool Document::SetEntryByNumber(std::string const& content, bool Document::SetEntryByNumber(uint8_t*content, int lgth, uint16_t group, uint16_t element) { - (void)lgth; //not used - TagKey key = DictEntry::TranslateToKey(group, element); - if ( !TagHT.count(key)) + BinEntry* entry = GetBinEntryByNumber(group, element); + if (!entry ) { + dbg.Verbose(0, "Document::SetEntryByNumber: no corresponding", + " ValEntry (try promotion first)."); return false; } -/* Hope Binary field length is *never* wrong - if(lgth%2) // Non even length are padded with a space (020H). - { - lgth++; - //content = content + '\0'; // fing a trick to enlarge a binary field? + return SetEntry(content,lgth,entry); +} + +/** + * \brief Accesses an existing DocEntry (i.e. a Dicom Element) + * and modifies it's content with the given value. + * @param content new value (string) to substitute with + * @param entry Entry to be modified + */ +bool Document::SetEntry(std::string const & content,ValEntry* entry) +{ + if(entry) + { + entry->SetValue(content); + return true; } -*/ - BinEntry* entry = (BinEntry *)TagHT[key]; - entry->SetBinArea(content); - entry->SetLength(lgth); - entry->SetValue(GDCM_BINLOADED); + return false; +} - return true; -} +/** + * \brief Accesses an existing BinEntry (i.e. a Dicom Element) + * and modifies it's content with the given value. + * @param content new value (void* -> uint8_t*) to substitute with + * @param entry Entry to be modified + * @param lgth new value length + */ +bool Document::SetEntry(uint8_t* content, int lgth, BinEntry* entry) +{ + if(entry) + { + // Hope Binary field length is *never* wrong + /*if(lgth%2) // Non even length are padded with a space (020H). + { + lgth++; + //content = content + '\0'; // fing a trick to enlarge a binary field? + }*/ + + entry->SetBinArea(content); + entry->SetLength(lgth); + entry->SetValue(GDCM_BINLOADED); + return true; + } + return false; +} /** * \brief Gets (from Header) a 'non string' element value @@ -1070,54 +1083,6 @@ void Document::LoadEntryBinArea(BinEntry* element) return false; }*/ -/** - * \brief Update the entries with the shadow dictionary. - * Only non even entries are analyzed - */ -void Document::UpdateShaEntries() -{ - //DictEntry *entry; - std::string vr; - - /// \todo TODO : still any use to explore recursively the whole structure? -/* - for(ListTag::iterator it=listEntries.begin(); - it!=listEntries.end(); - ++it) - { - // Odd group => from public dictionary - if((*it)->GetGroup()%2==0) - continue; - - // Peer group => search the corresponding dict entry - if(RefShaDict) - entry=RefShaDict->GetDictEntryByNumber((*it)->GetGroup(),(*it)->GetElement()); - else - entry=NULL; - - if((*it)->IsImplicitVR()) - vr="Implicit"; - else - vr=(*it)->GetVR(); - - (*it)->SetValue(GetDocEntryUnvalue(*it)); // to go on compiling - if(entry){ - // Set the new entry and the new value - (*it)->SetDictEntry(entry); - CheckDocEntryVR(*it,vr); - - (*it)->SetValue(GetDocEntryValue(*it)); // to go on compiling - - } - else - { - // Remove precedent value transformation - (*it)->SetDictEntry(NewVirtualDictEntry((*it)->GetGroup(),(*it)->GetElement(),vr)); - } - } -*/ -} - /** * \brief Searches within the Header Entries for a Dicom Element of * a given tag. @@ -1169,15 +1134,37 @@ ValEntry* Document::GetValEntryByNumber(uint16_t group, uint16_t element) { return 0; } - if ( ValEntry* valEntry = dynamic_cast(currentEntry) ) + if ( ValEntry* entry = dynamic_cast(currentEntry) ) { - return valEntry; + return entry; } dbg.Verbose(0, "Document::GetValEntryByNumber: unfound ValEntry."); return 0; } +/** + * \brief Same as \ref Document::GetDocEntryByNumber except it only + * returns a result when the corresponding entry is of type + * BinEntry. + * @return When present, the corresponding BinEntry. + */ +BinEntry* Document::GetBinEntryByNumber(uint16_t group, uint16_t element) +{ + DocEntry* currentEntry = GetDocEntryByNumber(group, element); + if ( !currentEntry ) + { + return 0; + } + if ( BinEntry* entry = dynamic_cast(currentEntry) ) + { + return entry; + } + dbg.Verbose(0, "Document::GetBinEntryByNumber: unfound BinEntry."); + + return 0; +} + /** * \brief Loads the element while preserving the current * underlying file position indicator as opposed to @@ -1269,6 +1256,12 @@ void Document::ParseDES(DocEntrySet *set, long offset, long l_max, bool delim_mode) { DocEntry *newDocEntry = 0; + ValEntry* newValEntry; + BinEntry* newBinEntry; + SeqEntry* newSeqEntry; + VRKey vr; + bool used=false; + long offsetEntry,readEntry; while (true) { @@ -1276,23 +1269,61 @@ void Document::ParseDES(DocEntrySet *set, long offset, { break; } + + used=true; newDocEntry = ReadNextDocEntry( ); if ( !newDocEntry ) { break; } - VRKey vr = newDocEntry->GetVR(); - if ( vr != "SQ" ) + vr = newDocEntry->GetVR(); + newValEntry = dynamic_cast(newDocEntry); + newBinEntry = dynamic_cast(newDocEntry); + newSeqEntry = dynamic_cast(newDocEntry); + + if ( newValEntry || newBinEntry ) { + offsetEntry=newDocEntry->GetOffset(); + readEntry=newDocEntry->GetReadLength(); - if ( Global::GetVR()->IsVROfGdcmStringRepresentable(vr) ) + if ( newBinEntry ) + { + if ( ! Global::GetVR()->IsVROfBinaryRepresentable(vr) ) + { + ////// Neither ValEntry NOR BinEntry: should mean UNKOWN VR + dbg.Verbose(0, "Document::ParseDES: neither Valentry, " + "nor BinEntry. Probably unknown VR."); + } + + //////////////////// BinEntry or UNKOWN VR: + // When "this" is a Document the Key is simply of the + // form ( group, elem )... + if (Document* dummy = dynamic_cast< Document* > ( set ) ) + { + (void)dummy; + newBinEntry->SetKey( newBinEntry->GetKey() ); + } + // but when "this" is a SQItem, we are inserting this new + // valEntry in a sequence item, and the kay has the + // generalized form (refer to \ref BaseTagKey): + if (SQItem* parentSQItem = dynamic_cast< SQItem* > ( set ) ) + { + newBinEntry->SetKey( parentSQItem->GetBaseTagKey() + + newBinEntry->GetKey() ); + } + + LoadDocEntry( newBinEntry ); + if( !set->AddEntry( newBinEntry ) ) + { + //Expect big troubles if here + //delete newBinEntry; + used=false; + } + } + else { /////////////////////// ValEntry - ValEntry* newValEntry = - new ValEntry( newDocEntry->GetDictEntry() ); //LEAK - newValEntry->Copy( newDocEntry ); - // When "set" is a Document, then we are at the top of the // hierarchy and the Key is simply of the form ( group, elem )... if (Document* dummy = dynamic_cast< Document* > ( set ) ) @@ -1314,55 +1345,23 @@ void Document::ParseDES(DocEntrySet *set, long offset, if( !set->AddEntry( newValEntry ) ) { // If here expect big troubles - delete newValEntry; //otherwise mem leak + //delete newValEntry; //otherwise mem leak + used=false; } if (delimitor) { - delete newDocEntry; + if(!used) + delete newDocEntry; break; } if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max) { - delete newDocEntry; + if(!used) + delete newDocEntry; break; } } - else - { - if ( ! Global::GetVR()->IsVROfGdcmBinaryRepresentable(vr) ) - { - ////// Neither ValEntry NOR BinEntry: should mean UNKOWN VR - dbg.Verbose(0, "Document::ParseDES: neither Valentry, " - "nor BinEntry. Probably unknown VR."); - } - - //////////////////// BinEntry or UNKOWN VR: - BinEntry* newBinEntry = new BinEntry( newDocEntry ); //LEAK - - // When "this" is a Document the Key is simply of the - // form ( group, elem )... - if (Document* dummy = dynamic_cast< Document* > ( set ) ) - { - (void)dummy; - newBinEntry->SetKey( newBinEntry->GetKey() ); - } - // but when "this" is a SQItem, we are inserting this new - // valEntry in a sequence item, and the kay has the - // generalized form (refer to \ref BaseTagKey): - if (SQItem* parentSQItem = dynamic_cast< SQItem* > ( set ) ) - { - newBinEntry->SetKey( parentSQItem->GetBaseTagKey() - + newBinEntry->GetKey() ); - } - - LoadDocEntry( newBinEntry ); - if( !set->AddEntry( newBinEntry ) ) - { - //Expect big troubles if here - delete newBinEntry; - } - } if ( ( newDocEntry->GetGroup() == 0x7fe0 ) && ( newDocEntry->GetElement() == 0x0010 ) ) @@ -1370,23 +1369,22 @@ void Document::ParseDES(DocEntrySet *set, long offset, TransferSyntaxType ts = GetTransferSyntax(); if ( ts == RLELossless ) { - long PositionOnEntry = Fp->tellg(); + long positionOnEntry = Fp->tellg(); Fp->seekg( newDocEntry->GetOffset(), std::ios::beg ); ComputeRLEInfo(); - Fp->seekg( PositionOnEntry, std::ios::beg ); + Fp->seekg( positionOnEntry, std::ios::beg ); } else if ( IsJPEG() ) { - long PositionOnEntry = Fp->tellg(); + long positionOnEntry = Fp->tellg(); Fp->seekg( newDocEntry->GetOffset(), std::ios::beg ); ComputeJPEGFragmentInfo(); - Fp->seekg( PositionOnEntry, std::ios::beg ); + Fp->seekg( positionOnEntry, std::ios::beg ); } } // Just to make sure we are at the beginning of next entry. - SkipToNextDocEntry(newDocEntry); - //delete newDocEntry; + SkipToNextDocEntry(offsetEntry,readEntry); } else { @@ -1404,9 +1402,6 @@ void Document::ParseDES(DocEntrySet *set, long offset, } } // no other way to create it ... - SeqEntry* newSeqEntry = - new SeqEntry( newDocEntry->GetDictEntry() ); - newSeqEntry->Copy( newDocEntry ); newSeqEntry->SetDelimitorMode( delim_mode ); // At the top of the hierarchy, stands a Document. When "set" @@ -1438,11 +1433,12 @@ void Document::ParseDES(DocEntrySet *set, long offset, set->AddEntry( newSeqEntry ); if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max) { - delete newDocEntry; break; } } - delete newDocEntry; + + if(!used) + delete newDocEntry; } } @@ -1816,16 +1812,12 @@ void Document::FindDocEntryLength( DocEntry *entry ) /** * \brief Find the Value Representation of the current Dicom Element. - * @param entry + * @return Value Representation of the current Entry */ -void Document::FindDocEntryVR( DocEntry *entry ) +std::string Document::FindDocEntryVR() { if ( Filetype != ExplicitVR ) - { - return; - } - - char vr[3]; + return(GDCM_UNKNOWN); long positionOnEntry = Fp->tellg(); // Warning: we believe this is explicit VR (Value Representation) because @@ -1835,104 +1827,34 @@ void Document::FindDocEntryVR( DocEntry *entry ) // within an explicit VR file. Hence we make sure the present tag // is in explicit VR and try to fix things if it happens not to be // the case. + + char vr[3]; Fp->read (vr, (size_t)2); vr[2] = 0; - if( !CheckDocEntryVR(entry, vr) ) + if( !CheckDocEntryVR(vr) ) { Fp->seekg(positionOnEntry, std::ios::beg); - // When this element is known in the dictionary we shall use, e.g. for - // the semantics (see the usage of IsAnInteger), the VR proposed by the - // dictionary entry. Still we have to flag the element as implicit since - // we know now our assumption on expliciteness is not furfilled. - // avoid . - if ( entry->IsVRUnknown() ) - { - entry->SetVR("Implicit"); - } - entry->SetImplicitVR(); + return(GDCM_UNKNOWN); } + return(vr); } /** * \brief Check the correspondance between the VR of the header entry * and the taken VR. If they are different, the header entry is * updated with the new VR. - * @param entry Header Entry to check * @param vr Dicom Value Representation * @return false if the VR is incorrect of if the VR isn't referenced * otherwise, it returns true */ -bool Document::CheckDocEntryVR(DocEntry *entry, VRKey vr) +bool Document::CheckDocEntryVR(VRKey vr) { - std::string msg; - bool realExplicit = true; - - // Assume we are reading a falsely explicit VR file i.e. we reached - // a tag where we expect reading a VR but are in fact we read the - // first to bytes of the length. Then we will interogate (through find) - // the dicom_vr dictionary with oddities like "\004\0" which crashes - // both GCC and VC++ implementations of the STL map. Hence when the - // expected VR read happens to be non-ascii characters we consider - // we hit falsely explicit VR tag. - - if ( !isalpha((unsigned char)vr[0]) && !isalpha((unsigned char)vr[1]) ) - { - realExplicit = false; - } - // CLEANME searching the dicom_vr at each occurence is expensive. // PostPone this test in an optional integrity check at the end // of parsing or only in debug mode. - if ( realExplicit && !Global::GetVR()->Count(vr) ) - { - realExplicit = false; - } - - if ( !realExplicit ) - { - // We thought this was explicit VR, but we end up with an - // implicit VR tag. Let's backtrack. - msg = Util::Format("Falsely explicit vr file (%04x,%04x)\n", - entry->GetGroup(), entry->GetElement()); - dbg.Verbose(1, "Document::FindVR: ", msg.c_str()); - - if( entry->GetGroup() % 2 && entry->GetElement() == 0x0000) - { - // Group length is UL ! - DictEntry* newEntry = NewVirtualDictEntry( - entry->GetGroup(), entry->GetElement(), - "UL", "FIXME", "Group Length"); - entry->SetDictEntry( newEntry ); - } + if ( !Global::GetVR()->IsValidVR(vr) ) return false; - } - - if ( entry->IsVRUnknown() ) - { - // When not a dictionary entry, we can safely overwrite the VR. - if( entry->GetElement() == 0x0000 ) - { - // Group length is UL ! - entry->SetVR("UL"); - } - else - { - entry->SetVR(vr); - } - } - else if ( entry->GetVR() != vr ) - { - // The VR present in the file and the dictionary disagree. We assume - // the file writer knew best and use the VR of the file. Since it would - // be unwise to overwrite the VR of a dictionary (since it would - // compromise it's next user), we need to clone the actual DictEntry - // and change the VR for the read one. - DictEntry* newEntry = NewVirtualDictEntry( - entry->GetGroup(), entry->GetElement(), - vr, "FIXME", entry->GetName()); - entry->SetDictEntry(newEntry); - } return true; } @@ -2083,10 +2005,10 @@ void Document::SkipDocEntry(DocEntry *entry) * \warning NOT end user intended method ! * @param entry entry to skip */ -void Document::SkipToNextDocEntry(DocEntry *entry) +void Document::SkipToNextDocEntry(long offset,long readLgth) { - Fp->seekg((long)(entry->GetOffset()), std::ios::beg); - Fp->seekg( (long)(entry->GetReadLength()), std::ios::cur); + Fp->seekg((long)(offset), std::ios::beg); + Fp->seekg( (long)(readLgth), std::ios::cur); } /** @@ -2665,8 +2587,37 @@ DocEntry* Document::ReadNextDocEntry() } HandleBrokenEndian(group, elem); - DocEntry *newEntry = NewDocEntryByNumber(group, elem); - FindDocEntryVR(newEntry); + std::string vr = FindDocEntryVR(); + std::string realVR = vr; + + if( vr == GDCM_UNKNOWN) + { + DictEntry *dictEntry = GetDictEntryByNumber(group,elem); + if( dictEntry ) + realVR = dictEntry->GetVR(); + } + + DocEntry *newEntry; + if( Global::GetVR()->IsVROfSequence(realVR) ) + newEntry = NewSeqEntryByNumber(group, elem); + else if( Global::GetVR()->IsVROfStringRepresentable(realVR) ) + newEntry = NewValEntryByNumber(group, elem,vr); + else + newEntry = NewBinEntryByNumber(group, elem,vr); + + if( vr == GDCM_UNKNOWN ) + { + if( Filetype == ExplicitVR ) + { + // We thought this was explicit VR, but we end up with an + // implicit VR tag. Let's backtrack. + std::string msg; + msg = Util::Format("Falsely explicit vr file (%04x,%04x)\n", + newEntry->GetGroup(), newEntry->GetElement()); + dbg.Verbose(1, "Document::FindVR: ", msg.c_str()); + } + newEntry->SetImplicitVR(); + } try { @@ -3149,24 +3100,23 @@ int Document::ComputeGroup0002Length( FileType filetype ) gr = entry->GetGroup(); if (gr == 0x0002) + { found0002 = true; - else - if (found0002 ) - break; - else - continue; - el = entry->GetElement(); - vr = entry->GetVR(); + el = entry->GetElement(); + vr = entry->GetVR(); - if (filetype == ExplicitVR) - { - if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") ) + if (filetype == ExplicitVR) { - groupLength += 4; // explicit VR AND OB, OW, SQ : 4 more bytes + if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") ) + { + groupLength += 4; // explicit VR AND OB, OW, SQ : 4 more bytes + } } + groupLength += 2 + 2 + 4 + entry->GetLength(); } - groupLength += 2 + 2 + 4 + entry->GetLength(); + else if (found0002 ) + break; entry = GetNextEntry(); }