Program: gdcm
Module: $RCSfile: gdcmDataEntry.cxx,v $
Language: C++
- Date: $Date: 2005/10/28 13:02:32 $
- Version: $Revision: 1.15 $
+ Date: $Date: 2006/02/07 12:37:19 $
+ Version: $Revision: 1.31 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <fstream>
+#if defined(__BORLANDC__)
+ #include <mem.h> // for memcpy
+ #include <stdlib.h> // for atof
+ #include <ctype.h> // for isdigit
+#endif
+
namespace gdcm
{
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// 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 )
{
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 )
{
}
}
+/**
+ * \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 )
}
/**
* \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
+ * FIXME : warn the user there was a problem !
+ * @param id id
*/
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
{
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();
}
/**
- * \brief Sets the 'value' of an Entry, passed as a std::string
+ * \brief Sets the 'value' of a DataEntry, passed as a std::string
* @param value string representation of the value to be set
*/
void DataEntry::SetString(std::string const &value)
{
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, ...)
*/
return; //delimitors have NO value
}
- // --> We only deal with Little Endian writting
+ // --> We only deal with Little Endian writting.
// --> 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.
// (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() << " 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)
}
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(l, 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)
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
{
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff