Page MenuHomePhabricator

[2DRendering] TODO's after merge
Closed, ResolvedPublic

Description

There are some issues which do not occur until the merge, and thus, can only be fixed after the merge.

This bug summarizes them:
1.Checkout Geometry2DDataVtkMapper3D.cpp, mitkDiffusionImagingObjectFactory.cpp and mitkExtractDirectedPlaneImageFilter.cpp from the bug-9176-RenderingIntegrationBranch, because the automatic merge accidently did some stuff wrong here
2.Change in mitkImageVTKMapper2D "GenerateData()" to "GenerateDataForRenderer()", in order to enable the channel system of thr dwi images
3.Use the new "WorldToIndex( vec, vec )" instead of the deprecated "WorldToIndex( origin, vec, vec )" in mitkImageVTKMapper2D

Event Timeline

I wrote the text above, but Eric was logged in on my machine ... :)

These issues should be fixed _during_ the merge. Do the git merge with the --no-commit option, edit everything till it works and the commit/push the result. You should enable rerere just in case you have to redo the manual fixes.