Diffusion MITK 8cd8c5370e19

Merge remote-tracking branch 'origin/personal/maleike/bug-8165-fast-and…
8cd8c5370e19
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge remote-tracking branch 'origin/personal/maleike/bug-8165-fast-and-correct-imagemapper-2D' into personal/zelzer/bug-8165-level-window-optimizations-for-christmas-release

Conflicts:
Core/Code/Rendering/mitkImageVtkMapper2D.cpp
Core/Code/Rendering/vtkMitkApplyLevelWindowToRGBFilter.cpp
Core/Code/Rendering/vtkMitkLevelWindowFilter.h
Core/Code/files.cmake

Details

Provenance

Authored on Nov 27 2012, 4:05 PM

Parents

rMITKc12bd5a88521: Implement and register replacement vtkTexture
rMITK92ad60917589: Merge branch 'bug-13572-OpenCL-OpenSource'

Branches

Unknown

Tags

Unknown

Event Timeline

zelzer committed rMITK8cd8c5370e19: Merge remote-tracking branch 'origin/personal/maleike/bug-8165-fast-and… (authored by zelzer).Nov 27 2012, 4:05 PM

Merged Changes

c12bd5a88521 Implement and register replacement vtkTexture
Author
maleike
Browse Repository
No Builds
No Audits
f79a09fbe424 Commit to safe local changes.
Author
• groch
Browse Repository
No Builds
No Audits
a63f75a4afab working version
Author
fangerau
Browse Repository
No Builds
No Audits
3b998f583cb7 build fixes
Author
fangerau
Browse Repository
No Builds
No Audits
af4afbc70759 Merge remote-tracking branch 'remotes/origin/bug-8165-imageMapper2D-cleanup'…
Author
• groch
Browse Repository
No Builds
No Audits
eb0c856795d2 cleanups
Author
fangerau
Browse Repository
No Builds
No Audits
58dc20f0a2a0 optimizations
Author
fangerau
Browse Repository
No Builds
No Audits
3347e702264f thickslices fix
Author
fangerau
Browse Repository
No Builds
No Audits
ba381108aad4 Merge branch 'bug-8165-imageMapper2D-optimization' into bug-8165-mastermerge
Author
fangerau
Browse Repository
No Builds
No Audits
829755aa65dd Fixed update bug; no unnecessary reslicing.
Author
• groch
Browse Repository
No Builds
No Audits
83d1413f426d safety commit
Author
• groch
Browse Repository
No Builds
No Audits
5cc568534578 Now working
Author
maleike
Browse Repository
No Builds
No Audits
f9b453e69d92 make aplication of LUT and L/W work with basic images
Author
maleike
Browse Repository
No Builds
No Audits
958265e661ec Zwischenstand von heute
Author
maleike
Browse Repository
No Builds
No Audits

Changes (11)

Path

Size

Core/

Code/

Controllers/

mitkCoreActivator.cpp

Rendering/

mitkGeometry2DDataVtkMapper3D.cpp

mitkImageVtkMapper2D.cpp

mitkImageVtkMapper2D.h

vtkMitkApplyLevelWindowToRGBFilter.cpp

vtkMitkApplyLevelWindowToRGBFilter.h

vtkMitkLevelWindowFilter.cpp

	vtkMitkLevelWindowFilter.h
	vtkMitkApplyLevelWindowToRGBFilter.h

vtkNeverTranslucentTexture.cpp

vtkNeverTranslucentTexture.h

rMITK8cd8c5370e19

Core/Code/Controllers/mitkCoreActivator.cpp

Loading...

Core/Code/Rendering/mitkGeometry2DDataVtkMapper3D.cpp

Loading...

Core/Code/Rendering/mitkImageVtkMapper2D.cpp

Loading...

Core/Code/Rendering/mitkImageVtkMapper2D.h

Loading...

Core/Code/Rendering/vtkMitkApplyLevelWindowToRGBFilter.cpp

Loading...

Core/Code/Rendering/vtkMitkApplyLevelWindowToRGBFilter.h

Loading...

Core/Code/Rendering/vtkMitkLevelWindowFilter.cpp

Loading...

Core/Code/Rendering/vtkMitkLevelWindowFilter.h

Loading...

Core/Code/Rendering/vtkNeverTranslucentTexture.cpp

Loading...

Core/Code/Rendering/vtkNeverTranslucentTexture.h

Loading...

Core/Code/files.cmake

Loading...