Diffusion MITK 101d7a103ef0

Merge branch 'bug-9176-RenderingIntegrationTest'
101d7a103ef0
Actions

Description

Merge branch 'bug-9176-RenderingIntegrationTest'

Conflicts:
Core/Code/Rendering/mitkImageMapperGL2D.h
Core/Code/files.cmake

Details

Provenance

• kilgus

Authored on Sep 9 2011, 6:22 PM

Parents

rMITK88040373e39d: Merge branch 'bug-7027-2DRendering' into bug-9176-RenderingIntegrationTest
rMITKaf3bddfa8bd6: Merge branch 'bug-9118-SmoothedSurfaceCreationFix1'

Branches

Unknown

Tags

Unknown

Event Timeline

• kilgus committed rMITK101d7a103ef0: Merge branch 'bug-9176-RenderingIntegrationTest' (authored by • kilgus).Sep 9 2011, 6:22 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

88040373e39d Merge branch 'bug-7027-2DRendering' into bug-9176-RenderingIntegrationTest
Author
• kilgus
Browse Repository
No Builds
No Audits
85d85efa455a Revert of some tmp changes in basicimageprocessingview. Very stable 2D…
Author
• kilgus
Browse Repository
No Builds
No Audits
009bab3d6342 Outcommented a bool flag inside the proprenderer, because it is not working…
Author
• kilgus
Browse Repository
No Builds
No Audits
835a20cc38b7 Fixed a bug with the RGB lut.
Author
• kilgus
Browse Repository
No Builds
No Audits
2ab97cd9010f Implemented a method to calculate the depth of an object for rendering.
Author
• kilgus
Browse Repository
No Builds
No Audits
165482c2e79a Fixed initialization inside the local storage.
Author
• kilgus
Browse Repository
No Builds
No Audits
706748d8b980 Refactoring session with Markus F. of ImageVtkMapper, VtkPropRenderer and…
Author
• kilgus
Browse Repository
No Builds
No Audits
23979de6dd54 Added work arround for bug #9048.
Author
• kilgus
Browse Repository
No Builds
No Audits
5a8f7d389944 Added comment for the depth in the crosshair mapper.
Author
• kilgus
Browse Repository
No Builds
No Audits
2625e54b37fc Added comments in the RenderingManager for PrepareRender() call.
Author
• kilgus
Browse Repository
No Builds
No Audits
5862d5d792e8 Refactored my parts of the prop renderer. Added/improved documentation. Minor…
Author
• kilgus
Browse Repository
No Builds
No Audits
f076ca1159bf Refactoring and minor docu changes.
Author
• kilgus
Browse Repository
No Builds
No Audits
569c936504d8 Merge remote-tracking branch 'origin/bug-7027-2DRendering' into bug-7027…
Author
• kilgus
Browse Repository
No Builds
No Audits
310602e200cb Quick and dirty Fangerau Fix.
Author
• kilgus
Browse Repository
No Builds
No Audits
867dcff1102f Merge branch 'bug-9236-Levelwindow' into bug-7027-2DRendering
Author
• heime
Browse Repository
No Builds
No Audits
c884605b03a7 Changed the the default value of the lookuptable from RampScurve to linear and…
Author
• heime
Browse Repository
No Builds
No Audits
f7a86877528b replaced GenerateData() with GenerateDataForRenderer()
Author
• heime
Browse Repository
No Builds
No Audits
6bb9b5154631 Removed -1 in RGB filter. Rendering is now not performed when the display…
Author
• kilgus
Browse Repository
No Builds
No Audits
3036bbf61b5e Removed output.
Author
• kilgus
Browse Repository
No Builds
No Audits
17e5b8f50578 Properties are only applied if they are changed.
Author
• kilgus
Browse Repository
No Builds
No Audits
8c8bfc7514e7 Replaced M_PI with itk::math::pi.
Author
• kilgus
Browse Repository
No Builds
No Audits
7053693d15d9 Removed sleep to enable compile
Author
• goch
Browse Repository
No Builds
No Audits
cffcdc136897 Quick fix for M_PI in windows.
Author
• kilgus
Browse Repository
No Builds
No Audits
dc8e853e891d Fixed some files which did not merge correctly.
Author
• kilgus
Browse Repository
No Builds
No Audits
8d8901792521 Merge branch 'bug-7027-2DRendering' into RenderingIntegrationBranch250811
Author
• kilgus
Browse Repository
No Builds
No Audits
8bd31ce8e7eb Merge branch 'bug-3257-RGBAlevelWindow' into bug-7027-2DRendering
Author
• kilgus
Browse Repository
No Builds
No Audits
8496d5d928c1 Added documentation. Some minor changes.
Author
• kilgus
Browse Repository
No Builds
No Audits
58cc0210db4c Implemented the opaque level window. Removed the VTK filters which converted…
Author
• kilgus
Browse Repository
No Builds
No Audits
0acefd4f34e4 Finished threaded execute.
Author
• kilgus
Browse Repository
No Builds
No Audits
4d1827cb5338 Added danials filter files.
Author
• kilgus
Browse Repository
No Builds
No Audits
43a08171d1bd Used danials filter to apply a level window on RGBA images. Implemented missing…
Author
• kilgus
Browse Repository
No Builds
No Audits
9ec305f3724d Fixed a crash in the outlining process.
Author
• kilgus
Browse Repository
No Builds
No Audits
e7e8259fe766 Removed 0.5 offset from QBalls again, because it seems to be unnecessary.
Author
• kilgus
Browse Repository
No Builds
No Audits
df9258ce4cea Removed unnecessary camera reset from rropRender; Finished camera positioning…
Author
• kilgus
Browse Repository
No Builds
No Audits
1ac3f6e714c2 Merge branch 'bug-8467-RenderingDocu' into bug-7027-2DRendering
Author
• kilgus
Browse Repository
No Builds
No Audits
0f74875a03e2 Added missing .png
Author
• kilgus
Browse Repository
No Builds
No Audits
68b0aedfd4b7 Merge branch 'bug-8630-RepairDTIiamges' into bug-7027-2DRendering
Author
• kilgus
Browse Repository
No Builds
No Audits
0d153724ac60 Merge branch 'bug-8892-QBallsRendering' into bug-7027-2DRendering
Author
• kilgus
Browse Repository
No Builds
No Audits
da85bdcdc868 Moved the camera modifications to the prop renderer. The transformation to…
Author
• kilgus
Browse Repository
No Builds
No Audits
add746da1333 Added a property to shift the image in depth direction in order to render…
Author
• kilgus
Browse Repository
No Builds
No Audits
10b029ee50a3 Added camera function dummy in prop renderer.
Author
• kilgus
Browse Repository
No Builds
No Audits
ed3d5d3f5fd9 Outcommented DoRefresh parts and AdaptCameraPosition.
Author
• kilgus
Browse Repository
No Builds
No Audits
dc96848c0bed corrected typos and language style ;-)
Author
reicht
Browse Repository
No Builds
No Audits
c1c8115fc295 Removed tabs.
Author
• kilgus
Browse Repository
No Builds
No Audits
0a065058af1f Removed tabs.
Author
• kilgus
Browse Repository
No Builds
No Audits
343f116d173b Removed tabs
Author
• kilgus
Browse Repository
No Builds
No Audits
1eeffb9ec423 Removed tabs
Author
• kilgus
Browse Repository
No Builds
No Audits
6ae999f36261 Added documentation and .png files.
Author
• kilgus
Browse Repository
No Builds
No Audits
2100500c3cb8 Cleaned up code. Removed unnecessary stuff. Added comments and docu.
Author
• kilgus
Browse Repository
No Builds
No Audits
75dd35c39eab Fixed the bug by returning a vtkPropAssembly in the CompositeMappers method…
Author
• kilgus
Browse Repository
No Builds
No Audits

Changes (41)

Path

Size

Core/

Code/

Algorithms/

mitkCoreObjectFactory.cpp

Controllers/

mitkCameraController.cpp

mitkRenderingManager.cpp

Rendering/

mitkBaseRenderer.h

mitkGeometry2DDataMapper2D.cpp

mitkGeometry2DDataVtkMapper3D.cpp

mitkGeometry2DDataVtkMapper3D.h

mitkImageMapperGL2D.cpp

mitkImageMapperGL2D.h

mitkImageVtkMapper2D.cpp

mitkImageVtkMapper2D.h

mitkPointSetGLMapper2D.cpp

mitkPointSetGLMapper2D.h

mitkPointSetVtkMapper3D.cpp

mitkPointSetVtkMapper3D.h

mitkVtkMapper2D.h

mitkVtkPropRenderer.cpp

mitkVtkPropRenderer.h

vtkMitkApplyLevelWindowToRGBFilter.cpp

vtkMitkApplyLevelWindowToRGBFilter.h

vtkMitkRenderProp.cpp

Testing/

mitkDataNodeTest.cpp

files.cmake

CoreUI/

Qmitk/

QmitkRenderWindow.cpp

QmitkRenderWindow.h

Documentation/

Doxygen/

ImageMapperdisplayGeometry.png

cameraPositioning.png

cameraPositioning3D.png

imageVtkMapper2Darchitecture.png

scaling.png

texturedPlane.png

Modules/

DiffusionImaging/

IODataStructures/

DiffusionWeightedImages/

mitkDiffusionImage.txx

mitkDiffusionImagingObjectFactory.cpp

Rendering/

mitkCompositeMapper.h

mitkDiffusionImageMapper.cpp

mitkDiffusionImageMapper.h

mitkOdfVtkMapper2D.h

mitkOdfVtkMapper2D.txx

IGT/

IGTFilters/

mitkCameraVisualization.cpp

ImageExtraction/

mitkExtractDirectedPlaneImageFilter.cpp

	Modules/	DiffusionImaging/	Rendering/
	Core/	Code/	Service/

	mitkCompositeMapper.cpp
	mitkCoreModuleContext.cpp

rMITK101d7a103ef0

View Options

Core/Code/Algorithms/mitkCoreObjectFactory.cpp

View Options

Core/Code/Controllers/mitkCameraController.cpp

View Options

Core/Code/Controllers/mitkRenderingManager.cpp

View Options

Core/Code/Rendering/mitkBaseRenderer.h

View Options

Core/Code/Rendering/mitkGeometry2DDataMapper2D.cpp

View Options

Core/Code/Rendering/mitkGeometry2DDataVtkMapper3D.cpp

View Options

Core/Code/Rendering/mitkGeometry2DDataVtkMapper3D.h

View Options

Core/Code/Rendering/mitkImageMapperGL2D.cpp

View Options

Core/Code/Rendering/mitkImageMapperGL2D.h

View Options

Core/Code/Rendering/mitkImageVtkMapper2D.cpp

View Options

Core/Code/Rendering/mitkImageVtkMapper2D.h

View Options

Core/Code/Rendering/mitkPointSetGLMapper2D.cpp

View Options

Core/Code/Rendering/mitkPointSetGLMapper2D.h

View Options

Core/Code/Rendering/mitkPointSetVtkMapper3D.cpp

View Options

Core/Code/Rendering/mitkPointSetVtkMapper3D.h

View Options

Core/Code/Rendering/mitkVtkMapper2D.h

View Options

Core/Code/Rendering/mitkVtkPropRenderer.cpp

View Options

Core/Code/Rendering/mitkVtkPropRenderer.h

View Options

Core/Code/Rendering/vtkMitkApplyLevelWindowToRGBFilter.cpp

View Options

Core/Code/Rendering/vtkMitkApplyLevelWindowToRGBFilter.h

View Options

Core/Code/Rendering/vtkMitkRenderProp.cpp

View Options

Core/Code/Testing/mitkDataNodeTest.cpp

View Options

Core/Code/files.cmake

View Options

CoreUI/Qmitk/QmitkRenderWindow.cpp

View Options

CoreUI/Qmitk/QmitkRenderWindow.h

View Options

Documentation/Doxygen/ImageMapperdisplayGeometry.png

View Options

Documentation/Doxygen/cameraPositioning.png

View Options

Documentation/Doxygen/cameraPositioning3D.png

View Options

Documentation/Doxygen/imageVtkMapper2Darchitecture.png

View Options

Documentation/Doxygen/scaling.png

View Options

Documentation/Doxygen/texturedPlane.png

View Options

Modules/DiffusionImaging/IODataStructures/DiffusionWeightedImages/mitkDiffusionImage.txx

View Options

Modules/DiffusionImaging/IODataStructures/mitkDiffusionImagingObjectFactory.cpp

View Options

Modules/DiffusionImaging/Rendering/mitkCompositeMapper.cpp

View Options

Modules/DiffusionImaging/Rendering/mitkCompositeMapper.h

View Options

Modules/DiffusionImaging/Rendering/mitkDiffusionImageMapper.cpp

View Options

Modules/DiffusionImaging/Rendering/mitkDiffusionImageMapper.h

View Options

Modules/DiffusionImaging/Rendering/mitkOdfVtkMapper2D.h

View Options

Modules/DiffusionImaging/Rendering/mitkOdfVtkMapper2D.txx

View Options

Modules/IGT/IGTFilters/mitkCameraVisualization.cpp

View Options

Modules/ImageExtraction/mitkExtractDirectedPlaneImageFilter.cpp

Merge branch 'bug-9176-RenderingIntegrationTest'101d7a103ef0Actions

Description

Details

Event Timeline

Merged Changes

Changes (41)

rMITK101d7a103ef0

Core/Code/Algorithms/mitkCoreObjectFactory.cpp

Core/Code/Controllers/mitkCameraController.cpp

Core/Code/Controllers/mitkRenderingManager.cpp

Core/Code/Rendering/mitkBaseRenderer.h

Core/Code/Rendering/mitkGeometry2DDataMapper2D.cpp

Core/Code/Rendering/mitkGeometry2DDataVtkMapper3D.cpp

Core/Code/Rendering/mitkGeometry2DDataVtkMapper3D.h

Core/Code/Rendering/mitkImageMapperGL2D.cpp

Core/Code/Rendering/mitkImageMapperGL2D.h

Core/Code/Rendering/mitkImageVtkMapper2D.cpp

Core/Code/Rendering/mitkImageVtkMapper2D.h

Core/Code/Rendering/mitkPointSetGLMapper2D.cpp

Core/Code/Rendering/mitkPointSetGLMapper2D.h

Core/Code/Rendering/mitkPointSetVtkMapper3D.cpp

Core/Code/Rendering/mitkPointSetVtkMapper3D.h

Core/Code/Rendering/mitkVtkMapper2D.h

Core/Code/Rendering/mitkVtkPropRenderer.cpp

Core/Code/Rendering/mitkVtkPropRenderer.h

Core/Code/Rendering/vtkMitkApplyLevelWindowToRGBFilter.cpp

Core/Code/Rendering/vtkMitkApplyLevelWindowToRGBFilter.h

Core/Code/Rendering/vtkMitkRenderProp.cpp

Core/Code/Testing/mitkDataNodeTest.cpp

Core/Code/files.cmake

CoreUI/Qmitk/QmitkRenderWindow.cpp

CoreUI/Qmitk/QmitkRenderWindow.h

Documentation/Doxygen/ImageMapperdisplayGeometry.png

Documentation/Doxygen/cameraPositioning.png

Documentation/Doxygen/cameraPositioning3D.png

Documentation/Doxygen/imageVtkMapper2Darchitecture.png

Documentation/Doxygen/scaling.png

Documentation/Doxygen/texturedPlane.png

Modules/DiffusionImaging/IODataStructures/DiffusionWeightedImages/mitkDiffusionImage.txx

Modules/DiffusionImaging/IODataStructures/mitkDiffusionImagingObjectFactory.cpp

Modules/DiffusionImaging/Rendering/mitkCompositeMapper.cpp

Modules/DiffusionImaging/Rendering/mitkCompositeMapper.h

Modules/DiffusionImaging/Rendering/mitkDiffusionImageMapper.cpp

Modules/DiffusionImaging/Rendering/mitkDiffusionImageMapper.h

Modules/DiffusionImaging/Rendering/mitkOdfVtkMapper2D.h

Modules/DiffusionImaging/Rendering/mitkOdfVtkMapper2D.txx

Modules/IGT/IGTFilters/mitkCameraVisualization.cpp

Modules/ImageExtraction/mitkExtractDirectedPlaneImageFilter.cpp

Merge branch 'bug-9176-RenderingIntegrationTest'
101d7a103ef0
Actions