Program: gdcm
Module: $RCSfile: gdcmException.cxx,v $
Language: C++
- Date: $Date: 2004/06/20 18:08:47 $
- Version: $Revision: 1.16 $
+ Date: $Date: 2004/08/16 04:25:18 $
+ Version: $Revision: 1.17 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#ifdef __GNUC__
try
#endif
- : from(f), error(msg) {
+ : From(f), Error(msg) {
}
#ifdef __GNUC__
catch(...) {
* \brief fatal
* @param from
*/
- void gdcmException::fatal(const char *from) throw() {
- try {
- std::cerr << "Fatal: exception received in " << from
- << " while handling exception." << std::endl;
- exit(-1);
- }
- catch(...) {
- try {
- std::cerr << "Fatal: exception received in Exception::fatal while handling exception."
- << std::endl;
- exit(-1);
- }
- catch(...) {
+void gdcmException::fatal(const char *from) throw() {
+ try
+ {
+ std::cerr << "Fatal: exception received in " << from
+ << " while handling exception." << std::endl;
exit(-1);
- }
- }
+ }
+ catch(...)
+ {
+ try
+ {
+ std::cerr << "Fatal: exception received in Exception::fatal while handling exception."
+ << std::endl;
+ exit(-1);
+ }
+ catch(...)
+ {
+ exit(-1);
+ }
+ }
}
/**
* \brief getName
* @return string
*/
- std::string gdcmException::getName() const throw() {
- try {
+std::string gdcmException::getName() const throw()
+{
+ try
+ {
#ifdef __GNUC__ // GNU C++ compiler class name demangling
unsigned int nested = 1, i, nb, offset;
std::string one;
std::string name;
std::string iname = typeid(*this).name();
- if(iname[0] == 'Q') {
- nested = iname[1] - '0';
- iname = std::string(iname, 2, std::string::npos);
+ if(iname[0] == 'Q')
+ {
+ nested = iname[1] - '0';
+ iname = std::string(iname, 2, std::string::npos);
}
- for(i = 0; i < nested; i++) {
- ::sscanf(iname.c_str(), "%u%n", &nb, &offset);
- iname = std::string(iname, offset, std::string::npos);
- name += std::string(iname, 0, nb);
- if(i + 1 < nested) name += "::";
- iname = std::string(iname, nb, std::string::npos);
+ for(i = 0; i < nested; i++)
+ {
+ ::sscanf(iname.c_str(), "%u%n", &nb, &offset);
+ iname = std::string(iname, offset, std::string::npos);
+ name += std::string(iname, 0, nb);
+ if(i + 1 < nested) name += "::";
+ iname = std::string(iname, nb, std::string::npos);
}
return name;
#else // no class name demangling
Program: gdcm
Module: $RCSfile: gdcmException.h,v $
Language: C++
- Date: $Date: 2004/08/02 14:06:58 $
- Version: $Revision: 1.14 $
+ Date: $Date: 2004/08/16 04:25:18 $
+ Version: $Revision: 1.15 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
/*
* Any exception thrown in the gdcm library
*/
-class GDCM_EXPORT gdcmException : public std::exception {
+class GDCM_EXPORT gdcmException : public std::exception
+{
public:
/*
* Builds an exception with minimal information: name of the thrower
* @param error error description string
*/
explicit gdcmException(const std::string &from, const std::string &error = "")
- throw();
+ throw();
/**
* \brief virtual destructor makes this class dynamic
*/
- virtual ~gdcmException() throw() {
- }
+ virtual ~gdcmException() throw() {};
/// exception caught within exception class: print error message and die
static void fatal(const char *from) throw();
/// returns error message
- const std::string &getError(void) const throw() {
- return error;
+ const std::string &getError() const throw() {
+ return Error;
}
/// try to discover this (dynamic) class name
/// returns exception name string (overloads std::exception::what)
virtual const char *what() const throw() {
- return (const char *) *this;
+ return (const char *) *this;
}
/// returns exception name string
protected:
/// error message part 1
- std::string from;
+ std::string From;
/// error message part 2
- std::string error;
+ std::string Error;
};
/*
* File error exception thrown in the gdcm library
*/
-class GDCM_EXPORT gdcmFileError : public gdcmException {
+class GDCM_EXPORT gdcmFileError : public gdcmException
+{
public:
/**
* \brief Builds an file-related exception with minimal information: name of
*/
explicit gdcmFileError(const std::string &from,
const std::string &error = "File error")
- throw() : gdcmException(from, error) {
- }
+ throw() : gdcmException(from, error) { }
};
/**
* \brief Unexpected file format exception
*/
-class GDCM_EXPORT gdcmFormatUnexpected : public gdcmException {
+class GDCM_EXPORT gdcmFormatUnexpected : public gdcmException
+{
public:
/// \brief Builds a file-related exception with minimal information:
/// name of the thrower method and error message
/**
* \brief Invalid file format exception
*/
-class GDCM_EXPORT gdcmFormatError : public gdcmFormatUnexpected {
+class GDCM_EXPORT gdcmFormatError : public gdcmFormatUnexpected
+{
public:
/// \brief Builds a file-related exception with minimal information:
/// name of the thrower method and error message
#include <vtkPointData.h>
#include <vtkLookupTable.h>
-vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.48 $");
+vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.49 $");
vtkStandardNewMacro(vtkGdcmReader);
//-----------------------------------------------------------------------------
// Print
void vtkGdcmReader::PrintSelf(ostream& os, vtkIndent indent)
{
- vtkImageReader::PrintSelf(os,indent);
+ this->Superclass::PrintSelf(os,indent);
os << indent << "Filenames : " << endl;
vtkIndent nextIndent = indent.GetNextIndent();
- for (std::list<std::string>::iterator FileName = FileNameList.begin();
- FileName != FileNameList.end();
- ++FileName)
+ for (std::list<std::string>::iterator it = FileNameList.begin();
+ it != FileNameList.end();
+ ++it)
{
- os << nextIndent << FileName->c_str() << endl ;
+ os << nextIndent << it->c_str() << endl ;
}
}
// Feeling the allocated memory space with each image/volume:
unsigned char *Dest = (unsigned char *)data->GetPointData()->GetScalars()->GetVoidPointer(0);
- for (std::list<std::string>::iterator FileName = InternalFileNameList.begin();
- FileName != InternalFileNameList.end();
- ++FileName)
+ for (std::list<std::string>::iterator filename = InternalFileNameList.begin();
+ filename != InternalFileNameList.end();
+ ++filename)
{
// Images that were tagged as unreadable in CheckFileCoherence()
// are substituted with a black image to let the caller visually
// notice something wrong is going on:
- if (*FileName != "GDCM_UNREADABLE")
+ if (*filename != "GDCM_UNREADABLE")
{
// Update progress related for good files is made in LoadImageInMemory
- Dest += this->LoadImageInMemory(*FileName, Dest,
+ Dest += this->LoadImageInMemory(*filename, Dest,
UpdateProgressTarget,
UpdateProgressCount);
}
// Loop on the filenames:
// - check for their existence and gdcm "parsability"
// - get the coherence check done:
- for (std::list<std::string>::iterator FileName = InternalFileNameList.begin();
- FileName != InternalFileNameList.end();
- ++FileName)
+ for (std::list<std::string>::iterator filename = InternalFileNameList.begin();
+ filename != InternalFileNameList.end();
+ ++filename)
{
// The file is always added in the number of planes
// - If file doesn't exist, it will be replaced by a black plane in the
ReturnedTotalNumberOfPlanes += 1;
/////// Stage 0: check for file name:
- if(*FileName==std::string("GDCM_UNREADABLE"))
+ if(*filename == std::string("GDCM_UNREADABLE"))
continue;
/////// Stage 1: check for file readability:
// Stage 1.1: check for file existence.
FILE *fp;
- fp = fopen(FileName->c_str(),"rb");
+ fp = fopen(filename->c_str(),"rb");
if (!fp)
{
- vtkErrorMacro("Unable to open file " << FileName->c_str());
+ vtkErrorMacro("Unable to open file " << filename->c_str());
vtkErrorMacro("Removing this file from readed files "
- << FileName->c_str());
- *FileName = "GDCM_UNREADABLE";
+ << filename->c_str());
+ *filename = "GDCM_UNREADABLE";
continue;
}
fclose(fp);
// Stage 1.2: check for Gdcm parsability
- gdcmHeader GdcmHeader(FileName->c_str() );
+ gdcmHeader GdcmHeader(filename->c_str() );
if (!GdcmHeader.IsReadable())
{
- vtkErrorMacro("Gdcm cannot parse file " << FileName->c_str());
+ vtkErrorMacro("Gdcm cannot parse file " << filename->c_str());
vtkErrorMacro("Removing this file from readed files "
- << FileName->c_str());
- *FileName = "GDCM_UNREADABLE";
+ << filename->c_str());
+ *filename = "GDCM_UNREADABLE";
continue;
}
// Stage 1.3: further gdcm compatibility on PixelType
std::string type = GdcmHeader.GetPixelType();
if ( (type != "8U") && (type != "8S")
- && (type != "16U") && (type != "16S")
- && (type != "32U") && (type != "32S") )
+ && (type != "16U") && (type != "16S")
+ && (type != "32U") && (type != "32S") )
{
- vtkErrorMacro("Bad File Type for file" << FileName->c_str());
+ vtkErrorMacro("Bad File Type for file" << filename->c_str());
vtkErrorMacro(" " << type.c_str());
vtkErrorMacro("Removing this file from readed files "
- << FileName->c_str());
- *FileName = "GDCM_UNREADABLE";
+ << filename->c_str());
+ *filename = "GDCM_UNREADABLE";
continue;
}
{
// Stage 2.1: mandatory coherence stage:
if ( ( NX != this->NumColumns )
- || ( NY != this->NumLines )
- || ( type != this->ImageType ) )
+ || ( NY != this->NumLines )
+ || ( type != this->ImageType ) )
{
vtkErrorMacro("This file is not coherent with previous ones"
- << FileName->c_str());
+ << filename->c_str());
vtkErrorMacro("Removing this file from readed files "
- << FileName->c_str());
- *FileName = "GDCM_UNREADABLE";
+ << filename->c_str());
+ *filename = "GDCM_UNREADABLE";
continue;
}
if ( NZ != ReferenceNZ )
{
vtkErrorMacro("File is not coherent in Z with previous ones"
- << FileName->c_str());
+ << filename->c_str());
}
else
{
vtkDebugMacro("File is coherent with previous ones"
- << FileName->c_str());
+ << filename->c_str());
}
// Stage 2.3: when the file contains a volume (as opposed to an image),
if (NZ > 1)
{
vtkErrorMacro("This file contains multiple planes (images)"
- << FileName->c_str());
+ << filename->c_str());
}
// Eventually, this file can be added on the stack. Update the
// as the reference.
FoundReferenceFile = true;
vtkDebugMacro("This file taken as coherence reference:"
- << FileName->c_str());
+ << filename->c_str());
vtkDebugMacro("Image dimension of reference file as read from Gdcm:"
<< NX << " " << NY << " " << NZ);
vtkDebugMacro("Number of planes added to the stack: " << NZ);
this->DataOrigin[2] = GdcmHeader.GetZOrigin();
}
- } // End of loop on FileName
+ } // End of loop on filename
///////// The files we CANNOT load are flaged. On debugging purposes
// count the loadable number of files and display their number:
int NumberCoherentFiles = 0;
- for (std::list<std::string>::iterator Filename = InternalFileNameList.begin();
- Filename != InternalFileNameList.end();
- ++Filename)
+ for (std::list<std::string>::iterator it = InternalFileNameList.begin();
+ it != InternalFileNameList.end();
+ ++it)
{
- if (*Filename != "GDCM_UNREADABLE")
- NumberCoherentFiles++;
+ if (*it != "GDCM_UNREADABLE")
+ {
+ NumberCoherentFiles++;
+ }
}
vtkDebugMacro("Number of coherent files: " << NumberCoherentFiles);
* the Dest memory address. Returns the size of the data loaded.
*/
size_t vtkGdcmReader::LoadImageInMemory(
- std::string FileName,
- unsigned char * Dest,
- const unsigned long UpdateProgressTarget,
- unsigned long & UpdateProgressCount)
+ std::string fileName,
+ unsigned char * dest,
+ const unsigned long updateProgressTarget,
+ unsigned long & updateProgressCount)
{
- vtkDebugMacro("Copying to memory image [" << FileName.c_str() << "]");
- gdcmFile GdcmFile( FileName.c_str() );
+ vtkDebugMacro("Copying to memory image [" << fileName.c_str() << "]");
+ gdcmFile file( fileName.c_str() );
size_t size;
// If the data structure of vtk for image/volume representation
// line comes first (for some axis related reasons?). Hence we need
// to load the image line by line, starting from the end.
- int NumColumns = GdcmFile.GetHeader()->GetXSize();
- int NumLines = GdcmFile.GetHeader()->GetYSize();
- int NumPlanes = GdcmFile.GetHeader()->GetZSize();
- int LineSize = NumComponents * NumColumns * GdcmFile.GetHeader()->GetPixelSize();
+ int numColumns = file.GetHeader()->GetXSize();
+ int numLines = file.GetHeader()->GetYSize();
+ int numPlanes = file.GetHeader()->GetZSize();
+ int lineSize = NumComponents * numColumns * file.GetHeader()->GetPixelSize();
- unsigned char * Source;
+ unsigned char * source;
- if( GdcmFile.GetHeader()->HasLUT() && this->AllowLookupTable )
+ if( file.GetHeader()->HasLUT() && AllowLookupTable )
{
- size = GdcmFile.GetImageDataSizeRaw();
- Source = (unsigned char*) GdcmFile.GetImageDataRaw();
- unsigned char *Lut = GdcmFile.GetHeader()->GetLUTRGBA();
+ size = file.GetImageDataSizeRaw();
+ source = (unsigned char*) file.GetImageDataRaw();
+ unsigned char *lut = file.GetHeader()->GetLUTRGBA();
- if(!this->LookupTable)
+ if(!this->LookupTable)
+ {
this->LookupTable = vtkLookupTable::New();
+ }
this->LookupTable->SetNumberOfTableValues(256);
for (int tmp=0; tmp<256; tmp++)
{
this->LookupTable->SetTableValue(tmp,
- (float)Lut[4*tmp+0]/255.0,
- (float)Lut[4*tmp+1]/255.0,
- (float)Lut[4*tmp+2]/255.0,
+ (float)lut[4*tmp+0]/255.0,
+ (float)lut[4*tmp+1]/255.0,
+ (float)lut[4*tmp+2]/255.0,
1);
}
this->LookupTable->SetRange(0,255);
- vtkDataSetAttributes *a=this->GetOutput()->GetPointData();
+ vtkDataSetAttributes *a = this->GetOutput()->GetPointData();
a->GetScalars()->SetLookupTable(this->LookupTable);
- free(Lut);
+ free(lut);
}
else
{
- size = GdcmFile.GetImageDataSize();
- Source = (unsigned char*)GdcmFile.GetImageData();
+ size = file.GetImageDataSize();
+ source = (unsigned char*)file.GetImageData();
}
- unsigned char * pSource = Source; //pointer for later deletion
- unsigned char * Destination = Dest + size - LineSize;
+ unsigned char * pSource = source; //pointer for later deletion
+ unsigned char * destination = dest + size - lineSize;
- for (int plane = 0; plane < NumPlanes; plane++)
+ for (int plane = 0; plane < numPlanes; plane++)
{
- for (int line = 0; line < NumLines; line++)
+ for (int line = 0; line < numLines; line++)
{
// Copy one line at proper destination:
- memcpy((void*)Destination, (void*)Source, LineSize);
- Source += LineSize;
- Destination -= LineSize;
+ memcpy((void*)destination, (void*)source, lineSize);
+ source += lineSize;
+ destination -= lineSize;
// Update progress related:
- if (!(UpdateProgressCount%UpdateProgressTarget))
+ if (!(updateProgressCount%updateProgressTarget))
{
- this->UpdateProgress(UpdateProgressCount/(50.0*UpdateProgressTarget));
+ this->UpdateProgress(updateProgressCount/(50.0*updateProgressTarget));
}
- UpdateProgressCount++;
+ updateProgressCount++;
}
}
git://git.creatis.insa-lyon.fr / gdcm.git / commitdiff