X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkGdcmWriter.cxx;h=4cf4db2da9252039a05365a1567748ce12c6180d;hb=c4fa2e74a4ce56a0a8db54e4a70d404bec9fc8dd;hp=822a7132d05fa3c4fe65e95bbff592d4770e4a21;hpb=3d5f18344f54d20b3a66cce87727c7970bfdded4;p=gdcm.git diff --git a/vtk/vtkGdcmWriter.cxx b/vtk/vtkGdcmWriter.cxx index 822a7132..4cf4db2d 100644 --- a/vtk/vtkGdcmWriter.cxx +++ b/vtk/vtkGdcmWriter.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: vtkGdcmWriter.cxx,v $ Language: C++ - Date: $Date: 2005/01/24 16:51:01 $ - Version: $Revision: 1.14 $ + Date: $Date: 2005/08/22 12:23:26 $ + Version: $Revision: 1.24 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -19,6 +19,7 @@ #include "gdcmFile.h" #include "gdcmFileHelper.h" #include "gdcmDebug.h" +#include "gdcmUtil.h" #include "vtkGdcmWriter.h" #include @@ -26,8 +27,12 @@ #include #include -vtkCxxRevisionMacro(vtkGdcmWriter, "$Revision: 1.14 $"); -vtkStandardNewMacro(vtkGdcmWriter); +#ifndef vtkFloatingPointType +#define vtkFloatingPointType float +#endif + +vtkCxxRevisionMacro(vtkGdcmWriter, "$Revision: 1.24 $") +vtkStandardNewMacro(vtkGdcmWriter) //----------------------------------------------------------------------------- // Constructor / Destructor @@ -44,9 +49,9 @@ vtkGdcmWriter::~vtkGdcmWriter() //----------------------------------------------------------------------------- // Print -void vtkGdcmWriter::PrintSelf(ostream& os, vtkIndent indent) +void vtkGdcmWriter::PrintSelf(ostream &os, vtkIndent indent) { - this->Superclass::PrintSelf(os,indent); + this->Superclass::PrintSelf(os, indent); os << indent << "Write type : " << this->GetWriteTypeAsString(); } @@ -75,7 +80,7 @@ const char *vtkGdcmWriter::GetWriteTypeAsString() /** * Copy the image and reverse the Y axis */ -// The output datas must be deleted by the user of the method !!! +// The output data must be deleted by the user of the method !!! size_t ReverseData(vtkImageData *image,unsigned char **data) { int inc[3]; @@ -118,9 +123,9 @@ size_t ReverseData(vtkImageData *image,unsigned char **data) } /** - * Set the datas informations in the file + * Set the data informations in the file */ -void SetImageInformation(gdcm::FileHelper *file,vtkImageData *image) +void SetImageInformation(gdcm::FileHelper *file, vtkImageData *image) { std::ostringstream str; @@ -132,37 +137,37 @@ void SetImageInformation(gdcm::FileHelper *file,vtkImageData *image) str.str(""); str << dim[0]; - file->Insert(str.str(),0x0028,0x0011); // Columns + file->InsertValEntry(str.str(),0x0028,0x0011); // Columns str.str(""); str << dim[1]; - file->Insert(str.str(),0x0028,0x0010); // Rows + file->InsertValEntry(str.str(),0x0028,0x0010); // Rows if(dim[2]>1) { str.str(""); str << dim[2]; //file->Insert(str.str(),0x0028,0x0012); // Planes - file->Insert(str.str(),0x0028,0x0008); // Number of Frames + file->InsertValEntry(str.str(),0x0028,0x0008); // Number of Frames } // Pixel type str.str(""); str << image->GetScalarSize()*8; - file->Insert(str.str(),0x0028,0x0100); // Bits Allocated - file->Insert(str.str(),0x0028,0x0101); // Bits Stored + file->InsertValEntry(str.str(),0x0028,0x0100); // Bits Allocated + file->InsertValEntry(str.str(),0x0028,0x0101); // Bits Stored str.str(""); str << image->GetScalarSize()*8-1; - file->Insert(str.str(),0x0028,0x0102); // High Bit + file->InsertValEntry(str.str(),0x0028,0x0102); // High Bit // Pixel Repr // FIXME : what do we do when the ScalarType is // VTK_UNSIGNED_INT or VTK_UNSIGNED_LONG str.str(""); - if( image->GetScalarType() == VTK_UNSIGNED_CHAR || + if( image->GetScalarType() == VTK_UNSIGNED_CHAR || image->GetScalarType() == VTK_UNSIGNED_SHORT || - image->GetScalarType() == VTK_UNSIGNED_INT || + image->GetScalarType() == VTK_UNSIGNED_INT || image->GetScalarType() == VTK_UNSIGNED_LONG ) { str << "0"; // Unsigned @@ -171,39 +176,50 @@ void SetImageInformation(gdcm::FileHelper *file,vtkImageData *image) { str << "1"; // Signed } - file->Insert(str.str(),0x0028,0x0103); // Pixel Representation + file->InsertValEntry(str.str(),0x0028,0x0103); // Pixel Representation // Samples per pixel str.str(""); str << image->GetNumberOfScalarComponents(); - file->Insert(str.str(),0x0028,0x0002); // Samples per Pixel + file->InsertValEntry(str.str(),0x0028,0x0002); // Samples per Pixel + + /// \todo : Spacing Between Slices is meaningfull ONLY for CT an MR modality + /// We should perform some checkings before forcing the Entry creation // Spacing - double *sp = image->GetSpacing(); + vtkFloatingPointType *sp = image->GetSpacing(); str.str(""); - str << sp[0] << "\\" << sp[1]; - file->Insert(str.str(),0x0028,0x0030); // Pixel Spacing + // We are about to enter floating point value. + // By default ostringstream are smart and don't do fixed point + // thus forcing to fixed point value + str.setf( std::ios::fixed ); + str << sp[1] << "\\" << sp[0]; + file->InsertValEntry(str.str(),0x0028,0x0030); // Pixel Spacing str.str(""); str << sp[2]; - file->Insert(str.str(),0x0018,0x0088); // Spacing Between Slices + file->InsertValEntry(str.str(),0x0018,0x0088); // Spacing Between Slices // Origin - double *org = image->GetOrigin(); + vtkFloatingPointType *org = image->GetOrigin(); + + /// \todo : Image Position Patient is meaningfull ONLY for CT an MR modality + /// We should perform some checkings before forcing the Entry creation str.str(""); str << org[0] << "\\" << org[1] << "\\" << org[2]; - file->Insert(str.str(),0x0020,0x0032); // Image Position Patient + file->InsertValEntry(str.str(),0x0020,0x0032); // Image Position Patient + str.unsetf( std::ios::fixed ); //done with floating point values // Window / Level - double *rng=image->GetScalarRange(); + vtkFloatingPointType *rng = image->GetScalarRange(); str.str(""); str << rng[1]-rng[0]; - file->Insert(str.str(),0x0028,0x1051); // Window Width + file->InsertValEntry(str.str(),0x0028,0x1051); // Window Width str.str(""); str << (rng[1]+rng[0])/2.0; - file->Insert(str.str(),0x0028,0x1050); // Window Center + file->InsertValEntry(str.str(),0x0028,0x1050); // Window Center // Pixels unsigned char *data; @@ -215,24 +231,25 @@ void SetImageInformation(gdcm::FileHelper *file,vtkImageData *image) * Write of the files * The call to this method is recursive if there is some files to write */ -void vtkGdcmWriter::RecursiveWrite(int axis, vtkImageData *image, ofstream *file) +void vtkGdcmWriter::RecursiveWrite(int axis, vtkImageData *image, + ofstream *file) { if(file) { - vtkErrorMacro( << "File musn't be opened"); + vtkErrorMacro( << "File must not be open"); return; } if( image->GetScalarType() == VTK_FLOAT || image->GetScalarType() == VTK_DOUBLE ) { - vtkErrorMacro(<< "Bad input type. Scalar type musn't be of type " + vtkErrorMacro(<< "Bad input type. Scalar type must not be of type " << "VTK_FLOAT or VTKDOUBLE (found:" << image->GetScalarTypeAsString()); return; } - RecursiveWrite(axis,image,image,file); + RecursiveWrite(axis,image, image, file); //WriteDcmFile(this->FileName,image); } @@ -244,7 +261,7 @@ void vtkGdcmWriter::RecursiveWrite(int axis, vtkImageData *cache, // if the file is already open then just write to it if( file ) { - vtkErrorMacro( << "File musn't be opened"); + vtkErrorMacro( << "File musn't be open"); return; } @@ -254,7 +271,7 @@ void vtkGdcmWriter::RecursiveWrite(int axis, vtkImageData *cache, // determine the name if (this->FileName) { - sprintf(this->InternalFileName,"%s",this->FileName); + sprintf(this->InternalFileName, "%s", this->FileName); } else { @@ -267,6 +284,8 @@ void vtkGdcmWriter::RecursiveWrite(int axis, vtkImageData *cache, { sprintf(this->InternalFileName, this->FilePattern,this->FileNumber); } +// Remove this code in case user is using VTK 4.2... +#if !(VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION == 2) if (this->FileNumber < this->MinimumFileNumber) { this->MinimumFileNumber = this->FileNumber; @@ -275,6 +294,7 @@ void vtkGdcmWriter::RecursiveWrite(int axis, vtkImageData *cache, { this->MaximumFileNumber = this->FileNumber; } +#endif } // Write the file @@ -283,7 +303,7 @@ void vtkGdcmWriter::RecursiveWrite(int axis, vtkImageData *cache, return; } - // if the current region is too high a dimension forthe file + // if the current region is too high a dimension for the file // the we will split the current axis cache->GetAxisUpdateExtent(axis, min, max); @@ -309,13 +329,13 @@ void vtkGdcmWriter::RecursiveWrite(int axis, vtkImageData *cache, cache->SetAxisUpdateExtent(axis, min, max); } -void vtkGdcmWriter::WriteDcmFile(char *fileName,vtkImageData *image) +void vtkGdcmWriter::WriteDcmFile(char *fileName, vtkImageData *image) { // From here, the write of the file begins gdcm::FileHelper *dcmFile = new gdcm::FileHelper(); // Set the image informations - SetImageInformation(dcmFile,image); + SetImageInformation(dcmFile, image); // Write the image switch(this->WriteType) @@ -338,7 +358,7 @@ void vtkGdcmWriter::WriteDcmFile(char *fileName,vtkImageData *image) if(!dcmFile->Write(fileName)) { - vtkErrorMacro( << "File " << this->FileName << "couldn't be written by " + vtkErrorMacro( << "File " << this->FileName << "cannot be written by " << " the gdcm library"); }