Merge branch 'bug-7027-2DRendering' into bug-9176-RenderingIntegrationTest
88040373e39d
Actions

Description

Merge branch 'bug-7027-2DRendering' into bug-9176-RenderingIntegrationTest

Conflicts:
Core/Code/Rendering/mitkImageVtkMapper2D.cpp
Core/Code/Rendering/vtkMitkApplyLevelWindowToRGBFilter.cpp
Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingView.cpp

Details

Provenance

• kilgus

Authored on Sep 9 2011, 3:55 PM

Parents

rMITK85d85efa455a: Revert of some tmp changes in basicimageprocessingview. Very stable 2D…
rMITKf7a86877528b: replaced GenerateData() with GenerateDataForRenderer()

Branches

Unknown

Tags

Unknown

Event Timeline

• kilgus committed rMITK88040373e39d: Merge branch 'bug-7027-2DRendering' into bug-9176-RenderingIntegrationTest (authored by • kilgus).Sep 9 2011, 4:03 PM

Merged Changes

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
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

Changes (20)

Path

Size

Applications/

Tutorial/

Step6.cpp

Step8.cpp

Core/

Code/

Controllers/

mitkCameraController.cpp

mitkRenderingManager.cpp

Rendering/

mitkBaseRenderer.h

mitkGeometry2DDataMapper2D.cpp

mitkImageVtkMapper2D.cpp

mitkImageVtkMapper2D.h

mitkVtkPropRenderer.cpp

mitkVtkPropRenderer.h

vtkMitkApplyLevelWindowToRGBFilter.cpp

vtkMitkApplyLevelWindowToRGBFilter.h

CoreUI/

Qmitk/

QmitkRenderWindow.cpp

QmitkRenderWindow.h

QmitkStdMultiWidget.cpp

Modules/

Bundles/

org.mitk.gui.qt.basicimageprocessing/

src/

internal/

QmitkBasicImageProcessingView.cpp

QmitkBasicImageProcessingView.h

QmitkBasicImageProcessingViewControls.ui

IGT/

IGTFilters/

mitkCameraVisualization.cpp

MitkExt/

Rendering/

vtkMitkOpenGLGPUVolumeRayCastMapper.cpp

rMITK88040373e39d

View Options

Applications/Tutorial/Step6.cpp

View Options

Applications/Tutorial/Step8.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/mitkImageVtkMapper2D.cpp

View Options

Core/Code/Rendering/mitkImageVtkMapper2D.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

CoreUI/Qmitk/QmitkRenderWindow.cpp

View Options

CoreUI/Qmitk/QmitkRenderWindow.h

View Options

CoreUI/Qmitk/QmitkStdMultiWidget.cpp

View Options

Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingView.cpp

View Options

Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingView.h

View Options

Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingViewControls.ui

View Options

Modules/IGT/IGTFilters/mitkCameraVisualization.cpp

View Options

Modules/MitkExt/Rendering/vtkMitkOpenGLGPUVolumeRayCastMapper.cpp

Merge branch 'bug-7027-2DRendering' into bug-9176-RenderingIntegrationTest88040373e39dActions

Description

Details

Event Timeline

Merged Changes

Changes (20)

rMITK88040373e39d

Applications/Tutorial/Step6.cpp

Applications/Tutorial/Step8.cpp

Core/Code/Controllers/mitkCameraController.cpp

Core/Code/Controllers/mitkRenderingManager.cpp

Core/Code/Rendering/mitkBaseRenderer.h

Core/Code/Rendering/mitkGeometry2DDataMapper2D.cpp

Core/Code/Rendering/mitkImageVtkMapper2D.cpp

Core/Code/Rendering/mitkImageVtkMapper2D.h

Core/Code/Rendering/mitkVtkPropRenderer.cpp

Core/Code/Rendering/mitkVtkPropRenderer.h

Core/Code/Rendering/vtkMitkApplyLevelWindowToRGBFilter.cpp

Core/Code/Rendering/vtkMitkApplyLevelWindowToRGBFilter.h

CoreUI/Qmitk/QmitkRenderWindow.cpp

CoreUI/Qmitk/QmitkRenderWindow.h

CoreUI/Qmitk/QmitkStdMultiWidget.cpp

Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingView.cpp

Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingView.h

Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingViewControls.ui

Modules/IGT/IGTFilters/mitkCameraVisualization.cpp

Modules/MitkExt/Rendering/vtkMitkOpenGLGPUVolumeRayCastMapper.cpp

Merge branch 'bug-7027-2DRendering' into bug-9176-RenderingIntegrationTest
88040373e39d
Actions