// //////////////////////////////////////////////////////////////
#include "gdcmFile.h"
-#include "gdcmHeaderHelper.h"
+#include "gdcmHeader.h"
#include "vtkGdcmReader.h"
//#include <stdio.h>
#include <vtkPointData.h>
#include <vtkLookupTable.h>
-vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.55 $");
+vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.63 $");
vtkStandardNewMacro(vtkGdcmReader);
//-----------------------------------------------------------------------------
// Since we maintain a list of filenames, when building a volume,
// (see vtkGdcmReader::AddFileName), we additionaly need to purge
// this list when we manually positionate the filename.
- vtkDebugMacro("Clearing all files given with AddFileName");
+ vtkDebugMacro(<< "Clearing all files given with AddFileName");
this->FileNameList.clear();
this->Modified();
}
this->TotalNumberOfPlanes = this->CheckFileCoherence();
if ( this->TotalNumberOfPlanes == 0)
{
- vtkErrorMacro("File set is not coherent. Exiting...");
+ vtkErrorMacro(<< "File set is not coherent. Exiting...");
return;
}
(this->DataVOI[4] < 0) ||
(this->DataVOI[5] >= this->TotalNumberOfPlanes ))
{
- vtkWarningMacro("The requested VOI is larger than expected extent.");
+ vtkWarningMacro(<< "The requested VOI is larger than expected extent.");
this->DataVOI[0] = 0;
this->DataVOI[1] = this->NumColumns - 1;
this->DataVOI[2] = 0;
// But we do need to set up the data type for downstream filters:
if ( ImageType == "8U" )
{
- vtkDebugMacro("8 bits unsigned image");
+ vtkDebugMacro(<< "8 bits unsigned image");
this->SetDataScalarTypeToUnsignedChar();
}
else if ( ImageType == "8S" )
{
- vtkErrorMacro("Cannot handle 8 bit signed files");
+ vtkErrorMacro(<< "Cannot handle 8 bit signed files");
return;
}
else if ( ImageType == "16U" )
{
- vtkDebugMacro("16 bits unsigned image");
+ vtkDebugMacro(<< "16 bits unsigned image");
this->SetDataScalarTypeToUnsignedShort();
}
else if ( ImageType == "16S" )
{
- vtkDebugMacro("16 bits signed image");
+ vtkDebugMacro(<< "16 bits signed image");
this->SetDataScalarTypeToShort();
- //vtkErrorMacro("Cannot handle 16 bit signed files");
+ //vtkErrorMacro(<< "Cannot handle 16 bit signed files");
}
else if ( ImageType == "32U" )
{
- vtkDebugMacro("32 bits unsigned image");
- vtkDebugMacro("WARNING: forced to signed int !");
+ vtkDebugMacro(<< "32 bits unsigned image");
+ vtkDebugMacro(<< "WARNING: forced to signed int !");
this->SetDataScalarTypeToInt();
}
else if ( ImageType == "32S" )
{
- vtkDebugMacro("32 bits signed image");
+ vtkDebugMacro(<< "32 bits signed image");
this->SetDataScalarTypeToInt();
}
else if ( ImageType == "FD" )
{
- vtkDebugMacro("64 bits Double image");
+ vtkDebugMacro(<< "64 bits Double image");
this->SetDataScalarTypeToDouble();
}
//Set number of scalar components:
{
if (this->InternalFileNameList.empty())
{
- vtkErrorMacro("A least a valid FileName must be specified.");
+ vtkErrorMacro(<< "A least a valid FileName must be specified.");
return;
}
unsigned long UpdateProgressCount = 0;
// Feeling the allocated memory space with each image/volume:
- unsigned char *Dest = (unsigned char *)data->GetPointData()->GetScalars()->GetVoidPointer(0);
+ unsigned char *Dest = (unsigned char *)data->GetScalarPointer();
for (std::list<std::string>::iterator filename = InternalFileNameList.begin();
filename != InternalFileNameList.end();
++filename)
if ((! this->FileNameList.empty()) && this->FileName )
{
- vtkErrorMacro("Both AddFileName and SetFileName schemes were used");
- vtkErrorMacro("No images loaded ! ");
+ vtkErrorMacro(<< "Both AddFileName and SetFileName schemes were used");
+ vtkErrorMacro(<< "No images loaded ! ");
return;
}
if ((! this->FileNameList.empty()) && this->FilePrefix )
{
- vtkErrorMacro("Both AddFileName and SetFilePrefix schemes were used");
- vtkErrorMacro("No images loaded ! ");
+ vtkErrorMacro(<< "Both AddFileName and SetFilePrefix schemes were used");
+ vtkErrorMacro(<< "No images loaded ! ");
return;
}
if (this->FileName && this->FilePrefix)
{
- vtkErrorMacro("Both SetFileName and SetFilePrefix schemes were used");
- vtkErrorMacro("No images loaded ! ");
+ vtkErrorMacro(<< "Both SetFileName and SetFilePrefix schemes were used");
+ vtkErrorMacro(<< "No images loaded ! ");
return;
}
if (! this->FileNameList.empty() )
{
- vtkDebugMacro("Using the AddFileName specified files");
+ vtkDebugMacro(<< "Using the AddFileName specified files");
this->InternalFileNameList=this->FileNameList;
return;
}
if (!this->FileName && !this->FilePrefix)
{
- vtkErrorMacro("FileNames are not set. Either use AddFileName() or");
- vtkErrorMacro("specify a FileName or FilePrefix.");
+ vtkErrorMacro(<< "FileNames are not set. Either use AddFileName() or");
+ vtkErrorMacro(<< "specify a FileName or FilePrefix.");
return;
}
// Single file loading (as given with ::SetFileName()):
// Case of multi-frame file considered here
this->ComputeInternalFileName(this->DataExtent[4]);
- vtkDebugMacro("Adding file " << this->InternalFileName);
+ vtkDebugMacro(<< "Adding file " << this->InternalFileName);
this->AddInternalFileName(this->InternalFileName);
}
else
for (int idx = this->DataExtent[4]; idx <= this->DataExtent[5]; ++idx)
{
this->ComputeInternalFileName(idx);
- vtkDebugMacro("Adding file " << this->InternalFileName);
+ vtkDebugMacro(<< "Adding file " << this->InternalFileName);
this->AddInternalFileName(this->InternalFileName);
}
}
this->BuildFileListFromPattern();
if (this->InternalFileNameList.empty())
{
- vtkErrorMacro("FileNames are not set.");
+ vtkErrorMacro(<< "FileNames are not set.");
return 0;
}
fp = fopen(filename->c_str(),"rb");
if (!fp)
{
- vtkErrorMacro("Unable to open file " << filename->c_str());
- vtkErrorMacro("Removing this file from readed files "
+ vtkErrorMacro(<< "Unable to open file " << filename->c_str());
+ vtkErrorMacro(<< "Removing this file from readed files "
<< filename->c_str());
*filename = "GDCM_UNREADABLE";
continue;
gdcm::Header GdcmHeader(filename->c_str() );
if (!GdcmHeader.IsReadable())
{
- vtkErrorMacro("Gdcm cannot parse file " << filename->c_str());
- vtkErrorMacro("Removing this file from readed files "
+ vtkErrorMacro(<< "Gdcm cannot parse file " << filename->c_str());
+ vtkErrorMacro(<< "Removing this file from readed files "
<< filename->c_str());
*filename = "GDCM_UNREADABLE";
continue;
&& (type != "16U") && (type != "16S")
&& (type != "32U") && (type != "32S") )
{
- vtkErrorMacro("Bad File Type for file" << filename->c_str());
- vtkErrorMacro(" " << type.c_str());
- vtkErrorMacro("Removing this file from readed files "
- << filename->c_str());
+ vtkErrorMacro(<< "Bad File Type for file " << filename->c_str() << "\n"
+ << " File type found : " << type.c_str()
+ << " (might be 8U, 8S, 16U, 16S, 32U, 32S) \n"
+ << " Removing this file from readed files");
*filename = "GDCM_UNREADABLE";
continue;
}
|| ( NY != this->NumLines )
|| ( type != this->ImageType ) )
{
- vtkErrorMacro("This file is not coherent with previous ones"
+ vtkErrorMacro(<< "This file is not coherent with previous ones"
<< filename->c_str());
- vtkErrorMacro("Removing this file from readed files "
+ vtkErrorMacro(<< "Removing this file from readed files "
<< filename->c_str());
*filename = "GDCM_UNREADABLE";
continue;
// Stage 2.2: optional coherence stage
if ( NZ != ReferenceNZ )
{
- vtkErrorMacro("File is not coherent in Z with previous ones"
+ vtkErrorMacro(<< "File is not coherent in Z with previous ones"
<< filename->c_str());
}
else
{
- vtkDebugMacro("File is coherent with previous ones"
+ vtkDebugMacro(<< "File is coherent with previous ones"
<< filename->c_str());
}
// notify the caller.
if (NZ > 1)
{
- vtkErrorMacro("This file contains multiple planes (images)"
+ vtkErrorMacro(<< "This file contains multiple planes (images)"
<< filename->c_str());
}
// We didn't have a workable reference file yet. Set this one
// as the reference.
FoundReferenceFile = true;
- vtkDebugMacro("This file taken as coherence reference:"
+ vtkDebugMacro(<< "This file taken as coherence reference:"
<< filename->c_str());
- vtkDebugMacro("Image dimension of reference file as read from Gdcm:"
+ vtkDebugMacro(<< "Image dimension of reference file as read from Gdcm:"
<< NX << " " << NY << " " << NZ);
- vtkDebugMacro("Number of planes added to the stack: " << NZ);
+ vtkDebugMacro(<< "Number of planes added to the stack: " << NZ);
// Set aside the size of the image
this->NumColumns = NX;
this->NumLines = NY;
this->DataSpacing[2] = GdcmHeader.GetZSpacing();
//Set image origin
- this->DataOrigin[0] = GdcmHeader.GetXOrigin();
- this->DataOrigin[1] = GdcmHeader.GetYOrigin();
- this->DataOrigin[2] = GdcmHeader.GetZOrigin();
+ //this->DataOrigin[0] = GdcmHeader.GetXOrigin();
+ //this->DataOrigin[1] = GdcmHeader.GetYOrigin();
+ //this->DataOrigin[2] = GdcmHeader.GetZOrigin();
}
} // End of loop on filename
NumberCoherentFiles++;
}
}
- vtkDebugMacro("Number of coherent files: " << NumberCoherentFiles);
+ vtkDebugMacro(<< "Number of coherent files: " << NumberCoherentFiles);
if (ReturnedTotalNumberOfPlanes == 0)
{
- vtkErrorMacro("No loadable file.");
+ vtkErrorMacro(<< "No loadable file.");
}
- vtkDebugMacro("Total number of planes on the stack: "
+ vtkDebugMacro(<< "Total number of planes on the stack: "
<< ReturnedTotalNumberOfPlanes);
return ReturnedTotalNumberOfPlanes;
*/
size_t vtkGdcmReader::LoadImageInMemory(
std::string fileName,
- unsigned char * dest,
+ unsigned char *dest,
const unsigned long updateProgressTarget,
unsigned long & updateProgressCount)
{
- vtkDebugMacro("Copying to memory image [" << fileName.c_str() << "]");
+ vtkDebugMacro(<< "Copying to memory image [" << fileName.c_str() << "]");
gdcm::File file( fileName.c_str() );
size_t size;
int numLines = file.GetHeader()->GetYSize();
int numPlanes = file.GetHeader()->GetZSize();
int lineSize = NumComponents * numColumns * file.GetHeader()->GetPixelSize();
+ int planeSize = lineSize * numLines;
- unsigned char * source;
+ unsigned char *src;
if( file.GetHeader()->HasLUT() && AllowLookupTable )
{
size = file.GetImageDataSize();
- source = (unsigned char*) file.GetImageDataRaw();
+ src = (unsigned char*) file.GetImageDataRaw();
unsigned char *lut = (unsigned char*) file.GetLutRGBA();
if(!this->LookupTable)
}
else
{
- size = file.GetImageDataSize();
- source = (unsigned char*)file.GetImageData();
+ size = file.GetImageDataSize();
+ src = (unsigned char*)file.GetImageData();
}
-
- unsigned char * destination = dest + size - lineSize;
+ unsigned char *dst = dest + planeSize - lineSize;
for (int plane = 0; plane < numPlanes; plane++)
{
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*)dst, (void*)src, lineSize);
+ src += lineSize;
+ dst -= lineSize;
// Update progress related:
if (!(updateProgressCount%updateProgressTarget))
{
}
updateProgressCount++;
}
+ dst += 2 * planeSize;
}
-// DO NOT remove this commented out code .
-// Nobody knows what's expecting you ...
-// Just to 'see' what was actually read on disk :-(
-
-// FILE * f2;
-// f2 = fopen("SpuriousFile.RAW","wb");
-// fwrite(Dest,size,1,f2);
-// fclose(f2);
-
- //GetImageData allocate a (void*)malloc, remove it:
-
- // CLEANME
- // Now, the delete on values keep from GetImageData is useless (made in
- // the PixelConvert class)
-
-// unsigned char * pSource = source; //pointer for later deletion
-// delete[] pSource;
return size;
}
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff