X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkGdcmReader.cxx;h=6db14bad8d58cf810a6740d8d0a34b4e337357e9;hb=27607c280b744ce7de6a1698935181e66aa2f3e6;hp=539d5fc8643b21c118d61a8183a5655fe64952a3;hpb=2ca09ddbc04e1ec02aa49e8815925cceb49b2402;p=gdcm.git diff --git a/vtk/vtkGdcmReader.cxx b/vtk/vtkGdcmReader.cxx index 539d5fc8..6db14bad 100644 --- a/vtk/vtkGdcmReader.cxx +++ b/vtk/vtkGdcmReader.cxx @@ -1,4 +1,21 @@ -// vtkGdcmReader.cxx +/*========================================================================= + + Program: gdcm + Module: $RCSfile: vtkGdcmReader.cxx,v $ + Language: C++ + Date: $Date: 2005/01/21 11:40:56 $ + Version: $Revision: 1.66 $ + + 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 @@ -24,18 +41,18 @@ // 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... // @@ -48,8 +65,8 @@ // time... // ////////////////////////////////////////////////////////////// +#include "gdcmFileHelper.h" #include "gdcmFile.h" -#include "gdcmHeader.h" #include "vtkGdcmReader.h" //#include @@ -58,7 +75,7 @@ #include #include -vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.62 $"); +vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.66 $"); vtkStandardNewMacro(vtkGdcmReader); //----------------------------------------------------------------------------- @@ -444,8 +461,8 @@ int vtkGdcmReader::CheckFileCoherence() 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 " @@ -455,7 +472,7 @@ int vtkGdcmReader::CheckFileCoherence() } // 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") ) @@ -469,9 +486,9 @@ int vtkGdcmReader::CheckFileCoherence() } // 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: @@ -530,27 +547,27 @@ int vtkGdcmReader::CheckFileCoherence() 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 @@ -607,12 +624,12 @@ void vtkGdcmReader::AddInternalFileName(const char* name) */ 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 @@ -622,17 +639,18 @@ size_t vtkGdcmReader::LoadImageInMemory( // 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) @@ -656,20 +674,19 @@ size_t vtkGdcmReader::LoadImageInMemory( } 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)) { @@ -677,17 +694,9 @@ size_t vtkGdcmReader::LoadImageInMemory( } 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; }