Program: gdcm
Module: $RCSfile: gdcmDataEntry.cxx,v $
Language: C++
- Date: $Date: 2006/03/01 09:29:29 $
- Version: $Revision: 1.32 $
+ Date: $Date: 2007/08/27 16:14:47 $
+ Version: $Revision: 1.46 $
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 <mem.h> // for memcpy
#include <stdlib.h> // for atof
- #include <ctype.h> // for isdigit
+ #include <ctype.h> // for isdigit
#endif
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
#define MAX_SIZE_PRINT_ELEMENT_VALUE 0x7fffffff
//-----------------------------------------------------------------------------
// Constructor / Destructor
/**
- * \brief Constructor for a given DictEntry
- * @param e Pointer to existing dictionary entry
+ * \brief Constructor for a given DataEntry
+ * @param group group number of the Data Entry to be created
+ * @param elem element number of the Data Entry to be created
+ * @param vr Value Representation of the Data Entry to be created
*/
-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;
+ StrArea = 0;
BinArea = 0;
SelfArea = true;
}
* @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 = FLAG_NONE;
BinArea = 0;
+
SelfArea = true;
Copy(e);
DataEntry::~DataEntry ()
{
DeleteBinArea();
+
}
//-----------------------------------------------------------------------------
/**
* \brief Sets the value (non string) of the current DataEntry
* @param area area
- * @param self self
+ * @param self self=true : The area : *belongs" to the DataEntry
+ * : will be delete with the DataEntry
+ * self=false The area *is not* deleted with the DataEntry
+ *
*/
void DataEntry::SetBinArea( uint8_t *area, bool self )
{
NewBinArea();
memcpy(BinArea,area,length);
if( length!=lgh )
- BinArea[length]=0;
+ BinArea[length]=0; // padd with zero
State = STATE_LOADED;
}
if( id > GetValueCount() )
{
- gdcmErrorMacro("Index (" << id << ")is greater than the data size");
+ gdcmErrorMacro("Index (" << id << ") is greater than the data size");
return;
}
}
}
/**
- * \brief returns, as a double (?!?) one of the values
+ * \brief returns, as a double one of the values
* (when entry is multivaluated), identified by its index.
* Returns 0.0 if index is wrong
* @param id id
{
if( !BinArea )
{
+ if (GetLength() != 0) // avoid stupid messages
/// \todo warn the user there was a problem !
- gdcmErrorMacro("BinArea not set. Can't get the value");
+ gdcmErrorMacro("BinArea not set " << std::hex
+ << GetGroup() << " " << GetElement()
+ << " Can't get the value");
return 0.0;
}
return 0.0;
}
- /// \todo FIX the API : user *knows* that entry contains a US
- /// and he receives a double ?!?
+ // if user *knows* that entry contains a US,
+ // he just has to cast the double he receives
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" )
/**
* \brief Checks if the multiplicity of the value follows Dictionary VM
*/
-bool DataEntry::IsValueCountValid() const
+bool DataEntry::IsValueCountValid() /*const*/
{
uint32_t vm;
const std::string &strVM = GetVM();
}
/**
- * \brief Gets a std::vector <double> holding the value(s) of a DS DataEntry
- * @param valueVector std::vector <double> of value(s)
+ * \brief Gets a std::vector of 'double' holding the value(s) of a DS DataEntry
+ * @param valueVector std::vector double of value(s)
* \return false if VR not "DS" or DataEntry empty
*/
bool DataEntry::GetDSValue(std::vector <double> &valueVector)
void DataEntry::SetString(std::string const &value)
{
DeleteBinArea();
-
const VRKey &vr = GetVR();
if ( vr == "US" || vr == "SS" )
{
tokens.clear();
}
else
- {
- if( value.size() > 0 )
- {
- size_t l = value.size();
- SetLength(l + l%2);
- NewBinArea();
- memcpy(BinArea, value.c_str(), l);
- if (l%2)
+ {
+ size_t l = value.size();
+ SetLength(l + l%2);
+ NewBinArea();
+ memcpy(BinArea, value.c_str(), l);
+ if (l%2) // padded with blank except for UI
+ if ( vr == "UI" )
BinArea[l] = '\0';
- }
+ else
+ BinArea[l] = ' ';
}
State = STATE_LOADED;
}
*/
std::string const &DataEntry::GetString() const
{
- static std::ostringstream s;
- const VRKey &vr = GetVR();
-
- s.str("");
- StrArea="";
-
- if( !BinArea )
- return StrArea;
-
- // When short integer(s) are stored, convert the following (n * 2) characters
- // as a displayable string, the values being separated by a back-slash
-
- if( vr == "US" || vr == "SS" )
- {
- uint16_t *data=(uint16_t *)BinArea;
-
- for (unsigned int i=0; i < GetValueCount(); i++)
- {
- if( i!=0 )
- s << '\\';
- s << data[i];
- }
- StrArea=s.str();
- }
- // See above comment on multiple short integers (mutatis mutandis).
- else if( vr == "UL" || vr == "SL" )
- {
- uint32_t *data=(uint32_t *)BinArea;
-
- for (unsigned int i=0; i < GetValueCount(); i++)
- {
- if( i!=0 )
- s << '\\';
- s << data[i];
- }
- StrArea=s.str();
- }
- else if( vr == "FL" )
- {
- float *data=(float *)BinArea;
-
- for (unsigned int i=0; i < GetValueCount(); i++)
- {
- if( i!=0 )
- s << '\\';
- s << data[i];
- }
- StrArea=s.str();
- }
- else if( vr == "FD" )
- {
- double *data=(double *)BinArea;
-
- for (unsigned int i=0; i < GetValueCount(); i++)
- {
- if( i!=0 )
- s << '\\';
- s << data[i];
- }
- 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;
+ static std::ostringstream s;
+ const VRKey &vr = GetVR();
+ s.str("");
+
+ if (!StrArea)
+ StrArea = new std::string();
+ else
+ *StrArea="";
+
+ if( !BinArea )
+ return *StrArea;
+ // When short integer(s) are stored, convert the following (n * 2) characters
+ // as a displayable string, the values being separated by a back-slash
+ if( vr == "US" )
+ {
+ uint16_t *data=(uint16_t *)BinArea;
+ for (unsigned int i=0; i < GetValueCount(); i++)
+ {
+ if( i!=0 )
+ s << '\\';
+ s << data[i];
+ }
+ *StrArea=s.str();
+ }
+ else if (vr == "SS" )
+ {
+ int16_t *data=(int16_t *)BinArea;
+ for (unsigned int i=0; i < GetValueCount(); i++)
+ {
+ if( i!=0 )
+ s << '\\';
+ s << data[i];
+ }
+ *StrArea=s.str();
+ } // See above comment on multiple short integers (mutatis mutandis).
+ else if( vr == "UL" )
+ {
+ uint32_t *data=(uint32_t *)BinArea;
+ for (unsigned int i=0; i < GetValueCount(); i++)
+ {
+ if( i!=0 )
+ s << '\\';
+ s << data[i];
+ }
+ *StrArea=s.str();
+ }
+ else if( vr == "SL" )
+ {
+ int32_t *data=(int32_t *)BinArea;
+ for (unsigned int i=0; i < GetValueCount(); i++)
+ {
+ if( i!=0 )
+ s << '\\';
+ s << data[i];
+ }
+ *StrArea=s.str();
+ } else if( vr == "FL" )
+ {
+ float *data=(float *)BinArea;
+ for (unsigned int i=0; i < GetValueCount(); i++)
+ {
+ if( i!=0 )
+ s << '\\';
+ s << data[i];
+ }
+ *StrArea=s.str();
+ }
+ else if( vr == "FD" )
+ {
+ double *data=(double *)BinArea;
+ for (unsigned int i=0; i < GetValueCount(); i++)
+ {
+ if( i!=0 )
+ s << '\\';
+ s << data[i];
+ }
+ *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
* @param doc entry to copy from
- * @remarks The content BinArea is copied too
+ * @remarks The content BinArea is copied too (StrArea is not)
*/
void DataEntry::Copy(DocEntry *doc)
{
{
State = entry->State;
Flag = entry->Flag;
- CopyBinArea(entry->BinArea,entry->GetLength());
+ CopyBinArea(entry->BinArea,entry->GetLength());
}
}
/**
- * \brief Writes the 'value' area of a DataEntry
+ * \brief Writes the 'common part' + the 'value' area of a DataEntry
* @param fp already open ofstream pointer
* @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
*/
-void DataEntry::WriteContent(std::ofstream *fp, FileType filetype)
+void DataEntry::WriteContent(std::ofstream *fp, FileType filetype,
+ bool insideMetaElements)
{
- DocEntry::WriteContent(fp, filetype);
+ // writes the 'common part'
+ DocEntry::WriteContent(fp, filetype, insideMetaElements);
if ( GetGroup() == 0xfffe )
{
uint8_t *data = BinArea; //safe notation
size_t l = GetLength();
- gdcmDebugMacro("in DataEntry::WriteContent " << GetKey() << " AtomicLength: "
- << Global::GetVR()->GetAtomicElementLength(this->GetVR() ) // << " BinArea in :" << &BinArea
- );
+// 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)
//-----------------------------------------------------------------------------
// Protected
-/// \brief Creates a DataEntry owned BinArea (remove previous one if any)
+/// \brief Creates a DataEntry owned BinArea
+/// (remove previous one if any and relevant StrArea if any)
void DataEntry::NewBinArea( )
{
DeleteBinArea();
BinArea = new uint8_t[GetLength()];
SelfArea = true;
}
-/// \brief Removes the BinArea, if owned by the DataEntry
+/// \brief Removes the BinArea, if owned by the DataEntry,
+/// and the relevant StrArea if any
void DataEntry::DeleteBinArea(void)
{
if (BinArea && SelfArea)
delete[] BinArea;
BinArea = NULL;
}
+ if (StrArea)
+ {
+ delete StrArea;
+ StrArea = 0;
+ }
}
//-----------------------------------------------------------------------------
}
else
{
- s << " [gdcm::too long for print (" << cleanString.length() << ") ]";
+ s << " [GDCM_NAME_SPACE::too long for print (" << cleanString.length() << ") ]";
}
}
else