Program: gdcm
Module: $RCSfile: vtkGdcmWriter.cxx,v $
Language: C++
- Date: $Date: 2006/05/02 11:11:00 $
- Version: $Revision: 1.30 $
+ 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
#define vtkFloatingPointType float
#endif
-vtkCxxRevisionMacro(vtkGdcmWriter, "$Revision: 1.30 $")
+vtkCxxRevisionMacro(vtkGdcmWriter, "$Revision: 1.36 $")
vtkStandardNewMacro(vtkGdcmWriter)
-vtkCxxSetObjectMacro(vtkGdcmWriter,LookupTable,vtkLookupTable);
+vtkCxxSetObjectMacro(vtkGdcmWriter,LookupTable,vtkLookupTable)
#if (VTK_MAJOR_VERSION >= 5)
-vtkCxxSetObjectMacro(vtkGdcmWriter,MedicalImageProperties,vtkMedicalImageProperties);
+vtkCxxSetObjectMacro(vtkGdcmWriter,MedicalImageProperties,vtkMedicalImageProperties)
#endif
//-----------------------------------------------------------------------------
// Constructor / Destructor
vtkGdcmWriter::vtkGdcmWriter()
{
this->LookupTable = NULL;
- this->MedicalImageProperties = NULL;
+ this->MedicalImageProperties = NULL;
this->FileDimensionality = 3;
this->WriteType = VTK_GDCM_WRITE_TYPE_EXPLICIT_VR;
this->GdcmFile = 0;
// 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::FileHelper *file, vtkMedicalImageProperties *medprop)
+/**
+ * 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;
+ std::ostringstream str;
if( medprop )
- {
- str.str("");
- str << medprop->GetPatientName();
- file->InsertEntryString(str.str(),0x0010,0x0010,"PN"); // PN 1 Patient's Name
-
- str.str("");
- str << medprop->GetPatientID();
- file->InsertEntryString(str.str(),0x0010,0x0020,"LO"); // LO 1 Patient ID
-
- str.str("");
- str << medprop->GetPatientAge();
- file->InsertEntryString(str.str(),0x0010,0x1010,"AS"); // AS 1 Patient's Age
-
- str.str("");
- str << medprop->GetPatientSex();
- file->InsertEntryString(str.str(),0x0010,0x0040,"CS"); // CS 1 Patient's Sex
-
- str.str("");
- str << medprop->GetPatientBirthDate();
- file->InsertEntryString(str.str(),0x0010,0x0030,"DA"); // DA 1 Patient's Birth Date
-
- str.str("");
- str << medprop->GetStudyID();
- file->InsertEntryString(str.str(),0x0020,0x0010,"SH"); // SH 1 Study ID
- }
- }
-
-#else
-void SetMedicalImageInformation(gdcm::FileHelper *, vtkMedicalImageProperties *)
-{
+ {
+ 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[2];
//file->Insert(str.str(),0x0028,0x0012); // Planes
- file->InsertEntryString(str.str(),0x0028,0x0008,"US"); // Number of Frames
+ file->InsertEntryString(str.str(),0x0028,0x0008,"IS"); // Number of Frames
}
// Pixel type
void vtkGdcmWriter::WriteDcmFile(char *fileName, vtkImageData *image)
{
- gdcm::FileHelper *dcmFile;
+ GDCM_NAME_SPACE::FileHelper *dcmFile;
if ( GdcmFile != 0)
- dcmFile = gdcm::FileHelper::New(GdcmFile);
+ dcmFile = GDCM_NAME_SPACE::FileHelper::New(GdcmFile);
else
- dcmFile = gdcm::FileHelper::New();
+ dcmFile = GDCM_NAME_SPACE::FileHelper::New();
// From here, the write of the file begins
-
// Set the medical informations:
+#if (VTK_MAJOR_VERSION >= 5)
SetMedicalImageInformation(dcmFile, this->MedicalImageProperties);
-
+#endif
+
// Set the image informations
SetImageInformation(dcmFile, image);
dcmFile->SetWriteTypeToDcmExplVR();
}
- dcmFile->SetContentType((gdcm::ImageContentType)ContentType);
+ dcmFile->SetContentType((GDCM_NAME_SPACE::ImageContentType)ContentType);
if(!dcmFile->Write(fileName))
{