Program: gdcm
Module: $RCSfile: gdcmDataEntry.cxx,v $
Language: C++
- Date: $Date: 2007/08/27 16:14:47 $
- Version: $Revision: 1.46 $
+ Date: $Date: 2009/02/05 09:50:09 $
+ Version: $Revision: 1.55 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <stdlib.h> // for atof
#include <ctype.h> // for isdigit
#endif
+#include <string.h> // memcpy
+#include <stdlib.h> // atof
+
+// Could be defined like MAX_SIZE_LOAD_ELEMENT_VALUE
+#define GDCM_MAX_LENGTH_TO_CONVERT_TO_HEXA 8
namespace GDCM_NAME_SPACE
{
State = STATE_LOADED;
Flag = FLAG_NONE;
- StrArea = 0;
- BinArea = 0;
- SelfArea = true;
+ StrArea = 0;
+ StrHexaArea = 0;
+ BinArea = 0;
+ SelfArea = true;
}
/**
}
-//-----------------------------------------------------------------------------
-// Print
-
//-----------------------------------------------------------------------------
// Public
/**
}
}
+/**
+ * \brief Checks wether the current DataEntry contains number(s)
+ */
+
+bool DataEntry::IsNumerical()
+{
+ const VRKey &vr = GetVR();
+
+ return
+ vr == "DS" ||
+ vr == "FL" ||
+ vr == "FD" ||
+ vr == "IS" ||
+ vr == "SH" ||
+ vr == "SL" ||
+ vr == "SS" ||
+ vr == "UI" ||
+ vr == "UL" ||
+ vr == "US" ;
+}
+
+/**
+ * \brief Gets a std::vector of 'double' holding the value(s) of any 'numerical' DataEntry
+ * @param valueVector std::vector double of value(s)
+ * \return false if VR not "a 'numerical" one
+ */
+ bool DataEntry::GetNumerical(std::vector <double> &valueVector)
+ {
+ valueVector.clear();
+
+ if (!IsNumerical()) // never trust a user !
+ return false;
+
+ const VRKey &vr = GetVR();
+ int loop;
+ if (vr == "IS" || vr == "DS")
+ {
+ /// \todo rewrite the whole method, in order *not to use* std::string !
+ std::vector<std::string> tokens;
+
+ Util::Tokenize ( GetString().c_str(), tokens, "\\" );
+
+ int nbValues= tokens.size();
+ if (nbValues == 0)
+ return false;
+
+ if (vr == "DS")
+ for (loop=0; loop<nbValues; loop++)
+ valueVector.push_back(atof(tokens[loop].c_str()));
+ else
+ for (loop=0; loop<nbValues; loop++)
+ valueVector.push_back(atoi(tokens[loop].c_str()));
+
+ return true;
+ }
+
+ uint32_t nbValues = GetValueCount();
+ if (nbValues == 0)
+ return false;
+
+ if( vr == "US") {
+ for (loop=0; loop<nbValues; loop++)
+ valueVector.push_back(((uint16_t *)BinArea)[loop]);
+ return true;
+ }
+ if( vr == "SS" ) {
+ for (loop=0; loop<nbValues; loop++)
+ valueVector.push_back(((int16_t *)BinArea)[loop]);
+ return true;
+ }
+ if( vr == "UL") {
+ for (loop=0; loop<nbValues; loop++)
+ valueVector.push_back(((uint32_t *)BinArea)[loop]);
+ return true;
+ }
+ if(vr == "SL" ) {
+ for (loop=0; loop<nbValues; loop++)
+ valueVector.push_back(((int32_t *)BinArea)[loop]);
+ return true;
+ }
+ if( vr == "FL" ) {
+ for (loop=0; loop<nbValues; loop++)
+ valueVector.push_back(((float *)BinArea)[loop]);
+ return true;
+ }
+ if( vr == "FD" ) {
+ for (loop=0; loop<nbValues; loop++)
+ valueVector.push_back(((double *)BinArea)[loop]);
+ return true;
+ }
+ return false; // ?!?
+ }
+
/**
* \brief Inserts the elementary (non string) value into the current DataEntry
* @param id index of the elementary value to be set
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] = ' ';
+ {
+ if ( vr == "UI" )
+ BinArea[l] = '\0';
+ else
+ BinArea[l] = ' ';
+ }
}
State = STATE_LOADED;
}
if( !BinArea )
return *StrArea;
- // When short integer(s) are stored, convert the following (n * 2) characters
+ // 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" )
{
s << data[i];
}
*StrArea=s.str();
- } else if( vr == "FL" )
+ } // See above comment on multiple short integers (mutatis mutandis).
+ else if( vr == "FL" )
{
float *data=(float *)BinArea;
for (unsigned int i=0; i < GetValueCount(); i++)
s << data[i];
}
*StrArea=s.str();
- }
+ } // See above comment on multiple short integers (mutatis mutandis).
else if( vr == "FD" )
{
double *data=(double *)BinArea;
StrArea->append((const char *)BinArea,GetLength());
// to avoid gdcm to propagate oddities in lengthes
if ( GetLength()%2)
- StrArea->append(" ",1); }
+ StrArea->append(" ",1);
+ }
return *StrArea;
}
+/**
+ * \brief returns an hexadecimal representation of the DataEntry value
+ */
+std::string const &DataEntry::GetHexaRepresentation() const
+{
+ static std::ostringstream s2;
+ const VRKey &vr = GetVR();
+
+ s2.str("");
+ if (!StrHexaArea)
+ StrHexaArea = new std::string();
+ else
+ *StrHexaArea="";
+ if( !BinArea )
+ return *StrHexaArea;
+ // When short integer(s) are stored, convert the following (n * 2) characters
+ // as a displayable string, the values being separated by a back-slash
+
+ s2 << std::hex;
+
+ if( vr == "US" )
+ {
+ uint16_t *data=(uint16_t *)BinArea;
+ for (unsigned int i=0; i < GetValueCount(); i++)
+ {
+ s2 << std::setw( 2 ) << std::setfill( '0' );
+ if( i!=0 )
+ s2 << '\\';
+ s2 << data[i];
+ }
+ *StrHexaArea=s2.str();
+ }
+ else if (vr == "SS" )
+ {
+ int16_t *data=(int16_t *)BinArea;
+ for (unsigned int i=0; i < GetValueCount(); i++)
+ {
+ s2 << std::setw( 4 ) << std::setfill( '0' );
+ if( i!=0 )
+ s2 << '\\';
+ s2 << data[i];
+ }
+ *StrHexaArea=s2.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++)
+ {
+ s2 << std::setw( 4 ) << std::setfill( '0' );
+ if( i!=0 )
+ s2 << '\\';
+ s2 << data[i];
+ }
+ *StrHexaArea=s2.str();
+ }
+ else if( vr == "SL" )
+ {
+ int32_t *data=(int32_t *)BinArea;
+ for (unsigned int i=0; i < GetValueCount(); i++)
+ {
+ s2 << std::setw( 4 ) << std::setfill( '0' );
+ if( i!=0 )
+ s2 << '\\';
+ s2 << data[i];
+ }
+ *StrHexaArea=s2.str();
+ }
+ else if( vr == "FL" )
+ {
+ unsigned char *toto=(unsigned char *)BinArea;
+ for (unsigned int i=0; i < GetValueCount(); i++)
+ {
+ s2.str("");
+ if( i!=0 )
+ s2 << '\\';
+ unsigned int a4;
+ for(int iif=0; iif<4; iif++)
+ {
+ a4=toto[iif];
+ s2 << a4;
+ }
+ }
+ *StrHexaArea=s2.str();
+ }
+ else if( vr == "FD" )
+ {
+ //double *data=(double *)BinArea;
+ unsigned char *toto=(unsigned char *)BinArea;
+ for (unsigned int i=0; i < GetValueCount(); i++)
+ {
+ s2.str("");
+ if( i!=0 )
+ s2 << '\\';
+ //s2 << data[i];
+
+ unsigned int a4;
+ for(int iid=0; iid<8; iid++)
+ {
+ a4=toto[iid];
+ s2 << a4;
+ }
+
+ }
+ *StrHexaArea=s2.str();
+ }
+ else
+ {
+ unsigned int l = (Length > GDCM_MAX_LENGTH_TO_CONVERT_TO_HEXA) ? GDCM_MAX_LENGTH_TO_CONVERT_TO_HEXA : Length;
+ uint8_t *data=(uint8_t *)BinArea;
+ for (unsigned int i=0; i < l; i++)
+ {
+ if( i!=0 )
+ s2 << '\\';
+ s2 << std::setw( 2 ) << (int)(data[i]);
+ }
+ if (Length > 16)
+ s2 << "\\...";
+ *StrHexaArea=s2.str();
+ }
+ return *StrHexaArea;
+}
/**
* \brief Copies all the attributes from an other DocEntry
* @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
*/
void DataEntry::WriteContent(std::ofstream *fp, FileType filetype,
- bool insideMetaElements)
+ bool insideMetaElements, bool insideSequence)
{
// writes the 'common part'
- DocEntry::WriteContent(fp, filetype, insideMetaElements);
+ DocEntry::WriteContent(fp, filetype, insideMetaElements, insideSequence);
if ( GetGroup() == 0xfffe )
{
//-----------------------------------------------------------------------------
// Protected
+
/// \brief Creates a DataEntry owned BinArea
/// (remove previous one if any and relevant StrArea if any)
void DataEntry::NewBinArea( )
delete StrArea;
StrArea = 0;
}
+ if (StrHexaArea)
+ {
+ delete StrHexaArea;
+ StrHexaArea = 0;
+ }
}
//-----------------------------------------------------------------------------
*/
void DataEntry::Print(std::ostream &os, std::string const & )
{
- os << "D ";
+ //os << "D ";
+
+ // First, Print the common part (vr [length offset] name).
DocEntry::Print(os);
uint16_t g = GetGroup();
if( vr == "US" || vr == "SS" || vr == "UL" || vr == "SL"
|| vr == "FL" || vr == "FD")
- s << " [" << GetString() << "]";
+ s << " [" << GetString() << "] =0x(" << GetHexaRepresentation() << ")";
else
{
if(Global::GetVR()->IsVROfStringRepresentable(vr))
else
{
s << " [" << GDCM_BINLOADED << ";"
- << "length = " << GetLength() << "]";
+ << "length = " << GetLength() << "] =0x(" << GetHexaRepresentation() << ")";
}
}
}
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff