-// $Header: /cvs/public/gdcm/vtk/vtkGdcmReader.cxx,v 1.11 2003/06/12 16:58:31 malaterre Exp $
-//CLEANME#include <vtkByteSwap.h>
+// $Header: /cvs/public/gdcm/vtk/vtkGdcmReader.cxx,v 1.15 2003/07/07 09:10:33 regrain Exp $
#include <stdio.h>
#include <vtkObjectFactory.h>
#include <vtkImageData.h>
vtkGdcmReader::~vtkGdcmReader()
{
// FIXME free memory
+ this->RemoveAllFileName();
+ this->InternalFileNameList.clear();
+}
+
+//----------------------------------------------------------------------------
+// Remove all files from the list of images to read.
+void vtkGdcmReader::RemoveAllFileName(void)
+{
this->FileNameList.clear();
}
vtkImageReader2::SetFileName(name);
// 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:
+ // this list when we manually positionate the filename.
this->FileNameList.clear();
this->Modified();
}
+//----------------------------------------------------------------------------
+// Adds a file name to the internal list of images to read.
+void vtkGdcmReader::RemoveAllInternalFileName(void)
+{
+ this->InternalFileNameList.clear();
+}
+
+//----------------------------------------------------------------------------
+// Adds a file name to the internal list of images to read.
+void vtkGdcmReader::AddInternalFileName(const char* name)
+{
+ char * LocalName = new char[strlen(name) + 1];
+ strcpy(LocalName, name);
+ this->InternalFileNameList.push_back(LocalName);
+ delete[] LocalName;
+}
+
//----------------------------------------------------------------------------
// vtkGdcmReader can have the file names specified through two ways:
// (1) by calling the vtkImageReader2::SetFileName(), SetFilePrefix() and
if (! this->FileNameList.empty() )
{
vtkDebugMacro("Using the AddFileName specified files");
+ this->InternalFileNameList=this->FileNameList;
return;
}
return;
}
+ this->RemoveAllInternalFileName();
for (int idx = this->DataExtent[4]; idx <= this->DataExtent[5]; ++idx)
{
this->ComputeInternalFileName(idx);
vtkDebugMacro("Adding file " << this->InternalFileName);
- this->AddFileName(this->InternalFileName);
+ this->AddInternalFileName(this->InternalFileName);
}
}
// (i.e. an image represents one plane, but a volume represents many planes)
int vtkGdcmReader::CheckFileCoherence()
{
- int ReturnedTotalNumberOfPlanes = 0; // The returned value.
+ int ReturnedTotalNumberOfPlanes = 0; // The returned value.
this->BuildFileListFromPattern();
- if (this->FileNameList.empty())
+ if (this->InternalFileNameList.empty())
{
vtkErrorMacro("FileNames are not set.");
return 0;
// Loop on the filenames:
// - check for their existence and gdcm "parasability"
// - get the coherence check done:
- for (std::list<std::string>::iterator FileName = FileNameList.begin();
- FileName != FileNameList.end();
+ 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 place in the
+ // ExecuteData method
+ // - If file has more than 1 plane, other planes will be added later to
+ // to the ReturnedTotalNumberOfPlanes variable counter
+ ReturnedTotalNumberOfPlanes += 1;
+
+ /////// Stage 0: check for file name:
+ if(*FileName==std::string("GDCM_UNREADABLE"))
+ continue;
+
/////// Stage 1: check for file readability:
// Stage 1.1: check for file existence.
FILE *fp;
{
vtkErrorMacro("This file contains multiple planes (images)"
<< FileName->c_str());
- vtkErrorMacro("Removing this file from readed files "
- << FileName->c_str());
}
// Eventually, this file can be added on the stack. Update the
// full size of the stack
vtkDebugMacro("Number of planes added to the stack: " << NZ);
- ReturnedTotalNumberOfPlanes += NZ;
+ ReturnedTotalNumberOfPlanes += NZ - 1; // First plane already added
continue;
} else {
this->NumColumns = NX;
this->NumLines = NY;
ReferenceNZ = NZ;
- ReturnedTotalNumberOfPlanes += NZ;
+ ReturnedTotalNumberOfPlanes += NZ - 1; // First plane already added
this->ImageType = type;
this->PixelSize = GdcmHeader.GetPixelSize();
}
///////// The files we CANNOT load are flaged. On debugging purposes
// count the loadable number of files and display thir number:
int NumberCoherentFiles = 0;
- for (std::list<std::string>::iterator FileName = FileNameList.begin();
- FileName != FileNameList.end();
- ++FileName)
+ for (std::list<std::string>::iterator Filename = InternalFileNameList.begin();
+ Filename != InternalFileNameList.end();
+ ++Filename)
{
- if (*FileName != "GDCM_UNREADABLE")
+ if (*Filename != "GDCM_UNREADABLE")
NumberCoherentFiles++;
}
vtkDebugMacro("Number of coherent files: " << NumberCoherentFiles);
vtkDebugMacro("Total number of planes on the stack: "
<< ReturnedTotalNumberOfPlanes);
- return ReturnedTotalNumberOfPlanes;
+
+ return ReturnedTotalNumberOfPlanes;
}
//----------------------------------------------------------------------------
// Configure the output e.g. WholeExtent, spacing, origin, scalar type...
void vtkGdcmReader::ExecuteInformation()
{
- //FIXME free any old memory
+ //FIXME free any old memory
this->TotalNumberOfPlanes = this->CheckFileCoherence();
if ( this->TotalNumberOfPlanes == 0)
{
this->DataExtent[1] = this->NumColumns - 1;
this->DataExtent[2] = 0;
this->DataExtent[3] = this->NumLines - 1;
- if(this->FileNameList.size() > 1)
+ if(this->InternalFileNameList.size() > 1)
{
this->DataExtent[4] = 0;
this->DataExtent[5] = this->TotalNumberOfPlanes - 1;
}
//----------------------------------------------------------------------------
-// Update -> UpdateData -> Execute -> ExecuteData (see vtkSource.cxx for
-// last step.
+// Update => ouput->Update => UpdateData => Execute => ExecuteData
+// (see vtkSource.cxx for last step).
// This function (redefinition of vtkImageReader::ExecuteData, see
// VTK/IO/vtkImageReader.cxx) reads a data from a file. The datas
// extent/axes are assumed to be the
// same as the file extent/order.
void vtkGdcmReader::ExecuteData(vtkDataObject *output)
{
- if (this->FileNameList.empty())
+ if (this->InternalFileNameList.empty())
{
vtkErrorMacro("A least a valid FileName must be specified.");
return;
}
+ // FIXME : the bad parse of header is made when allocating OuputData
vtkImageData *data = this->AllocateOutputData(output);
data->SetExtent(this->DataExtent);
data->GetPointData()->GetScalars()->SetName("DicomImage-Volume");
- // 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;
- size_t stack_size = StackNumPixels * this->PixelSize;
- // Allocate pixel data space itself.
- unsigned char *mem = new unsigned char [stack_size];
-
- // Variables for the UpdateProgress. We shall use 50 steps to signify
- // the advance of the process:
- unsigned long UpdateProgressTarget = (unsigned long) this->NumLines
- * this->TotalNumberOfPlanes
- / 50.0;
- // The actual advance measure:
- unsigned long UpdateProgressCount = 0;
-
- // Feeling the allocated memory space with each image/volume:
- unsigned char * Dest = mem;
- for (std::list<std::string>::iterator FileName = FileNameList.begin();
- FileName != FileNameList.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")
- {
- Dest += this->LoadImageInMemory(*FileName, Dest,
- UpdateProgressTarget,
- UpdateProgressCount);
- } else {
- // We insert a black image in the stack for the user to be aware that
- // this image/volume couldn't be loaded. We simply skip one image
- // size:
- Dest += this->NumColumns * this->NumLines * this->PixelSize;
- // Update progress related:
- UpdateProgressCount += this->NumLines;
- if (!(UpdateProgressCount%UpdateProgressTarget))
+ // Test if output has valid extent
+ // Prevent memory errors
+ if((this->DataExtent[1]-this->DataExtent[0]>0) &&
+ (this->DataExtent[3]-this->DataExtent[2]>0) &&
+ (this->DataExtent[5]-this->DataExtent[4]>0))
+ {
+ // 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;
+ size_t stack_size = StackNumPixels * this->PixelSize;
+ // Allocate pixel data space itself.
+ unsigned char *mem = new unsigned char [stack_size];
+
+ // Variables for the UpdateProgress. We shall use 50 steps to signify
+ // the advance of the process:
+ unsigned long UpdateProgressTarget = (unsigned long) ceil (this->NumLines
+ * this->TotalNumberOfPlanes
+ / 50.0);
+ // The actual advance measure:
+ unsigned long UpdateProgressCount = 0;
+
+ // Feeling the allocated memory space with each image/volume:
+ unsigned char * Dest = mem;
+ 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")
{
- this->UpdateProgress(UpdateProgressCount/(50.0*UpdateProgressTarget));
- }
- } // Else, file not loadable
- } // Loop on files
-
- // The "size" of the vtkScalars data is expressed in number of points,
- // and is not the memory size representing those points:
- data->GetPointData()->GetScalars()->SetVoidArray(mem, StackNumPixels, 0);
- this->Modified();
+ // Update progress related for good files is made in LoadImageInMemory
+ Dest += this->LoadImageInMemory(*FileName, Dest,
+ UpdateProgressTarget,
+ UpdateProgressCount);
+ } else {
+ // We insert a black image in the stack for the user to be aware that
+ // this image/volume couldn't be loaded. We simply skip one image
+ // size:
+ Dest += this->NumColumns * this->NumLines * this->PixelSize;
+
+ // Update progress related for bad files:
+ UpdateProgressCount += this->NumLines;
+ if (UpdateProgressTarget > 0)
+ {
+ if (!(UpdateProgressCount%UpdateProgressTarget))
+ {
+ this->UpdateProgress(UpdateProgressCount/(50.0*UpdateProgressTarget));
+ }
+ }
+ } // Else, file not loadable
+
+ } // Loop on files
+
+ // The "size" of the vtkScalars data is expressed in number of points,
+ // and is not the memory size representing those points:
+ data->GetPointData()->GetScalars()->SetVoidArray(mem, StackNumPixels, 0);
+ this->Modified();
+ }
}
//----------------------------------------------------------------------------
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff