X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.cxx;h=95b8efec2fc3470081a5bc4c0df1da349f969901;hb=f2892379e89dd5236abb60ea3c84c3fe9d5ef45f;hp=f87337747ee26e66f5ff2c46f3f66208e3463044;hpb=be803332322436f4bc87c9b517dcfc658a9027b4;p=gdcm.git diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index f8733774..95b8efec 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/04/05 10:20:53 $ - Version: $Revision: 1.234 $ + Date: $Date: 2005/05/25 12:54:17 $ + Version: $Revision: 1.241 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -59,7 +59,9 @@ Document::Document() Initialize(); SwapCode = 1234; Filetype = ExplicitVR; + // Load will set it to true if sucessfull Group0002Parsed = false; + IsDocumentAlreadyLoaded = false; LoadMode = 0x00000000; // default : load everything, later } @@ -67,7 +69,7 @@ Document::Document() * \brief Constructor (not to break the API) * @param filename 'Document' (File or DicomDir) to be opened for parsing */ -Document::Document( std::string const &filename ) +Document::Document( std::string const &fileName ) :ElementSet(-1) { Fp = 0; @@ -79,7 +81,15 @@ Document::Document( std::string const &filename ) Group0002Parsed = false; LoadMode = 0x00000000; // Load everything - Load(filename); + // Load will set it to true if sucessfull + IsDocumentAlreadyLoaded = false; + + Load(fileName); + + // Normaly (?) Fp should be already deleted by CloseFile() + if ( Fp != 0 ) + delete Fp; + Fp = 0; } /** * \brief Canonical destructor. @@ -96,17 +106,33 @@ Document::~Document () /** * \brief Loader * @param filename 'Document' (File or DicomDir) to be opened for parsing + * @return false if file cannot be open or no swap info was found, + * or no tag was found. */ -void Document::Load( std::string const &filename ) +bool Document::Load( std::string const &fileName ) { - Filename = 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' + // We should 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; @@ -118,13 +144,31 @@ void Document::Load( std::string const &filename ) Fp->seekg(0, std::ios::beg); - CheckSwap(); + // 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 + 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 @@ -187,6 +231,8 @@ void Document::Load( std::string const &filename ) SetValEntry(rows , 0x0028, 0x0011); } // --- End of ACR-LibIDO kludge --- + + return true; } /** @@ -226,12 +272,11 @@ 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() { @@ -257,7 +302,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; @@ -427,10 +472,16 @@ std::ifstream *Document::OpenFile() 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 = 0; @@ -441,20 +492,20 @@ 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); + 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] = {' ',' ',' ',' '}; Fp->read(dicm, (size_t)4); @@ -468,10 +519,11 @@ std::ifstream *Document::OpenFile() HasDCMPreamble = true; return Fp; } - + + // -- Neither ACR/No Preamble Dicom nor DICOMV3 file CloseFile(); - gdcmWarningMacro( "Not DICOM/ACR (missing preamble)" << Filename.c_str()); - + gdcmWarningMacro( "Neither ACR/No Preamble Dicom nor DICOMV3 file: " + << Filename.c_str()); return 0; } @@ -1108,8 +1160,10 @@ void Document::LoadDocEntry(DocEntry *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()); } @@ -1779,19 +1833,56 @@ bool Document::CheckSwap() // 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). - gdcmWarningMacro( "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. @@ -1800,7 +1891,6 @@ bool Document::CheckSwap() // representation of a 32 bits integer. Hence the following dirty // trick : s32 = *((uint32_t *)(entCur)); - switch( s32 ) { case 0x00040000 :