Program: gdcm
Module: $RCSfile: gdcmDataEntry.cxx,v $
Language: C++
- Date: $Date: 2006/06/29 13:26:08 $
- Version: $Revision: 1.39 $
+ Date: $Date: 2007/06/04 13:40:01 $
+ Version: $Revision: 1.43 $
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
State = STATE_LOADED;
Flag = FLAG_NONE;
+ StrArea = 0;
BinArea = 0;
SelfArea = true;
}
{
Flag = FLAG_NONE;
BinArea = 0;
+
SelfArea = true;
Copy(e);
DataEntry::~DataEntry ()
{
DeleteBinArea();
+
}
//-----------------------------------------------------------------------------
}
/**
- * \brief Gets a std::vector <double> holding the value(s) of a DS DataEntry
+ * \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
*/
void DataEntry::SetString(std::string const &value)
{
DeleteBinArea();
-
const VRKey &vr = GetVR();
if ( vr == "US" || vr == "SS" )
{
tokens.clear();
}
else
- {
- //if( value.size() > 0 ) // when user sets a string to 0, *do* the job.
- {
- 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;
}
static std::ostringstream s;
const VRKey &vr = GetVR();
s.str("");
- StrArea="";
+
+ if (!StrArea)
+ StrArea = new std::string();
+ else
+ *StrArea="";
if( !BinArea )
- return StrArea;
+ 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" )
s << '\\';
s << data[i];
}
- StrArea=s.str();
+ *StrArea=s.str();
}
else if (vr == "SS" )
{
s << '\\';
s << data[i];
}
- StrArea=s.str();
+ *StrArea=s.str();
} // See above comment on multiple short integers (mutatis mutandis).
else if( vr == "UL" )
{
s << '\\';
s << data[i];
}
- StrArea=s.str();
+ *StrArea=s.str();
}
else if( vr == "SL" )
{
s << '\\';
s << data[i];
}
- StrArea=s.str();
+ *StrArea=s.str();
} else if( vr == "FL" )
{
float *data=(float *)BinArea;
s << '\\';
s << data[i];
}
- StrArea=s.str();
+ *StrArea=s.str();
}
else if( vr == "FD" )
{
s << '\\';
s << data[i];
}
- StrArea=s.str();
+ *StrArea=s.str();
}
else
{
- StrArea.append((const char *)BinArea,GetLength());
+ StrArea->append((const char *)BinArea,GetLength());
// to avoid gdcm to propagate oddities in lengthes
if ( GetLength()%2)
- StrArea.append(" ",1); }
- return StrArea;
+ 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());
}
}
//-----------------------------------------------------------------------------
// 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