Program: gdcm
Module: $RCSfile: gdcmDataEntry.cxx,v $
Language: C++
- Date: $Date: 2006/03/13 14:44:07 $
- Version: $Revision: 1.33 $
+ Date: $Date: 2006/05/30 08:12:51 $
+ Version: $Revision: 1.38 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
* \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;
* @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;
{
if( !BinArea )
{
+ 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");
+ gdcmErrorMacro("BinArea not set " << std::hex
+ << GetGroup() << " " << GetElement()
+ << " Can't get the value");
return 0.0;
}
/**
* \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)
+ * @param valueVector std::vector \<double\> of value(s)
* \return false if VR not "DS" or DataEntry empty
*/
bool DataEntry::GetDSValue(std::vector <double> &valueVector)
}
else
{
- if( value.size() > 0 )
+ //if( value.size() > 0 ) // when user sets a string to 0, *do* the job.
{
size_t l = value.size();
SetLength(l + l%2);
memcpy(BinArea, value.c_str(), l);
if (l%2)
BinArea[l] = '\0';
- }
+ }
}
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("");
+ 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
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)
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff