// vtkGdcmReader.cxx
//-----------------------------------------------------------------------------
// //////////////////////////////////////////////////////////////
-// WARNING TODO CLENAME
+// WARNING TODO CLEANME
// Actual limitations of this code:
//
// /////// Redundant and unnecessary header parsing
#include <vtkPointData.h>
#include <vtkLookupTable.h>
+vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.53 $");
+vtkStandardNewMacro(vtkGdcmReader);
+
//-----------------------------------------------------------------------------
// Constructor / Destructor
vtkGdcmReader::vtkGdcmReader()
{
this->LookupTable = NULL;
+ this->AllowLookupTable = 0;
}
vtkGdcmReader::~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 ;
}
}
{
// The memory size for a full stack of images of course depends
// on the number of planes and the size of each image:
- size_t StackNumPixels = this->NumColumns * this->NumLines
- * this->TotalNumberOfPlanes * this->NumComponents;
- size_t stack_size = StackNumPixels * this->PixelSize;
+ //size_t StackNumPixels = this->NumColumns * this->NumLines
+ // * this->TotalNumberOfPlanes * this->NumComponents;
+ //size_t stack_size = StackNumPixels * this->PixelSize; //not used
// Allocate pixel data space itself.
// Variables for the UpdateProgress. We shall use 50 steps to signify
// 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);
}
return;
}
- if ((! this->FileNameList.empty()) && this->FilePattern )
+ if ((! this->FileNameList.empty()) && this->FilePrefix )
{
- vtkErrorMacro("Both AddFileName and SetFilePattern schemes were used");
+ vtkErrorMacro("Both AddFileName and SetFilePrefix schemes were used");
vtkErrorMacro("No images loaded ! ");
return;
}
- if (this->FileName && this->FilePattern)
+ if (this->FileName && this->FilePrefix)
{
- vtkErrorMacro("Both SetFileName and SetFilePattern schemes were used");
+ vtkErrorMacro("Both SetFileName and SetFilePrefix schemes were used");
vtkErrorMacro("No images loaded ! ");
return;
}
return;
}
- if (!this->FileName && !this->FilePattern)
+ if (!this->FileName && !this->FilePrefix)
{
vtkErrorMacro("FileNames are not set. Either use AddFileName() or");
- vtkErrorMacro("specify a FileName or FilePattern.");
+ vtkErrorMacro("specify a FileName or FilePrefix.");
return;
}
// 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
- gdcmHeaderHelper GdcmHeader(FileName->c_str(), false, true);
- // true : for enableSequences
+ gdcm::Header 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->ImageType = type;
this->PixelSize = GdcmHeader.GetPixelSize();
- if( GdcmHeader.HasLUT() )
+ if( GdcmHeader.HasLUT() && this->AllowLookupTable )
{
+ // I could raise an error is AllowLookupTable is on and HasLUT() off
this->NumComponents = GdcmHeader.GetNumberOfScalarComponentsRaw();
}
else
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(),false,true);
- // true : to enable SeQuences
+ vtkDebugMacro("Copying to memory image [" << fileName.c_str() << "]");
+ gdcm::File 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() )
+ 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 = (unsigned char*) file.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++;
}
}
// fclose(f2);
//GetImageData allocate a (void*)malloc, remove it:
- free(pSource);
+
+ // CLEANME
+ // Now, the delete on values keep from GetImageData is useless (made in
+ // the PixelConvert class)
+ //delete[] pSource;
return size;
}
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff