X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDataEntry.cxx;h=0c5178650fc2ec019c13532e7dcf82527372f72a;hb=17ebda2271dd65565f512e835546b22c22ebbbb0;hp=4f8937e9faf603d99db15640e62da7abaa3b076d;hpb=8932b26860546fddfa6d5805c075aab116b93bd4;p=gdcm.git diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx index 4f8937e9..0c517865 100644 --- a/src/gdcmDataEntry.cxx +++ b/src/gdcmDataEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDataEntry.cxx,v $ Language: C++ - Date: $Date: 2005/10/25 14:27:37 $ - Version: $Revision: 1.11 $ + Date: $Date: 2006/04/11 16:03:26 $ + Version: $Revision: 1.36 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -25,6 +25,12 @@ #include +#if defined(__BORLANDC__) + #include // for memcpy + #include // for atof + #include // for isdigit +#endif + namespace gdcm { //----------------------------------------------------------------------------- @@ -37,8 +43,9 @@ uint32_t DataEntry::MaxSizePrintEntry = MAX_SIZE_PRINT_ELEMENT_VALUE; * \brief Constructor for a given DictEntry * @param e Pointer to existing dictionary entry */ -DataEntry::DataEntry(DictEntry *e) - : DocEntry(e) +DataEntry::DataEntry(uint16_t group,uint16_t elem, + VRKey const &vr) + : DocEntry(group,elem,vr) { State = STATE_LOADED; Flag = FLAG_NONE; @@ -52,9 +59,10 @@ DataEntry::DataEntry(DictEntry *e) * @param e Pointer to existing Doc entry */ DataEntry::DataEntry(DocEntry *e) - : DocEntry(e->GetDictEntry()) + //: DocEntry(e->GetDictEntry()) + : DocEntry(e->GetGroup(),e->GetElement(), e->GetVR() ) { - Flag = 0; + Flag = FLAG_NONE; BinArea = 0; SelfArea = true; @@ -75,7 +83,9 @@ DataEntry::~DataEntry () //----------------------------------------------------------------------------- // Public /** - * \brief Sets the value (non string) of the current Dicom Header Entry + * \brief Sets the value (non string) of the current DataEntry + * @param area area + * @param self self */ void DataEntry::SetBinArea( uint8_t *area, bool self ) { @@ -87,7 +97,9 @@ void DataEntry::SetBinArea( uint8_t *area, bool self ) State = STATE_LOADED; } /** - * \brief Inserts the value (non string) into the current Dicom Header Entry + * \brief Inserts the value (non string) into the current DataEntry + * @param area area + * @param length length */ void DataEntry::CopyBinArea( uint8_t *area, uint32_t length ) { @@ -107,6 +119,11 @@ void DataEntry::CopyBinArea( uint8_t *area, uint32_t length ) } } +/** + * \brief Inserts the elementary (non string) value into the current DataEntry + * @param id index of the elementary value to be set + * @param val value, passed as a double + */ void DataEntry::SetValue(const uint32_t &id, const double &val) { if( !BinArea ) @@ -151,29 +168,36 @@ void DataEntry::SetValue(const uint32_t &id, const double &val) } /** * \brief returns, as a double (?!?) one of the values - // (when entry is multivaluated), identified by its index. - // Returns 0.0 if index is wrong - // FIXME : warn the user there was a problem ! + * (when entry is multivaluated), identified by its index. + * Returns 0.0 if index is wrong + * @param id id */ double DataEntry::GetValue(const uint32_t &id) const { if( !BinArea ) { - gdcmErrorMacro("BinArea not set. Can't get the value"); + if (GetLength() != 0) // avoid stupid messages + /// \todo warn the user there was a problem ! + gdcmErrorMacro("BinArea not set " << std::hex + << GetGroup() << " " << GetElement() + << " Can't get the value"); return 0.0; } uint32_t count = GetValueCount(); if( id > count ) { - gdcmErrorMacro("Index (" << id << ")is greater than the data size"); + gdcmErrorMacro("Index (" << id << ") is greater than the data size"); return 0.0; } - // FIX the API : user *knows* that entry contains a US - // and he receives a double ?!? + /// \todo FIX the API : user *knows* that entry contains a US + /// and he receives a double ?!? const VRKey &vr = GetVR(); + /// \todo FIX the API : user *knows* that entry contains a US, + /// the method is supposed to return a double + /// but sends a US ?!? if( vr == "US" || vr == "SS" ) return ((uint16_t *)BinArea)[id]; else if( vr == "UL" || vr == "SL" ) @@ -184,6 +208,7 @@ double DataEntry::GetValue(const uint32_t &id) const return ((double *)BinArea)[id]; else if( Global::GetVR()->IsVROfStringRepresentable(vr) ) { + // this is for VR = "DS", ... if( GetLength() ) { // Don't use std::string to accelerate processing @@ -232,19 +257,21 @@ double DataEntry::GetValue(const uint32_t &id) const /** * \brief Checks if the multiplicity of the value follows Dictionary VM */ -bool DataEntry::IsValueCountValid() const +bool DataEntry::IsValueCountValid() /*const*/ { - bool valid; uint32_t vm; const std::string &strVM = GetVM(); uint32_t vc = GetValueCount(); + bool valid = vc == 0; + if( valid ) + return true; // FIXME : what shall we do with VM = "2-n", "3-n", etc if( strVM == "1-n" ) { - // make sure it is at least one ??? FIXME - valid = vc >= 1 || vc == 0; + // make sure there is at least one ??? FIXME + valid = vc >= 1; } else { @@ -252,7 +279,7 @@ bool DataEntry::IsValueCountValid() const os.str( strVM ); os >> vm; // Two cases: - // vm respect the one from the dict + // vm respects the one from the dict // vm is 0 (we need to check if this element is allowed to be empty) FIXME // note (JPR) @@ -269,7 +296,7 @@ bool DataEntry::IsValueCountValid() const // Problem : entry type may depend on the modality and/or the Sequence // it's embedded in ! // (Get the information in the 'Conformance Statements' ...) - valid = vc == vm || vc == 0; + valid = vc == vm; } return valid; } @@ -284,14 +311,15 @@ uint32_t DataEntry::GetValueCount( ) const return GetLength()/sizeof(uint16_t); else if( vr == "UL" || vr == "SL" ) return GetLength()/sizeof(uint32_t); - else if( vr == "FL" ) - return GetLength()/sizeof(float); + else if( vr == "FL" || vr == "OF" ) + return GetLength()/4 ; // FL has a *4* length! sizeof(float); else if( vr == "FD" ) - return GetLength()/sizeof(double); + return GetLength()/8; // FD has a *8* length! sizeof(double); else if( Global::GetVR()->IsVROfStringRepresentable(vr) ) { // Some element in DICOM are allowed to be empty - if( !GetLength() ) return 0; + if( !GetLength() ) + return 0; // Don't use std::string to accelerate processing uint32_t count = 1; for(uint32_t i=0;i holding the value(s) of a DS DataEntry + * @param valueVector std::vector of value(s) + * \return false if VR not "DS" or DataEntry empty + */ + bool DataEntry::GetDSValue(std::vector &valueVector) + { + /// \todo rewrite the whole method, in order *not to use* std::string ! + std::vector tokens; + + if (GetVR() != "DS") // never trust a user ! + return false; + + Util::Tokenize ( GetString().c_str(), tokens, "\\" ); + + int nbValues= tokens.size(); + if (nbValues == 0) + return false; + + for (int loop=0; loop 0 ) + //if( value.size() > 0 ) // when user sets a string to 0, *do* the job. { - // FIXME : should be quicker if we don't create one more std::string - // just to make even the length of a char array ... - - /* - std::string finalVal = Util::DicomString( value.c_str() ); - SetLength(finalVal.size()); - NewBinArea(); - - memcpy(BinArea, &(finalVal[0]), finalVal.size()); - */ - size_t l = value.size(); SetLength(l + l%2); NewBinArea(); - memcpy(BinArea, &(value[0]), l); + memcpy(BinArea, value.c_str(), l); if (l%2) BinArea[l] = '\0'; - } + } } State = STATE_LOADED; } @@ -453,13 +495,19 @@ std::string const &DataEntry::GetString() const StrArea=s.str(); } else + { StrArea.append((const char *)BinArea,GetLength()); - + // to avoid gdcm to propagate oddities in lengthes + if ( GetLength()%2) + StrArea.append(" ",1); + } return StrArea; } + /** - * \brief Copies all the attributes from an other DocEntry + * \brief Copies all the attributes from an other DocEntry * @param doc entry to copy from + * @remarks The content BinArea is copied too */ void DataEntry::Copy(DocEntry *doc) { @@ -473,8 +521,9 @@ void DataEntry::Copy(DocEntry *doc) CopyBinArea(entry->BinArea,entry->GetLength()); } } + /** - * \brief Writes the value of a DataEntry + * \brief Writes the 'value' area of a DataEntry * @param fp already open ofstream pointer * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...) */ @@ -486,84 +535,110 @@ void DataEntry::WriteContent(std::ofstream *fp, FileType filetype) { return; //delimitors have NO value } - - uint8_t *binArea8 = BinArea; //safe notation - size_t lgr = GetLength(); - if (BinArea) // the binArea was *actually* loaded - { - - // The same operation should be done if we wanted - // to write image with Big Endian Transfer Syntax, - // while working on Little Endian Processor + + // --> We only deal with Little Endian writting. // --> forget Big Endian Transfer Syntax writting! // Next DICOM version will give it up ... - - // --> FIXME - // The stuff looks nice, but it's probably bugged, - // since troubles occur on big endian processors (SunSparc, Motorola) - // while reading the pixels of a - // gdcm-written Little-Endian 16 bits per pixel image - + + // WARNING - For Implicit VR private element, + // we have *no choice* but considering them as + // something like 'OB' values. + // we rewrite them as we found them on disc. + // Some trouble will occur if element was + // *actually* OW, if image was produced + // on Big endian based processor, read and writen + // on Little endian based processor + // and, later on, somebody needs + // this 'OW' Implicit VR private element (?!?) + // (Same stuff, mutatis mutandis, for Little/Big) + + // 8/16 bits Pixels problem should be solved automatiquely, + // since we ensure the VR (OB vs OW) is conform to Pixel size. + + uint8_t *data = BinArea; //safe notation + size_t l = GetLength(); +// gdcmDebugMacro("in DataEntry::WriteContent " << GetKey() << " AtomicLength: " +// << Global::GetVR()->GetAtomicElementLength(this->GetVR() ) // << " BinArea in :" << &BinArea +// ); + if (BinArea) // the binArea was *actually* loaded + { #if defined(GDCM_WORDS_BIGENDIAN) || defined(GDCM_FORCE_BIGENDIAN_EMULATION) - - /// \todo FIXME : Right now, we only care of Pixels element - /// we should deal with *all* the BinEntries - /// Well, not really since we are not interpreting values read... - - // 8 Bits Pixels *are* OB, 16 Bits Pixels *are* OW - // -value forced while Reading process- - - // --> WARNING - // --> the following lines *looked* very clever, - // --> but they don't work on big endian processors. - // --> since I've no access for the moment to a big endian proc :-( - // --> I comment them out, to see the result on the dash board - // --> - - // --> Revert to initial code : TestWriteSimple hangs on Darwin :-( - if (GetGroup() == 0x7fe0 && GetVR() == "OW") - { - uint16_t *binArea16 = (uint16_t*)binArea8; - binary_write (*fp, binArea16, lgr ); - } - else - { - // For any other VR, DataEntry is re-written as-is - binary_write (*fp, binArea8, lgr ); + unsigned short vrLgth = + Global::GetVR()->GetAtomicElementLength(this->GetVR()); + unsigned int i; + switch(vrLgth) + { + case 1: + { + binary_write (*fp, data, l ); + break; + } + case 2: + { + uint16_t *data16 = (uint16_t *)data; + for(i=0;i WARNING - // --> remove the following line, an uncomment the previous ones, - // --> if it doesn't work better - // --> - /*binary_write ( *fp, binArea8, lgr ); // Elem value*/ - #else - binary_write ( *fp, binArea8, lgr ); // Elem value + binary_write (*fp, data, l ); #endif //GDCM_WORDS_BIGENDIAN + } else { - // nothing was loaded, but we need to skip space on disc - + // nothing was loaded, but we need to skip space on disc + if (l != 0) + { // --> WARNING : nothing is written; // --> the initial data (on the the source image) is lost - // --> user is *not* informed ! - - fp->seekp(lgr, std::ios::cur); + // --> user is *not* informed ! + gdcmDebugMacro ("Nothing was loaded, but we need to skip space on disc. " + << "Length =" << l << " for " << GetKey() ); + fp->seekp(l, std::ios::cur); // At Write time, for unloaded elems + } } + // to avoid gdcm to propagate oddities + // (length was already modified) + if (l%2) + fp->seekp(1, std::ios::cur); // At Write time, for non even length elems +} + +/** + * \brief Compute the full length of the elementary DataEntry (not only value + * length) depending on the VR. + */ +uint32_t DataEntry::ComputeFullLength() +{ + return GetFullLength(); } //----------------------------------------------------------------------------- // Protected -void DataEntry::NewBinArea(void) +/// \brief Creates a DataEntry owned BinArea (remove previous one if any) +void DataEntry::NewBinArea( ) { DeleteBinArea(); if( GetLength() > 0 ) BinArea = new uint8_t[GetLength()]; SelfArea = true; } - +/// \brief Removes the BinArea, if owned by the DataEntry void DataEntry::DeleteBinArea(void) { if (BinArea && SelfArea) @@ -602,13 +677,8 @@ void DataEntry::Print(std::ostream &os, std::string const & ) v = GetString(); const VRKey &vr = GetVR(); - if( vr == "US" || vr == "SS" ) - s << " [" << GetString() << "]"; - else if( vr == "UL" || vr == "SL" ) - s << " [" << GetString() << "]"; - else if ( vr == "FL" ) - s << " [" << GetString() << "]"; - else if ( vr == "FD" ) + if( vr == "US" || vr == "SS" || vr == "UL" || vr == "SL" + || vr == "FL" || vr == "FD") s << " [" << GetString() << "]"; else {