Diffusion MITK ce74281bf314

Merge branch 'bug-8165-mastermerge5' into bug-8165-mastermerge6
ce74281bf314
Actions

Description

Merge branch 'bug-8165-mastermerge5' into bug-8165-mastermerge6

Conflicts:
Core/Code/Rendering/mitkImageVtkMapper2D.cpp
Core/Code/Rendering/mitkImageVtkMapper2D.h

Details

Provenance

• engelhsa

Authored on Feb 15 2013, 4:00 PM

Parents

rMITK6b9e7ce5423b: Delete comment and replace MITK_Error message by MITK_WARN
rMITK472a77c18174: Merge branch 'bug-14413-FixLinuxWarning1'

Branches

Unknown

Tags

Unknown

Event Timeline

• engelhsa committed rMITKce74281bf314: Merge branch 'bug-8165-mastermerge5' into bug-8165-mastermerge6 (authored by • engelhsa).Feb 15 2013, 4:00 PM

Merged Changes

6b9e7ce5423b Delete comment and replace MITK_Error message by MITK_WARN
Author
• engelhsa
Browse Repository
No Builds
No Audits
609650785fa7 added documentation/fixed merging
Author
• engelhsa
Browse Repository
No Builds
No Audits
1f7e2a20a5ce Merge branch 'bug-8165-mastermerge4' into bug-8165-mastermerge5
Author
• engelhsa
Browse Repository
No Builds
No Audits
d4a455d58ed1 fixed tabs
Author
• engelhsa
Browse Repository
No Builds
No Audits
70a6ce365387 Made Levelwindowfilter working with color transfer functions property
Author
• engelhsa
Browse Repository
No Builds
No Audits
783759b0d12c fixed binary images
Author
• engelhsa
Browse Repository
No Builds
No Audits
89ab2aa81534 Reviewed Code / added missing comments and descriptions
Author
• engelhsa
Browse Repository
No Builds
No Audits
65cc97814ce4 Merge branch 'bug-8165-mastermerge3' into bug-8165-mastermerge4
Author
• engelhsa
Browse Repository
No Builds
No Audits
3baca144e94a fixed wrong opacity on cr images
Author
• heime
Browse Repository
No Builds
No Audits
404c12ff38eb fixed rendering of rgba images
Author
• heime
Browse Repository
No Builds
No Audits
2eb91df37f7c Merge branch 'bug-8165-level-window-optimizations-testing' into bug-8165…
Author
fangerau
Browse Repository
No Builds
No Audits
8cd8c5370e19 Merge remote-tracking branch 'origin/personal/maleike/bug-8165-fast-and-correct…
Author
zelzer
Browse Repository
No Builds
No Audits
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 (13)

Path

Size

Core/

Code/

Algorithms/

mitkPlaneClipping.h

Controllers/

mitkCoreActivator.cpp

Rendering/

mitkGeometry2DDataVtkMapper3D.cpp

mitkImageVtkMapper2D.cpp

mitkImageVtkMapper2D.h

mitkVolumeDataVtkMapper3D.cpp

vtkMitkApplyLevelWindowToRGBFilter.cpp

vtkMitkApplyLevelWindowToRGBFilter.h

vtkMitkLevelWindowFilter.cpp

	vtkMitkLevelWindowFilter.h
	vtkMitkApplyLevelWindowToRGBFilter.h

vtkNeverTranslucentTexture.cpp

vtkNeverTranslucentTexture.h

files.cmake

rMITKce74281bf314

View Options

Core/Code/Algorithms/mitkPlaneClipping.h

View Options

Core/Code/Controllers/mitkCoreActivator.cpp

View Options

Core/Code/Rendering/mitkGeometry2DDataVtkMapper3D.cpp

View Options

Core/Code/Rendering/mitkImageVtkMapper2D.cpp

View Options

Core/Code/Rendering/mitkImageVtkMapper2D.h

View Options

Core/Code/Rendering/mitkVolumeDataVtkMapper3D.cpp

View Options

Core/Code/Rendering/vtkMitkApplyLevelWindowToRGBFilter.cpp

View Options

Core/Code/Rendering/vtkMitkApplyLevelWindowToRGBFilter.h

View Options

Core/Code/Rendering/vtkMitkLevelWindowFilter.cpp

View Options

Core/Code/Rendering/vtkMitkLevelWindowFilter.h

View Options

Core/Code/Rendering/vtkNeverTranslucentTexture.cpp

View Options

Core/Code/Rendering/vtkNeverTranslucentTexture.h

View Options

Merge branch 'bug-8165-mastermerge5' into bug-8165-mastermerge6ce74281bf314Actions

Description

Details

Event Timeline

Merged Changes

Changes (13)

rMITKce74281bf314

Core/Code/Algorithms/mitkPlaneClipping.h

Core/Code/Controllers/mitkCoreActivator.cpp

Core/Code/Rendering/mitkGeometry2DDataVtkMapper3D.cpp

Core/Code/Rendering/mitkImageVtkMapper2D.cpp

Core/Code/Rendering/mitkImageVtkMapper2D.h

Core/Code/Rendering/mitkVolumeDataVtkMapper3D.cpp

Core/Code/Rendering/vtkMitkApplyLevelWindowToRGBFilter.cpp

Core/Code/Rendering/vtkMitkApplyLevelWindowToRGBFilter.h

Core/Code/Rendering/vtkMitkLevelWindowFilter.cpp

Core/Code/Rendering/vtkMitkLevelWindowFilter.h

Core/Code/Rendering/vtkNeverTranslucentTexture.cpp

Core/Code/Rendering/vtkNeverTranslucentTexture.h

Core/Code/files.cmake

Merge branch 'bug-8165-mastermerge5' into bug-8165-mastermerge6
ce74281bf314
Actions