Program: gdcm
Module: $RCSfile: vtkGdcmWriter.cxx,v $
Language: C++
- Date: $Date: 2005/08/20 22:29:46 $
- Version: $Revision: 1.23 $
+ Date: $Date: 2007/12/13 15:16:19 $
+ Version: $Revision: 1.36 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <vtkImageData.h>
#include <vtkPointData.h>
#include <vtkLookupTable.h>
-
+#if (VTK_MAJOR_VERSION >= 5)
+#include <vtkMedicalImageProperties.h>
+#endif
#ifndef vtkFloatingPointType
#define vtkFloatingPointType float
#endif
-vtkCxxRevisionMacro(vtkGdcmWriter, "$Revision: 1.23 $")
+vtkCxxRevisionMacro(vtkGdcmWriter, "$Revision: 1.36 $")
vtkStandardNewMacro(vtkGdcmWriter)
+vtkCxxSetObjectMacro(vtkGdcmWriter,LookupTable,vtkLookupTable)
+#if (VTK_MAJOR_VERSION >= 5)
+vtkCxxSetObjectMacro(vtkGdcmWriter,MedicalImageProperties,vtkMedicalImageProperties)
+#endif
//-----------------------------------------------------------------------------
// Constructor / Destructor
vtkGdcmWriter::vtkGdcmWriter()
{
this->LookupTable = NULL;
+ this->MedicalImageProperties = NULL;
this->FileDimensionality = 3;
this->WriteType = VTK_GDCM_WRITE_TYPE_EXPLICIT_VR;
+ this->GdcmFile = 0;
+ this->ContentType = VTK_GDCM_WRITE_TYPE_USER_OWN_IMAGE;
}
vtkGdcmWriter::~vtkGdcmWriter()
{
+ this->SetMedicalImageProperties(NULL);
+ this->SetLookupTable(NULL);
}
//-----------------------------------------------------------------------------
// The output data must be deleted by the user of the method !!!
size_t ReverseData(vtkImageData *image,unsigned char **data)
{
+#if (VTK_MAJOR_VERSION >= 5)
+ vtkIdType inc[3];
+#else
int inc[3];
+#endif
int *extent = image->GetUpdateExtent();
int dim[3] = {extent[1]-extent[0]+1,
extent[3]-extent[2]+1,
return size;
}
+/**
+ * Set the medical informations in the file, based on the user passed
+ * vtkMedicalImageProperties
+ */
+#if (VTK_MAJOR_VERSION >= 5)
+void SetMedicalImageInformation(GDCM_NAME_SPACE::FileHelper *file, vtkMedicalImageProperties *medprop)
+{
+ // For now only do:
+ // PatientName, PatientID, PatientAge, PatientSex, PatientBirthDate, StudyID
+ std::ostringstream str;
+ if( medprop )
+ {
+ if (medprop->GetPatientName())
+ {
+ str.str("");
+ str << medprop->GetPatientName();
+ file->InsertEntryString(str.str(),0x0010,0x0010,"PN"); // PN 1 Patient's Name
+ }
+
+ if (medprop->GetPatientID())
+ {
+ str.str("");
+ str << medprop->GetPatientID();
+ file->InsertEntryString(str.str(),0x0010,0x0020,"LO"); // LO 1 Patient ID
+ }
+
+ if (medprop->GetPatientAge())
+ {
+ str.str("");
+ str << medprop->GetPatientAge();
+ file->InsertEntryString(str.str(),0x0010,0x1010,"AS"); // AS 1 Patient's Age
+ }
+
+ if (medprop->GetPatientSex())
+ {
+ str.str("");
+ str << medprop->GetPatientSex();
+ file->InsertEntryString(str.str(),0x0010,0x0040,"CS"); // CS 1 Patient's Sex
+ }
+
+ if (medprop->GetPatientBirthDate())
+ {
+ str.str("");
+ str << medprop->GetPatientBirthDate();
+ file->InsertEntryString(str.str(),0x0010,0x0030,"DA"); // DA 1 Patient's Birth Date
+ }
+
+ if (medprop->GetStudyID())
+ {
+ str.str("");
+ str << medprop->GetStudyID();
+ file->InsertEntryString(str.str(),0x0020,0x0010,"SH"); // SH 1 Study ID
+ }
+ }
+}
+#endif
+
/**
* Set the data informations in the file
*/
-void SetImageInformation(gdcm::FileHelper *file, vtkImageData *image)
+void SetImageInformation(GDCM_NAME_SPACE::FileHelper *file, vtkImageData *image)
{
std::ostringstream str;
str.str("");
str << dim[0];
- file->InsertValEntry(str.str(),0x0028,0x0011); // Columns
+ file->InsertEntryString(str.str(),0x0028,0x0011,"US"); // Columns
str.str("");
str << dim[1];
- file->InsertValEntry(str.str(),0x0028,0x0010); // Rows
+ file->InsertEntryString(str.str(),0x0028,0x0010,"US"); // Rows
if(dim[2]>1)
{
str.str("");
str << dim[2];
//file->Insert(str.str(),0x0028,0x0012); // Planes
- file->InsertValEntry(str.str(),0x0028,0x0008); // Number of Frames
+ file->InsertEntryString(str.str(),0x0028,0x0008,"IS"); // Number of Frames
}
// Pixel type
str.str("");
str << image->GetScalarSize()*8;
- file->InsertValEntry(str.str(),0x0028,0x0100); // Bits Allocated
- file->InsertValEntry(str.str(),0x0028,0x0101); // Bits Stored
+ file->InsertEntryString(str.str(),0x0028,0x0100,"US"); // Bits Allocated
+ file->InsertEntryString(str.str(),0x0028,0x0101,"US"); // Bits Stored
str.str("");
str << image->GetScalarSize()*8-1;
- file->InsertValEntry(str.str(),0x0028,0x0102); // High Bit
+ file->InsertEntryString(str.str(),0x0028,0x0102,"US"); // 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
{
str << "1"; // Signed
}
- file->InsertValEntry(str.str(),0x0028,0x0103); // Pixel Representation
+ file->InsertEntryString(str.str(),0x0028,0x0103,"US"); // Pixel Representation
// Samples per pixel
str.str("");
str << image->GetNumberOfScalarComponents();
- file->InsertValEntry(str.str(),0x0028,0x0002); // Samples per Pixel
+ file->InsertEntryString(str.str(),0x0028,0x0002,"US"); // 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
vtkFloatingPointType *sp = image->GetSpacing();
str.str("");
- // We are about to enter floating point value. By default ostringstream are smart and don't do fixed point
+ // 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
+ file->InsertEntryString(str.str(),0x0028,0x0030,"DS"); // Pixel Spacing
str.str("");
str << sp[2];
- file->InsertValEntry(str.str(),0x0018,0x0088); // Spacing Between Slices
+ file->InsertEntryString(str.str(),0x0018,0x0088,"DS"); // Spacing Between Slices
// Origin
vtkFloatingPointType *org = image->GetOrigin();
str.str("");
str << org[0] << "\\" << org[1] << "\\" << org[2];
- file->InsertValEntry(str.str(),0x0020,0x0032); // Image Position Patient
+ file->InsertEntryString(str.str(),0x0020,0x0032,"DS"); // Image Position Patient
str.unsetf( std::ios::fixed ); //done with floating point values
// Window / Level
str.str("");
str << rng[1]-rng[0];
- file->InsertValEntry(str.str(),0x0028,0x1051); // Window Width
+ file->InsertEntryString(str.str(),0x0028,0x1051,"DS"); // Window Width
str.str("");
str << (rng[1]+rng[0])/2.0;
- file->InsertValEntry(str.str(),0x0028,0x1050); // Window Center
+ file->InsertEntryString(str.str(),0x0028,0x1050,"DS"); // Window Center
// Pixels
unsigned char *data;
image->GetScalarType() == VTK_DOUBLE )
{
vtkErrorMacro(<< "Bad input type. Scalar type must not be of type "
- << "VTK_FLOAT or VTKDOUBLE (found:"
- << image->GetScalarTypeAsString());
+ << "VTK_FLOAT or VTK_DOUBLE (found:"
+ << image->GetScalarTypeAsString() << ")" );
return;
}
void vtkGdcmWriter::WriteDcmFile(char *fileName, vtkImageData *image)
{
+ GDCM_NAME_SPACE::FileHelper *dcmFile;
+ if ( GdcmFile != 0)
+ dcmFile = GDCM_NAME_SPACE::FileHelper::New(GdcmFile);
+ else
+ dcmFile = GDCM_NAME_SPACE::FileHelper::New();
+
// From here, the write of the file begins
- gdcm::FileHelper *dcmFile = new gdcm::FileHelper();
+ // Set the medical informations:
+#if (VTK_MAJOR_VERSION >= 5)
+ SetMedicalImageInformation(dcmFile, this->MedicalImageProperties);
+#endif
+
// Set the image informations
SetImageInformation(dcmFile, image);
default :
dcmFile->SetWriteTypeToDcmExplVR();
}
-
+
+ dcmFile->SetContentType((GDCM_NAME_SPACE::ImageContentType)ContentType);
+
if(!dcmFile->Write(fileName))
{
vtkErrorMacro( << "File " << this->FileName << "cannot be written by "
<< " the gdcm library");
}
-
// Clean up
if( dcmFile->GetUserData() && dcmFile->GetUserDataSize()>0 )
{
delete[] dcmFile->GetUserData();
}
- delete dcmFile;
+ dcmFile->Delete();
}
//-----------------------------------------------------------------------------
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff