X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkGdcmWriter.cxx;h=7f4526542d040c1667c01eba505ae6ab4452e97e;hb=922095a0dd56f24d651b36f62256690020937d9a;hp=c9843e32136c2b746bf9962a956b76dfc36fbfc9;hpb=1c35ba5e5bc72b0861b92698dd4ea29f0bab5f73;p=gdcm.git diff --git a/vtk/vtkGdcmWriter.cxx b/vtk/vtkGdcmWriter.cxx index c9843e32..7f452654 100644 --- a/vtk/vtkGdcmWriter.cxx +++ b/vtk/vtkGdcmWriter.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: vtkGdcmWriter.cxx,v $ Language: C++ - Date: $Date: 2004/12/09 17:08:36 $ - Version: $Revision: 1.6 $ + Date: $Date: 2004/12/10 13:49:08 $ + Version: $Revision: 1.8 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -26,7 +26,7 @@ #include #include -vtkCxxRevisionMacro(vtkGdcmWriter, "$Revision: 1.6 $"); +vtkCxxRevisionMacro(vtkGdcmWriter, "$Revision: 1.8 $"); vtkStandardNewMacro(vtkGdcmWriter); //----------------------------------------------------------------------------- @@ -35,6 +35,7 @@ vtkGdcmWriter::vtkGdcmWriter() { this->LookupTable = NULL; this->FileDimensionality = 3; + this->WriteType = VTK_GDCM_WRITE_TYPE_EXPLICIT_VR; } vtkGdcmWriter::~vtkGdcmWriter() @@ -46,10 +47,28 @@ vtkGdcmWriter::~vtkGdcmWriter() void vtkGdcmWriter::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os,indent); + + os << indent << "Write type : " << this->GetWriteTypeAsString(); } //----------------------------------------------------------------------------- // Public +const char *vtkGdcmWriter::GetWriteTypeAsString() +{ + switch(WriteType) + { + case VTK_GDCM_WRITE_TYPE_EXPLICIT_VR : + return "Explicit VR"; + case VTK_GDCM_WRITE_TYPE_IMPLICIT_VR : + return "Implicit VR"; + case VTK_GDCM_WRITE_TYPE_ACR : + return "ACR"; + case VTK_GDCM_WRITE_TYPE_ACR_LIBIDO : + return "ACR Libido"; + default : + return "Unknow type"; + } +} //----------------------------------------------------------------------------- // Protected @@ -70,22 +89,29 @@ size_t ReverseData(vtkImageData *image,unsigned char **data) size_t planeSize = dim[1] * lineSize; size_t size = dim[2] * planeSize; - *data = new unsigned char[size]; - - image->GetIncrements(inc); - unsigned char *src = (unsigned char *)image->GetScalarPointerForExtent(extent); - unsigned char *dst = *data + planeSize - lineSize; - for (int plane = extent[4]; plane <= extent[5]; plane++) + if( size>0 ) { - for (int line = extent[2]; line <= extent[3]; line++) + *data = new unsigned char[size]; + + image->GetIncrements(inc); + unsigned char *src = (unsigned char *)image->GetScalarPointerForExtent(extent); + unsigned char *dst = *data + planeSize - lineSize; + for (int plane = extent[4]; plane <= extent[5]; plane++) { - // Copy one line at proper destination: - memcpy((void*)dst, (void*)src, lineSize); + for (int line = extent[2]; line <= extent[3]; line++) + { + // Copy one line at proper destination: + memcpy((void*)dst, (void*)src, lineSize); - src += inc[1]*image->GetScalarSize(); - dst -= lineSize; + src += inc[1] * image->GetScalarSize(); + dst -= lineSize; + } + dst += 2 * planeSize; } - dst += 2 * planeSize; + } + else + { + *data = NULL; } return size; @@ -106,28 +132,29 @@ void SetImageInformation(gdcm::File *file,vtkImageData *image) str.str(""); str << dim[0]; - file->ReplaceOrCreateByNumber(str.str(),0x0028,0x0011); + file->ReplaceOrCreateByNumber(str.str(),0x0028,0x0011); // Columns str.str(""); str << dim[1]; - file->ReplaceOrCreateByNumber(str.str(),0x0028,0x0010); + file->ReplaceOrCreateByNumber(str.str(),0x0028,0x0010); // Rows if(dim[2]>1) { str.str(""); str << dim[2]; - file->ReplaceOrCreateByNumber(str.str(),0x0028,0x0012); + //file->ReplaceOrCreateByNumber(str.str(),0x0028,0x0012); // Planes + file->ReplaceOrCreateByNumber(str.str(),0x0028,0x0008); // Number of Frames } // Pixel type str.str(""); str << image->GetScalarSize()*8; - file->ReplaceOrCreateByNumber(str.str(),0x0028,0x0100); - file->ReplaceOrCreateByNumber(str.str(),0x0028,0x0101); + file->ReplaceOrCreateByNumber(str.str(),0x0028,0x0100); // Bits Allocated + file->ReplaceOrCreateByNumber(str.str(),0x0028,0x0101); // Bits Stored str.str(""); str << image->GetScalarSize()*8-1; - file->ReplaceOrCreateByNumber(str.str(),0x0028,0x0102); + file->ReplaceOrCreateByNumber(str.str(),0x0028,0x0102); // High Bit // Pixel Repr // FIXME : what do we do when the ScalarType is @@ -144,44 +171,44 @@ void SetImageInformation(gdcm::File *file,vtkImageData *image) { str << "1"; // Signed } - file->ReplaceOrCreateByNumber(str.str(),0x0028,0x0103); + file->ReplaceOrCreateByNumber(str.str(),0x0028,0x0103); // Pixel Representation // Samples per pixel str.str(""); str << image->GetNumberOfScalarComponents(); - file->ReplaceOrCreateByNumber(str.str(),0x0028,0x0002); + file->ReplaceOrCreateByNumber(str.str(),0x0028,0x0002); // Samples per Pixel // Spacing double *sp = image->GetSpacing(); str.str(""); str << sp[0] << "\\" << sp[1]; - file->ReplaceOrCreateByNumber(str.str(),0x0028,0x0030); + file->ReplaceOrCreateByNumber(str.str(),0x0028,0x0030); // Pixel Spacing str.str(""); str << sp[2]; - file->ReplaceOrCreateByNumber(str.str(),0x0018,0x0088); + file->ReplaceOrCreateByNumber(str.str(),0x0018,0x0088); // Spacing Between Slices // Origin double *org = image->GetOrigin(); str.str(""); str << org[0] << "\\" << org[1] << "\\" << org[2]; - file->ReplaceOrCreateByNumber(str.str(),0x0020,0x0032); + file->ReplaceOrCreateByNumber(str.str(),0x0020,0x0032); // Image Position Patient // Window / Level double *rng=image->GetScalarRange(); str.str(""); str << rng[1]-rng[0]; - file->ReplaceOrCreateByNumber(str.str(),0x0028,0x1051); + file->ReplaceOrCreateByNumber(str.str(),0x0028,0x1051); // Window Width str.str(""); str << (rng[1]+rng[0])/2.0; - file->ReplaceOrCreateByNumber(str.str(),0x0028,0x1050); + file->ReplaceOrCreateByNumber(str.str(),0x0028,0x1050); // Window Center // Pixels unsigned char *data; size_t size = ReverseData(image,&data); - file->SetImageData(data,size); + file->SetUserData(data,size); } /** @@ -291,6 +318,24 @@ void vtkGdcmWriter::WriteDcmFile(char *fileName,vtkImageData *image) SetImageInformation(dcmFile,image); // Write the image + switch(this->WriteType) + { + case VTK_GDCM_WRITE_TYPE_EXPLICIT_VR : + dcmFile->SetWriteTypeToDcmExplVR(); + break; + case VTK_GDCM_WRITE_TYPE_IMPLICIT_VR : + dcmFile->SetWriteTypeToDcmImplVR(); + break; + case VTK_GDCM_WRITE_TYPE_ACR : + dcmFile->SetWriteTypeToAcr(); + break; + case VTK_GDCM_WRITE_TYPE_ACR_LIBIDO : + dcmFile->SetWriteTypeToAcrLibido(); + break; + default : + dcmFile->SetWriteTypeToDcmExplVR(); + } + if(!dcmFile->Write(fileName)) { vtkErrorMacro( << "File " << this->FileName << "couldn't be written by " @@ -298,6 +343,11 @@ void vtkGdcmWriter::WriteDcmFile(char *fileName,vtkImageData *image) std::cerr << "not written \n"; } + // Clean up + if( dcmFile->GetUserData() && dcmFile->GetUserDataSize()>0 ) + { + delete[] dcmFile->GetUserData(); + } delete dcmFile; }