Program: gdcm
Module: $RCSfile: gdcmFile.cxx,v $
Language: C++
- Date: $Date: 2005/11/21 16:28:06 $
- Version: $Revision: 1.305 $
+ Date: $Date: 2006/02/16 20:06:14 $
+ Version: $Revision: 1.315 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
/**
* \brief Canonical destructor.
*/
-File::~File ()
+File::~File()
{
if ( RLEInfo )
delete RLEInfo;
* \brief gets the info from 0018,0088 : Space Between Slices
* else from 0018,0050 : Slice Thickness
* else 1.0
+ *
+ * When an element is missing, we suppose slices join together
+ * (no overlapping, no interslice gap) but we have no way to check it !
+ * For *Dicom* images, ZSpacing *should be* calculated using
+ * XOrigin, YOrigin, ZOrigin (of the top left image corner)
+ * of 2 consecutive images, and the Orientation
+ * Computing ZSpacing on a single image is not really meaningfull !
* @return Z dimension of a voxel-to be
*/
float File::GetZSpacing()
{
- // --->
- // ---> Warning :
- // --->
- // For *Dicom* images, ZSpacing should be calculated using
- // XOrigin, YOrigin, ZOrigin (of the top left image corner)
- // of 2 consecutive images, and the Orientation
- //
- // Computing ZSpacing on a single image is not really meaningfull !
float zspacing = 1.0f;
// if no 'Spacing Between Slices' is found,
// we assume slices join together
// (no overlapping, no interslice gap)
- // if they don't, we're fucked up
entry = GetDataEntry(0x0018,0x0050);
if( entry )
{
else
gdcmWarningMacro("Unfound Slice Thickness (0018,0050)");
+ // if no 'Spacing Between Slices' is found,
+ // we assume slices join together
+ // (no overlapping, no interslice gap)
+ entry = GetDataEntry(0x3004,0x000c);
+ if( entry )
+ {
+ float z1 = (float)entry->GetValue(0);
+ float z2 = (float)entry->GetValue(1);
+ zspacing = z2 - z1; // can be negative...
+
+ if ( zspacing == 0.0 )
+ zspacing = 1.0;
+ return zspacing;
+ }
+
return zspacing;
}
/**
* \brief gets the info from 0020,0037 : Image Orientation Patient
* or from 0020 0035 : Image Orientation (RET)
+ *
* (needed to organize DICOM files based on their x,y,z position)
- * @param iop adress of the (6)float array to receive values
- * @return true when one of the tag is found
- * false when nothing is found
+ *
+ * @param iop adress of the (6)float array to receive values.
+ * (defaulted as 1.,0.,0.,0.,1.,0. if nothing -or inconsistent stuff-
+ * is found.
+ * @return true when one of the tag -with consistent values- is found
+ * false when nothing or inconsistent stuff - is found
*/
bool File::GetImageOrientationPatient( float iop[6] )
{
std::string strImOriPat;
//iop is supposed to be float[6]
- iop[0] = iop[1] = iop[2] = iop[3] = iop[4] = iop[5] = 0.;
+ iop[0] = iop[4] = 1.;
+ iop[1] = iop[2] = iop[3] = iop[5] = 0.;
// 0020 0037 DS REL Image Orientation (Patient)
if ( (strImOriPat = GetEntryString(0x0020,0x0037)) != GDCM_UNFOUND )
<< " Less than 6 values were found." );
return false;
}
+ return true;
}
//For ACR-NEMA
// 0020 0035 DS REL Image Orientation (RET)
<< "Less than 6 values were found." );
return false;
}
+ return true;
}
- return true;
+ return false;
}
/**
/**
*\brief gets the info from 0028,1052 : Rescale Intercept
- * @return Rescale Intercept
+ * @return Rescale Intercept. defaulted to 0.0 is not found or empty
*/
float File::GetRescaleIntercept()
{
/**
*\brief gets the info from 0028,1053 : Rescale Slope
- * @return Rescale Slope
+ * @return Rescale Slope. defaulted to 1.0 is not found or empty
*/
float File::GetRescaleSlope()
{
e0000->SetString(sLen.str());
}
- // FIXME : Derma?.dcm does not have it...let's remove it ?!? JPRx
+ /// \todo FIXME : Derma?.dcm does not have it...let's remove it ?!? JPRx
if( writetype != JPEG )
{
int i_lgPix = GetEntryLength(GrPixel, NumPixel);
// Offset Table information on fragments of this current Frame.
// Note that the fragment pixels themselves are not loaded
// (but just skipped).
- long frameOffset = Fp->tellg();
+ long frameOffset = Fp->tellg(); // once per fragment
uint32_t nbRleSegments = ReadInt32();
if ( nbRleSegments > 16 )
// Make sure that we encounter a 'Sequence Delimiter Item'
// at the end of the item :
- if ( !ReadTag(0xfffe, 0xe0dd) )
+ if ( !ReadTag(0xfffe, 0xe0dd) ) // once per RLE File
{
gdcmWarningMacro( "No sequence delimiter item at end of RLE item sequence");
}
i++;
}
- long fragmentOffset = Fp->tellg();
+ long fragmentOffset = Fp->tellg(); // Once per fragment
// Store the collected info
JPEGFragment *newFragment = new JPEGFragment;
newFragment->SetOffset(fragmentOffset);
*/
bool File::ReadTag(uint16_t testGroup, uint16_t testElem)
{
- long positionOnEntry = Fp->tellg();
- long currentPosition = Fp->tellg(); // On debugging purposes
+ long positionOnEntry = Fp->tellg(); // Only when reading fragments
+ //long currentPosition = positionOnEntry; // On debugging purposes
// Read the Item Tag group and element, and make
// sure they are what we expected:
return false;
}
if ( itemTagGroup != testGroup || itemTagElem != testElem )
- {
+ {
// in order not to pollute output we don't warn on 'delimitors'
if (itemTagGroup != 0xfffe || testGroup != 0xfffe )
gdcmWarningMacro( "Wrong Item Tag found:"
<< " but instead we encountered tag ("
<< DictEntry::TranslateToKey(itemTagGroup,itemTagElem) << ")"
<< " at address: " << " 0x(" << std::hex
- << (unsigned int)currentPosition << std::dec << ")"
+ << (unsigned int)positionOnEntry << std::dec << ")"
) ;
Fp->seekg(positionOnEntry, std::ios::beg);
}
//// Then read the associated Item Length
- long currentPosition = Fp->tellg();
+
+ // long currentPosition = Fp->tellg(); // save time // JPRx
uint32_t itemLength = ReadInt32();
gdcmDebugMacro( "Basic Item Length is: " << itemLength
- << " at address: " << std::hex << (unsigned int)currentPosition);
+// << " at address: " << std::hex << (unsigned int)currentPosition
+ );
return itemLength;
}
// These are the deprecated method that one day should be removed (after the next release)
-//#ifndef GDCM_LEGACY_REMOVE
+#ifndef GDCM_LEGACY_REMOVE
/*
* \ brief Loader. (DEPRECATED : temporaryly kept not to break the API)
* @ param fileName file to be open for parsing
* @ return false if file cannot be open or no swap info was found,
* or no tag was found.
- * @ deprecated Use the Load() [ + SetLoadMode() ] + SetFileName() functions instead
+ * @deprecated Use the Load() [ + SetLoadMode() ] + SetFileName() functions instead
*/
- /*
bool File::Load( std::string const &fileName )
{
GDCM_LEGACY_REPLACED_BODY(File::Load(std::string), "1.2",
return DoTheLoadingJob( );
}
-*/
-//#endif
+#endif
//-----------------------------------------------------------------------------
// Print