Program: gdcm
Module: $RCSfile: gdcmFile.cxx,v $
Language: C++
- Date: $Date: 2006/02/07 12:37:19 $
- Version: $Revision: 1.314 $
+ Date: $Date: 2006/04/11 16:03:26 $
+ Version: $Revision: 1.318 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
GrPixel = 0x7fe0; // to avoid further troubles
NumPixel = 0x0010;
BasicOffsetTableItemValue = 0;
+ FourthDimensionLocation = TagKey(0,0);
}
/**
* \brief Canonical destructor.
*/
-File::~File ()
+File::~File()
{
if ( RLEInfo )
delete RLEInfo;
// The changed DictEntry will have
// - a correct PixelVR OB or OW)
// - the name to "Pixel Data"
+
+ //==>Take it easy!
+ //==> Just change the VR !
+
+/*
DataEntry *oldEntry = dynamic_cast<DataEntry *>(entry);
if (oldEntry)
{
// Change only made if usefull
if ( PixelVR != oldEntry->GetVR() )
- {
- DictEntry* newDict = DictEntry::New(GrPixel,NumPixel,
- PixelVR,"1","Pixel Data");
-
- DataEntry *newEntry = DataEntry::New(newDict);
- newDict->Delete();
- newEntry->Copy(entry);
- newEntry->SetBinArea(oldEntry->GetBinArea(),oldEntry->IsSelfArea());
- oldEntry->SetSelfArea(false);
-
- RemoveEntry(oldEntry);
- AddEntry(newEntry);
- newEntry->Delete();
+ {
+ //DictEntry* newDict = DictEntry::New(GrPixel,NumPixel,
+ // PixelVR,"1","Pixel Data");
+ //DataEntry *newEntry = DataEntry::New(newDict);
+ //newDict->Delete();
+ //newEntry->Copy(entry);
+ //newEntry->SetBinArea(oldEntry->GetBinArea(),oldEntry->IsSelfArea());
+ //oldEntry->SetSelfArea(false);
+
+ //RemoveEntry(oldEntry);
+ //AddEntry(newEntry);
+ //newEntry->Delete();
+
}
}
+*/
+ VRKey PixelVR;
+ // 8 bits allocated is a 'O Bytes' , as well as 24 (old ACR-NEMA RGB)
+ // more than 8 (i.e 12, 16) is a 'O Words'
+ if ( GetBitsAllocated() == 8 || GetBitsAllocated() == 24 )
+ PixelVR = "OB";
+ else
+ PixelVR = "OW";
+ // Change only made if usefull
+ if ( PixelVR != entry->GetVR() )
+ {
+ entry->SetVR(PixelVR);
+ }
}
return true;
}
+
/**
* \brief This predicate, based on hopefully reasonable heuristics,
* decides whether or not the current File was properly parsed
return 1;
}
+/**
+ * \brief Retrieve the -unnormalized- number of 'times' of '4D image'.
+ * User has to tell gdcm the location of this '4th Dimension component'
+ * using SetFourthDimensionLocation() method before.
+ * \warning The defaulted value is 1.
+ * @return The encountered size when found, 1 by default
+ * (The file doesn't contain a '4D image'.).
+ */
+int File::GetTSize()
+{
+ if (FourthDimensionLocation == TagKey(0,0) )// 4D location is not set : not a 4D object
+ return 1;
+
+ DataEntry *entry = GetDataEntry(FourthDimensionLocation.GetGroup(),
+ FourthDimensionLocation.GetElement() );
+ if( !entry )
+ {
+ gdcmWarningMacro( " FourthDimensionLocation not found at : " <<
+ std::hex << FourthDimensionLocation.GetGroup()
+ << "|" << FourthDimensionLocation.GetElement());
+ return 1;
+ }
+ else
+ {
+ return (int)entry->GetValue(0);
+ }
+}
+
/**
* \brief gets the info from 0018,1164 : ImagerPixelSpacing
* then 0028,0030 : Pixel Spacing
{
gdcmWarningMacro( "Unfound Pixel Spacing (0028,0030)" );
}
-
return xspacing;
}
* 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()
{
std::string strImOriPat;
//iop is supposed to be float[6]
+ 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 )
if ( sscanf( strImOriPat.c_str(), "%f \\ %f \\%f \\%f \\%f \\%f ",
&iop[0], &iop[1], &iop[2], &iop[3], &iop[4], &iop[5]) != 6 )
{
- iop[0] = iop[4] = 1.;
- iop[1] = iop[2] = iop[3] = iop[5] = 0.;
gdcmWarningMacro( "Wrong Image Orientation Patient (0020,0037)."
<< " Less than 6 values were found." );
return false;
}
- else
- return true;
+ return true;
}
//For ACR-NEMA
// 0020 0035 DS REL Image Orientation (RET)
if ( sscanf( strImOriPat.c_str(), "%f \\ %f \\%f \\%f \\%f \\%f ",
&iop[0], &iop[1], &iop[2], &iop[3], &iop[4], &iop[5]) != 6 )
{
- iop[0] = iop[4] = 1.;
- iop[1] = iop[2] = iop[3] = iop[5] = 0.;
gdcmWarningMacro( "wrong Image Orientation Patient (0020,0035). "
<< "Less than 6 values were found." );
return false;
}
- else
- return true;
+ return true;
}
return false;
}
/**
*\brief gets the info from 0028,1053 : Rescale Slope
- * @return Rescale Slope. defaulted to 0.0 is not found or empty
+ * @return Rescale Slope. defaulted to 1.0 is not found or empty
*/
float File::GetRescaleSlope()
{
/**
* \brief This function is intended to user who doesn't want
* to have to manage a LUT and expects to get an RBG Pixel image
- * (or a monochrome one ...)
+ * (or a monochrome one, if no LUT found ...)
* \warning to be used with GetImagePixels()
* @return 1 if Gray level, 3 if Color (RGB, YBR, *or PALETTE COLOR*)
*/
// no (GrPixel, NumPixel) element
std::string s_lgPix = Util::Format("%d", i_lgPix+12);
s_lgPix = Util::DicomString( s_lgPix.c_str() );
- InsertEntryString(s_lgPix,GrPixel, 0x0000);
+ InsertEntryString(s_lgPix,GrPixel, 0x0000, "UL");
}
}
Document::WriteContent(fp, writetype);
return true;
}
-
//-----------------------------------------------------------------------------
// Protected
long fragmentLength;
int i=0;
uint32_t sum = 0;
- while ( (fragmentLength = ReadTagLength(0xfffe, 0xe000)) != 0 )
+ while ( (fragmentLength = ReadTagLength(0xfffe, 0xe000)) != 0 )
{
// Since we have read the basic offset table, let's check the value were correct
// or else produce a warning:
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:"
// 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
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff