Program: gdcm
Module: $RCSfile: gdcmFile.cxx,v $
Language: C++
- Date: $Date: 2005/02/06 14:39:35 $
- Version: $Revision: 1.213 $
+ Date: $Date: 2005/02/10 20:53:23 $
+ Version: $Revision: 1.223 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
*/
float File::GetXSpacing()
{
- float xspacing, yspacing;
+ float xspacing = 1.0;
+ float yspacing = 1.0;
const std::string &strSpacing = GetEntryValue(0x0028,0x0030);
- if ( strSpacing == GDCM_UNFOUND )
+ if( strSpacing == GDCM_UNFOUND )
{
gdcmWarningMacro( "Unfound Pixel Spacing (0028,0030)" );
return 1.;
if( ( nbValues = sscanf( strSpacing.c_str(),
"%f\\%f", &yspacing, &xspacing)) != 2 )
{
+ // if no values, xspacing is set to 1.0
+ if( nbValues == 0 )
+ xspacing = 1.0;
// if single value is found, xspacing is defaulted to yspacing
- if ( nbValues == 1 )
- {
+ if( nbValues == 1 )
xspacing = yspacing;
- }
if ( xspacing == 0.0 )
xspacing = 1.0;
}
// if sscanf cannot read any float value, it won't affect yspacing
- sscanf( strSpacing.c_str(), "%f", &yspacing);
+ int nbValues = sscanf( strSpacing.c_str(), "%f", &yspacing);
+
+ // if no values, xspacing is set to 1.0
+ if( nbValues == 0 )
+ yspacing = 1.0;
if ( yspacing == 0.0 )
yspacing = 1.0;
*/
size_t File::GetPixelOffset()
{
- DocEntry* pxlElement = GetDocEntry(GrPixel,NumPixel);
+ DocEntry *pxlElement = GetDocEntry(GrPixel, NumPixel);
if ( pxlElement )
{
return pxlElement->GetOffset();
*/
size_t File::GetPixelAreaLength()
{
- DocEntry* pxlElement = GetDocEntry(GrPixel,NumPixel);
+ DocEntry *pxlElement = GetDocEntry(GrPixel, NumPixel);
if ( pxlElement )
{
return pxlElement->GetLength();
}
}
-
/**
* \brief Adds the characteristics of a new element we want to anonymize
*
*/
void File::AddAnonymizeElement (uint16_t group, uint16_t elem,
- std::string const &value)
+ std::string const &value)
{
Element el;
{
std::fstream *fp = new std::fstream(Filename.c_str(),
std::ios::in | std::ios::out | std::ios::binary);
+
// TODO : FIXME
// how to white out disk space if longer than 50 ?
- char spaces[50] = " ";
+
gdcm::DocEntry *d;
uint32_t offset;
uint32_t lgth;
- uint32_t lgtToWrite;
+ uint32_t valLgth = 0;
+ std::string *spaces;
for (ListElements::iterator it = AnonymizeList.begin();
it != AnonymizeList.end();
++it)
- {
+ {
d = GetDocEntry( (*it).Group, (*it).Elem);
+ if ( d == NULL)
+ continue;
+
if ( dynamic_cast<BinEntry *>(d)
|| dynamic_cast<SeqEntry *>(d) )
continue;
offset = d->GetOffset();
lgth = d->GetLength();
- fp->seekp( offset, std::ios::beg );
-
- if ( (*it).Value == "" )
+ if (valLgth < lgth)
{
- lgtToWrite = lgth > 50 ? 50 : lgth;
- fp->write( spaces, lgtToWrite );
+ spaces = new std::string( lgth-valLgth, ' ');
+ (*it).Value = (*it).Value + *spaces;
+ delete spaces;
}
- else
- {
- // TODO : FIXME
- // how to white out disk space if longer than 50 ?
- (*it).Value = (*it).Value + spaces;
- lgtToWrite = lgth > (*it).Value.length() ? (*it).Value.length() : lgth;
- fp->write( (char *)(*it).Value.c_str(), lgtToWrite );
-
- }
- fp->close();
- delete fp;
+ fp->seekp( offset, std::ios::beg );
+ fp->write( (*it).Value.c_str(), lgth );
+
}
+ fp->close();
+ delete fp;
}
/**
*/
bool File::AnonymizeFile()
{
- // If Anonymisation list is empty, let's perform some basic anonymisation
+ // If Anonymisation list is empty, let's perform some basic anonymization
if ( AnonymizeList.begin() == AnonymizeList.end() )
{
// If exist, replace by spaces
{
d = GetDocEntry( (*it).Group, (*it).Elem);
+ if ( d == NULL)
+ continue;
+
if ( dynamic_cast<BinEntry *>(d)
|| dynamic_cast<SeqEntry *>(d) )
continue;
}
}
-
-#ifdef GDCM_WORDS_BIGENDIAN
- // Super Super hack that will make gdcm a BOMB ! but should
- // Fix temporarily the dashboard
- BinEntry *b = GetBinEntry(GrPixel,NumPixel);
- if ( GetPixelSize() == 16 )
- {
- uint16_t *im16 = (uint16_t *)b->GetBinArea();
- int lgth = b->GetLength();
- for( int i = 0; i < lgth / 2; i++ )
- {
- im16[i]= (im16[i] >> 8) | (im16[i] << 8 );
- }
- }
-#endif //GDCM_WORDS_BIGENDIAN
-
-
Document::WriteContent(fp, filetype);
-
-#ifdef GDCM_WORDS_BIGENDIAN
- // Flip back the pixel ... I told you this is a hack
- if ( GetPixelSize() == 16 )
- {
- uint16_t *im16 = (uint16_t*)b->GetBinArea();
- int lgth = b->GetLength();
- for( int i = 0; i < lgth / 2; i++ )
- {
- im16[i]= (im16[i] >> 8) | (im16[i] << 8 );
- }
- }
-#endif //GDCM_WORDS_BIGENDIAN
-
-
fp->close();
delete fp;
// Media Storage SOP Class UID (CT Image Storage)
InsertValEntry("1.2.840.10008.5.1.4.1.1.2", 0x0002, 0x0002);
// Media Storage SOP Instance UID
- InsertValEntry(uidClass.c_str(), 0x0002, 0x0003);
+ InsertValEntry(uidMedia.c_str(), 0x0002, 0x0003);
// Transfer Syntax UID (Explicit VR Little Endian)
InsertValEntry("1.2.840.10008.1.2.1 ", 0x0002, 0x0010);
// META Implementation Class UID
long positionOnEntry = Fp->tellg();
long currentPosition = Fp->tellg(); // On debugging purposes
- //// Read the Item Tag group and element, and make
+ // Read the Item Tag group and element, and make
// sure they are what we expected:
uint16_t itemTagGroup;
uint16_t itemTagElement;
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff