X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDataEntry.cxx;h=f80dd7d290db83810222a52b1334f7b470b2e6af;hb=4f3b36b1db085e9be749d2cababa274d1e76b68d;hp=2cd9b15599c703b6266c263323b72d8870dc5fe1;hpb=003f9a9e167e2d3355773660e8fed130c653a251;p=gdcm.git diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx index 2cd9b155..f80dd7d2 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/28 13:02:32 $ - Version: $Revision: 1.15 $ + Date: $Date: 2005/11/21 12:15:06 $ + Version: $Revision: 1.23 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -234,17 +234,19 @@ double DataEntry::GetValue(const uint32_t &id) 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 +254,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 +271,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 +286,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 0 ) { - // 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'; @@ -454,8 +444,12 @@ std::string const &DataEntry::GetString() const StrArea=s.str(); } else + { StrArea.append((const char *)BinArea,GetLength()); - + // to avoid gdcm propagate oddities in lengthes + if ( GetLength()%2) + StrArea.append(" ",1); + } return StrArea; } /** @@ -475,7 +469,7 @@ void DataEntry::Copy(DocEntry *doc) } } /** - * \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, ...) */ @@ -492,7 +486,7 @@ void DataEntry::WriteContent(std::ofstream *fp, FileType filetype) // --> forget Big Endian Transfer Syntax writting! // Next DICOM version will give it up ... - // WARNING - Implicit VR private element : + // 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. @@ -505,10 +499,13 @@ void DataEntry::WriteContent(std::ofstream *fp, FileType filetype) // (Same stuff, mutatis mutandis, for Little/Big) // 8/16 bits Pixels problem should be solved automatiquely, - // since we ensure the VR is conform to Pixel size. + // 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() + << " : " << Global::GetVR()->GetAtomicElementLength(this->GetVR()) + ); if (BinArea) // the binArea was *actually* loaded { #if defined(GDCM_WORDS_BIGENDIAN) || defined(GDCM_FORCE_BIGENDIAN_EMULATION) @@ -524,6 +521,7 @@ void DataEntry::WriteContent(std::ofstream *fp, FileType filetype) } case 2: { +gdcmDebugMacro ("AtomicLength = 2 found; lgt =" << l); uint16_t *data16 = (uint16_t *)data; for(i=0;iseekp(l, std::ios::cur); } + // to avoid gdcm to propagate oddities + // (length was already modified) + if (l%2) + fp->seekp(1, std::ios::cur); +} + +/** + * \brief Compute the full length of the elementary DataEntry (not only value + * length) depending on the VR. + */ +uint32_t DataEntry::ComputeFullLength() +{ + return GetFullLength(); } //----------------------------------------------------------------------------- // Protected +/// \brief Creates a DataEntry owned BinArea (remove previous one if any) void DataEntry::NewBinArea(void) { DeleteBinArea(); @@ -570,7 +582,7 @@ void DataEntry::NewBinArea(void) BinArea = new uint8_t[GetLength()]; SelfArea = true; } - +/// \brief Removes the BinArea, if owned by the DataEntry void DataEntry::DeleteBinArea(void) { if (BinArea && SelfArea)