X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDocument.cxx;h=d6f1cbb1e0a1f9d4c3e29fa99822fbf35da9f334;hb=70a3a0f95bf2240a6ef4b1d6523c0e6614437304;hp=6715afc1c8ccce8c45c0053e6cc8a5170b7334df;hpb=9bc299b2b2e1b334a3bbfaf20aba3afa64d0f05b;p=gdcm.git diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index 6715afc1..d6f1cbb1 100644 --- a/src/gdcmDocument.cxx +++ b/src/gdcmDocument.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.cxx,v $ Language: C++ - Date: $Date: 2005/01/19 15:58:00 $ - Version: $Revision: 1.200 $ + Date: $Date: 2005/01/24 14:14:11 $ + Version: $Revision: 1.205 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -24,7 +24,6 @@ #include "gdcmUtil.h" #include "gdcmDebug.h" #include "gdcmTS.h" -#include "gdcmException.h" #include "gdcmDictSet.h" #include "gdcmRLEFramesInfo.h" #include "gdcmJPEGFragmentsInfo.h" @@ -59,13 +58,16 @@ const unsigned int Document::MAX_SIZE_PRINT_ELEMENT_VALUE = 0x7fffffff; /** * \brief constructor - * @param filename file to be opened for parsing + * @param filename 'Document' (File or DicomDir) to be opened for parsing */ Document::Document( std::string const &filename ) : ElementSet(-1) { + RLEInfo = NULL; + JPEGInfo = NULL; + SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE); Filename = filename; - Initialise(); + Initialize(); Fp = 0; if ( !OpenFile() ) @@ -159,10 +161,13 @@ Document::Document( std::string const &filename ) : ElementSet(-1) */ Document::Document() : ElementSet(-1) { + RLEInfo = NULL; + JPEGInfo = NULL; + Fp = 0; SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE); - Initialise(); + Initialize(); SwapCode = 1234; Filetype = ExplicitVR; Group0002Parsed = false; @@ -176,8 +181,10 @@ Document::~Document () RefPubDict = NULL; RefShaDict = NULL; - delete RLEInfo; - delete JPEGInfo; + if( RLEInfo ) + delete RLEInfo; + if( JPEGInfo ) + delete JPEGInfo; } //----------------------------------------------------------------------------- @@ -257,7 +264,8 @@ bool Document::IsReadable() return false; } - if( TagHT.empty() ) + //if( TagHT.empty() ) + if ( IsEmpty() ) { gdcmVerboseMacro( "No tag in internal hash table."); return false; @@ -316,6 +324,23 @@ bool Document::IsDicomV3() return GetDocEntry(0x0002, 0x0010) != NULL; } +/** + * \brief Predicate for Papyrus file + * Dedicated to whomsoever it may concern + * @return True when the file is a Papyrus file. + */ +bool Document::IsPapyrus() +{ + // 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 returns the File Type * (ACR, ACR_LIBIDO, ExplicitVR, ImplicitVR, Unknown) @@ -655,39 +680,6 @@ bool Document::ReplaceIfExist(std::string const &value, //----------------------------------------------------------------------------- // Protected -/** - * \brief Checks if a given Dicom Element exists within the H table - * @param group Group number of the searched Dicom Element - * @param elem Element number of the searched Dicom Element - * @return true is found - */ -bool Document::CheckIfEntryExist(uint16_t group, uint16_t elem ) -{ - const std::string &key = DictEntry::TranslateToKey(group, elem ); - return TagHT.count(key) != 0; -} - - -/** - * \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 elem Element number of the searched tag. - * @return Corresponding element value representation when it exists, - * and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise. - */ -std::string Document::GetEntry(uint16_t group, uint16_t elem) -{ - TagKey key = DictEntry::TranslateToKey(group, elem); - if ( !TagHT.count(key)) - { - return GDCM_UNFOUND; - } - - return ((ValEntry *)TagHT.find(key)->second)->GetValue(); -} - /** * \brief Searches within Header Entries (Dicom Elements) parsed with * the public and private dictionaries @@ -920,94 +912,6 @@ void Document::LoadEntryBinArea(BinEntry *elem) return false; }*/ -/** - * \brief retrieves a Dicom Element using (group, element) - * @param group Group number of the searched Dicom Element - * @param elem Element number of the searched Dicom Element - * @return - */ -DocEntry *Document::GetDocEntry(uint16_t group, uint16_t elem) -{ - TagKey key = DictEntry::TranslateToKey(group, elem); - if ( !TagHT.count(key)) - { - return NULL; - } - return TagHT.find(key)->second; -} - -/** - * \brief Same as \ref Document::GetDocEntry except it only - * returns a result when the corresponding entry is of type - * ValEntry. - * @param group Group number of the searched Dicom Element - * @param elem Element number of the searched Dicom Element - * @return When present, the corresponding ValEntry. - */ -ValEntry *Document::GetValEntry(uint16_t group, uint16_t elem) -{ - DocEntry *currentEntry = GetDocEntry(group, elem); - if ( !currentEntry ) - { - return 0; - } - if ( ValEntry *entry = dynamic_cast(currentEntry) ) - { - return entry; - } - gdcmVerboseMacro( "Unfound ValEntry."); - - return 0; -} - -/** - * \brief Same as \ref Document::GetDocEntry except it only - * returns a result when the corresponding entry is of type - * BinEntry. - * @param group Group number of the searched Dicom Element - * @param elem Element number of the searched Dicom Element - * @return When present, the corresponding BinEntry. - */ -BinEntry *Document::GetBinEntry(uint16_t group, uint16_t elem) -{ - DocEntry *currentEntry = GetDocEntry(group, elem); - if ( !currentEntry ) - { - return 0; - } - if ( BinEntry *entry = dynamic_cast(currentEntry) ) - { - return entry; - } - gdcmVerboseMacro( "Unfound BinEntry."); - - return 0; -} - -/** - * \brief Same as \ref Document::GetDocEntry except it only - * returns a result when the corresponding entry is of type - * SeqEntry. - * @param group Group number of the searched Dicom Element - * @param elem Element number of the searched Dicom Element - * @return When present, the corresponding SeqEntry. - */ -SeqEntry *Document::GetSeqEntry(uint16_t group, uint16_t elem) -{ - DocEntry *currentEntry = GetDocEntry(group, elem); - if ( !currentEntry ) - { - return 0; - } - if ( SeqEntry *entry = dynamic_cast(currentEntry) ) - { - return entry; - } - gdcmVerboseMacro( "Unfound SeqEntry."); - - return 0; -} - /** * \brief Loads the element while preserving the current @@ -1305,7 +1209,7 @@ void Document::ParseSQ( SeqEntry *seqEntry, { if ( newDocEntry->IsSequenceDelimitor() ) { - seqEntry->SetSequenceDelimitationItem( newDocEntry ); + seqEntry->SetDelimitationItem( newDocEntry ); break; } } @@ -1348,7 +1252,7 @@ void Document::ParseSQ( SeqEntry *seqEntry, offsetStartCurrentSQItem = Fp->tellg(); // end try ----------------- - seqEntry->AddEntry( itemSQ, SQItemNumber ); + seqEntry->AddSQItem( itemSQ, SQItemNumber ); SQItemNumber++; if ( !delim_mode && ((long)(Fp->tellg())-offset ) >= l_max ) { @@ -2119,7 +2023,7 @@ void Document::SkipBytes(uint32_t nBytes) * \brief Loads all the needed Dictionaries * \warning NOT end user intended method ! */ -void Document::Initialise() +void Document::Initialize() { RefPubDict = Global::GetDicts()->GetDefaultPubDict(); RefShaDict = NULL; @@ -2557,25 +2461,25 @@ DocEntry *Document::ReadNextDocEntry() return newEntry; } - +//GenerateFreeTagKeyInGroup? What was it designed for ?!? /** * \brief Generate a free TagKey i.e. a TagKey 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 Document::GenerateFreeTagKeyInGroup(uint16_t group) -{ - for (uint32_t elem = 0; elem < UINT32_MAX; elem++) - { - TagKey key = DictEntry::TranslateToKey(group, elem); - if (TagHT.count(key) == 0) - { - return elem; - } - } - return UINT32_MAX; -} +//uint32_t Document::GenerateFreeTagKeyInGroup(uint16_t group) +//{ +// for (uint32_t elem = 0; elem < UINT32_MAX; elem++) +// { +// TagKey key = DictEntry::TranslateToKey(group, elem); +// if (TagHT.count(key) == 0) +// { +// return elem; +// } +// } +// return UINT32_MAX; +//} /** * \brief Assuming the internal file pointer \ref Document::Fp @@ -2829,7 +2733,7 @@ void Document::ComputeJPEGFragmentInfo() } } -/** +/* * \brief Walk recursively the given \ref DocEntrySet, and feed * the given hash table (\ref TagDocEntryHT) with all the * \ref DocEntry (Dicom entries) encountered. @@ -2890,7 +2794,7 @@ void Document::ComputeJPEGFragmentInfo() } }*/ -/** +/* * \brief Build a \ref TagDocEntryHT (i.e. a std::map<>) from the current * Document. *