-// vtkGdcmReader.cxx
+/*=========================================================================
+
+ Program: gdcm
+ Module: $RCSfile: vtkGdcmReader.cxx,v $
+ Language: C++
+ Date: $Date: 2005/04/22 12:07:39 $
+ Version: $Revision: 1.68 $
+
+ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+ l'Image). All rights reserved. See Doc/License.txt or
+ http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+
//-----------------------------------------------------------------------------
// //////////////////////////////////////////////////////////////
// WARNING TODO CLEANME
// is compared to this new value to find a modification in the class
// parameters
// 2b/ the core of ExecuteData then needs gdcmFile (which in turns
-// initialises gdcmHeader in the constructor) in order to access
+// initialises gdcmFile in the constructor) in order to access
// the data-image.
//
// Possible solution:
// maintain a list of gdcmFiles (created by say ExecuteInformation) created
-// once and for all accross the life of vtkGdcmHeader (it would only load
+// once and for all accross the life of vtkGdcmFile (it would only load
// new gdcmFile if the user changes the list). ExecuteData would then use
// those gdcmFile and hence avoid calling the construtor:
// - advantage: the header of the files would only be parser once.
// - drawback: once execute information is called (i.e. on creation of
-// a vtkGdcmHeader) the gdcmFile structure is loaded in memory.
-// The average size of a gdcmHeader being of 100Ko, is one
+// a vtkGdcmFile) the gdcmFile structure is loaded in memory.
+// The average size of a gdcmFile being of 100Ko, is one
// loads 10 stacks of images with say 200 images each, you
// end-up with a loss of 200Mo...
//
// time...
// //////////////////////////////////////////////////////////////
+#include "gdcmFileHelper.h"
#include "gdcmFile.h"
-#include "gdcmHeader.h"
#include "vtkGdcmReader.h"
//#include <stdio.h>
#include <vtkPointData.h>
#include <vtkLookupTable.h>
-vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.58 $");
+vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.68 $");
vtkStandardNewMacro(vtkGdcmReader);
//-----------------------------------------------------------------------------
{
vtkDebugMacro(<< "16 bits signed image");
this->SetDataScalarTypeToShort();
- //vtkErrorMacro(<< "Cannot handle 16 bit signed files");
}
else if ( ImageType == "32U" )
{
vtkDebugMacro(<< "32 bits unsigned image");
- vtkDebugMacro("WARNING: forced to signed int !");
+ vtkDebugMacro(<< "WARNING: forced to signed int !");
this->SetDataScalarTypeToInt();
}
else if ( ImageType == "32S" )
* 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
+ * VTK/IO/vtkImageReader.cxx) reads a data from a file. The data
* extent/axes are assumed to be the same as the file extent/order.
*/
void vtkGdcmReader::ExecuteData(vtkDataObject *output)
// The actual advance measure:
unsigned long UpdateProgressCount = 0;
- // Feeling the allocated memory space with each image/volume:
+ // Filling the allocated memory space with each image/volume:
unsigned char *Dest = (unsigned char *)data->GetScalarPointer();
for (std::list<std::string>::iterator filename = InternalFileNameList.begin();
filename != InternalFileNameList.end();
fclose(fp);
// Stage 1.2: check for Gdcm parsability
- gdcm::Header GdcmHeader(filename->c_str() );
- if (!GdcmHeader.IsReadable())
+ gdcm::File GdcmFile(filename->c_str() );
+ if (!GdcmFile.IsReadable())
{
vtkErrorMacro(<< "Gdcm cannot parse file " << filename->c_str());
vtkErrorMacro(<< "Removing this file from readed files "
}
// Stage 1.3: further gdcm compatibility on PixelType
- std::string type = GdcmHeader.GetPixelType();
+ std::string type = GdcmFile.GetPixelType();
if ( (type != "8U") && (type != "8S")
&& (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;
}
// Stage 2: check coherence of the set of files
- int NX = GdcmHeader.GetXSize();
- int NY = GdcmHeader.GetYSize();
- int NZ = GdcmHeader.GetZSize();
+ int NX = GdcmFile.GetXSize();
+ int NY = GdcmFile.GetYSize();
+ int NZ = GdcmFile.GetZSize();
if (FoundReferenceFile)
{
// Stage 2.1: mandatory coherence stage:
}
else
{
- // We didn't have a workable reference file yet. Set this one
- // as the reference.
+ // We didn't have a workable reference file yet.
+ // Set this one as the reference.
FoundReferenceFile = true;
vtkDebugMacro(<< "This file taken as coherence reference:"
<< filename->c_str());
ReferenceNZ = NZ;
ReturnedTotalNumberOfPlanes += NZ - 1; // First plane already added
this->ImageType = type;
- this->PixelSize = GdcmHeader.GetPixelSize();
+ this->PixelSize = GdcmFile.GetPixelSize();
- if( GdcmHeader.HasLUT() && this->AllowLookupTable )
+ if( GdcmFile.HasLUT() && this->AllowLookupTable )
{
// I could raise an error is AllowLookupTable is on and HasLUT() off
- this->NumComponents = GdcmHeader.GetNumberOfScalarComponentsRaw();
+ this->NumComponents = GdcmFile.GetNumberOfScalarComponentsRaw();
}
else
{
- this->NumComponents = GdcmHeader.GetNumberOfScalarComponents(); //rgb or mono
+ this->NumComponents = GdcmFile.GetNumberOfScalarComponents(); //rgb or mono
}
//Set image spacing
- this->DataSpacing[0] = GdcmHeader.GetXSpacing();
- this->DataSpacing[1] = GdcmHeader.GetYSpacing();
- this->DataSpacing[2] = GdcmHeader.GetZSpacing();
+ this->DataSpacing[0] = GdcmFile.GetXSpacing();
+ this->DataSpacing[1] = GdcmFile.GetYSpacing();
+ this->DataSpacing[2] = GdcmFile.GetZSpacing();
//Set image origin
- this->DataOrigin[0] = GdcmHeader.GetXOrigin();
- this->DataOrigin[1] = GdcmHeader.GetYOrigin();
- this->DataOrigin[2] = GdcmHeader.GetZOrigin();
+ //this->DataOrigin[0] = GdcmFile.GetXOrigin();
+ //this->DataOrigin[1] = GdcmFile.GetYOrigin();
+ //this->DataOrigin[2] = GdcmFile.GetZOrigin();
}
} // End of loop on filename
*/
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() << "]");
- gdcm::File file( fileName.c_str() );
+ gdcm::FileHelper 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 = file.GetHeader()->GetXSize();
- int numLines = file.GetHeader()->GetYSize();
- int numPlanes = file.GetHeader()->GetZSize();
- int lineSize = NumComponents * numColumns * file.GetHeader()->GetPixelSize();
+ int numColumns = file.GetFile()->GetXSize();
+ int numLines = file.GetFile()->GetYSize();
+ int numPlanes = file.GetFile()->GetZSize();
+ int lineSize = NumComponents * numColumns * file.GetFile()->GetPixelSize();
+ int planeSize = lineSize * numLines;
- unsigned char * source;
+ unsigned char *src;
- if( file.GetHeader()->HasLUT() && AllowLookupTable )
+ if( file.GetFile()->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);
-
return size;
}
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff