X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.cxx;h=2fbb8bd7884047ffeea053322bebef07c1510fc7;hb=25c9af365d9221bd45f3fbe27275ff0f66a265b1;hp=95bd114750c2c2c3c0fc18619d3bfc89444ffb97;hpb=0fc486652e88490f7344439111750eb9dcaf7a29;p=gdcm.git diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index 95bd1147..9c12f0ce 100644 --- a/src/gdcmDocument.cxx +++ b/src/gdcmDocument.cxx @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmDocument.cxx,v $ Language: C++ - Date: $Date: 2004/09/16 19:21:57 $ - Version: $Revision: 1.80 $ + Date: $Date: 2005/02/07 09:51:03 $ + Version: $Revision: 1.225 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or - http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -20,135 +20,113 @@ #include "gdcmValEntry.h" #include "gdcmBinEntry.h" #include "gdcmSeqEntry.h" - #include "gdcmGlobal.h" #include "gdcmUtil.h" #include "gdcmDebug.h" +#include "gdcmTS.h" +#include "gdcmDictSet.h" +#include "gdcmDocEntrySet.h" +#include "gdcmSQItem.h" #include +#include +#include // For nthos: -#ifdef _MSC_VER +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) #include -#else - #include #endif -# include - -// Implicit VR Little Endian -#define UI1_2_840_10008_1_2 "1.2.840.10008.1.2" -// Explicit VR Little Endian -#define UI1_2_840_10008_1_2_1 "1.2.840.10008.1.2.1" -// Deflated Explicit VR Little Endian -#define UI1_2_840_10008_1_2_1_99 "1.2.840.10008.1.2.1.99" -// Explicit VR Big Endian -#define UI1_2_840_10008_1_2_2 "1.2.840.10008.1.2.2" -// JPEG Baseline (Process 1) -#define UI1_2_840_10008_1_2_4_50 "1.2.840.10008.1.2.4.50" -// JPEG Extended (Process 2 & 4) -#define UI1_2_840_10008_1_2_4_51 "1.2.840.10008.1.2.4.51" -// JPEG Extended (Process 3 & 5) -#define UI1_2_840_10008_1_2_4_52 "1.2.840.10008.1.2.4.52" -// JPEG Spectral Selection, Non-Hierarchical (Process 6 & 8) -#define UI1_2_840_10008_1_2_4_53 "1.2.840.10008.1.2.4.53" -// JPEG Full Progression, Non-Hierarchical (Process 10 & 12) -#define UI1_2_840_10008_1_2_4_55 "1.2.840.10008.1.2.4.55" -// JPEG Lossless, Non-Hierarchical (Process 14) -#define UI1_2_840_10008_1_2_4_57 "1.2.840.10008.1.2.4.57" -// JPEG Lossless, Hierarchical, First-Order Prediction (Process 14, -// [Selection Value 1]) -#define UI1_2_840_10008_1_2_4_70 "1.2.840.10008.1.2.4.70" -// JPEG 2000 Lossless -#define UI1_2_840_10008_1_2_4_90 "1.2.840.10008.1.2.4.90" -// JPEG 2000 -#define UI1_2_840_10008_1_2_4_91 "1.2.840.10008.1.2.4.91" -// RLE Lossless -#define UI1_2_840_10008_1_2_5 "1.2.840.10008.1.2.5" -// UI1_1_2_840_10008_1_2_5 -#define str2num(str, typeNum) *((typeNum *)(str)) +#ifdef CMAKE_HAVE_NETINET_IN_H + #include +#endif +namespace gdcm +{ //----------------------------------------------------------------------------- -// Refer to gdcmDocument::CheckSwap() -const unsigned int gdcmDocument::HEADER_LENGTH_TO_READ = 256; +// Refer to Document::CheckSwap() +//const unsigned int Document::HEADER_LENGTH_TO_READ = 256; -// Refer to gdcmDocument::SetMaxSizeLoadEntry() -const unsigned int gdcmDocument::MAX_SIZE_LOAD_ELEMENT_VALUE = 0xfff; // 4096 -const unsigned int gdcmDocument::MAX_SIZE_PRINT_ELEMENT_VALUE = 0x7fffffff; +// 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 file to be opened for parsing + * @param filename 'Document' (File or DicomDir) to be opened for parsing */ -gdcmDocument::gdcmDocument( std::string const & filename ) - : gdcmElementSet(-1) +Document::Document( std::string const &filename ) + :ElementSet(-1) { SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE); Filename = filename; - Initialise(); + Initialize(); + Fp = 0; if ( !OpenFile() ) { return; } - dbg.Verbose(0, "gdcmDocument::gdcmDocument: starting parsing of file: ", - Filename.c_str()); - rewind(Fp); + Group0002Parsed = false; + + gdcmWarningMacro( "Starting parsing of file: " << Filename.c_str()); + // Fp->seekg( 0, std::ios::beg); - fseek(Fp,0L,SEEK_END); - long lgt = ftell(Fp); + Fp->seekg(0, std::ios::end); + long lgt = Fp->tellg(); - rewind(Fp); + Fp->seekg(0, std::ios::beg); + CheckSwap(); - long beg = ftell(Fp); + long beg = Fp->tellg(); lgt -= beg; - (void)ParseDES( this, beg, lgt, false); // le Load sera fait a la volee + ParseDES( this, beg, lgt, false); // Loading is done during parsing - rewind(Fp); + Fp->seekg( 0, std::ios::beg); // Load 'non string' values - std::string PhotometricInterpretation = GetEntryByNumber(0x0028,0x0004); + std::string PhotometricInterpretation = GetEntryValue(0x0028,0x0004); if( PhotometricInterpretation == "PALETTE COLOR " ) { - LoadEntryVoidArea(0x0028,0x1200); // gray LUT + LoadEntryBinArea(0x0028,0x1200); // gray LUT /// FIXME FIXME FIXME /// The tags refered by the three following lines used to be CORRECTLY /// defined as having an US Value Representation in the public - /// dictionnary. BUT the semantics implied by the three following + /// dictionary. BUT the semantics implied by the three following /// lines state that the corresponding tag contents are in fact - /// the ones of a gdcmBinEntry. - /// In order to fix things "Quick and Dirty" the dictionnary was - /// altered on PURPOUS but now contains a WRONG value. + /// the ones of a BinEntry. + /// In order to fix things "Quick and Dirty" the dictionary was + /// altered on PURPOSE but now contains a WRONG value. /// In order to fix things and restore the dictionary to its /// correct value, one needs to decided of the semantics by deciding - /// wether the following tags are either: - /// - multivaluated US, and hence loaded as gdcmValEntry, but afterwards - /// also used as gdcmBinEntry, which requires the proper conversion, - /// - OW, and hence loaded as gdcmBinEntry, but afterwards also used - /// as gdcmValEntry, which requires the proper conversion. - LoadEntryVoidArea(0x0028,0x1201); // R LUT - LoadEntryVoidArea(0x0028,0x1202); // G LUT - LoadEntryVoidArea(0x0028,0x1203); // B LUT + /// whether the following tags are either: + /// - multivaluated US, and hence loaded as ValEntry, but afterwards + /// also used as BinEntry, which requires the proper conversion, + /// - OW, and hence loaded as BinEntry, but afterwards also used + /// as ValEntry, which requires the proper conversion. + LoadEntryBinArea(0x0028,0x1201); // R LUT + LoadEntryBinArea(0x0028,0x1202); // G LUT + LoadEntryBinArea(0x0028,0x1203); // B LUT // Segmented Red Palette Color LUT Data - LoadEntryVoidArea(0x0028,0x1221); + LoadEntryBinArea(0x0028,0x1221); // Segmented Green Palette Color LUT Data - LoadEntryVoidArea(0x0028,0x1222); + LoadEntryBinArea(0x0028,0x1222); // Segmented Blue Palette Color LUT Data - LoadEntryVoidArea(0x0028,0x1223); + LoadEntryBinArea(0x0028,0x1223); } //FIXME later : how to use it? - LoadEntryVoidArea(0x0028,0x3006); //LUT Data (CTX dependent) + LoadEntryBinArea(0x0028,0x3006); //LUT Data (CTX dependent) CloseFile(); - // -------------------------------------------------------------- + // ---------------------------- // 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) @@ -159,70 +137,43 @@ gdcmDocument::gdcmDocument( std::string const & filename ) // we switch lineNumber and columnNumber // std::string RecCode; - RecCode = GetEntryByNumber(0x0008, 0x0010); // recognition code + RecCode = GetEntryValue(0x0008, 0x0010); // recognition code (RET) if (RecCode == "ACRNEMA_LIBIDO_1.1" || RecCode == "CANRME_AILIBOD1_1." ) // for brain-damaged softwares // with "little-endian strings" { - Filetype = gdcmACR_LIBIDO; - std::string rows = GetEntryByNumber(0x0028, 0x0010); - std::string columns = GetEntryByNumber(0x0028, 0x0011); - SetEntryByNumber(columns, 0x0028, 0x0010); - SetEntryByNumber(rows , 0x0028, 0x0011); + Filetype = ACR_LIBIDO; + std::string rows = GetEntryValue(0x0028, 0x0010); + std::string columns = GetEntryValue(0x0028, 0x0011); + SetValEntry(columns, 0x0028, 0x0010); + SetValEntry(rows , 0x0028, 0x0011); } - // ----------------- End of ACR-LibIDO kludge ------------------ - - PrintLevel = 1; // 'Medium' print level by default + // --- End of ACR-LibIDO kludge --- } /** * \brief This default constructor doesn't parse the file. You should - * then invoke \ref gdcmDocument::SetFileName and then the parsing. + * then invoke \ref Document::SetFileName and then the parsing. */ -gdcmDocument::gdcmDocument() - :gdcmElementSet(-1) +Document::Document() + :ElementSet(-1) { + Fp = 0; + SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE); - Initialise(); - PrintLevel = 1; // 'Medium' print level by default + Initialize(); + SwapCode = 1234; + Filetype = ExplicitVR; + Group0002Parsed = false; } /** * \brief Canonical destructor. */ -gdcmDocument::~gdcmDocument () +Document::~Document () { RefPubDict = NULL; RefShaDict = NULL; - - // Recursive clean up of sequences - for (TagDocEntryHT::const_iterator it = TagHT.begin(); - it != TagHT.end(); ++it ) - { - //delete it->second; //temp remove - } - TagHT.clear(); -} - -//----------------------------------------------------------------------------- -// Print - -/** - * \brief Prints The Dict Entries of THE public Dicom Dictionary - * @return - */ -void gdcmDocument::PrintPubDict(std::ostream & os) -{ - RefPubDict->Print(os); -} - -/** - * \brief Prints The Dict Entries of THE shadow Dicom Dictionary - * @return - */ -void gdcmDocument::PrintShaDict(std::ostream & os) -{ - RefShaDict->Print(os); } //----------------------------------------------------------------------------- @@ -230,7 +181,7 @@ void gdcmDocument::PrintShaDict(std::ostream & os) /** * \brief Get the public dictionary used */ -gdcmDict *gdcmDocument::GetPubDict() +Dict *Document::GetPubDict() { return RefPubDict; } @@ -238,16 +189,16 @@ gdcmDict *gdcmDocument::GetPubDict() /** * \brief Get the shadow dictionary used */ -gdcmDict *gdcmDocument::GetShaDict() +Dict *Document::GetShaDict() { return RefShaDict; } /** * \brief Set the shadow dictionary used - * \param dict dictionary to use in shadow + * @param dict dictionary to use in shadow */ -bool gdcmDocument::SetShaDict(gdcmDict *dict) +bool Document::SetShaDict(Dict *dict) { RefShaDict = dict; return !RefShaDict; @@ -255,1306 +206,689 @@ bool gdcmDocument::SetShaDict(gdcmDict *dict) /** * \brief Set the shadow dictionary used - * \param dictName name of the dictionary to use in shadow + * @param dictName name of the dictionary to use in shadow */ -bool gdcmDocument::SetShaDict(DictKey const & dictName) +bool Document::SetShaDict(DictKey const &dictName) { - RefShaDict = gdcmGlobal::GetDicts()->GetDict(dictName); + RefShaDict = Global::GetDicts()->GetDict(dictName); return !RefShaDict; } /** * \brief This predicate, based on hopefully reasonable heuristics, - * decides whether or not the current gdcmDocument was properly parsed + * 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 gdcmDocument is the one of a reasonable Dicom/Acr file, + * @return true when Document is the one of a reasonable Dicom/Acr file, * false otherwise. */ -bool gdcmDocument::IsReadable() +bool Document::IsReadable() { - if( Filetype == gdcmUnknown) + if( Filetype == Unknown) { - dbg.Verbose(0, "gdcmDocument::IsReadable: wrong filetype"); + gdcmWarningMacro( "Wrong filetype"); return false; } - if( TagHT.empty() ) - { - dbg.Verbose(0, "gdcmDocument::IsReadable: no tags in internal" - " hash table."); + if ( IsEmpty() ) + { + gdcmWarningMacro( "No tag in internal hash table."); return false; } return true; } - -/** - * \brief Internal function that checks whether the Transfer Syntax given - * as argument is the one present in the current document. - * @param syntaxToCheck The transfert syntax we need to check against. - * @return True when SyntaxToCheck corresponds to the Transfer Syntax of - * the current document. False either when the document contains - * no Transfer Syntax, or when the Tranfer Syntaxes doesn't match. - */ -bool gdcmDocument::IsGivenTransferSyntax(std::string const & syntaxToCheck) -{ - gdcmDocEntry *entry = GetDocEntryByNumber(0x0002, 0x0010); - if ( !entry ) - { - return false; - } - - // The entry might be present but not loaded (parsing and loading - // happen at different stages): try loading and proceed with check... - LoadDocEntrySafe(entry); - if (gdcmValEntry* valEntry = dynamic_cast< gdcmValEntry* >(entry) ) - { - std::string transfer = valEntry->GetValue(); - // The actual transfer (as read from disk) might be padded. We - // first need to remove the potential padding. We can make the - // weak assumption that padding was not executed with digits... - if ( transfer.length() == 0 ) { // for brain damaged headers - return false; - } - while ( ! isdigit(transfer[transfer.length()-1]) ) - { - transfer.erase(transfer.length()-1, 1); - } - if ( transfer == syntaxToCheck ) - { - return true; - } - } - return false; -} - -/** - * \brief Determines if the Transfer Syntax of the present document - * corresponds to a Implicit Value Representation of - * Little Endian. - * \sa \ref gdcmDocument::IsGivenTransferSyntax. - * @return True when ImplicitVRLittleEndian found. False in all other cases. - */ -bool gdcmDocument::IsImplicitVRLittleEndianTransferSyntax() -{ - return IsGivenTransferSyntax(UI1_2_840_10008_1_2); -} - -/** - * \brief Determines if the Transfer Syntax was already encountered - * and if it corresponds to a ExplicitVRLittleEndian one. - * @return True when ExplicitVRLittleEndian found. False in all other cases. - */ -bool gdcmDocument::IsExplicitVRLittleEndianTransferSyntax() -{ - return IsGivenTransferSyntax(UI1_2_840_10008_1_2_1); -} - -/** - * \brief Determines if the Transfer Syntax was already encountered - * and if it corresponds to a DeflatedExplicitVRLittleEndian one. - * @return True when DeflatedExplicitVRLittleEndian found. False in all other cases. - */ -bool gdcmDocument::IsDeflatedExplicitVRLittleEndianTransferSyntax() -{ - return IsGivenTransferSyntax(UI1_2_840_10008_1_2_1_99); -} - -/** - * \brief Determines if the Transfer Syntax was already encountered - * and if it corresponds to a Explicit VR Big Endian one. - * @return True when big endian found. False in all other cases. - */ -bool gdcmDocument::IsExplicitVRBigEndianTransferSyntax() -{ - return IsGivenTransferSyntax(UI1_2_840_10008_1_2_2); -} - -/** - * \brief Determines if the Transfer Syntax was already encountered - * and if it corresponds to a JPEGBaseLineProcess1 one. - * @return True when JPEGBaseLineProcess1found. False in all other cases. - */ -bool gdcmDocument::IsJPEGBaseLineProcess1TransferSyntax() -{ - return IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_50); -} - -/** - * \brief Determines if the Transfer Syntax was already encountered - * and if it corresponds to a JPEGExtendedProcess2-4 one. - * @return True when JPEGExtendedProcess2-4 found. False in all other cases. - */ -bool gdcmDocument::IsJPEGExtendedProcess2_4TransferSyntax() -{ - return IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_51); -} - -/** - * \brief Determines if the Transfer Syntax was already encountered - * and if it corresponds to a JPEGExtendeProcess3-5 one. - * @return True when JPEGExtendedProcess3-5 found. False in all other cases. - */ -bool gdcmDocument::IsJPEGExtendedProcess3_5TransferSyntax() -{ - return IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_52); -} - -/** - * \brief Determines if the Transfer Syntax was already encountered - * and if it corresponds to a JPEGSpectralSelectionProcess6-8 one. - * @return True when JPEGSpectralSelectionProcess6-8 found. False in all - * other cases. - */ -bool gdcmDocument::IsJPEGSpectralSelectionProcess6_8TransferSyntax() -{ - return IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_53); -} - -/** - * \brief Determines if the Transfer Syntax was already encountered - * and if it corresponds to a RLE Lossless one. - * @return True when RLE Lossless found. False in all - * other cases. - */ -bool gdcmDocument::IsRLELossLessTransferSyntax() -{ - return IsGivenTransferSyntax(UI1_2_840_10008_1_2_5); -} - -/** - * \brief Determines if Transfer Syntax was already encountered - * and if it corresponds to a JPEG Lossless one. - * @return True when RLE Lossless found. False in all - * other cases. - */ - -bool gdcmDocument::IsJPEGLossless() -{ - return ( IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_55) - || IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_57) - || IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_70) ); -} - -/** - * \brief Determines if the Transfer Syntax was already encountered - * and if it corresponds to a JPEG2000 one - * @return True when JPEG2000 (Lossly or LossLess) found. False in all - * other cases. - */ -bool gdcmDocument::IsJPEG2000() -{ - return ( IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_90) - || IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_91) ); -} - /** * \brief Predicate for dicom version 3 file. * @return True when the file is a dicom version 3. */ -bool gdcmDocument::IsDicomV3() +bool Document::IsDicomV3() { - // Checking if Transfert Syntax exists is enough + // Checking if Transfer Syntax exists is enough // Anyway, it's to late check if the 'Preamble' was found ... // And ... would it be a rich idea to check ? // (some 'no Preamble' DICOM images exist !) - return GetDocEntryByNumber(0x0002, 0x0010) != NULL; + return GetDocEntry(0x0002, 0x0010) != NULL; } /** - * \brief returns the File Type - * (ACR, ACR_LIBIDO, ExplicitVR, ImplicitVR, Unknown) - * @return the FileType code + * \brief Predicate for Papyrus file + * Dedicated to whomsoever it may concern + * @return True when the file is a Papyrus file. */ -FileType gdcmDocument::GetFileType() +bool Document::IsPapyrus() { - return Filetype; -} - -/** - * \brief Tries to open the file \ref gdcmDocument::Filename and - * checks the preamble when existing. - * @return The FILE pointer on success. - */ -FILE* gdcmDocument::OpenFile() -{ - Fp = fopen(Filename.c_str(),"rb"); - - if(!Fp) - { - dbg.Verbose( 0, - "gdcmDocument::OpenFile cannot open file: ", - Filename.c_str()); - return 0; - } - - uint16_t zero; - fread(&zero, (size_t)2, (size_t)1, Fp); - - //ACR -- or DICOM with no Preamble -- - if( zero == 0x0008 || zero == 0x0800 || zero == 0x0002 || zero == 0x0200 ) - { - return Fp; - } - - //DICOM - fseek(Fp, 126L, SEEK_CUR); - char dicm[4]; - fread(dicm, (size_t)4, (size_t)1, Fp); - if( memcmp(dicm, "DICM", 4) == 0 ) - { - return Fp; - } - - fclose(Fp); - dbg.Verbose( 0, - "gdcmDocument::OpenFile not DICOM/ACR (missing preamble)", - Filename.c_str()); - - return 0; + // check for Papyrus private Sequence + DocEntry *e = GetDocEntry(0x0041, 0x1050); + if ( !e ) + return false; + // check if it's actually a Sequence + if ( !dynamic_cast(e) ) + return false; + return true; } /** - * \brief closes the file - * @return TRUE if the close was successfull + * \brief returns the File Type + * (ACR, ACR_LIBIDO, ExplicitVR, ImplicitVR, Unknown) + * @return the FileType code */ -bool gdcmDocument::CloseFile() +FileType Document::GetFileType() { - int closed = fclose(Fp); - Fp = 0; - - return closed; + return Filetype; } /** - * \brief Writes in a file all the Header Entries (Dicom Elements) - * @param fp file pointer on an already open file - * @param filetype Type of the File to be written - * (ACR-NEMA, ExplicitVR, ImplicitVR) - * \return Always true. + * \brief Accessor to the Transfer Syntax (when present) of the + * current document (it internally handles reading the + * value from disk when only parsing occured). + * @return The encountered Transfer Syntax of the current document. */ -void gdcmDocument::Write(FILE* fp,FileType filetype) +std::string Document::GetTransferSyntax() { - /// \todo move the following lines (and a lot of others, to be written) - /// to a future function CheckAndCorrectHeader - - /// WARNING : Si on veut ecrire du DICOM V3 a partir d'un DcmHeader ACR-NEMA - /// no way (check : FileType est un champ de gdcmDocument ...) - /// a moins de se livrer a un tres complique ajout des champs manquants. - /// faire un CheckAndCorrectHeader (?) - - if (filetype == gdcmImplicitVR) - { - std::string implicitVRTransfertSyntax = UI1_2_840_10008_1_2; - ReplaceOrCreateByNumber(implicitVRTransfertSyntax,0x0002, 0x0010); - - /// \todo Refer to standards on page 21, chapter 6.2 - /// "Value representation": values with a VR of UI shall be - /// padded with a single trailing null - /// in the following case we have to padd manually with a 0 - - SetEntryLengthByNumber(18, 0x0002, 0x0010); - } - - if (filetype == gdcmExplicitVR) + DocEntry *entry = GetDocEntry(0x0002, 0x0010); + if ( !entry ) { - std::string explicitVRTransfertSyntax = UI1_2_840_10008_1_2_1; - ReplaceOrCreateByNumber(explicitVRTransfertSyntax,0x0002, 0x0010); - - /// \todo Refer to standards on page 21, chapter 6.2 - /// "Value representation": values with a VR of UI shall be - /// padded with a single trailing null - /// Dans le cas suivant on doit pader manuellement avec un 0 - - SetEntryLengthByNumber(20, 0x0002, 0x0010); + return GDCM_UNKNOWN; } - -/** - * \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); - */ - - gdcmElementSet::Write(fp, filetype); // This one is recursive - -} -/** - * \brief Modifies the value of a given Header 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 - * @param elem Element number of the Entry - * \return pointer to the modified/created Header Entry (NULL when creation - * failed). - */ - -/* -gdcmValEntry * gdcmDocument::ReplaceOrCreateByNumber( - std::string const & value, - uint16_t group, - uint16_t elem ) -{ - gdcmValEntry* valEntry = 0; - gdcmDocEntry* currentEntry = GetDocEntryByNumber( group, elem); - - if (!currentEntry) + // The entry might be present but not loaded (parsing and loading + // happen at different stages): try loading and proceed with check... + LoadDocEntrySafe(entry); + if (ValEntry *valEntry = dynamic_cast< ValEntry* >(entry) ) { - // The entry wasn't present and we simply create the required ValEntry: - currentEntry = NewDocEntryByNumber(group, elem); - if (!currentEntry) + std::string transfer = valEntry->GetValue(); + // The actual transfer (as read from disk) might be padded. We + // first need to remove the potential padding. We can make the + // weak assumption that padding was not executed with digits... + if ( transfer.length() == 0 ) { - dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: call to" - " NewDocEntryByNumber failed."); - return NULL; + // for brain damaged headers + return GDCM_UNKNOWN; } - valEntry = new gdcmValEntry(currentEntry); - if ( !AddEntry(valEntry)) + while ( !isdigit((unsigned char)transfer[transfer.length()-1]) ) { - dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: AddEntry" - " failed allthough this is a creation."); - } - } - else - { - valEntry = dynamic_cast< gdcmValEntry* >(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 gdcmDocEntry to a gdcmValEntry: - valEntry = new gdcmValEntry(currentEntry); - if (!RemoveEntry(currentEntry)) - { - dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: removal" - " of previous DocEntry failed."); - return NULL; - } - if ( !AddEntry(valEntry)) - { - dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: adding" - " promoted ValEntry failed."); - return NULL; - } + transfer.erase(transfer.length()-1, 1); } + return transfer; } - - SetEntryByNumber(value, group, elem); - - return valEntry; -} -*/ + return GDCM_UNKNOWN; +} /** - * \brief Modifies the value of a given Header 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 - * @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). + * \brief Accesses the info from 0002,0010 : Transfer Syntax and TS + * @return The full Transfer Syntax Name (as opposed to Transfer Syntax UID) */ - - // TODO : write something clever, using default value for VR - // to avoid code duplication - // (I don't know how to tell NewDocEntryByNumber - // that ReplaceOrCreateByNumber was called with a default value) - -gdcmValEntry * gdcmDocument::ReplaceOrCreateByNumber( - std::string const & value, - uint16_t group, - uint16_t elem, - std::string const & VR ) +std::string Document::GetTransferSyntaxName() { - gdcmValEntry* valEntry = 0; - gdcmDocEntry* currentEntry = GetDocEntryByNumber( group, elem); - - if (!currentEntry) - { - // check if (group,element) DictEntry exists - // if it doesn't, create an entry in gdcmDictSet::VirtualEntry - // and use it - - // Find out if the tag we received is in the dictionaries: - gdcmDict *pubDict = gdcmGlobal::GetDicts()->GetDefaultPubDict(); - gdcmDictEntry *dictEntry = pubDict->GetDictEntryByNumber(group, elem); - if (!dictEntry) - { - currentEntry = NewDocEntryByNumber(group, elem,VR); - } - else - { - currentEntry = NewDocEntryByNumber(group, elem); - } - - if (!currentEntry) - { - dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: call to" - " NewDocEntryByNumber failed."); - return NULL; - } - valEntry = new gdcmValEntry(currentEntry); - if ( !AddEntry(valEntry)) - { - dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: AddEntry" - " failed allthough this is a creation."); - } - } - else - { - valEntry = dynamic_cast< gdcmValEntry* >(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 gdcmDocEntry to a gdcmValEntry: - valEntry = new gdcmValEntry(currentEntry); - if (!RemoveEntry(currentEntry)) - { - dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: removal" - " of previous DocEntry failed."); - return NULL; - } - if ( !AddEntry(valEntry)) - { - dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: adding" - " promoted ValEntry failed."); - return NULL; - } - } - } - - SetEntryByNumber(value, group, elem); - - return valEntry; -} + // use the TS (TS : Transfer Syntax) + std::string transferSyntax = GetEntryValue(0x0002,0x0010); -/* - * \brief Modifies the value of a given Header Entry (Dicom Element) - * when it exists. Create it with the given value when unexistant. - * @param voidArea (binary) value to be set - * @param Group Group number of the Entry - * @param Elem Element number of the Entry - * \return pointer to the modified/created Header Entry (NULL when creation - * failed). - */ -gdcmBinEntry * gdcmDocument::ReplaceOrCreateByNumber( - void *voidArea, - int lgth, - uint16_t group, - uint16_t elem, - std::string const & VR ) -{ - gdcmBinEntry* binEntry = 0; - gdcmDocEntry* currentEntry = GetDocEntryByNumber( group, elem); - if (!currentEntry) + if ( (transferSyntax.find(GDCM_NOTLOADED) < transferSyntax.length()) ) { - - // check if (group,element) DictEntry exists - // if it doesn't, create an entry in gdcmDictSet::VirtualEntry - // and use it - - // Find out if the tag we received is in the dictionaries: - gdcmDict *pubDict = gdcmGlobal::GetDicts()->GetDefaultPubDict(); - gdcmDictEntry *dictEntry = pubDict->GetDictEntryByNumber(group, elem); - - if (!dictEntry) - { - currentEntry = NewDocEntryByNumber(group, elem,VR); - } - else - { - currentEntry = NewDocEntryByNumber(group, elem); - } - if (!currentEntry) - { - dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: call to" - " NewDocEntryByNumber failed."); - return NULL; - } - binEntry = new gdcmBinEntry(currentEntry); - if ( !AddEntry(binEntry)) - { - dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: AddEntry" - " failed allthough this is a creation."); - } + gdcmErrorMacro( "Transfer Syntax not loaded. " << std::endl + << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE" ); + return "Uncompressed ACR-NEMA"; } - else + if ( transferSyntax == GDCM_UNFOUND ) { - binEntry = dynamic_cast< gdcmBinEntry* >(currentEntry); - if ( !binEntry ) // Euuuuh? It wasn't a BinEntry - // then we change it to a BinEntry ? - // Shouldn't it be considered as an error ? - { - // We need to promote the gdcmDocEntry to a gdcmBinEntry: - binEntry = new gdcmBinEntry(currentEntry); - if (!RemoveEntry(currentEntry)) - { - dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: removal" - " of previous DocEntry failed."); - return NULL; - } - if ( !AddEntry(binEntry)) - { - dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: adding" - " promoted BinEntry failed."); - return NULL; - } - } + gdcmWarningMacro( "Unfound Transfer Syntax (0002,0010)"); + return "Uncompressed ACR-NEMA"; } - SetEntryByNumber(voidArea, lgth, group, elem); - - return binEntry; -} - - -/* - * \brief Modifies the value of a given Header Entry (Dicom Element) - * when it exists. Create it when unexistant. - * @param Group Group number of the Entry - * @param Elem Element number of the Entry - * \return pointer to the modified/created SeqEntry (NULL when creation - * failed). - */ -gdcmSeqEntry * gdcmDocument::ReplaceOrCreateByNumber( - uint16_t group, - uint16_t elem) -{ - gdcmSeqEntry* b = 0; - gdcmDocEntry* a = GetDocEntryByNumber( group, elem); - if (!a) - { - a = NewSeqEntryByNumber(group, elem); - if (!a) - { - return 0; - } + // we do it only when we need it + const TSKey &tsName = Global::GetTS()->GetValue( transferSyntax ); - b = new gdcmSeqEntry(a, 1); // FIXME : 1 (Depth) - AddEntry(b); - } - return b; -} - -/** - * \brief Set a new value if the invoked element exists - * Seems to be useless !!! - * @param value new element value - * @param group group number of the Entry - * @param elem element number of the Entry - * \return boolean - */ -bool gdcmDocument::ReplaceIfExistByNumber(std::string const & value, - uint16_t group, uint16_t elem ) -{ - SetEntryByNumber(value, group, elem); - - return true; -} - -//----------------------------------------------------------------------------- -// Protected - -/** - * \brief Checks if a given Dicom Element exists within the H table - * @param group Group number of the searched Dicom Element - * @param element Element number of the searched Dicom Element - * @return true is found - */ -bool gdcmDocument::CheckIfEntryExistByNumber(uint16_t group, uint16_t element ) -{ - const std::string &key = gdcmDictEntry::TranslateToKey(group, element ); - return TagHT.count(key); + // Global::GetTS() is a global static you shall never try to delete it! + return tsName; } - +// +// --------------- Swap Code ------------------ /** - * \brief Searches within Header Entries (Dicom Elements) parsed with - * the public and private dictionaries - * for the element value of a given tag. - * \warning Don't use any longer : use GetPubEntryByName - * @param tagName name of the searched element. - * @return Corresponding element value when it exists, - * and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise. - */ -std::string gdcmDocument::GetEntryByName(TagName const & tagName) -{ - gdcmDictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName); - if( !dictEntry ) - { - return GDCM_UNFOUND; - } - - return GetEntryByNumber(dictEntry->GetGroup(),dictEntry->GetElement()); -} - -/** - * \brief Searches within Header Entries (Dicom Elements) parsed with - * the public and private dictionaries - * for the element value representation of a given tag. - * - * Obtaining the VR (Value Representation) might be needed by caller - * to convert the string typed content to caller's native type - * (think of C++ vs Python). The VR is actually of a higher level - * of semantics than just the native C++ type. - * @param tagName name of the searched element. - * @return Corresponding element value representation when it exists, - * and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise. + * \brief Swaps the bytes so they agree with the processor order + * @return The properly swaped 16 bits integer. */ -std::string gdcmDocument::GetEntryVRByName(TagName const & tagName) +uint16_t Document::SwapShort(uint16_t a) { - gdcmDictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName); - if( dictEntry == NULL) + if ( SwapCode == 4321 || SwapCode == 2143 ) { - return GDCM_UNFOUND; + a = ((( a << 8 ) & 0xff00 ) | (( a >> 8 ) & 0x00ff ) ); } - - gdcmDocEntry* elem = GetDocEntryByNumber(dictEntry->GetGroup(), - dictEntry->GetElement()); - return elem->GetVR(); + return a; } - /** - * \brief Searches within Header Entries (Dicom Elements) parsed with - * the public and private dictionaries - * for the element value representation of a given tag. - * @param group Group number of the searched tag. - * @param element Element number of the searched tag. - * @return Corresponding element value representation when it exists, - * and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise. + * \brief Swaps back the bytes of 4-byte long integer accordingly to + * processor order. + * @return The properly swaped 32 bits integer. */ -std::string gdcmDocument::GetEntryByNumber(uint16_t group, uint16_t element) +uint32_t Document::SwapLong(uint32_t a) { - gdcmTagKey key = gdcmDictEntry::TranslateToKey(group, element); - /// \todo use map methods, instead of multimap JPR - if ( !TagHT.count(key)) + switch (SwapCode) { - return GDCM_UNFOUND; + case 1234 : + break; + case 4321 : + a=( ((a<<24) & 0xff000000) | ((a<<8) & 0x00ff0000) | + ((a>>8) & 0x0000ff00) | ((a>>24) & 0x000000ff) ); + break; + case 3412 : + a=( ((a<<16) & 0xffff0000) | ((a>>16) & 0x0000ffff) ); + break; + case 2143 : + a=( ((a<< 8) & 0xff00ff00) | ((a>>8) & 0x00ff00ff) ); + break; + default : + gdcmErrorMacro( "Unset swap code:" << SwapCode ); + a = 0; } + return a; +} - return ((gdcmValEntry *)TagHT.find(key)->second)->GetValue(); -} - +// +// -----------------File I/O --------------- /** - * \brief Searches within Header Entries (Dicom Elements) parsed with - * the public and private dictionaries - * for the element value representation of a given tag.. - * - * Obtaining the VR (Value Representation) might be needed by caller - * to convert the string typed content to caller's native type - * (think of C++ vs Python). The VR is actually of a higher level - * of semantics than just the native C++ type. - * @param group Group number of the searched tag. - * @param element Element number of the searched tag. - * @return Corresponding element value representation when it exists, - * and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise. + * \brief Tries to open the file \ref Document::Filename and + * checks the preamble when existing. + * @return The FILE pointer on success. */ -std::string gdcmDocument::GetEntryVRByNumber(uint16_t group, uint16_t element) +std::ifstream *Document::OpenFile() { - gdcmDocEntry* elem = GetDocEntryByNumber(group, element); - if ( !elem ) + HasDCMPreamble = false; + if (Filename.length() == 0) { - return GDCM_UNFOUND; + return 0; } - return elem->GetVR(); -} -/** - * \brief Searches within Header Entries (Dicom Elements) parsed with - * the public and private dictionaries - * for the value length of a given tag.. - * @param group Group number of the searched tag. - * @param element Element number of the searched tag. - * @return Corresponding element length; -2 if not found - */ -int gdcmDocument::GetEntryLengthByNumber(uint16_t group, uint16_t element) -{ - gdcmDocEntry* elem = GetDocEntryByNumber(group, element); - if ( !elem ) - { - return -2; //magic number - } - return elem->GetLength(); -} -/** - * \brief Sets the value (string) of the Header Entry (Dicom Element) - * @param content string value of the Dicom Element - * @param tagName name of the searched Dicom Element. - * @return true when found - */ -bool gdcmDocument::SetEntryByName(std::string const & content,std::string const & tagName) -{ - gdcmDictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName); - if( !dictEntry ) + if(Fp) { - return false; + gdcmWarningMacro( "File already open: " << Filename.c_str()); + CloseFile(); } - return SetEntryByNumber(content,dictEntry->GetGroup(), - dictEntry->GetElement()); -} - -/** - * \brief Accesses an existing gdcmDocEntry (i.e. a Dicom Element) - * through it's (group, element) and modifies it's content with - * the given value. - * @param content new value (string) to substitute with - * @param group group number of the Dicom Element to modify - * @param element element number of the Dicom Element to modify - */ -bool gdcmDocument::SetEntryByNumber(std::string const & content, - uint16_t group, - uint16_t element) -{ - int c; - int l; - - gdcmValEntry* valEntry = GetValEntryByNumber(group, element); - if (!valEntry ) - { - dbg.Verbose(0, "gdcmDocument::SetEntryByNumber: no corresponding", - " ValEntry (try promotion first)."); - return false; - } - // Non even content must be padded with a space (020H)... - std::string finalContent = content; - if( finalContent.length() % 2 ) + Fp = new std::ifstream(Filename.c_str(), std::ios::in | std::ios::binary); + if( ! *Fp ) { - finalContent += '\0'; // ... therefore we padd with (000H) .!?! - } - valEntry->SetValue(finalContent); - - // Integers have a special treatement for their length: - - l = finalContent.length(); - if ( l != 0) // To avoid to be cheated by 'zero length' integers - { - gdcmVRKey vr = valEntry->GetVR(); - if( vr == "US" || vr == "SS" ) - { - c = CountSubstring(content, "\\") + 1; // for multivaluated items - l = c*2; - } - else if( vr == "UL" || vr == "SL" ) - { - c = CountSubstring(content, "\\") + 1; // for multivaluated items - l = c*4;; - } + gdcmDebugMacro( "Cannot open file: " << Filename.c_str()); + delete Fp; + Fp = 0; + return 0; } - valEntry->SetLength(l); - return true; -} - -/** - * \brief Accesses an existing gdcmDocEntry (i.e. a Dicom Element) - * through it's (group, element) and modifies it's content with - * the given value. - * @param content new value (void *) to substitute with - * @param lgth new value length - * @param group group number of the Dicom Element to modify - * @param element element number of the Dicom Element to modify - */ -bool gdcmDocument::SetEntryByNumber(void *content, - int lgth, - uint16_t group, - uint16_t element) -{ - (void)lgth; //not used - gdcmTagKey key = gdcmDictEntry::TranslateToKey(group, element); - if ( !TagHT.count(key)) + + uint16_t zero = 0; + Fp->read((char*)&zero, (size_t)2); + if( Fp->eof() ) { - return false; + CloseFile(); + return 0; } - -/* 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? + + //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); + gdcmWarningMacro( msg.c_str() ); + return Fp; } -*/ - gdcmBinEntry* a = (gdcmBinEntry *)TagHT[key]; - a->SetVoidArea(content); - a->SetLength(lgth); - - return true; -} - -/** - * \brief Accesses an existing gdcmDocEntry (i.e. a Dicom Element) - * in the PubDocEntrySet of this instance - * through it's (group, element) and modifies it's length with - * the given value. - * \warning Use with extreme caution. - * @param l new length to substitute with - * @param group group number of the Entry to modify - * @param element element number of the Entry to modify - * @return true on success, false otherwise. - */ -bool gdcmDocument::SetEntryLengthByNumber(uint32_t l, - uint16_t group, - uint16_t element) -{ - /// \todo use map methods, instead of multimap JPR - gdcmTagKey key = gdcmDictEntry::TranslateToKey(group, element); - if ( !TagHT.count(key) ) + + //DICOM + Fp->seekg(126L, std::ios::cur); + char dicm[4] = {' ',' ',' ',' '}; + Fp->read(dicm, (size_t)4); + if( Fp->eof() ) { - return false; + CloseFile(); + return 0; } - if ( l % 2 ) + if( memcmp(dicm, "DICM", 4) == 0 ) { - l++; // length must be even + HasDCMPreamble = true; + return Fp; } - ( ((TagHT.equal_range(key)).first)->second )->SetLength(l); - - return true ; + + CloseFile(); + gdcmWarningMacro( "Not DICOM/ACR (missing preamble)" << Filename.c_str()); + + return 0; } /** - * \brief Gets (from Header) the offset of a 'non string' element value - * (LoadElementValues has already be executed) - * @param group group number of the Entry - * @param elem element number of the Entry - * @return File Offset of the Element Value + * \brief closes the file + * @return TRUE if the close was successfull */ -size_t gdcmDocument::GetEntryOffsetByNumber(uint16_t group, uint16_t elem) +bool Document::CloseFile() { - gdcmDocEntry* entry = GetDocEntryByNumber(group, elem); - if (!entry) + if( Fp ) { - dbg.Verbose(1, "gdcmDocument::GetDocEntryByNumber: no entry present."); - return 0; + Fp->close(); + delete Fp; + Fp = 0; } - return entry->GetOffset(); + return true; //FIXME how do we detect a non-closed ifstream ? } /** - * \brief Gets (from Header) a 'non string' element value - * (LoadElementValues has already be executed) - * @param group group number of the Entry - * @param elem element number of the Entry - * @return Pointer to the 'non string' area + * \brief Writes in a file all the Header Entries (Dicom Elements) + * @param fp file pointer on an already open file (actually: Output File Stream) + * @param filetype Type of the File to be written + * (ACR-NEMA, ExplicitVR, ImplicitVR) + * @return Always true. */ -void * gdcmDocument::GetEntryVoidAreaByNumber(uint16_t group, uint16_t elem) +void Document::WriteContent(std::ofstream *fp, FileType filetype) { - gdcmDocEntry* entry = GetDocEntryByNumber(group, elem); - if (!entry) + // \TODO move the following lines (and a lot of others, to be written) + // to a future function CheckAndCorrectHeader + + // (necessary if user wants to write a DICOM V3 file + // starting from an ACR-NEMA (V2) Header + + if ( filetype == ImplicitVR || filetype == ExplicitVR ) { - dbg.Verbose(1, "gdcmDocument::GetDocEntryByNumber: no entry"); - return 0; + // writing Dicom File Preamble + char filePreamble[128]; + memset(filePreamble, 0, 128); + fp->write(filePreamble, 128); + fp->write("DICM", 4); } - return ((gdcmBinEntry *)entry)->GetVoidArea(); + + /* + * \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 } +// ----------------------------------------- +// Content entries /** - * \brief Loads (from disk) the element content - * when a string is not suitable + * \brief Loads (from disk) the element content + * when a string is not suitable * @param group group number of the Entry * @param elem element number of the Entry */ -void* gdcmDocument::LoadEntryVoidArea(uint16_t group, uint16_t elem) +void Document::LoadEntryBinArea(uint16_t group, uint16_t elem) { - gdcmDocEntry *docElement = GetDocEntryByNumber(group, elem); + // Search the corresponding DocEntry + DocEntry *docElement = GetDocEntry(group, elem); if ( !docElement ) - { - return NULL; - } - size_t o =(size_t)docElement->GetOffset(); - fseek(Fp, o, SEEK_SET); - size_t l = docElement->GetLength(); - char* a = new char[l]; - if(!a) - { - dbg.Verbose(0, "gdcmDocument::LoadEntryVoidArea cannot allocate a"); - return NULL; - } - size_t l2 = fread(a, 1, l , Fp); - if( l != l2 ) - { - delete[] a; - return NULL; - } - /// \todo Drop any already existing void area! JPR - if( !SetEntryVoidAreaByNumber( a, group, elem ) ); - { - dbg.Verbose(0, "gdcmDocument::LoadEntryVoidArea setting failed."); - } + return; - return a; + BinEntry *binElement = dynamic_cast(docElement); + if( !binElement ) + return; + + LoadEntryBinArea(binElement); } + /** - * \brief Loads (from disk) the element content - * when a string is not suitable - * @param element Entry whose voidArea is going to be loaded + * \brief Loads (from disk) the element content + * when a string is not suitable + * @param elem Entry whose binArea is going to be loaded */ -void *gdcmDocument::LoadEntryVoidArea(gdcmBinEntry *element) +void Document::LoadEntryBinArea(BinEntry *elem) { - size_t o =(size_t)element->GetOffset(); - fseek(Fp, o, SEEK_SET); - size_t l = element->GetLength(); - char* a = new char[l]; + if(elem->GetBinArea()) + return; + + bool openFile = !Fp; + if(openFile) + OpenFile(); + + size_t o =(size_t)elem->GetOffset(); + Fp->seekg(o, std::ios::beg); + + size_t l = elem->GetLength(); + uint8_t *a = new uint8_t[l]; if( !a ) { - dbg.Verbose(0, "gdcmDocument::LoadEntryVoidArea cannot allocate a"); - return NULL; + gdcmWarningMacro( "Cannot allocate BinEntry content"); + return; } - element->SetVoidArea((void *)a); + /// \todo check the result - size_t l2 = fread(a, 1, l , Fp); - if( l != l2 ) + Fp->read((char*)a, l); + if( Fp->fail() || Fp->eof()) { delete[] a; - return NULL; + return; } - return a; + elem->SetBinArea(a); + + if(openFile) + CloseFile(); } /** - * \brief Sets a 'non string' value to a given Dicom Element - * @param area area containing the 'non string' value - * @param group Group number of the searched Dicom Element - * @param element Element number of the searched Dicom Element - * @return + * \brief Loads the element while preserving the current + * underlying file position indicator as opposed to + * LoadDocEntry that modifies it. + * @param entry DocEntry whose value will be loaded. */ -bool gdcmDocument::SetEntryVoidAreaByNumber(void * area, - uint16_t group, - uint16_t element) +void Document::LoadDocEntrySafe(DocEntry *entry) { - gdcmDocEntry* currentEntry = GetDocEntryByNumber(group, element); - if ( !currentEntry ) + if(Fp) { - return false; + long PositionOnEntry = Fp->tellg(); + LoadDocEntry(entry); + Fp->seekg(PositionOnEntry, std::ios::beg); } - if ( gdcmBinEntry* binEntry = dynamic_cast(currentEntry) ) - { - binEntry->SetVoidArea( area ); - return true; - } - return true; } /** - * \brief Update the entries with the shadow dictionary. - * Only non even entries are analyzed + * \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' */ -void gdcmDocument::UpdateShaEntries() +bool Document::operator<(Document &document) { - //gdcmDictEntry *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 - + // 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 { - // Remove precedent value transformation - (*it)->SetDictEntry(NewVirtualDictEntry((*it)->GetGroup(),(*it)->GetElement(),vr)); + // 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 Searches within the Header Entries for a Dicom Element of - * a given tag. - * @param tagName name of the searched Dicom Element. - * @return Corresponding Dicom Element when it exists, and NULL - * otherwise. + * \brief Reads a supposed to be 16 Bits integer + * (swaps it depending on processor endianness) + * @return read value */ -gdcmDocEntry* gdcmDocument::GetDocEntryByName(std::string const & tagName) +uint16_t Document::ReadInt16() + throw( FormatError ) { - gdcmDictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName); - if( !dictEntry ) + uint16_t g; + Fp->read ((char*)&g, (size_t)2); + if ( Fp->fail() ) { - return NULL; + throw FormatError( "Document::ReadInt16()", " file error." ); } - - return GetDocEntryByNumber(dictEntry->GetGroup(),dictEntry->GetElement()); -} - -/** - * \brief retrieves a Dicom Element (the first one) using (group, element) - * \warning (group, element) IS NOT an identifier inside the Dicom Header - * if you think it's NOT UNIQUE, check the count number - * and use iterators to retrieve ALL the Dicoms Elements within - * a given couple (group, element) - * @param group Group number of the searched Dicom Element - * @param element Element number of the searched Dicom Element - * @return - */ -gdcmDocEntry* gdcmDocument::GetDocEntryByNumber(uint16_t group, - uint16_t element) -{ - gdcmTagKey key = gdcmDictEntry::TranslateToKey(group, element); - if ( !TagHT.count(key)) + if( Fp->eof() ) { - return NULL; + throw FormatError( "Document::ReadInt16()", "EOF." ); } - return TagHT.find(key)->second; + g = SwapShort(g); + return g; } /** - * \brief Same as \ref gdcmDocument::GetDocEntryByNumber except it only - * returns a result when the corresponding entry is of type - * ValEntry. - * @return When present, the corresponding ValEntry. + * \brief Reads a supposed to be 32 Bits integer + * (swaps it depending on processor endianness) + * @return read value */ -gdcmValEntry* gdcmDocument::GetValEntryByNumber(uint16_t group, - uint16_t element) +uint32_t Document::ReadInt32() + throw( FormatError ) { - gdcmDocEntry* currentEntry = GetDocEntryByNumber(group, element); - if ( !currentEntry ) + uint32_t g; + Fp->read ((char*)&g, (size_t)4); + if ( Fp->fail() ) { - return 0; + throw FormatError( "Document::ReadInt32()", " file error." ); } - if ( gdcmValEntry* valEntry = dynamic_cast(currentEntry) ) + if( Fp->eof() ) { - return valEntry; + throw FormatError( "Document::ReadInt32()", "EOF." ); } - dbg.Verbose(0, "gdcmDocument::GetValEntryByNumber: unfound ValEntry."); - - return 0; + g = SwapLong(g); + return g; } /** - * \brief Loads the element while preserving the current - * underlying file position indicator as opposed to - * to LoadDocEntry that modifies it. - * @param entry Header Entry whose value shall be loaded. - * @return + * \brief skips bytes inside the source file + * \warning NOT end user intended method ! + * @return */ -void gdcmDocument::LoadDocEntrySafe(gdcmDocEntry * entry) +void Document::SkipBytes(uint32_t nBytes) { - long PositionOnEntry = ftell(Fp); - LoadDocEntry(entry); - fseek(Fp, PositionOnEntry, SEEK_SET); + //FIXME don't dump the returned value + Fp->seekg((long)nBytes, std::ios::cur); } /** - * \brief Swaps back the bytes of 4-byte long integer accordingly to - * processor order. - * @return The properly swaped 32 bits integer. + * \brief Re-computes the length of a ACR-NEMA/Dicom group from a DcmHeader + * @param filetype Type of the File to be written */ -uint32_t gdcmDocument::SwapLong(uint32_t a) +int Document::ComputeGroup0002Length( FileType filetype ) { - switch (SwapCode) - { - case 0 : - break; - case 4321 : - a=( ((a<<24) & 0xff000000) | ((a<<8) & 0x00ff0000) | - ((a>>8) & 0x0000ff00) | ((a>>24) & 0x000000ff) ); - break; - - case 3412 : - a=( ((a<<16) & 0xffff0000) | ((a>>16) & 0x0000ffff) ); - break; + uint16_t gr; + std::string vr; - case 2143 : - a=( ((a<< 8) & 0xff00ff00) | ((a>>8) & 0x00ff00ff) ); - break; - default : - //std::cout << "swapCode= " << SwapCode << std::endl; - dbg.Error(" gdcmDocument::SwapLong : unset swap code"); - a = 0; - } - return a; -} + int groupLength = 0; + bool found0002 = false; + + // for each zero-level Tag in the DCM Header + DocEntry *entry = GetFirstEntry(); + while( entry ) + { + gr = entry->GetGroup(); -/** - * \brief Unswaps back the bytes of 4-byte long integer accordingly to - * processor order. - * @return The properly unswaped 32 bits integer. - */ -uint32_t gdcmDocument::UnswapLong(uint32_t a) -{ - return SwapLong(a); -} + if( gr == 0x0002 ) + { + found0002 = true; -/** - * \brief Swaps the bytes so they agree with the processor order - * @return The properly swaped 16 bits integer. - */ -uint16_t gdcmDocument::SwapShort(uint16_t a) -{ - if ( SwapCode == 4321 || SwapCode == 2143 ) - { - a = ((( a << 8 ) & 0x0ff00 ) | (( a >> 8 ) & 0x00ff ) ); + if( entry->GetElement() != 0x0000 ) + { + vr = entry->GetVR(); + + if( filetype == ExplicitVR ) + { + if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") ) + { + // explicit VR AND OB, OW, SQ : 4 more bytes + groupLength += 4; + } + } + groupLength += 2 + 2 + 4 + entry->GetLength(); + } + } + else if (found0002 ) + break; + + entry = GetNextEntry(); } - return a; + return groupLength; } +//----------------------------------------------------------------------------- +// Private /** - * \brief Unswaps the bytes so they agree with the processor order - * @return The properly unswaped 16 bits integer. + * \brief Loads all the needed Dictionaries + * \warning NOT end user intended method ! */ -uint16_t gdcmDocument::UnswapShort(uint16_t a) +void Document::Initialize() { - return SwapShort(a); + RefPubDict = Global::GetDicts()->GetDefaultPubDict(); + RefShaDict = NULL; + Filetype = Unknown; } -//----------------------------------------------------------------------------- -// Private - /** * \brief Parses a DocEntrySet (Zero-level DocEntries or SQ Item DocEntries) * @return length of the parsed set. */ - -long gdcmDocument::ParseDES(gdcmDocEntrySet *set, - long offset, - long l_max, - bool delim_mode) +void Document::ParseDES(DocEntrySet *set, long offset, + long l_max, bool delim_mode) { - gdcmDocEntry *newDocEntry = 0; - unsigned long l = 0; - + DocEntry *newDocEntry = 0; + ValEntry *newValEntry; + BinEntry *newBinEntry; + SeqEntry *newSeqEntry; + VRKey vr; + bool used = false; + while (true) - { - if ( !delim_mode && (ftell(Fp)-offset) >= l_max) + { + if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max) { break; } + + used = true; newDocEntry = ReadNextDocEntry( ); + if ( !newDocEntry ) { break; } - gdcmVRKey vr = newDocEntry->GetVR(); - if ( vr != "SQ" ) + vr = newDocEntry->GetVR(); + newValEntry = dynamic_cast(newDocEntry); + newBinEntry = dynamic_cast(newDocEntry); + newSeqEntry = dynamic_cast(newDocEntry); + + if ( newValEntry || newBinEntry ) { - - if ( gdcmGlobal::GetVR()->IsVROfGdcmStringRepresentable(vr) ) + if ( newBinEntry ) + { + if ( Filetype == ExplicitVR && + !Global::GetVR()->IsVROfBinaryRepresentable(vr) ) + { + ////// Neither ValEntry NOR BinEntry: should mean UNKOWN VR + gdcmWarningMacro( std::hex << newDocEntry->GetGroup() + << "|" << newDocEntry->GetElement() + << " : 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 ( dynamic_cast< Document* > ( set ) ) + { + newBinEntry->SetKey( newBinEntry->GetKey() ); + } + // but when "this" is a SQItem, we are inserting this new + // valEntry in a sequence item, and the key 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 - gdcmValEntry* newValEntry = - new gdcmValEntry( newDocEntry->GetDictEntry() ); - newValEntry->Copy( newDocEntry ); - - // When "set" is a gdcmDocument, then we are at the top of the + // 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 (gdcmDocument* dummy = dynamic_cast< gdcmDocument* > ( set ) ) + if ( dynamic_cast< Document* > ( set ) ) { newValEntry->SetKey( newValEntry->GetKey() ); } - // ...but when "set" is a gdcmSQItem, we are inserting this new + // ...but when "set" is a SQItem, we are inserting this new // valEntry in a sequence item. Hence the key has the - // generalized form (refer to \ref gdcmBaseTagKey): - if (gdcmSQItem* parentSQItem = dynamic_cast< gdcmSQItem* > ( set ) ) + // generalized form (refer to \ref BaseTagKey): + if (SQItem *parentSQItem = dynamic_cast< SQItem* > ( set ) ) { newValEntry->SetKey( parentSQItem->GetBaseTagKey() + newValEntry->GetKey() ); } - set->AddEntry( newValEntry ); LoadDocEntry( newValEntry ); - if (newValEntry->IsItemDelimitor()) + bool delimitor=newValEntry->IsItemDelimitor(); + if( !set->AddEntry( newValEntry ) ) { - break; - } - if ( !delim_mode && (ftell(Fp)-offset) >= l_max) - { - break; + // If here expect big troubles + //delete newValEntry; //otherwise mem leak + used=false; } - } - else - { - if ( ! gdcmGlobal::GetVR()->IsVROfGdcmBinaryRepresentable(vr) ) - { - ////// Neither ValEntry NOR BinEntry: should mean UNKOWN VR - dbg.Verbose(0, "gdcmDocument::ParseDES: neither Valentry, " - "nor BinEntry. Probably unknown VR."); - } - - //////////////////// BinEntry or UNKOWN VR: - gdcmBinEntry* newBinEntry = - new gdcmBinEntry( newDocEntry->GetDictEntry() ); - newBinEntry->Copy( newDocEntry ); - // When "this" is a gdcmDocument the Key is simply of the - // form ( group, elem )... - if (gdcmDocument* dummy = dynamic_cast< gdcmDocument* > ( set ) ) + if (delimitor) { - newBinEntry->SetKey( newBinEntry->GetKey() ); + if(!used) + delete newDocEntry; + break; } - // 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 gdcmBaseTagKey): - if (gdcmSQItem* parentSQItem = dynamic_cast< gdcmSQItem* > ( set ) ) + if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max) { - newBinEntry->SetKey( parentSQItem->GetBaseTagKey() - + newBinEntry->GetKey() ); + if(!used) + delete newDocEntry; + break; } - - set->AddEntry( newBinEntry ); - LoadDocEntry( newBinEntry ); } - if (newDocEntry->GetGroup() == 0x7fe0 && - newDocEntry->GetElement() == 0x0010 ) - { - if (newDocEntry->GetReadLength()==0xffffffff) - { - // Broken US.3405.1.dcm - Parse7FE0(); // to skip the pixels - // (multipart JPEG/RLE are trouble makers) - } - else - { - SkipToNextDocEntry(newDocEntry); - l = newDocEntry->GetFullLength(); - } - } - else - { - // to be sure we are at the beginning - SkipToNextDocEntry(newDocEntry); - l = newDocEntry->GetFullLength(); - } + // Just to make sure we are at the beginning of next entry. + SkipToNextDocEntry(newDocEntry); } else { // VR = "SQ" - l = newDocEntry->GetReadLength(); + unsigned long l = newDocEntry->GetReadLength(); if ( l != 0 ) // don't mess the delim_mode for zero-length sequence { if ( l == 0xffffffff ) @@ -1567,24 +901,22 @@ long gdcmDocument::ParseDES(gdcmDocEntrySet *set, } } // no other way to create it ... - gdcmSeqEntry* newSeqEntry = - new gdcmSeqEntry( newDocEntry->GetDictEntry() ); - newSeqEntry->Copy( newDocEntry ); newSeqEntry->SetDelimitorMode( delim_mode ); - // At the top of the hierarchy, stands a gdcmDocument. When "set" - // is a gdcmDocument, then we are building the first depth level. - // Hence the gdcmSeqEntry we are building simply has a depth + // At the top of the hierarchy, stands a Document. When "set" + // 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 (gdcmDocument* dummy = dynamic_cast< gdcmDocument* > ( set ) ) + if (/*Document *dummy =*/ dynamic_cast< Document* > ( set ) ) { + //(void)dummy; newSeqEntry->SetDepthLevel( 1 ); newSeqEntry->SetKey( newSeqEntry->GetKey() ); } - // But when "set" is allready a SQItem, we are building a nested - // sequence, and hence the depth level of the new gdcmSeqEntry + // But when "set" is already a SQItem, we are building a nested + // sequence, and hence the depth level of the new SeqEntry // we are building, is one level deeper: - if (gdcmSQItem* parentSQItem = dynamic_cast< gdcmSQItem* > ( set ) ) + if (SQItem *parentSQItem = dynamic_cast< SQItem* > ( set ) ) { newSeqEntry->SetDepthLevel( parentSQItem->GetDepthLevel() + 1 ); newSeqEntry->SetKey( parentSQItem->GetBaseTagKey() @@ -1593,34 +925,43 @@ long gdcmDocument::ParseDES(gdcmDocEntrySet *set, if ( l != 0 ) { // Don't try to parse zero-length sequences - (void)ParseSQ( newSeqEntry, - newDocEntry->GetOffset(), - l, delim_mode); + ParseSQ( newSeqEntry, + newDocEntry->GetOffset(), + l, delim_mode); + } + if( !set->AddEntry( newSeqEntry ) ) + { + used = false; } - set->AddEntry( newSeqEntry ); - if ( !delim_mode && (ftell(Fp)-offset) >= l_max) + if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max) { + if( !used ) + delete newDocEntry; break; } } - delete newDocEntry; + + if( !used ) + delete newDocEntry; } - return l; // Probably useless } /** * \brief Parses a Sequence ( SeqEntry after SeqEntry) * @return parsed length for this level */ -long gdcmDocument::ParseSQ( gdcmSeqEntry* seqEntry, - long offset, long l_max, bool delim_mode) +void Document::ParseSQ( SeqEntry *seqEntry, + long offset, long l_max, bool delim_mode) { int SQItemNumber = 0; bool dlm_mod; + long offsetStartCurrentSQItem = offset; while (true) { - gdcmDocEntry* newDocEntry = ReadNextDocEntry(); + // the first time, we read the fff0,e000 of the first SQItem + DocEntry *newDocEntry = ReadNextDocEntry(); + if ( !newDocEntry ) { // FIXME Should warn user @@ -1630,16 +971,17 @@ long gdcmDocument::ParseSQ( gdcmSeqEntry* seqEntry, { if ( newDocEntry->IsSequenceDelimitor() ) { - seqEntry->SetSequenceDelimitationItem( newDocEntry ); + seqEntry->SetDelimitationItem( newDocEntry ); break; } } - if ( !delim_mode && (ftell(Fp)-offset) >= l_max) + if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max) { - break; + delete newDocEntry; + break; } - - gdcmSQItem *itemSQ = new gdcmSQItem( seqEntry->GetDepthLevel() ); + // create the current SQItem + SQItem *itemSQ = new SQItem( seqEntry->GetDepthLevel() ); std::ostringstream newBase; newBase << seqEntry->GetKey() << "/" @@ -1656,34 +998,43 @@ long gdcmDocument::ParseSQ( gdcmSeqEntry* seqEntry, { dlm_mod = false; } - - (void)ParseDES(itemSQ, newDocEntry->GetOffset(), l, dlm_mod); - - seqEntry->AddEntry( itemSQ, SQItemNumber ); + // 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 + delete newDocEntry; + Fp->seekg(offsetStartCurrentSQItem, std::ios::beg); + // fill up the current SQItem, starting at the beginning of fff0,e000 + ParseDES(itemSQ, offsetStartCurrentSQItem, l+8, dlm_mod); + offsetStartCurrentSQItem = Fp->tellg(); + // end try ----------------- + + seqEntry->AddSQItem( itemSQ, SQItemNumber ); SQItemNumber++; - if ( !delim_mode && ( ftell(Fp) - offset ) >= l_max ) + if ( !delim_mode && ((long)(Fp->tellg())-offset ) >= l_max ) { break; } } - - int lgth = ftell(Fp) - offset; - return lgth; } /** - * \brief Loads the element content if its length doesn't exceed - * the value specified with gdcmDocument::SetMaxSizeLoadEntry() - * @param entry Header Entry (Dicom Element) to be dealt with + * \brief Loads the element content if its length doesn't exceed + * the value specified with Document::SetMaxSizeLoadEntry() + * @param entry Header Entry (Dicom Element) to be dealt with */ -void gdcmDocument::LoadDocEntry(gdcmDocEntry* entry) +void Document::LoadDocEntry(DocEntry *entry) { - size_t item_read; uint16_t group = entry->GetGroup(); std::string vr = entry->GetVR(); uint32_t length = entry->GetLength(); - fseek(Fp, (long)entry->GetOffset(), SEEK_SET); + Fp->seekg((long)entry->GetOffset(), std::ios::beg); // A SeQuence "contains" a set of Elements. // (fffe e000) tells us an Element is beginning @@ -1698,7 +1049,7 @@ void gdcmDocument::LoadDocEntry(gdcmDocEntry* entry) // When the length is zero things are easy: if ( length == 0 ) { - ((gdcmValEntry *)entry)->SetValue(""); + ((ValEntry *)entry)->SetValue(""); return; } @@ -1709,7 +1060,7 @@ void gdcmDocument::LoadDocEntry(gdcmDocEntry* entry) std::ostringstream s; if (length > MaxSizeLoadEntry) { - if (gdcmBinEntry* binEntryPtr = dynamic_cast< gdcmBinEntry* >(entry) ) + if (BinEntry *binEntryPtr = dynamic_cast< BinEntry* >(entry) ) { //s << "gdcm::NotLoaded (BinEntry)"; s << GDCM_NOTLOADED; @@ -1718,8 +1069,8 @@ void gdcmDocument::LoadDocEntry(gdcmDocEntry* entry) s << " x(" << std::hex << entry->GetLength() << ")"; binEntryPtr->SetValue(s.str()); } - // Be carefull : a BinEntry IS_A ValEntry ... - else if (gdcmValEntry* valEntryPtr = dynamic_cast< gdcmValEntry* >(entry) ) + // Be carefull : a BinEntry IS_A ValEntry ... + else if (ValEntry *valEntryPtr = dynamic_cast< ValEntry* >(entry) ) { // s << "gdcm::NotLoaded. (ValEntry)"; s << GDCM_NOTLOADED; @@ -1731,24 +1082,25 @@ void gdcmDocument::LoadDocEntry(gdcmDocEntry* entry) else { // fusible - std::cout<< "MaxSizeLoadEntry exceeded, neither a BinEntry " - << "nor a ValEntry ?! Should never print that !" << std::endl; + gdcmErrorMacro( "MaxSizeLoadEntry exceeded, neither a BinEntry " + << "nor a ValEntry ?! Should never print that !" ); } // to be sure we are at the end of the value ... - fseek(Fp,(long)entry->GetOffset()+(long)entry->GetLength(),SEEK_SET); + Fp->seekg((long)entry->GetOffset()+(long)entry->GetLength(), + std::ios::beg); return; } // When we find a BinEntry not very much can be done : - if (gdcmBinEntry* binEntryPtr = dynamic_cast< gdcmBinEntry* >(entry) ) + if (BinEntry *binEntryPtr = dynamic_cast< BinEntry* >(entry) ) { - s << "gdcm::Loaded (BinEntry)"; + s << GDCM_BINLOADED; binEntryPtr->SetValue(s.str()); - LoadEntryVoidArea(binEntryPtr); // last one, not to erase length ! + LoadEntryBinArea(binEntryPtr); // last one, not to erase length ! return; } - + /// \todo Any compacter code suggested (?) if ( IsDocEntryAnInteger(entry) ) { @@ -1794,25 +1146,35 @@ void gdcmDocument::LoadDocEntry(gdcmDocEntry* entry) s << std::ends; // to avoid oddities on Solaris #endif //GDCM_NO_ANSI_STRING_STREAM - ((gdcmValEntry *)entry)->SetValue(s.str()); + ((ValEntry *)entry)->SetValue(s.str()); return; } - // We need an additional byte for storing \0 that is not on disk - //std::string newValue(length,0); - //item_read = fread(&(newValue[0]), (size_t)length, (size_t)1, Fp); - //rah !! I can't believe it could work, normally this is a const char* !!! + // FIXME: We need an additional byte for storing \0 that is not on disk char *str = new char[length+1]; - item_read = fread(str, (size_t)length, (size_t)1, Fp); - str[length] = '\0'; - std::string newValue = str; + Fp->read(str, (size_t)length); + str[length] = '\0'; //this is only useful when length is odd + // Special DicomString call to properly handle \0 and even length + std::string newValue; + if( length % 2 ) + { + newValue = Util::DicomString(str, length+1); + gdcmWarningMacro("Warning: bad length: " << length << + ",For string :" << newValue.c_str()); + // Since we change the length of string update it length + //entry->SetReadLength(length+1); + } + else + { + newValue = Util::DicomString(str, length); + } delete[] str; - if ( gdcmValEntry* valEntry = dynamic_cast(entry) ) - { - if ( item_read != 1 ) + + if ( ValEntry *valEntry = dynamic_cast(entry) ) + { + if ( Fp->fail() || Fp->eof()) { - dbg.Verbose(1, "gdcmDocument::LoadDocEntry", - "unread element value"); + gdcmWarningMacro("Unread element value"); valEntry->SetValue(GDCM_UNREAD); return; } @@ -1829,54 +1191,55 @@ void gdcmDocument::LoadDocEntry(gdcmDocEntry* entry) } else { - dbg.Error(true, "gdcmDocument::LoadDocEntry" - "Should have a ValEntry, here !"); + gdcmErrorMacro( "Should have a ValEntry, here !"); } } - /** * \brief Find the value Length of the passed Header Entry * @param entry Header Entry whose length of the value shall be loaded. */ -void gdcmDocument::FindDocEntryLength( gdcmDocEntry *entry ) - throw ( gdcmFormatError ) +void Document::FindDocEntryLength( DocEntry *entry ) + throw ( FormatError ) { - uint16_t element = entry->GetElement(); std::string vr = entry->GetVR(); uint16_t length16; - if ( Filetype == gdcmExplicitVR && !entry->IsImplicitVR() ) + if ( Filetype == ExplicitVR && !entry->IsImplicitVR() ) { if ( vr == "OB" || vr == "OW" || vr == "SQ" || vr == "UN" ) { - // The following reserved two bytes (see PS 3.5-2001, section - // 7.1.2 Data element structure with explicit vr p27) must be + // The following reserved two bytes (see PS 3.5-2003, section + // "7.1.2 Data element structure with explicit vr", p 27) must be // skipped before proceeding on reading the length on 4 bytes. - fseek(Fp, 2L, SEEK_CUR); + Fp->seekg( 2L, std::ios::cur); uint32_t length32 = ReadInt32(); - if ( vr == "OB" && length32 == 0xffffffff ) + if ( (vr == "OB" || vr == "OW") && length32 == 0xffffffff ) { uint32_t lengthOB; try { - lengthOB = FindDocEntryLengthOB(); + lengthOB = FindDocEntryLengthOBOrOW(); } - catch ( gdcmFormatUnexpected ) + catch ( FormatUnexpected ) { // Computing the length failed (this happens with broken // files like gdcm-JPEG-LossLess3a.dcm). We still have a // chance to get the pixels by deciding the element goes // until the end of the file. Hence we artificially fix the // the length and proceed. - long currentPosition = ftell(Fp); - fseek(Fp,0L,SEEK_END); - long lengthUntilEOF = ftell(Fp) - currentPosition; - fseek(Fp, currentPosition, SEEK_SET); + long currentPosition = Fp->tellg(); + Fp->seekg(0L,std::ios::end); + + long lengthUntilEOF = (long)(Fp->tellg())-currentPosition; + Fp->seekg(currentPosition, std::ios::beg); + + entry->SetReadLength(lengthUntilEOF); entry->SetLength(lengthUntilEOF); return; } + entry->SetReadLength(lengthOB); entry->SetLength(lengthOB); return; } @@ -1886,6 +1249,14 @@ void gdcmDocument::FindDocEntryLength( gdcmDocEntry *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 @@ -1906,6 +1277,8 @@ void gdcmDocument::FindDocEntryLength( gdcmDocEntry *entry ) // 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 @@ -1914,36 +1287,39 @@ void gdcmDocument::FindDocEntryLength( gdcmDocEntry *entry ) // 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 ) - { - if ( !IsExplicitVRBigEndianTransferSyntax() ) - { - throw gdcmFormatError( "gdcmDocument::FindDocEntryLength()", - " not explicit VR." ); - return; - } - length16 = 4; - SwitchSwapToBigEndian(); - // 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() ); - gdcmDictEntry* newTag = GetDictEntryByNumber( 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 ); - } - - // Heuristic: well, some files are really ill-formed. + +// 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 if ( length16 == 0xffff) - { - // 0xffff means that we deal with 'Unknown Length' Sequence + { length16 = 0; } FixDocEntryFoundLength( entry, (uint32_t)length16 ); @@ -1957,6 +1333,9 @@ void gdcmDocument::FindDocEntryLength( gdcmDocEntry *entry ) // on Data elements "Implicit and Explicit VR Data Elements shall // not coexist in a Data Set and Data Sets nested within it".] // Length is on 4 bytes. + + // Well ... group 0002 is always coded in 'Explicit VR Litle Endian' + // even if Transfer Syntax is 'Implicit VR ...' FixDocEntryFoundLength( entry, ReadInt32() ); return; @@ -1964,19 +1343,72 @@ void gdcmDocument::FindDocEntryLength( gdcmDocEntry *entry ) } /** - * \brief Find the Value Representation of the current Dicom Element. - * @param entry + * \brief Find the Length till the next sequence delimiter + * \warning NOT end user intended method ! + * @return */ -void gdcmDocument::FindDocEntryVR( gdcmDocEntry *entry ) +uint32_t Document::FindDocEntryLengthOBOrOW() + throw( FormatUnexpected ) { - if ( Filetype != gdcmExplicitVR ) + // See PS 3.5-2001, section A.4 p. 49 on encapsulation of encoded pixel data. + long positionOnEntry = Fp->tellg(); + bool foundSequenceDelimiter = false; + uint32_t totalLength = 0; + + while ( !foundSequenceDelimiter ) { - return; + uint16_t group; + uint16_t elem; + try + { + group = ReadInt16(); + elem = ReadInt16(); + } + catch ( FormatError ) + { + throw FormatError("Unexpected end of file encountered during ", + "Document::FindDocEntryLengthOBOrOW()"); + } + // We have to decount the group and element we just read + totalLength += 4; + if ( group != 0xfffe || ( ( elem != 0xe0dd ) && ( elem != 0xe000 ) ) ) + { + long filePosition = Fp->tellg(); + 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."); + } + if ( elem == 0xe0dd ) + { + foundSequenceDelimiter = true; + } + uint32_t itemLength = ReadInt32(); + // We add 4 bytes since we just read the ItemLength with ReadInt32 + totalLength += itemLength + 4; + SkipBytes(itemLength); + + if ( foundSequenceDelimiter ) + { + break; + } } + Fp->seekg( positionOnEntry, std::ios::beg); + return totalLength; +} - char vr[3]; +/** + * \brief Find the Value Representation of the current Dicom Element. + * @return Value Representation of the current Entry + */ +std::string Document::FindDocEntryVR() +{ + if ( Filetype != ExplicitVR ) + return GDCM_UNKNOWN; - long positionOnEntry = ftell(Fp); + long positionOnEntry = Fp->tellg(); // Warning: we believe this is explicit VR (Value Representation) because // we used a heuristic that found "UL" in the first tag. Alas this // doesn't guarantee that all the tags will be in explicit VR. In some @@ -1984,105 +1416,31 @@ void gdcmDocument::FindDocEntryVR( gdcmDocEntry *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. - - fread (vr, (size_t)2,(size_t)1, Fp); + + char vr[3]; + Fp->read (vr, (size_t)2); vr[2] = 0; - if( !CheckDocEntryVR(entry, vr) ) + if( !CheckDocEntryVR(vr) ) { - fseek(Fp, positionOnEntry, SEEK_SET); - // 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(); + Fp->seekg(positionOnEntry, std::ios::beg); + 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 gdcmDocument::CheckDocEntryVR(gdcmDocEntry *entry, gdcmVRKey vr) +bool Document::CheckDocEntryVR(VRKey vr) { - char msg[100]; // for sprintf - 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(vr[0]) && !isalpha(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 && !gdcmGlobal::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. - sprintf(msg,"Falsely explicit vr file (%04x,%04x)\n", - entry->GetGroup(), entry->GetElement()); - dbg.Verbose(1, "gdcmDocument::FindVR: ",msg); - - if( entry->GetGroup() % 2 && entry->GetElement() == 0x0000) - { - // Group length is UL ! - gdcmDictEntry* 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. - gdcmDictEntry* newEntry = NewVirtualDictEntry( - entry->GetGroup(), entry->GetElement(), - vr, "FIXME", entry->GetName()); - entry->SetDictEntry(newEntry); - } return true; } @@ -2094,11 +1452,11 @@ bool gdcmDocument::CheckDocEntryVR(gdcmDocEntry *entry, gdcmVRKey vr) * @param entry entry to tranform * @return Transformed entry value */ -std::string gdcmDocument::GetDocEntryValue(gdcmDocEntry *entry) +std::string Document::GetDocEntryValue(DocEntry *entry) { if ( IsDocEntryAnInteger(entry) && entry->IsImplicitVR() ) { - std::string val = ((gdcmValEntry *)entry)->GetValue(); + std::string val = ((ValEntry *)entry)->GetValue(); std::string vr = entry->GetVR(); uint32_t length = entry->GetLength(); std::ostringstream s; @@ -2158,8 +1516,7 @@ std::string gdcmDocument::GetDocEntryValue(gdcmDocEntry *entry) #endif //GDCM_NO_ANSI_STRING_STREAM return s.str(); } - - return ((gdcmValEntry *)entry)->GetValue(); + return ((ValEntry *)entry)->GetValue(); } /** @@ -2170,7 +1527,7 @@ std::string gdcmDocument::GetDocEntryValue(gdcmDocEntry *entry) * @param entry Entry to reverse transform * @return Reverse transformed entry value */ -std::string gdcmDocument::GetDocEntryUnvalue(gdcmDocEntry* entry) +std::string Document::GetDocEntryUnvalue(DocEntry *entry) { if ( IsDocEntryAnInteger(entry) && entry->IsImplicitVR() ) { @@ -2183,7 +1540,7 @@ std::string gdcmDocument::GetDocEntryUnvalue(gdcmDocEntry* entry) uint16_t newInt16; tokens.erase( tokens.begin(), tokens.end()); // clean any previous value - Tokenize (((gdcmValEntry *)entry)->GetValue(), tokens, "\\"); + Util::Tokenize (((ValEntry *)entry)->GetValue(), tokens, "\\"); for (unsigned int i=0; iGetValue(), tokens, "\\"); + Util::Tokenize (((ValEntry *)entry)->GetValue(), tokens, "\\"); for (unsigned int i=0; iGetValue(); + return ((ValEntry *)entry)->GetValue(); } /** @@ -2223,20 +1580,21 @@ std::string gdcmDocument::GetDocEntryUnvalue(gdcmDocEntry* entry) * \warning NOT end user intended method ! * @param entry entry to skip */ -void gdcmDocument::SkipDocEntry(gdcmDocEntry *entry) +void Document::SkipDocEntry(DocEntry *entry) { SkipBytes(entry->GetLength()); } /** - * \brief Skips to the begining of the next Header Entry + * \brief Skips to the beginning of the next Header Entry * \warning NOT end user intended method ! - * @param entry entry to skip + * @param currentDocEntry entry to skip */ -void gdcmDocument::SkipToNextDocEntry(gdcmDocEntry *entry) +void Document::SkipToNextDocEntry(DocEntry *currentDocEntry) { - fseek(Fp, (long)(entry->GetOffset()), SEEK_SET); - fseek(Fp, (long)(entry->GetReadLength()), SEEK_CUR); + Fp->seekg((long)(currentDocEntry->GetOffset()), std::ios::beg); + if (currentDocEntry->GetGroup() != 0xfffe) // for fffe pb + Fp->seekg( (long)(currentDocEntry->GetReadLength()),std::ios::cur); } /** @@ -2244,10 +1602,10 @@ void gdcmDocument::SkipToNextDocEntry(gdcmDocEntry *entry) * the parser went Jabberwocky) one can hope improving things by * applying some heuristics. * @param entry entry to check - * @param foundLength fist assumption about length + * @param foundLength first assumption about length */ -void gdcmDocument::FixDocEntryFoundLength(gdcmDocEntry *entry, - uint32_t foundLength) +void Document::FixDocEntryFoundLength(DocEntry *entry, + uint32_t foundLength) { entry->SetReadLength( foundLength ); // will be updated only if a bug is found if ( foundLength == 0xffffffff) @@ -2255,30 +1613,25 @@ void gdcmDocument::FixDocEntryFoundLength(gdcmDocEntry *entry, foundLength = 0; } - uint16_t gr = entry->GetGroup(); - uint16_t el = entry->GetElement(); + uint16_t gr = entry->GetGroup(); + uint16_t elem = entry->GetElement(); if ( foundLength % 2) { - std::ostringstream s; - s << "Warning : Tag with uneven length " - << foundLength - << " in x(" << std::hex << gr << "," << el <<")" << std::dec; - dbg.Verbose(0, s.str().c_str()); + gdcmWarningMacro( "Warning : Tag with uneven length " << foundLength + << " in x(" << std::hex << gr << "," << elem <<")"); } //////// Fix for some naughty General Electric images. // 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 user (we are talking a few years, here)... + // 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 // those pesky GE images ... if ( foundLength == 13) { // Only happens for this length ! - if ( entry->GetGroup() != 0x0008 - || ( entry->GetElement() != 0x0070 - && entry->GetElement() != 0x0080 ) ) + if ( gr != 0x0008 || ( elem != 0x0070 && elem != 0x0080 ) ) { foundLength = 10; entry->SetReadLength(10); /// \todo a bug is to be fixed !? @@ -2289,9 +1642,7 @@ void gdcmDocument::FixDocEntryFoundLength(gdcmDocEntry *entry, // Occurence of such images is quite low (unless one leaves close to a // 'Leonardo' source. Hence, one might consider commenting out the // following fix on efficiency reasons. - else if ( entry->GetGroup() == 0x0009 - && ( entry->GetElement() == 0x1113 - || entry->GetElement() == 0x1114 ) ) + else if ( gr == 0x0009 && ( elem == 0x1113 || elem == 0x1114 ) ) { foundLength = 4; entry->SetReadLength(4); /// \todo a bug is to be fixed !? @@ -2305,7 +1656,7 @@ void gdcmDocument::FixDocEntryFoundLength(gdcmDocEntry *entry, //////// We encountered a 'delimiter' element i.e. a tag of the form // "fffe|xxxx" which is just a marker. Delimiters length should not be // taken into account. - else if( entry->GetGroup() == 0xfffe ) + else if( gr == 0xfffe ) { // According to the norm, fffe|0000 shouldn't exist. BUT the Philips // image gdcmData/gdcm-MR-PHILIPS-16-Multi-Seq.dcm happens to @@ -2314,9 +1665,8 @@ void gdcmDocument::FixDocEntryFoundLength(gdcmDocEntry *entry, { foundLength = 0; } - } - - entry->SetUsableLength(foundLength); + } + entry->SetLength(foundLength); } /** @@ -2325,17 +1675,17 @@ void gdcmDocument::FixDocEntryFoundLength(gdcmDocEntry *entry, * @param entry The element value on which to apply the predicate. * @return The result of the heuristical predicate. */ -bool gdcmDocument::IsDocEntryAnInteger(gdcmDocEntry *entry) +bool Document::IsDocEntryAnInteger(DocEntry *entry) { - uint16_t element = entry->GetElement(); - uint16_t group = entry->GetGroup(); - 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 // able to swap it's element value properly. - if ( element == 0 ) // This is the group length of the group + if ( elem == 0 ) // This is the group length of the group { if ( length == 4 ) { @@ -2350,150 +1700,21 @@ bool gdcmDocument::IsDocEntryAnInteger(gdcmDocEntry *entry) // test is useless (and might even look a bit paranoid), when we // encounter such an ill-formed image, we simply display a warning // message and proceed on parsing (while crossing fingers). - std::ostringstream s; - int filePosition = ftell(Fp); - s << "Erroneous Group Length element length on : (" \ - << std::hex << group << " , " << element + long filePosition = Fp->tellg(); + gdcmWarningMacro( "Erroneous Group Length element length on : (" + << std::hex << group << " , " << elem << ") -before- position x(" << filePosition << ")" - << "lgt : " << length; - dbg.Verbose(0, "gdcmDocument::IsDocEntryAnInteger", s.str().c_str() ); + << "lgt : " << length ); } } if ( vr == "UL" || vr == "US" || vr == "SL" || vr == "SS" ) { return true; - } - + } return false; } -/** - * \brief Find the Length till the next sequence delimiter - * \warning NOT end user intended method ! - * @return - */ - -uint32_t gdcmDocument::FindDocEntryLengthOB() - throw( gdcmFormatUnexpected ) -{ - // See PS 3.5-2001, section A.4 p. 49 on encapsulation of encoded pixel data. - long positionOnEntry = ftell(Fp); - bool foundSequenceDelimiter = false; - uint32_t totalLength = 0; - - while ( !foundSequenceDelimiter ) - { - uint16_t group; - uint16_t elem; - try - { - group = ReadInt16(); - elem = ReadInt16(); - } - catch ( gdcmFormatError ) - { - throw gdcmFormatError("gdcmDocument::FindDocEntryLengthOB()", - " group or element not present."); - } - - // We have to decount the group and element we just read - totalLength += 4; - - if ( group != 0xfffe || ( ( elem != 0xe0dd ) && ( elem != 0xe000 ) ) ) - { - dbg.Verbose(1, "gdcmDocument::FindDocEntryLengthOB: neither an Item " - "tag nor a Sequence delimiter tag."); - fseek(Fp, positionOnEntry, SEEK_SET); - throw gdcmFormatUnexpected("gdcmDocument::FindDocEntryLengthOB()", - "Neither an Item tag nor a Sequence " - "delimiter tag."); - } - - if ( elem == 0xe0dd ) - { - foundSequenceDelimiter = true; - } - - uint32_t itemLength = ReadInt32(); - // We add 4 bytes since we just read the ItemLength with ReadInt32 - totalLength += itemLength + 4; - SkipBytes(itemLength); - - if ( foundSequenceDelimiter ) - { - break; - } - } - fseek(Fp, positionOnEntry, SEEK_SET); - return totalLength; -} - -/** - * \brief Reads a supposed to be 16 Bits integer - * (swaps it depending on processor endianity) - * @return read value - */ -uint16_t gdcmDocument::ReadInt16() - throw( gdcmFormatError ) -{ - uint16_t g; - size_t item_read = fread (&g, (size_t)2,(size_t)1, Fp); - if ( item_read != 1 ) - { - if( ferror(Fp) ) - { - throw gdcmFormatError( "gdcmDocument::ReadInt16()", " file error." ); - } - throw gdcmFormatError( "gdcmDocument::ReadInt16()", "EOF." ); - } - g = SwapShort(g); - return g; -} - -/** - * \brief Reads a supposed to be 32 Bits integer - * (swaps it depending on processor endianity) - * @return read value - */ -uint32_t gdcmDocument::ReadInt32() - throw( gdcmFormatError ) -{ - uint32_t g; - size_t item_read = fread (&g, (size_t)4,(size_t)1, Fp); - if ( item_read != 1 ) - { - if( ferror(Fp) ) - { - throw gdcmFormatError( "gdcmDocument::ReadInt16()", " file error." ); - } - throw gdcmFormatError( "gdcmDocument::ReadInt32()", "EOF." ); - } - g = SwapLong(g); - return g; -} - -/** - * \brief skips bytes inside the source file - * \warning NOT end user intended method ! - * @return - */ -void gdcmDocument::SkipBytes(uint32_t nBytes) -{ - //FIXME don't dump the returned value - (void)fseek(Fp, (long)nBytes, SEEK_CUR); -} - -/** - * \brief Loads all the needed Dictionaries - * \warning NOT end user intended method ! - */ -void gdcmDocument::Initialise() -{ - RefPubDict = gdcmGlobal::GetDicts()->GetDefaultPubDict(); - RefShaDict = NULL; -} - /** * \brief Discover what the swap code is (among little endian, big endian, * bad little endian, bad big endian). @@ -2502,7 +1723,7 @@ void gdcmDocument::Initialise() * it's neither ACR-NEMA nor DICOM * true when we hope ours assuptions are OK */ -bool gdcmDocument::CheckSwap() +bool Document::CheckSwap() { // The only guaranted way of finding the swap code is to find a // group tag since we know it's length has to be of four bytes i.e. @@ -2514,7 +1735,7 @@ bool gdcmDocument::CheckSwap() uint32_t s32; uint16_t s16; - char deb[HEADER_LENGTH_TO_READ]; + char deb[256]; // First, compare HostByteOrder and NetworkByteOrder in order to // determine if we shall need to swap bytes (i.e. the Endian type). @@ -2527,26 +1748,24 @@ bool gdcmDocument::CheckSwap() net2host = false; } - // The easiest case is the one of a DICOM header, since it possesses a - // file preamble where it suffice to look for the string "DICM". - int lgrLue = fread(deb, 1, HEADER_LENGTH_TO_READ, Fp); - (void)lgrLue; //FIXME not used + // The easiest case is the one of a 'true' DICOM header, we just have + // to look for the string "DICM" inside the file preamble. + Fp->read(deb, 256); char *entCur = deb + 128; if( memcmp(entCur, "DICM", (size_t)4) == 0 ) { - dbg.Verbose(1, "gdcmDocument::CheckSwap:", "looks like DICOM Version3"); + gdcmWarningMacro( "Looks like DICOM Version3 (preamble + DCM)" ); - // Next, determine the value representation (VR). Let's skip to the - // first element (0002, 0000) and check there if we find "UL" - // - or "OB" if the 1st one is (0002,0001) -, + // Group 0002 should always be VR, and the first element 0000 + // Let's be carefull (so many wrong headers ...) + // and determine the value representation (VR) : + // Let's skip to the first element (0002,0000) and check there if we find + // "UL" - or "OB" if the 1st one is (0002,0001) -, // in which case we (almost) know it is explicit VR. // WARNING: if it happens to be implicit VR then what we will read // is the length of the group. If this ascii representation of this // length happens to be "UL" then we shall believe it is explicit VR. - // FIXME: in order to fix the above warning, we could read the next - // element value (or a couple of elements values) in order to make - // sure we are not commiting a big mistake. // We need to skip : // * the 128 bytes of File Preamble (often padded with zeroes), // * the 4 bytes of "DICM" string, @@ -2554,56 +1773,52 @@ bool gdcmDocument::CheckSwap() // i.e. a total of 136 bytes. entCur = deb + 136; - // FIXME : FIXME: - // Sometimes (see : gdcmData/icone.dcm) group 0x0002 *is* Explicit VR, - // but elem 0002,0010 (Transfert Syntax) tells us the file is - // *Implicit* VR. -and it is !- + // group 0x0002 *is always* Explicit VR Sometimes , + // even if elem 0002,0010 (Transfer Syntax) tells us the file is + // *Implicit* VR (see former 'gdcmData/icone.dcm') if( memcmp(entCur, "UL", (size_t)2) == 0 || memcmp(entCur, "OB", (size_t)2) == 0 || memcmp(entCur, "UI", (size_t)2) == 0 || memcmp(entCur, "CS", (size_t)2) == 0 ) // CS, to remove later - // when Write DCM *adds* + // when Write DCM *adds* // FIXME - // Use gdcmDocument::dicom_vr to test all the possibilities + // Use Document::dicom_vr to test all the possibilities // instead of just checking for UL, OB and UI !? group 0000 { - Filetype = gdcmExplicitVR; - dbg.Verbose(1, "gdcmDocument::CheckSwap:", - "explicit Value Representation"); + Filetype = ExplicitVR; + gdcmWarningMacro( "Group 0002 : Explicit Value Representation"); } else { - Filetype = gdcmImplicitVR; - dbg.Verbose(1, "gdcmDocument::CheckSwap:", - "not an explicit Value Representation"); + Filetype = ImplicitVR; + gdcmWarningMacro( "Group 0002 :Not an explicit Value Representation;" + << "Looks like a bugged Header!"); } if ( net2host ) { SwapCode = 4321; - dbg.Verbose(1, "gdcmDocument::CheckSwap:", - "HostByteOrder != NetworkByteOrder"); + gdcmWarningMacro( "HostByteOrder != NetworkByteOrder"); } else { - SwapCode = 0; - dbg.Verbose(1, "gdcmDocument::CheckSwap:", - "HostByteOrder = NetworkByteOrder"); + SwapCode = 1234; + gdcmWarningMacro( "HostByteOrder = NetworkByteOrder"); } - // Position the file position indicator at first tag (i.e. - // after the file preamble and the "DICM" string). - rewind(Fp); - fseek (Fp, 132L, SEEK_SET); + // 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 ( 132L, std::ios::beg); return true; } // 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). - dbg.Verbose(1, "gdcmDocument::CheckSwap:", "not a DICOM Version3 file"); - rewind(Fp); + gdcmWarningMacro( "Not a DICOM Version3 file"); + Fp->seekg(0, std::ios::beg); // 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. @@ -2615,24 +1830,24 @@ bool gdcmDocument::CheckSwap() // representation of a 32 bits integer. Hence the following dirty // trick : s32 = *((uint32_t *)(entCur)); - + switch( s32 ) { case 0x00040000 : SwapCode = 3412; - Filetype = gdcmACR; + Filetype = ACR; return true; case 0x04000000 : SwapCode = 4321; - Filetype = gdcmACR; + Filetype = ACR; return true; case 0x00000400 : SwapCode = 2143; - Filetype = gdcmACR; + Filetype = ACR; return true; case 0x00000004 : - SwapCode = 0; - Filetype = gdcmACR; + SwapCode = 1234; + Filetype = ACR; return true; default : // We are out of luck. It is not a DicomV3 nor a 'clean' ACR/NEMA file. @@ -2640,13 +1855,13 @@ bool gdcmDocument::CheckSwap() // So, let's check if this file wouldn't happen to be 'dirty' ACR/NEMA, // i.e. the 'group length' element is not present : - // check the supposed to be 'group number' - // 0x0002 or 0x0004 or 0x0008 + // check the supposed-to-be 'group number' + // in ( 0x0001 .. 0x0008 ) // to determine ' SwapCode' value . // Only 0 or 4321 will be possible // (no oportunity to check for the formerly well known // ACR-NEMA 'Bad Big Endian' or 'Bad Little Endian' - // if unsuccessfull (i.e. neither 0x0002 nor 0x0200 etc -4, 8-) + // if unsuccessfull (i.e. neither 0x0002 nor 0x0200 etc -3, 4, ..., 8-) // the file IS NOT ACR-NEMA nor DICOM V3 // Find a trick to tell it the caller... @@ -2654,48 +1869,49 @@ bool gdcmDocument::CheckSwap() switch ( s16 ) { + case 0x0001 : case 0x0002 : + case 0x0003 : case 0x0004 : - case 0x0008 : - SwapCode = 0; - Filetype = gdcmACR; + case 0x0005 : + case 0x0006 : + case 0x0007 : + case 0x0008 : + SwapCode = 1234; + Filetype = ACR; return true; + case 0x0100 : case 0x0200 : + case 0x0300 : case 0x0400 : - case 0x0800 : + case 0x0500 : + case 0x0600 : + case 0x0700 : + case 0x0800 : SwapCode = 4321; - Filetype = gdcmACR; + Filetype = ACR; return true; default : - dbg.Verbose(0, "gdcmDocument::CheckSwap:", - "ACR/NEMA unfound swap info (Really hopeless !)"); - Filetype = gdcmUnknown; + gdcmWarningMacro( "ACR/NEMA unfound swap info (Really hopeless !)"); + Filetype = Unknown; return false; } - // Then the only info we have is the net2host one. - //if (! net2host ) - // SwapCode = 0; - //else - // SwapCode = 4321; - //return; } } /** - * \brief Restore the unproperly loaded values i.e. the group, the element - * and the dictionary entry depending on them. + * \brief Change the Byte Swap code. */ -void gdcmDocument::SwitchSwapToBigEndian() +void Document::SwitchByteSwapCode() { - dbg.Verbose(1, "gdcmDocument::SwitchSwapToBigEndian", - "Switching to BigEndian mode."); - if ( SwapCode == 0 ) + gdcmWarningMacro( "Switching Byte Swap code from "<< SwapCode); + if ( SwapCode == 1234 ) { SwapCode = 4321; } else if ( SwapCode == 4321 ) { - SwapCode = 0; + SwapCode = 1234; } else if ( SwapCode == 3412 ) { @@ -2711,7 +1927,7 @@ void gdcmDocument::SwitchSwapToBigEndian() * \brief during parsing, Header Elements too long are not loaded in memory * @param newSize */ -void gdcmDocument::SetMaxSizeLoadEntry(long newSize) +void Document::SetMaxSizeLoadEntry(long newSize) { if ( newSize < 0 ) { @@ -2725,15 +1941,13 @@ void gdcmDocument::SetMaxSizeLoadEntry(long newSize) MaxSizeLoadEntry = newSize; } - /** * \brief Header Elements too long will not be printed - * \todo See comments of \ref gdcmDocument::MAX_SIZE_PRINT_ELEMENT_VALUE + * \todo See comments of \ref Document::MAX_SIZE_PRINT_ELEMENT_VALUE * @param newSize */ -void gdcmDocument::SetMaxSizePrintEntry(long newSize) +void Document::SetMaxSizePrintEntry(long newSize) { - //DOH !! This is exactly SetMaxSizeLoadEntry FIXME FIXME if ( newSize < 0 ) { return; @@ -2747,15 +1961,14 @@ void gdcmDocument::SetMaxSizePrintEntry(long newSize) } - /** * \brief Read the next tag but WITHOUT loading it's value * (read the 'Group Number', the 'Element Number', - * gets the Dict Entry + * gets the Dict Entry * gets the VR, gets the length, gets the offset value) * @return On succes the newly created DocEntry, NULL on failure. */ -gdcmDocEntry* gdcmDocument::ReadNextDocEntry() +DocEntry *Document::ReadNextDocEntry() { uint16_t group; uint16_t elem; @@ -2765,22 +1978,60 @@ gdcmDocEntry* gdcmDocument::ReadNextDocEntry() group = ReadInt16(); elem = ReadInt16(); } - catch ( gdcmFormatError e ) + catch ( FormatError e ) { // We reached the EOF (or an error occured) therefore // header parsing has to be considered as finished. - //std::cout << e; return 0; } - gdcmDocEntry *newEntry = NewDocEntryByNumber(group, elem); - FindDocEntryVR(newEntry); + // Sometimes file contains groups of tags with reversed endianess. + HandleBrokenEndian(group, elem); + + // In 'true DICOM' files Group 0002 is always little endian + if ( HasDCMPreamble ) + HandleOutOfGroup0002(group, elem); + + std::string vr = FindDocEntryVR(); + std::string realVR = vr; + + if( vr == GDCM_UNKNOWN) + { + DictEntry *dictEntry = GetDictEntry(group,elem); + if( dictEntry ) + realVR = dictEntry->GetVR(); + } + + DocEntry *newEntry; + if( Global::GetVR()->IsVROfSequence(realVR) ) + newEntry = NewSeqEntry(group, elem); + else if( Global::GetVR()->IsVROfStringRepresentable(realVR) ) + newEntry = NewValEntry(group, elem,vr); + else + newEntry = NewBinEntry(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. + if ( newEntry->GetGroup() != 0xfffe ) + { + std::string msg; + msg = Util::Format("Entry (%04x,%04x) should be Explicit VR\n", + newEntry->GetGroup(), newEntry->GetElement()); + gdcmWarningMacro( msg.c_str() ); + } + } + newEntry->SetImplicitVR(); + } try { FindDocEntryLength(newEntry); } - catch ( gdcmFormatError e ) + catch ( FormatError e ) { // Call it quits //std::cout << e; @@ -2788,279 +2039,82 @@ gdcmDocEntry* gdcmDocument::ReadNextDocEntry() return 0; } - newEntry->SetOffset(ftell(Fp)); + newEntry->SetOffset(Fp->tellg()); return newEntry; } - -/** - * \brief Generate a free gdcmTagKey i.e. a gdcmTagKey that is not present - * in the TagHt dictionary. - * @param group The generated tag must belong to this group. - * @return The element of tag with given group which is fee. - */ -uint32_t gdcmDocument::GenerateFreeTagKeyInGroup(uint16_t group) -{ - for (uint32_t elem = 0; elem < UINT32_MAX; elem++) - { - gdcmTagKey key = gdcmDictEntry::TranslateToKey(group, elem); - if (TagHT.count(key) == 0) - { - return elem; - } - } - return UINT32_MAX; -} - -/** - * \brief Assuming the internal file pointer \ref gdcmDocument::Fp - * is placed at the beginning of a tag check whether this - * tag is (TestGroup, TestElement). - * \warning On success the internal file pointer \ref gdcmDocument::Fp - * is modified to point after the tag. - * On failure (i.e. when the tag wasn't the expected tag - * (TestGroup, TestElement) the internal file pointer - * \ref gdcmDocument::Fp is restored to it's original position. - * @param testGroup The expected group of the tag. - * @param testElement The expected Element of the tag. - * @return True on success, false otherwise. - */ -bool gdcmDocument::ReadTag(uint16_t testGroup, uint16_t testElement) -{ - long positionOnEntry = ftell(Fp); - long currentPosition = ftell(Fp); // On debugging purposes - - //// Read the Item Tag group and element, and make - // sure they are what we expected: - uint16_t itemTagGroup = ReadInt16(); - uint16_t itemTagElement = ReadInt16(); - if ( itemTagGroup != testGroup || itemTagElement != testElement ) - { - std::ostringstream s; - s << " We should have found tag ("; - s << std::hex << testGroup << "," << testElement << ")" << std::endl; - s << " but instead we encountered tag ("; - s << std::hex << itemTagGroup << "," << itemTagElement << ")" - << std::endl; - s << " at address: " << (unsigned)currentPosition << std::endl; - dbg.Verbose(0, "gdcmDocument::ReadItemTagLength: wrong Item Tag found:"); - dbg.Verbose(0, s.str().c_str()); - fseek(Fp, positionOnEntry, SEEK_SET); - - return false; - } - return true; -} - /** - * \brief Assuming the internal file pointer \ref gdcmDocument::Fp - * is placed at the beginning of a tag (TestGroup, TestElement), - * read the length associated to the Tag. - * \warning On success the internal file pointer \ref gdcmDocument::Fp - * is modified to point after the tag and it's length. - * On failure (i.e. when the tag wasn't the expected tag - * (TestGroup, TestElement) the internal file pointer - * \ref gdcmDocument::Fp is restored to it's original position. - * @param testGroup The expected group of the tag. - * @param testElement The expected Element of the tag. - * @return On success returns the length associated to the tag. On failure - * returns 0. + * \brief Handle broken private tag from Philips NTSCAN + * where the endianess is being switch to BigEndian for no + * apparent reason + * @return no return */ -uint32_t gdcmDocument::ReadTagLength(uint16_t testGroup, uint16_t testElement) +void Document::HandleBrokenEndian(uint16_t &group, uint16_t &elem) { - long positionOnEntry = ftell(Fp); - (void)positionOnEntry; - - if ( !ReadTag(testGroup, testElement) ) + // Endian reversion. Some files contain groups of tags with reversed endianess. + static int reversedEndian = 0; + // try to fix endian switching in the middle of headers + if ((group == 0xfeff) && (elem == 0x00e0)) { - return 0; - } - - //// Then read the associated Item Length - long currentPosition = ftell(Fp); - uint32_t itemLength = ReadInt32(); + // start endian swap mark for group found + reversedEndian++; + SwitchByteSwapCode(); + // fix the tag + group = 0xfffe; + elem = 0xe000; + } + else if (group == 0xfffe && elem == 0xe00d && reversedEndian) { - std::ostringstream s; - s << "Basic Item Length is: " - << itemLength << std::endl; - s << " at address: " << (unsigned)currentPosition << std::endl; - dbg.Verbose(0, "gdcmDocument::ReadItemTagLength: ", s.str().c_str()); + // end of reversed endian group + reversedEndian--; + SwitchByteSwapCode(); } - return itemLength; } /** - * \brief Parse pixel data from disk for multi-fragment Jpeg/Rle files - * No other way so 'skip' the Data - * + * \brief Group 0002 is always coded Little Endian + * whatever Transfer Syntax is + * @return no return */ -void gdcmDocument::Parse7FE0 () +void Document::HandleOutOfGroup0002(uint16_t &group, uint16_t &elem) { - gdcmDocEntry* element = GetDocEntryByNumber(0x0002, 0x0010); - if ( !element ) - { - // Should warn user FIXME - return; - } - - if ( IsImplicitVRLittleEndianTransferSyntax() - || IsExplicitVRLittleEndianTransferSyntax() - || IsExplicitVRBigEndianTransferSyntax() /// \todo 1.2.2 ??? A verifier ! - || IsDeflatedExplicitVRLittleEndianTransferSyntax() ) - { - return; - } - - // ---------------- for Parsing : Position on begining of Jpeg/RLE Pixels - - //// Read the Basic Offset Table Item Tag length... - uint32_t itemLength = ReadTagLength(0xfffe, 0xe000); - - //// ... and then read length[s] itself[themselves]. We don't use - // the values read (BTW what is the purpous of those lengths ?) - if ( itemLength != 0 ) + // Endian reversion. Some files contain groups of tags with reversed endianess. + if ( !Group0002Parsed && group != 0x0002) { - // BTW, what is the purpous of those length anyhow !? - char* basicOffsetTableItemValue = new char[itemLength + 1]; - fread(basicOffsetTableItemValue, itemLength, 1, Fp); + Group0002Parsed = true; + // we just came out of group 0002 + // if Transfer syntax is Big Endian we have to change CheckSwap - for (unsigned int i=0; i < itemLength; i += 4 ) + std::string ts = GetTransferSyntax(); + if ( !Global::GetTS()->IsTransferSyntax(ts) ) { - uint32_t individualLength = str2num(&basicOffsetTableItemValue[i],uint32_t); - std::ostringstream s; - s << " Read one length: "; - s << std::hex << individualLength << std::endl; - dbg.Verbose(0, "gdcmDocument::Parse7FE0: ", s.str().c_str()); + gdcmWarningMacro("True DICOM File, with NO Tansfer Syntax: " << ts ); + return; } - delete[] basicOffsetTableItemValue; - } - if ( ! IsRLELossLessTransferSyntax() ) - { - // JPEG Image - - //// We then skip (not reading them) all the fragments of images: - while ( (itemLength = ReadTagLength(0xfffe, 0xe000)) ) - { - SkipBytes(itemLength); - } - } - else - { - // RLE Image - long ftellRes; - long rleSegmentLength[15], fragmentLength; + // Group 0002 is always 'Explicit ...' enven when Transfer Syntax says 'Implicit ..." - // While we find some items: - while ( (fragmentLength = ReadTagLength(0xfffe, 0xe000)) ) - { - // Parse fragments of the current Fragment (Frame) - //------------------ scanning (not reading) fragment pixels - uint32_t nbRleSegments = ReadInt32(); - - //// Reading RLE Segments Offset Table - uint32_t rleSegmentOffsetTable[15]; - for(int k=1; k<=15; k++) + if ( Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ImplicitVRLittleEndian ) { - ftellRes = ftell(Fp); - rleSegmentOffsetTable[k] = ReadInt32(); + Filetype = ImplicitVR; } - - // skipping (not reading) RLE Segments - if ( nbRleSegments > 1) - { - for(unsigned int k = 1; k <= nbRleSegments-1; k++) - { - rleSegmentLength[k] = rleSegmentOffsetTable[k+1] - - rleSegmentOffsetTable[k]; - ftellRes = ftell(Fp); - SkipBytes(rleSegmentLength[k]); - } - } - - rleSegmentLength[nbRleSegments] = fragmentLength - - rleSegmentOffsetTable[nbRleSegments]; - ftellRes = ftell(Fp); - SkipBytes(rleSegmentLength[nbRleSegments]); - } - - // Make sure that at the end of the item we encounter a 'Sequence - // Delimiter Item': - if ( !ReadTag(0xfffe, 0xe0dd) ) - { - dbg.Verbose(0, "gdcmDocument::Parse7FE0: no sequence delimiter item"); - dbg.Verbose(0, " at end of RLE item sequence"); - } - } -} - - - -/** - * \brief Compares two documents, according to \ref gdcmDicomDir 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 gdcmDocument::operator<(gdcmDocument &document) -{ - // Patient Name - std::string s1 = GetEntryByNumber(0x0010,0x0010); - std::string s2 = document.GetEntryByNumber(0x0010,0x0010); - if(s1 < s2) - { - return true; - } - else if( s1 > s2 ) - { - return false; - } - else - { - // Patient ID - s1 = GetEntryByNumber(0x0010,0x0020); - s2 = document.GetEntryByNumber(0x0010,0x0020); - if ( s1 < s2 ) - { - return true; - } - else if ( s1 > s2 ) - { - return false; - } - else + + // FIXME Strangely, this works with + //'Implicit VR Transfer Syntax (GE Private) + if ( Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ExplicitVRBigEndian ) { - // Study Instance UID - s1 = GetEntryByNumber(0x0020,0x000d); - s2 = document.GetEntryByNumber(0x0020,0x000d); - if ( s1 < s2 ) - { - return true; - } - else if( s1 > s2 ) - { - return false; - } - else - { - // Serie Instance UID - s1 = GetEntryByNumber(0x0020,0x000e); - s2 = document.GetEntryByNumber(0x0020,0x000e); - if ( s1 < s2 ) - { - return true; - } - else if( s1 > s2 ) - { - return false; - } - } + gdcmWarningMacro("Transfer Syntax Name = [" + << GetTransferSyntaxName() << "]" ); + SwitchByteSwapCode(); + group = SwapShort(group); + elem = SwapShort(elem); } } - return false; } +//----------------------------------------------------------------------------- +// Print //----------------------------------------------------------------------------- +} // end namespace gdcm