X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.cxx;h=70e868c1236a99d51c53ce6f8be0518858f2d71c;hb=957dcd905e535fcfe37185ca5ea08a801e3078d3;hp=0f76b64a3068759285e129c12b76899e3f78873d;hpb=3e82e8b67eddf5d4b95b6aa2a2e2615aced4c452;p=gdcm.git diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index 0f76b64a..70e868c1 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/02/02 10:02:17 $ - Version: $Revision: 1.219 $ + Date: $Date: 2005/06/23 09:20:23 $ + Version: $Revision: 1.250 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -30,71 +30,151 @@ #include #include - -// For nthos: -#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) - #include -#endif - -#ifdef CMAKE_HAVE_NETINET_IN_H - #include -#endif +#include namespace gdcm { //----------------------------------------------------------------------------- -// Refer to Document::CheckSwap() -//const unsigned int Document::HEADER_LENGTH_TO_READ = 256; // Refer to Document::SetMaxSizeLoadEntry() const unsigned int Document::MAX_SIZE_LOAD_ELEMENT_VALUE = 0xfff; // 4096 -const unsigned int Document::MAX_SIZE_PRINT_ELEMENT_VALUE = 0x7fffffff; //----------------------------------------------------------------------------- // Constructor / Destructor // Constructors and destructors are protected to avoid user to invoke directly + /** - * \brief constructor - * @param filename 'Document' (File or DicomDir) to be opened for parsing + * \brief This default constructor neither loads nor parses the file. + * You should then invoke \ref Document::Load. + * */ -Document::Document( std::string const &filename ) +Document::Document() :ElementSet(-1) { - SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE); - Filename = filename; + Fp = 0; + + SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE); + Initialize(); + SwapCode = 1234; + Filetype = ExplicitVR; + // Load will set it to true if sucessfull + Group0002Parsed = false; + IsDocumentAlreadyLoaded = false; + LoadMode = 0x00000000; // default : load everything, later +} + +/** + * \brief Constructor (not to break the API) + * @param fileName 'Document' (File or DicomDir) to be open for parsing + */ +Document::Document( std::string const &fileName ) + :ElementSet(-1) +{ + Fp = 0; + + SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE); Initialize(); + SwapCode = 1234; + Filetype = ExplicitVR; + Group0002Parsed = false; + LoadMode = 0x00000000; // Load everything + + // Load will set it to true if sucessfull + IsDocumentAlreadyLoaded = false; + + Load(fileName); +} +/** + * \brief Canonical destructor. + */ +Document::~Document () +{ + RefPubDict = NULL; + RefShaDict = NULL; +} + +//----------------------------------------------------------------------------- +// Public + +/** + * \brief Loader + * @param fileName 'Document' (File or DicomDir) to be open for parsing + * @return false if file cannot be open or no swap info was found, + * or no tag was found. + */ +bool Document::Load( std::string const &fileName ) +{ + // We should clean out anything that already exists. + // Check IsDocumentAlreadyLoaded to be sure. + if( IsDocumentAlreadyLoaded ) + { + gdcmWarningMacro( "A file was already parsed inside this " + << "gdcm::Document (previous name was: " + << Filename.c_str() << ". New name is :" + << fileName ); + // todo : clean out the 'Document' + // Should we call ClearEntry() on the parent object ?!? + } + + Filename = fileName; Fp = 0; if ( !OpenFile() ) { - return; + // warning already performed in OpenFile() + //gdcmWarningMacro( "Unable to open as an ACR/DICOM file: " + // << Filename.c_str() ); + Filetype = Unknown; + return false; } Group0002Parsed = false; - gdcmVerboseMacro( "Starting parsing of file: " << Filename.c_str()); - // Fp->seekg( 0, std::ios::beg); - + gdcmWarningMacro( "Starting parsing of file: " << Filename.c_str()); + Fp->seekg(0, std::ios::end); - long lgt = Fp->tellg(); - + long lgt = Fp->tellg(); // total length of the file + Fp->seekg(0, std::ios::beg); - CheckSwap(); - long beg = Fp->tellg(); - lgt -= beg; - + // CheckSwap returns a boolean + // (false if no swap info of any kind was found) + if (! CheckSwap() ) + { + gdcmWarningMacro( "Neither a DICOM V3 nor an ACR-NEMA file: " + << Filename.c_str()); + CloseFile(); + return false; + } + + long beg = Fp->tellg(); // just after DICOM preamble (if any) + + lgt -= beg; // remaining length to parse + ParseDES( this, beg, lgt, false); // Loading is done during parsing - Fp->seekg( 0, std::ios::beg); + if ( IsEmpty() ) + { + gdcmWarningMacro( "No tag in internal hash table for: " + << Filename.c_str()); + CloseFile(); + return false; + } + IsDocumentAlreadyLoaded = true; + + Fp->seekg( 0, std::ios::beg); // Load 'non string' values std::string PhotometricInterpretation = GetEntryValue(0x0028,0x0004); if( PhotometricInterpretation == "PALETTE COLOR " ) { - LoadEntryBinArea(0x0028,0x1200); // gray LUT - /// FIXME FIXME FIXME + // FIXME + // Probabely this line should be outside the 'if' + // Try to find an image sample holding a 'gray LUT' + LoadEntryBinArea(0x0028,0x1200); // gray LUT + + /// FIXME /// The tags refered by the three following lines used to be CORRECTLY /// defined as having an US Value Representation in the public /// dictionary. BUT the semantics implied by the three following @@ -119,9 +199,25 @@ Document::Document( std::string const &filename ) LoadEntryBinArea(0x0028,0x1222); // Segmented Blue Palette Color LUT Data LoadEntryBinArea(0x0028,0x1223); - } + } + //FIXME later : how to use it? - LoadEntryBinArea(0x0028,0x3006); //LUT Data (CTX dependent) + SeqEntry *modLutSeq = GetSeqEntry(0x0028,0x3000); + if ( modLutSeq !=0 ) + { + SQItem *sqi= modLutSeq->GetFirstSQItem(); + if ( sqi != 0 ) + { + BinEntry *b = sqi->GetBinEntry(0x0028,0x3006); + if ( b != 0 ) + { + if ( b->GetLength() != 0 ) + { + LoadEntryBinArea(b); //LUT Data (CTX dependent) + } + } + } + } CloseFile(); @@ -129,8 +225,8 @@ Document::Document( std::string const &filename ) // Specific code to allow gdcm to read ACR-LibIDO formated images // Note: ACR-LibIDO is an extension of the ACR standard that was // used at CREATIS. For the time being (say a couple years) - // we keep this kludge to allow a smooth move to gdcm for - // CREATIS developpers (sorry folks). + // we keep this kludge to allow CREATIS users + // reading their old images. // // if recognition code tells us we deal with a LibIDO image // we switch lineNumber and columnNumber @@ -148,35 +244,10 @@ Document::Document( std::string const &filename ) SetValEntry(rows , 0x0028, 0x0011); } // --- End of ACR-LibIDO kludge --- -} - -/** - * \brief This default constructor doesn't parse the file. You should - * then invoke \ref Document::SetFileName and then the parsing. - */ -Document::Document() - :ElementSet(-1) -{ - Fp = 0; - SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE); - Initialize(); - SwapCode = 1234; - Filetype = ExplicitVR; - Group0002Parsed = false; -} - -/** - * \brief Canonical destructor. - */ -Document::~Document () -{ - RefPubDict = NULL; - RefShaDict = NULL; + return true; } -//----------------------------------------------------------------------------- -// Public /** * \brief Get the public dictionary used */ @@ -214,24 +285,23 @@ bool Document::SetShaDict(DictKey const &dictName) } /** - * \brief This predicate, based on hopefully reasonable heuristics, - * decides whether or not the current Document was properly parsed - * and contains the mandatory information for being considered as - * a well formed and usable Dicom/Acr File. - * @return true when Document is the one of a reasonable Dicom/Acr file, - * false otherwise. + * \brief This predicate tells us whether or not the current Document + * was properly parsed and contains at least *one* Dicom Element + * (and nothing more, sorry). + * @return false when we're 150 % sure it's NOT a Dicom/Acr file, + * true otherwise. */ bool Document::IsReadable() { if( Filetype == Unknown) { - gdcmVerboseMacro( "Wrong filetype"); + gdcmWarningMacro( "Wrong filetype"); return false; } if ( IsEmpty() ) { - gdcmVerboseMacro( "No tag in internal hash table."); + gdcmWarningMacro( "No tag in internal hash table."); return false; } @@ -245,7 +315,7 @@ bool Document::IsReadable() bool Document::IsDicomV3() { // Checking if Transfer Syntax exists is enough - // Anyway, it's to late check if the 'Preamble' was found ... + // Anyway, it's too late check if the 'Preamble' was found ... // And ... would it be a rich idea to check ? // (some 'no Preamble' DICOM images exist !) return GetDocEntry(0x0002, 0x0010) != NULL; @@ -332,7 +402,7 @@ std::string Document::GetTransferSyntaxName() } if ( transferSyntax == GDCM_UNFOUND ) { - gdcmVerboseMacro( "Unfound Transfer Syntax (0002,0010)"); + gdcmWarningMacro( "Unfound Transfer Syntax (0002,0010)"); return "Uncompressed ACR-NEMA"; } @@ -352,7 +422,9 @@ uint16_t Document::SwapShort(uint16_t a) { if ( SwapCode == 4321 || SwapCode == 2143 ) { - a = ((( a << 8 ) & 0x0ff00 ) | (( a >> 8 ) & 0x00ff ) ); + //a = ((( a << 8 ) & 0xff00 ) | (( a >> 8 ) & 0x00ff ) ); + // Save CPU time + a = ( a << 8 ) | ( a >> 8 ); } return a; } @@ -369,11 +441,15 @@ uint32_t Document::SwapLong(uint32_t a) case 1234 : break; case 4321 : - a=( ((a<<24) & 0xff000000) | ((a<<8) & 0x00ff0000) | - ((a>>8) & 0x0000ff00) | ((a>>24) & 0x000000ff) ); +// a=( ((a<<24) & 0xff000000) | ((a<<8) & 0x00ff0000) | +// ((a>>8) & 0x0000ff00) | ((a>>24) & 0x000000ff) ); +// save CPU time + a=( ( a<<24) | ((a<<8) & 0x00ff0000) | + ((a>>8) & 0x0000ff00) | (a>>24) ); break; case 3412 : - a=( ((a<<16) & 0xffff0000) | ((a>>16) & 0x0000ffff) ); +// a=( ((a<<16) & 0xffff0000) | ((a>>16) & 0x0000ffff) ); + a=( (a<<16) | (a>>16) ); break; case 2143 : a=( ((a<< 8) & 0xff00ff00) | ((a>>8) & 0x00ff00ff) ); @@ -402,20 +478,26 @@ std::ifstream *Document::OpenFile() if(Fp) { - gdcmVerboseMacro( "File already open: " << Filename.c_str()); + gdcmWarningMacro( "File already open: " << Filename.c_str()); CloseFile(); } Fp = new std::ifstream(Filename.c_str(), std::ios::in | std::ios::binary); if( ! *Fp ) { - gdcmDebugMacro( "Cannot open file: " << Filename.c_str()); + // Don't user gdcmErrorMacro : + // a spurious message will appear when you use, for instance + // gdcm::FileHelper *fh = new gdcm::FileHelper( outputFileName ); + // to create outputFileName. + gdcmWarningMacro( "Cannot open file: " << Filename.c_str()); delete Fp; Fp = 0; return 0; + //exit(1); // No function is allowed to leave the application instead + // of warning the caller } - uint16_t zero; + uint16_t zero = 0; Fp->read((char*)&zero, (size_t)2); if( Fp->eof() ) { @@ -423,22 +505,22 @@ std::ifstream *Document::OpenFile() return 0; } - //ACR -- or DICOM with no Preamble; may start with a Shadow Group -- + //-- ACR or DICOM with no Preamble; may start with a Shadow Group -- if( zero == 0x0001 || zero == 0x0100 || zero == 0x0002 || zero == 0x0200 || zero == 0x0003 || zero == 0x0300 || zero == 0x0004 || zero == 0x0400 || zero == 0x0005 || zero == 0x0500 || zero == 0x0006 || zero == 0x0600 || zero == 0x0007 || zero == 0x0700 || zero == 0x0008 || zero == 0x0800 ) { - std::string msg - = Util::Format("ACR/DICOM with no preamble: (%04x)\n", zero); - gdcmVerboseMacro( msg.c_str() ); + std::string msg = Util::Format( + "ACR/DICOM starting at the begining of the file:(%04x)\n", zero); + gdcmWarningMacro( msg.c_str() ); return Fp; } - //DICOM + //-- DICOM -- Fp->seekg(126L, std::ios::cur); - char dicm[4]; + char dicm[4] = {' ',' ',' ',' '}; Fp->read(dicm, (size_t)4); if( Fp->eof() ) { @@ -450,10 +532,11 @@ std::ifstream *Document::OpenFile() HasDCMPreamble = true; return Fp; } - + + // -- Neither ACR/No Preamble Dicom nor DICOMV3 file CloseFile(); - gdcmVerboseMacro( "Not DICOM/ACR (missing preamble)" << Filename.c_str()); - + gdcmWarningMacro( "Neither ACR/No Preamble Dicom nor DICOMV3 file: " + << Filename.c_str()); return 0; } @@ -469,7 +552,7 @@ bool Document::CloseFile() delete Fp; Fp = 0; } - return true; //FIXME how do we detect a non-closed ifstream ? + return true; } /** @@ -496,18 +579,18 @@ void Document::WriteContent(std::ofstream *fp, FileType filetype) fp->write("DICM", 4); } -/* - * \todo rewrite later, if really usefull - * - 'Group Length' element is optional in DICOM - * - but un-updated odd groups lengthes can causes pb - * (xmedcon breaker) - * - * if ( (filetype == ImplicitVR) || (filetype == ExplicitVR) ) - * UpdateGroupLength(false,filetype); - * if ( filetype == ACR) - * UpdateGroupLength(true,ACR); - */ - + /* + * \todo rewrite later, if really usefull + * - 'Group Length' element is optional in DICOM + * - but un-updated odd groups lengthes can causes pb + * (xmedcon breaker) + * + * if ( (filetype == ImplicitVR) || (filetype == ExplicitVR) ) + * UpdateGroupLength(false,filetype); + * if ( filetype == ACR) + * UpdateGroupLength(true,ACR); + */ + ElementSet::WriteContent(fp, filetype); // This one is recursive } @@ -554,11 +637,10 @@ void Document::LoadEntryBinArea(BinEntry *elem) uint8_t *a = new uint8_t[l]; if( !a ) { - gdcmVerboseMacro( "Cannot allocate BinEntry content"); + gdcmWarningMacro( "Cannot allocate BinEntry content"); return; } - /// \todo check the result Fp->read((char*)a, l); if( Fp->fail() || Fp->eof()) { @@ -576,8 +658,7 @@ void Document::LoadEntryBinArea(BinEntry *elem) * \brief Loads the element while preserving the current * underlying file position indicator as opposed to * LoadDocEntry that modifies it. - * @param entry Header Entry whose value will be loaded. - * @return + * @param entry DocEntry whose value will be loaded. */ void Document::LoadDocEntrySafe(DocEntry *entry) { @@ -589,11 +670,76 @@ void Document::LoadDocEntrySafe(DocEntry *entry) } } +/** + * \brief Compares two documents, according to \ref DicomDir rules + * \warning Does NOT work with ACR-NEMA files + * \todo Find a trick to solve the pb (use RET fields ?) + * @param document to compare with current one + * @return true if 'smaller' + */ +bool Document::operator<(Document &document) +{ + // Patient Name + std::string s1 = GetEntryValue(0x0010,0x0010); + std::string s2 = document.GetEntryValue(0x0010,0x0010); + if(s1 < s2) + { + return true; + } + else if( s1 > s2 ) + { + return false; + } + else + { + // Patient ID + s1 = GetEntryValue(0x0010,0x0020); + s2 = document.GetEntryValue(0x0010,0x0020); + if ( s1 < s2 ) + { + return true; + } + else if ( s1 > s2 ) + { + return false; + } + else + { + // Study Instance UID + s1 = GetEntryValue(0x0020,0x000d); + s2 = document.GetEntryValue(0x0020,0x000d); + if ( s1 < s2 ) + { + return true; + } + else if( s1 > s2 ) + { + return false; + } + else + { + // Serie Instance UID + s1 = GetEntryValue(0x0020,0x000e); + s2 = document.GetEntryValue(0x0020,0x000e); + if ( s1 < s2 ) + { + return true; + } + else if( s1 > s2 ) + { + return false; + } + } + } + } + return false; +} + //----------------------------------------------------------------------------- // Protected /** * \brief Reads a supposed to be 16 Bits integer - * (swaps it depending on processor endianity) + * (swaps it depending on processor endianness) * @return read value */ uint16_t Document::ReadInt16() @@ -615,7 +761,7 @@ uint16_t Document::ReadInt16() /** * \brief Reads a supposed to be 32 Bits integer - * (swaps it depending on processor endianity) + * (swaps it depending on processor endianness) * @return read value */ uint32_t Document::ReadInt32() @@ -674,9 +820,9 @@ int Document::ComputeGroup0002Length( FileType filetype ) if( filetype == ExplicitVR ) { - if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") ) + if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") || (vr == "UT") ) { - // explicit VR AND OB, OW, SQ : 4 more bytes + // explicit VR AND OB, OW, SQ, UT : 4 more bytes groupLength += 4; } } @@ -693,19 +839,33 @@ int Document::ComputeGroup0002Length( FileType filetype ) //----------------------------------------------------------------------------- // Private +/** + * \brief Loads all the needed Dictionaries + * \warning NOT end user intended method ! + */ +void Document::Initialize() +{ + RefPubDict = Global::GetDicts()->GetDefaultPubDict(); + RefShaDict = NULL; + Filetype = Unknown; +} + /** * \brief Parses a DocEntrySet (Zero-level DocEntries or SQ Item DocEntries) - * @return length of the parsed set. + * @param set DocEntrySet we are going to parse ('zero level' or a SQItem) + * @param offset start of parsing + * @param l_max length to parse + * @param delim_mode : whether we are in 'delimitor mode' (l=0xffffff) or not */ void Document::ParseDES(DocEntrySet *set, long offset, long l_max, bool delim_mode) { - DocEntry *newDocEntry = 0; + DocEntry *newDocEntry; ValEntry *newValEntry; BinEntry *newBinEntry; SeqEntry *newSeqEntry; VRKey vr; - bool used = false; + bool used; while (true) { @@ -735,7 +895,7 @@ void Document::ParseDES(DocEntrySet *set, long offset, !Global::GetVR()->IsVROfBinaryRepresentable(vr) ) { ////// Neither ValEntry NOR BinEntry: should mean UNKOWN VR - gdcmVerboseMacro( std::hex << newDocEntry->GetGroup() + gdcmWarningMacro( std::hex << newDocEntry->GetGroup() << "|" << newDocEntry->GetElement() << " : Neither Valentry, nor BinEntry." "Probably unknown VR."); @@ -768,6 +928,7 @@ void Document::ParseDES(DocEntrySet *set, long offset, else { /////////////////////// ValEntry + // 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 ( dynamic_cast< Document* > ( set ) ) @@ -785,10 +946,32 @@ void Document::ParseDES(DocEntrySet *set, long offset, LoadDocEntry( newValEntry ); bool delimitor=newValEntry->IsItemDelimitor(); + + if ( LoadMode & NO_SHADOW ) // User asked to skip, if possible, + // shadow groups ( if possible : + // whether element 0x0000 exits) + { + if ( newValEntry->GetGroup()%2 != 0 ) + { + if ( newValEntry->GetElement() == 0x0000 ) + { + std::string strLgrGroup = newValEntry->GetValue(); + int lgrGroup; + if ( strLgrGroup != GDCM_UNFOUND) + { + lgrGroup = atoi(strLgrGroup.c_str()); + Fp->seekg(lgrGroup, std::ios::cur); + used = false; + continue; + } + } + } + } + if( !set->AddEntry( newValEntry ) ) { // If here expect big troubles - //delete newValEntry; //otherwise mem leak + // delete newValEntry; //otherwise mem leak used=false; } @@ -812,7 +995,7 @@ void Document::ParseDES(DocEntrySet *set, long offset, else { // VR = "SQ" - unsigned long l = newDocEntry->GetReadLength(); + unsigned long l = newDocEntry->GetReadLength(); if ( l != 0 ) // don't mess the delim_mode for zero-length sequence { if ( l == 0xffffffff ) @@ -824,6 +1007,14 @@ void Document::ParseDES(DocEntrySet *set, long offset, delim_mode = false; } } + + if ( (LoadMode & NO_SEQ) && ! delim_mode ) // User asked to skip SQ + { + Fp->seekg( l, std::ios::cur); + used = false; + continue; + } + // no other way to create it ... newSeqEntry->SetDelimitorMode( delim_mode ); @@ -831,9 +1022,8 @@ 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: - if (/*Document *dummy =*/ dynamic_cast< Document* > ( set ) ) + if ( dynamic_cast< Document* > ( set ) ) { - //(void)dummy; newSeqEntry->SetDepthLevel( 1 ); newSeqEntry->SetKey( newSeqEntry->GetKey() ); } @@ -857,6 +1047,7 @@ void Document::ParseDES(DocEntrySet *set, long offset, { used = false; } + if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max) { if( !used ) @@ -922,12 +1113,6 @@ void Document::ParseSQ( SeqEntry *seqEntry, { dlm_mod = false; } - // FIXME, TODO - // when we're here, element fffe,e000 is already passed. - // it's lost for the SQItem we're going to process !! - - //ParseDES(itemSQ, newDocEntry->GetOffset(), l, dlm_mod); - //delete newDocEntry; // FIXME well ... it's too late to use it ! // Let's try :------------ // remove fff0,e000, created out of the SQItem @@ -986,17 +1171,16 @@ void Document::LoadDocEntry(DocEntry *entry) { if (BinEntry *binEntryPtr = dynamic_cast< BinEntry* >(entry) ) { - //s << "gdcm::NotLoaded (BinEntry)"; s << GDCM_NOTLOADED; - s << " Address:" << (long)entry->GetOffset(); - s << " Length:" << entry->GetLength(); + s << " Ad.:" << (long)entry->GetOffset(); + s << " x(" << std::hex << entry->GetOffset() << ")"; + s << std::dec; + s << " Lgt:" << entry->GetLength(); s << " x(" << std::hex << entry->GetLength() << ")"; binEntryPtr->SetValue(s.str()); } - // Be carefull : a BinEntry IS_A ValEntry ... else if (ValEntry *valEntryPtr = dynamic_cast< ValEntry* >(entry) ) { - // s << "gdcm::NotLoaded. (ValEntry)"; s << GDCM_NOTLOADED; s << " Address:" << (long)entry->GetOffset(); s << " Length:" << entry->GetLength(); @@ -1025,13 +1209,12 @@ void Document::LoadDocEntry(DocEntry *entry) return; } - /// \todo Any compacter code suggested (?) if ( IsDocEntryAnInteger(entry) ) { uint32_t NewInt; int nbInt; // When short integer(s) are expected, read and convert the following - // n *two characters properly i.e. consider them as short integers as + // (n * 2) characters properly i.e. consider them as short integers as // opposed to strings. // Elements with Value Multiplicity > 1 // contain a set of integers (not a single one) @@ -1083,8 +1266,8 @@ void Document::LoadDocEntry(DocEntry *entry) if( length % 2 ) { newValue = Util::DicomString(str, length+1); - gdcmVerboseMacro("Warning: bad length: " << length << - ",For string :" << newValue.c_str()); + gdcmWarningMacro("Warning: bad length: " << length << + " For string :" << newValue.c_str()); // Since we change the length of string update it length //entry->SetReadLength(length+1); } @@ -1098,7 +1281,12 @@ void Document::LoadDocEntry(DocEntry *entry) { if ( Fp->fail() || Fp->eof()) { - gdcmVerboseMacro("Unread element value"); + if ( Fp->fail() ) + gdcmWarningMacro("--> fail"); + + gdcmWarningMacro("Unread element value " << valEntry->GetKey() + << " lgt : " << valEntry->GetReadLength() + << " at " << std::hex << valEntry->GetOffset()); valEntry->SetValue(GDCM_UNREAD); return; } @@ -1115,7 +1303,9 @@ void Document::LoadDocEntry(DocEntry *entry) } else { - gdcmErrorMacro( "Should have a ValEntry, here !"); + gdcmWarningMacro("Should have a ValEntry, here ! " << valEntry->GetKey() + << " lgt : " << valEntry->GetReadLength() + << " at " << std::hex << valEntry->GetOffset()); } } @@ -1131,7 +1321,7 @@ void Document::FindDocEntryLength( DocEntry *entry ) if ( Filetype == ExplicitVR && !entry->IsImplicitVR() ) { - if ( vr == "OB" || vr == "OW" || vr == "SQ" || vr == "UN" ) + if ( vr == "OB" || vr == "OW" || vr == "SQ" || vr == "UT" || vr == "UN" ) { // The following reserved two bytes (see PS 3.5-2003, section // "7.1.2 Data element structure with explicit vr", p 27) must be @@ -1173,72 +1363,6 @@ void Document::FindDocEntryLength( DocEntry *entry ) // Length is encoded on 2 bytes. length16 = ReadInt16(); - - // FIXME : This heuristic supposes that the first group following - // group 0002 *has* and element 0000. - // BUT ... Element 0000 is optionnal :-( - - - // Fixed using : HandleOutOfGroup0002() - // (first hereafter strategy ...) - - // We can tell the current file is encoded in big endian (like - // Data/US-RGB-8-epicard) when we find the "Transfer Syntax" tag - // and it's value is the one of the encoding of a big endian file. - // In order to deal with such big endian encoded files, we have - // (at least) two strategies: - // * when we load the "Transfer Syntax" tag with value of big endian - // encoding, we raise the proper flags. Then we wait for the end - // of the META group (0x0002) among which is "Transfer Syntax", - // before switching the swap code to big endian. We have to postpone - // the switching of the swap code since the META group is fully encoded - // in little endian, and big endian coding only starts at the next - // group. The corresponding code can be hard to analyse and adds - // many additional unnecessary tests for regular tags. - // * the second strategy consists in waiting for trouble, that shall - // appear when we find the first group with big endian encoding. This - // is easy to detect since the length of a "Group Length" tag (the - // ones with zero as element number) has to be of 4 (0x0004). When we - // encounter 1024 (0x0400) chances are the encoding changed and we - // found a group with big endian encoding. - //---> Unfortunately, element 0000 is optional. - //---> This will not work when missing! - // We shall use this second strategy. In order to make sure that we - // can interpret the presence of an apparently big endian encoded - // length of a "Group Length" without committing a big mistake, we - // add an additional check: we look in the already parsed elements - // for the presence of a "Transfer Syntax" whose value has to be "big - // endian encoding". When this is the case, chances are we have got our - // hands on a big endian encoded file: we switch the swap code to - // big endian and proceed... - -// if ( element == 0x0000 && length16 == 0x0400 ) -// { -// std::string ts = GetTransferSyntax(); -// if ( Global::GetTS()->GetSpecialTransferSyntax(ts) -// != TS::ExplicitVRBigEndian ) -// { -// throw FormatError( "Document::FindDocEntryLength()", -// " not explicit VR." ); -// return; -// } -// length16 = 4; -// SwitchByteSwapCode(); -// -// // Restore the unproperly loaded values i.e. the group, the element -// // and the dictionary entry depending on them. -// uint16_t correctGroup = SwapShort( entry->GetGroup() ); -// uint16_t correctElem = SwapShort( entry->GetElement() ); -// DictEntry *newTag = GetDictEntry( correctGroup, correctElem ); -// if ( !newTag ) -// { -// // This correct tag is not in the dictionary. Create a new one. -// newTag = NewVirtualDictEntry(correctGroup, correctElem); -// } -// // FIXME this can create a memory leaks on the old entry that be -// // left unreferenced. -// entry->SetDictEntry( newTag ); -// } // 0xffff means that we deal with 'No Length' Sequence // or 'No Length' SQItem @@ -1298,12 +1422,14 @@ uint32_t Document::FindDocEntryLengthOBOrOW() if ( group != 0xfffe || ( ( elem != 0xe0dd ) && ( elem != 0xe000 ) ) ) { long filePosition = Fp->tellg(); - gdcmVerboseMacro( "Neither an Item tag nor a Sequence delimiter tag on :" + gdcmWarningMacro( + "Neither an Item tag nor a Sequence delimiter tag on :" << std::hex << group << " , " << elem << ") -before- position x(" << filePosition << ")" ); Fp->seekg(positionOnEntry, std::ios::beg); - throw FormatUnexpected( "Neither an Item tag nor a Sequence delimiter tag."); + throw FormatUnexpected( + "Neither an Item tag nor a Sequence delimiter tag."); } if ( elem == 0xe0dd ) { @@ -1363,9 +1489,6 @@ std::string Document::FindDocEntryVR() */ bool Document::CheckDocEntryVR(VRKey vr) { - // 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 ( !Global::GetVR()->IsValidVR(vr) ) return false; @@ -1545,7 +1668,7 @@ void Document::FixDocEntryFoundLength(DocEntry *entry, if ( foundLength % 2) { - gdcmVerboseMacro( "Warning : Tag with uneven length " << foundLength + gdcmWarningMacro( "Warning : Tag with uneven length " << foundLength << " in x(" << std::hex << gr << "," << elem <<")"); } @@ -1553,7 +1676,7 @@ void Document::FixDocEntryFoundLength(DocEntry *entry, // Allthough not recent many such GE corrupted images are still present // on Creatis hard disks. Hence this fix shall remain when such images // are no longer in use (we are talking a few years, here)... - // Note: XMedCom probably uses such a trick since it is able to read + // Note: XMedCon probably uses such a trick since it is able to read // those pesky GE images ... if ( foundLength == 13) { @@ -1561,7 +1684,7 @@ void Document::FixDocEntryFoundLength(DocEntry *entry, if ( gr != 0x0008 || ( elem != 0x0070 && elem != 0x0080 ) ) { foundLength = 10; - entry->SetReadLength(10); /// \todo a bug is to be fixed !? + entry->SetReadLength(10); // a bug is to be fixed !? } } @@ -1572,7 +1695,7 @@ void Document::FixDocEntryFoundLength(DocEntry *entry, else if ( gr == 0x0009 && ( elem == 0x1113 || elem == 0x1114 ) ) { foundLength = 4; - entry->SetReadLength(4); /// \todo a bug is to be fixed !? + entry->SetReadLength(4); // a bug is to be fixed !? } else if ( entry->GetVR() == "SQ" ) @@ -1604,10 +1727,10 @@ void Document::FixDocEntryFoundLength(DocEntry *entry, */ bool Document::IsDocEntryAnInteger(DocEntry *entry) { - uint16_t elem = entry->GetElement(); - uint16_t group = entry->GetGroup(); - const std::string &vr = entry->GetVR(); - uint32_t length = entry->GetLength(); + uint16_t elem = entry->GetElement(); + uint16_t group = entry->GetGroup(); + const std::string &vr = entry->GetVR(); + uint32_t length = entry->GetLength(); // When we have some semantics on the element we just read, and if we // a priori know we are dealing with an integer, then we shall be @@ -1628,7 +1751,7 @@ bool Document::IsDocEntryAnInteger(DocEntry *entry) // encounter such an ill-formed image, we simply display a warning // message and proceed on parsing (while crossing fingers). long filePosition = Fp->tellg(); - gdcmVerboseMacro( "Erroneous Group Length element length on : (" + gdcmWarningMacro( "Erroneous Group Length element length on : (" << std::hex << group << " , " << elem << ") -before- position x(" << filePosition << ")" << "lgt : " << length ); @@ -1642,17 +1765,6 @@ bool Document::IsDocEntryAnInteger(DocEntry *entry) return false; } -/** - * \brief Loads all the needed Dictionaries - * \warning NOT end user intended method ! - */ -void Document::Initialize() -{ - RefPubDict = Global::GetDicts()->GetDefaultPubDict(); - RefShaDict = NULL; - Filetype = Unknown; -} - /** * \brief Discover what the swap code is (among little endian, big endian, * bad little endian, bad big endian). @@ -1668,8 +1780,6 @@ bool Document::CheckSwap() // 0x00000004. Finding the swap code in then straigthforward. Trouble // occurs when we can't find such group... - uint32_t x = 4; // x : for ntohs - bool net2host; // true when HostByteOrder is the same as NetworkByteOrder uint32_t s32; uint16_t s16; @@ -1677,14 +1787,7 @@ bool Document::CheckSwap() // First, compare HostByteOrder and NetworkByteOrder in order to // determine if we shall need to swap bytes (i.e. the Endian type). - if ( x == ntohs(x) ) - { - net2host = true; - } - else - { - net2host = false; - } + bool net2host = Util::IsCurrentProcessorBigEndian(); // The easiest case is the one of a 'true' DICOM header, we just have // to look for the string "DICM" inside the file preamble. @@ -1693,7 +1796,7 @@ bool Document::CheckSwap() char *entCur = deb + 128; if( memcmp(entCur, "DICM", (size_t)4) == 0 ) { - gdcmVerboseMacro( "Looks like DICOM Version3 (preamble + DCM)" ); + gdcmWarningMacro( "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 ...) @@ -1725,41 +1828,78 @@ bool Document::CheckSwap() // instead of just checking for UL, OB and UI !? group 0000 { Filetype = ExplicitVR; - gdcmVerboseMacro( "Group 0002 : Explicit Value Representation"); + gdcmWarningMacro( "Group 0002 : Explicit Value Representation"); } else { Filetype = ImplicitVR; - gdcmVerboseMacro( "Group 0002 :Not an explicit Value Representation;" + gdcmWarningMacro( "Group 0002 :Not an explicit Value Representation;" << "Looks like a bugged Header!"); } if ( net2host ) { SwapCode = 4321; - gdcmVerboseMacro( "HostByteOrder != NetworkByteOrder"); + gdcmWarningMacro( "HostByteOrder != NetworkByteOrder"); } else { SwapCode = 1234; - gdcmVerboseMacro( "HostByteOrder = NetworkByteOrder"); + gdcmWarningMacro( "HostByteOrder = NetworkByteOrder"); } // Position the file position indicator at first tag // (i.e. after the file preamble and the "DICM" string). - Fp->seekg(0, std::ios::beg); + + Fp->seekg(0, std::ios::beg); // FIXME : Is it usefull? + Fp->seekg ( 132L, std::ios::beg); return true; - } // End of DicomV3 + } // ------------------------------- End of DicomV3 ---------------- // Alas, this is not a DicomV3 file and whatever happens there is no file // preamble. We can reset the file position indicator to where the data // is (i.e. the beginning of the file). - gdcmVerboseMacro( "Not a DICOM Version3 file"); + + gdcmWarningMacro( "Not a Kosher DICOM Version3 file (no preamble)"); + Fp->seekg(0, std::ios::beg); + // Let's check 'No Preamble Dicom File' : + // Should start with group 0x0002 + // and be Explicit Value Representation + + s16 = *((uint16_t *)(deb)); + SwapCode = 0; + switch ( s16 ) + { + case 0x0002 : + SwapCode = 1234; + entCur = deb + 4; + break; + case 0x0200 : + SwapCode = 4321; + entCur = deb + 6; + } + + if ( SwapCode != 0 ) + { + if( memcmp(entCur, "UL", (size_t)2) == 0 || + memcmp(entCur, "OB", (size_t)2) == 0 || + memcmp(entCur, "UI", (size_t)2) == 0 || + memcmp(entCur, "SH", (size_t)2) == 0 || + memcmp(entCur, "AE", (size_t)2) == 0 || + memcmp(entCur, "OB", (size_t)2) == 0 ) + { + Filetype = ExplicitVR; + gdcmWarningMacro( "Group 0002 : Explicit Value Representation"); + return true; + } + } +// ------------------------------- End of 'No Preamble' DicomV3 ------------- + // Our next best chance would be to be considering a 'clean' ACR/NEMA file. - // By clean we mean that the length of the first tag is written down. + // By clean we mean that the length of the first group is written down. // If this is the case and since the length of the first group HAS to be // four (bytes), then determining the proper swap code is straightforward. @@ -1768,7 +1908,6 @@ bool Document::CheckSwap() // representation of a 32 bits integer. Hence the following dirty // trick : s32 = *((uint32_t *)(entCur)); - switch( s32 ) { case 0x00040000 : @@ -1830,7 +1969,7 @@ bool Document::CheckSwap() Filetype = ACR; return true; default : - gdcmVerboseMacro( "ACR/NEMA unfound swap info (Really hopeless !)"); + gdcmWarningMacro( "ACR/NEMA unfound swap info (Really hopeless !)"); Filetype = Unknown; return false; } @@ -1842,7 +1981,8 @@ bool Document::CheckSwap() */ void Document::SwitchByteSwapCode() { - gdcmVerboseMacro( "Switching Byte Swap code from "<< SwapCode); + gdcmWarningMacro( "Switching Byte Swap code from "<< SwapCode + << " at :" <tellg() ); if ( SwapCode == 1234 ) { SwapCode = 4321; @@ -1863,7 +2003,7 @@ void Document::SwitchByteSwapCode() /** * \brief during parsing, Header Elements too long are not loaded in memory - * @param newSize + * @param newSize new size */ void Document::SetMaxSizeLoadEntry(long newSize) { @@ -1879,26 +2019,6 @@ void Document::SetMaxSizeLoadEntry(long newSize) MaxSizeLoadEntry = newSize; } -/** - * \brief Header Elements too long will not be printed - * \todo See comments of \ref Document::MAX_SIZE_PRINT_ELEMENT_VALUE - * @param newSize - */ -void Document::SetMaxSizePrintEntry(long newSize) -{ - if ( newSize < 0 ) - { - return; - } - if ((uint32_t)newSize >= (uint32_t)0xffffffff ) - { - MaxSizePrintEntry = 0xffffffff; - return; - } - MaxSizePrintEntry = newSize; -} - - /** * \brief Read the next tag but WITHOUT loading it's value * (read the 'Group Number', the 'Element Number', @@ -1935,9 +2055,14 @@ DocEntry *Document::ReadNextDocEntry() if( vr == GDCM_UNKNOWN) { - DictEntry *dictEntry = GetDictEntry(group,elem); - if( dictEntry ) - realVR = dictEntry->GetVR(); + if ( elem == 0x0000 ) // Group Length + realVR = "UL"; // must be UL + else + { + DictEntry *dictEntry = GetDictEntry(group,elem); + if( dictEntry ) + realVR = dictEntry->GetVR(); + } } DocEntry *newEntry; @@ -1959,7 +2084,7 @@ DocEntry *Document::ReadNextDocEntry() std::string msg; msg = Util::Format("Entry (%04x,%04x) should be Explicit VR\n", newEntry->GetGroup(), newEntry->GetElement()); - gdcmVerboseMacro( msg.c_str() ); + gdcmWarningMacro( msg.c_str() ); } } newEntry->SetImplicitVR(); @@ -1972,7 +2097,6 @@ DocEntry *Document::ReadNextDocEntry() catch ( FormatError e ) { // Call it quits - //std::cout << e; delete newEntry; return 0; } @@ -2027,7 +2151,7 @@ void Document::HandleOutOfGroup0002(uint16_t &group, uint16_t &elem) std::string ts = GetTransferSyntax(); if ( !Global::GetTS()->IsTransferSyntax(ts) ) { - gdcmVerboseMacro("True DICOM File, with NO Tansfer Syntax: " << ts ); + gdcmWarningMacro("True DICOM File, with NO Tansfer Syntax: " << ts ); return; } @@ -2042,7 +2166,7 @@ void Document::HandleOutOfGroup0002(uint16_t &group, uint16_t &elem) //'Implicit VR Transfer Syntax (GE Private) if ( Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ExplicitVRBigEndian ) { - gdcmVerboseMacro("Transfer Syntax Name = [" + gdcmWarningMacro("Transfer Syntax Name = [" << GetTransferSyntaxName() << "]" ); SwitchByteSwapCode(); group = SwapShort(group); @@ -2051,94 +2175,8 @@ void Document::HandleOutOfGroup0002(uint16_t &group, uint16_t &elem) } } -/** - * \brief Compares two documents, according to \ref DicomDir rules - * \warning Does NOT work with ACR-NEMA files - * \todo Find a trick to solve the pb (use RET fields ?) - * @param document - * @return true if 'smaller' - */ -bool Document::operator<(Document &document) -{ - // Patient Name - std::string s1 = GetEntryValue(0x0010,0x0010); - std::string s2 = document.GetEntryValue(0x0010,0x0010); - if(s1 < s2) - { - return true; - } - else if( s1 > s2 ) - { - return false; - } - else - { - // Patient ID - s1 = GetEntryValue(0x0010,0x0020); - s2 = document.GetEntryValue(0x0010,0x0020); - if ( s1 < s2 ) - { - return true; - } - else if ( s1 > s2 ) - { - return false; - } - else - { - // Study Instance UID - s1 = GetEntryValue(0x0020,0x000d); - s2 = document.GetEntryValue(0x0020,0x000d); - if ( s1 < s2 ) - { - return true; - } - else if( s1 > s2 ) - { - return false; - } - else - { - // Serie Instance UID - s1 = GetEntryValue(0x0020,0x000e); - s2 = document.GetEntryValue(0x0020,0x000e); - if ( s1 < s2 ) - { - return true; - } - else if( s1 > s2 ) - { - return false; - } - } - } - } - return false; -} - //----------------------------------------------------------------------------- // Print -/** - * \brief Prints The Dict Entries of THE public Dicom Dictionary - * @param os ostream to print to - * @return - */ -void Document::PrintPubDict(std::ostream &os) -{ - RefPubDict->SetPrintLevel(PrintLevel); - RefPubDict->Print(os); -} - -/** - * \brief Prints The Dict Entries of THE shadow Dicom Dictionary - * @param os ostream to print to - * @return - */ -void Document::PrintShaDict(std::ostream &os) -{ - RefShaDict->SetPrintLevel(PrintLevel); - RefShaDict->Print(os); -} //----------------------------------------------------------------------------- } // end namespace gdcm