Program: gdcm
Module: $RCSfile: gdcmDataEntry.cxx,v $
Language: C++
- Date: $Date: 2005/10/27 17:07:24 $
- Version: $Revision: 1.14 $
+ Date: $Date: 2005/11/29 12:48:45 $
+ Version: $Revision: 1.24 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
*/
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
{
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)
// 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;
}
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<GetLength();i++)
}
return count;
}
-
return GetLength();
}
/**
{
if( value.size() > 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';
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;
}
+
/**
- * \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)
{
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, ...)
*/
// --> 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.
// 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 solve automatiquely,
- // since we ensure the VR is conform to Pixel size.
+ // 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()
+ << " : " << Global::GetVR()->GetAtomicElementLength(this->GetVR())
+ );
if (BinArea) // the binArea was *actually* loaded
{
#if defined(GDCM_WORDS_BIGENDIAN) || defined(GDCM_FORCE_BIGENDIAN_EMULATION)
}
case 2:
{
+gdcmDebugMacro ("AtomicLength = 2 found; lgt =" << l);
uint16_t *data16 = (uint16_t *)data;
for(i=0;i<l/vrLgth;i++)
binary_write( *fp, data16[i]);
fp->seekp(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();
BinArea = new uint8_t[GetLength()];
SelfArea = true;
}
-
+/// \brief Removes the BinArea, if owned by the DataEntry
void DataEntry::DeleteBinArea(void)
{
if (BinArea && SelfArea)
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff