X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FvvImage.txx;h=14da10a227f7d825cde021a143b8c2f84a74d7bb;hb=5bff4d89c8ca42336267c36974e9ceb6fe2ac843;hp=6e8907633987e48e4fc17c0f7b97cd3eecc57eae;hpb=573d80d0f7a17607d2ee883c21c940c0ba020282;p=clitk.git diff --git a/common/vvImage.txx b/common/vvImage.txx index 6e89076..14da10a 100644 --- a/common/vvImage.txx +++ b/common/vvImage.txx @@ -26,21 +26,30 @@ void vvImage::AddItkImage(TItkImageType *input) input->Update(); // Convert from ITK object to VTK object - mImageDimension = TItkImageType::ImageDimension; + mImageDimension = TItkImageType::ImageDimension; typedef itk::ImageToVTKImageFilter ConverterType; typename ConverterType::Pointer converter = ConverterType::New(); mItkToVtkConverters.push_back(dynamic_cast< itk::ProcessObject *>(converter.GetPointer())); converter->SetInput(input); converter->Update(); mVtkImages.push_back( converter->GetOutput() ); - + // Account for direction in transform. The offset is already accounted for // in the VTK image coordinates, no need to put it in the transform. vtkSmartPointer matrix = vtkSmartPointer::New(); matrix->Identity(); - for(unsigned int j=0; jGetImageDimension(); j++) - for(unsigned int i=0; iGetImageDimension(); i++) + for(unsigned int i=0; iGetImageDimension(); i++) { + for(unsigned int j=0; jGetImageDimension(); j++) { (*matrix)[i][j] = input->GetDirection()[i][j]; + // Direction is used around the image origin in ITK + (*matrix)[i][3] -= (*matrix)[i][j] * input->GetOrigin()[j]; + } + (*matrix)[i][3] += input->GetOrigin()[i]; + } + + // GetDirection provides the forward transform, vtkImageReslice wants the inverse + matrix->Invert(); + mTransform->SetMatrix(matrix); } //--------------------------------------------------------------------