X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.cxx;h=d4410d1b47a6ca947374137ca51b9c5e360ebba2;hb=cb6cf86b2b3cc6b43d40561fb9552ebd19fdbc99;hp=94de7cae21bbd26f098d29e818042818650268c4;hpb=7796d0740430edfba773ad0d20bc159c6cafcbd3;p=gdcm.git diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index 94de7cae..d4410d1b 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/10/18 11:35:31 $ - Version: $Revision: 1.293 $ + Date: $Date: 2005/10/23 15:28:26 $ + Version: $Revision: 1.303 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -127,7 +127,7 @@ bool Document::DoTheLoadingDocumentJob( ) Group0002Parsed = false; - gdcmWarningMacro( "Starting parsing of file: " << Filename.c_str()); + gdcmDebugMacro( "Starting parsing of file: " << Filename.c_str()); Fp->seekg(0, std::ios::end); long lgt = Fp->tellg(); // total length of the file @@ -277,7 +277,7 @@ bool Document::DoTheLoadingDocumentJob( ) */ void Document::AddForceLoadElement (uint16_t group, uint16_t elem) { - Element el; + DicomElement el; el.Group = group; el.Elem = elem; UserForceLoadList.push_back(el); @@ -604,7 +604,8 @@ void Document::WriteContent(std::ofstream *fp, FileType filetype) { // Skip if user wants to write an ACR-NEMA file - if ( filetype == ImplicitVR || filetype == ExplicitVR ) + if ( filetype == ImplicitVR || filetype == ExplicitVR || + filetype == JPEG ) { // writing Dicom File Preamble char filePreamble[128]; @@ -659,7 +660,7 @@ void Document::LoadEntryBinArea(uint16_t group, uint16_t elem) /** * \brief Loads (from disk) the element content * when a string is not suitable - * @param elem Entry whose binArea is going to be loaded + * @param entry Entry whose binArea is going to be loaded */ void Document::LoadEntryBinArea(DataEntry *entry) { @@ -683,7 +684,7 @@ void Document::LoadEntryBinArea(DataEntry *entry) return; } - // Read the datas + // Read the data Fp->read((char*)data, l); if ( Fp->fail() || Fp->eof() ) { @@ -717,7 +718,7 @@ void Document::LoadEntryBinArea(DataEntry *entry) } case 8: { - gdcmWarningMacro("Can't swap 64 bits datas"); + gdcmWarningMacro("Can't swap 64 bits data"); /* uint64_t *data64 = (uint64_t *)data; for(i=0;iGetVR(); + + // Useless checking, now ! + /* if ( Filetype == ExplicitVR && !Global::GetVR()->IsVROfBinaryRepresentable(vr) ) { ////// No DataEntry: should mean UNKOWN VR gdcmWarningMacro( std::hex << newDocEntry->GetGroup() << "|" << newDocEntry->GetElement() - << " : No DataEntry." - "Probably unknown VR."); + << " : unknown VR." + " Probably 'Implicit VR' entry within " + "an explicit VR 'document'."); } + */ if ( !set->AddEntry( newDataEntry ) ) { @@ -1080,8 +1087,7 @@ void Document::ParseDES(DocEntrySet *set, long offset, if ( newDocEntry->GetGroup()%2 != 0 ) { Fp->seekg( l, std::ios::cur); - RemoveEntry( newDocEntry ); // Remove and delete - //used = false; // never used + delete newDocEntry; // Delete, not in the set continue; } } @@ -1089,8 +1095,7 @@ void Document::ParseDES(DocEntrySet *set, long offset, { // User asked to skip *any* SeQuence Fp->seekg( l, std::ios::cur); - //used = false; // never used - RemoveEntry( newDocEntry ); // Remove and delete + delete newDocEntry; // Delete, not in the set continue; } // delay the dynamic cast as late as possible @@ -1103,11 +1108,9 @@ void Document::ParseDES(DocEntrySet *set, long offset, // is a Document, then we are building the first depth level. // Hence the SeqEntry we are building simply has a depth // level of one: -// SQItem *parentSQItem = dynamic_cast< SQItem* > ( set ); if ( set == this ) // ( dynamic_cast< Document* > ( set ) ) { newSeqEntry->SetDepthLevel( 1 ); - // newSeqEntry->SetKey( newSeqEntry->GetKey() ); } // But when "set" is already a SQItem, we are building a nested // sequence, and hence the depth level of the new SeqEntry @@ -1117,9 +1120,6 @@ void Document::ParseDES(DocEntrySet *set, long offset, else if (SQItem *parentSQItem = dynamic_cast< SQItem* > ( set ) ) { newSeqEntry->SetDepthLevel( parentSQItem->GetDepthLevel() + 1 ); - - // newSeqEntry->SetKey( parentSQItem->GetBaseTagKey() - // + newSeqEntry->GetKey() ); } if ( l != 0 ) @@ -1159,7 +1159,7 @@ void Document::ParseDES(DocEntrySet *set, long offset, } first = false; } // end While - gdcmWarningMacro( "Exit from ParseDES, delim-mode " << delim_mode ); + gdcmDebugMacro( "Exit from ParseDES, delim-mode " << delim_mode ); } /** @@ -1275,7 +1275,7 @@ void Document::LoadDocEntry(DocEntry *entry, bool forceLoad) { uint16_t group = entry->GetGroup(); uint16_t elem = entry->GetElement(); - std::string vr = entry->GetVR(); + const VRKey &vr = entry->GetVR(); uint32_t length = entry->GetLength(); Fp->seekg((long)entry->GetOffset(), std::ios::beg); @@ -1337,7 +1337,7 @@ void Document::LoadDocEntry(DocEntry *entry, bool forceLoad) void Document::FindDocEntryLength( DocEntry *entry ) throw ( FormatError ) { - std::string vr = entry->GetVR(); + const VRKey &vr = entry->GetVR(); uint16_t length16; if ( Filetype == ExplicitVR && !entry->IsImplicitVR() ) @@ -1478,10 +1478,10 @@ uint32_t Document::FindDocEntryLengthOBOrOW() * \brief Find the Value Representation of the current Dicom Element. * @return Value Representation of the current Entry */ -std::string Document::FindDocEntryVR() +VRKey Document::FindDocEntryVR() { if ( Filetype != ExplicitVR ) - return GDCM_UNKNOWN; + return GDCM_VRUNKNOWN; long positionOnEntry = Fp->tellg(); // Warning: we believe this is explicit VR (Value Representation) because @@ -1492,14 +1492,15 @@ std::string Document::FindDocEntryVR() // 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; + VRKey vr; + Fp->read(&(vr[0]),(size_t)2); + gdcmDebugMacro( "--> VR: " << vr ) if ( !CheckDocEntryVR(vr) ) { + gdcmWarningMacro( "Unknown VR '" << vr << "'" ) Fp->seekg(positionOnEntry, std::ios::beg); - return GDCM_UNKNOWN; + return GDCM_VRUNKNOWN; } return vr; } @@ -1512,12 +1513,9 @@ std::string Document::FindDocEntryVR() * @return false if the VR is incorrect or if the VR isn't referenced * otherwise, it returns true */ -bool Document::CheckDocEntryVR(VRKey vr) +bool Document::CheckDocEntryVR(const VRKey &vr) { - if ( !Global::GetVR()->IsValidVR(vr) ) - return false; - - return true; + return Global::GetVR()->IsValidVR(vr); } /** @@ -1634,7 +1632,7 @@ bool Document::IsDocEntryAnInteger(DocEntry *entry) { uint16_t elem = entry->GetElement(); uint16_t group = entry->GetGroup(); - const std::string &vr = entry->GetVR(); + const VRKey &vr = entry->GetVR(); uint32_t length = entry->GetLength(); // When we have some semantics on the element we just read, and if we @@ -1648,9 +1646,9 @@ bool Document::IsDocEntryAnInteger(DocEntry *entry) } else { - // Allthough this should never happen, still some images have a + // Although this should never happen, still some images have a // corrupted group length [e.g. have a glance at offset x(8336) of - // gdcmData/gdcm-MR-PHILIPS-16-Multi-Seq.dcm]. + // gdcmData/gdcm-MR-PHILIPS-16-Multi-Seq.dcm. // Since for dicom compliant and well behaved headers, the present // test is useless (and might even look a bit paranoid), when we // encounter such an ill-formed image, we simply display a warning @@ -1696,7 +1694,7 @@ bool Document::CheckSwap() char *entCur = deb + 128; if ( memcmp(entCur, "DICM", (size_t)4) == 0 ) { - gdcmWarningMacro( "Looks like DICOM Version3 (preamble + DCM)" ); + gdcmDebugMacro( "Looks like DICOM Version3 (preamble + DCM)" ); // Group 0002 should always be VR, and the first element 0000 // Let's be carefull (so many wrong headers ...) @@ -1728,24 +1726,24 @@ bool Document::CheckSwap() // instead of just checking for UL, OB and UI !? group 0000 { Filetype = ExplicitVR; - gdcmWarningMacro( "Group 0002 : Explicit Value Representation"); + gdcmDebugMacro( "Group 0002 : Explicit Value Representation"); } else { Filetype = ImplicitVR; - gdcmWarningMacro( "Group 0002 :Not an explicit Value Representation;" + gdcmErrorMacro( "Group 0002 :Not an explicit Value Representation;" << "Looks like a bugged Header!"); } if ( net2host ) { SwapCode = 4321; - gdcmWarningMacro( "HostByteOrder != NetworkByteOrder"); + gdcmDebugMacro( "HostByteOrder != NetworkByteOrder"); } else { SwapCode = 1234; - gdcmWarningMacro( "HostByteOrder = NetworkByteOrder"); + gdcmDebugMacro( "HostByteOrder = NetworkByteOrder"); } // Position the file position indicator at first tag @@ -1792,7 +1790,7 @@ bool Document::CheckSwap() memcmp(entCur, "OB", (size_t)2) == 0 ) { Filetype = ExplicitVR; - gdcmWarningMacro( "Group 0002 : Explicit Value Representation"); + gdcmDebugMacro( "Group 0002 : Explicit Value Representation"); return true; } } @@ -1881,8 +1879,8 @@ bool Document::CheckSwap() */ void Document::SwitchByteSwapCode() { - gdcmWarningMacro( "Switching Byte Swap code from "<< SwapCode - << " at :" <tellg() ); + gdcmDebugMacro( "Switching Byte Swap code from "<< SwapCode + << " at: 0x" << std::hex << Fp->tellg() ); if ( SwapCode == 1234 ) { SwapCode = 4321; @@ -1899,6 +1897,7 @@ void Document::SwitchByteSwapCode() { SwapCode = 3412; } + gdcmDebugMacro( " Into: "<< SwapCode ); } /** @@ -1950,10 +1949,11 @@ DocEntry *Document::ReadNextDocEntry() if ( HasDCMPreamble ) HandleOutOfGroup0002(group, elem); - std::string vr = FindDocEntryVR(); - std::string realVR = vr; + VRKey vr = FindDocEntryVR(); + + VRKey realVR = vr; - if ( vr == GDCM_UNKNOWN ) + if ( vr == GDCM_VRUNKNOWN ) { if ( elem == 0x0000 ) // Group Length { @@ -1971,9 +1971,11 @@ DocEntry *Document::ReadNextDocEntry() if ( dictEntry ) { realVR = dictEntry->GetVR(); + dictEntry->Unregister(); } } } + gdcmDebugMacro( "Found VR: " << vr << " / Real VR: " << realVR ); DocEntry *newEntry; if ( Global::GetVR()->IsVROfSequence(realVR) ) @@ -1984,7 +1986,7 @@ DocEntry *Document::ReadNextDocEntry() static_cast(newEntry)->SetState(DataEntry::STATE_NOTLOADED); } - if ( vr == GDCM_UNKNOWN ) + if ( vr == GDCM_VRUNKNOWN ) { if ( Filetype == ExplicitVR ) {