Diffusion MITK 8d8901792521

Merge branch 'bug-7027-2DRendering' into RenderingIntegrationBranch250811
8d8901792521
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-7027-2DRendering' into RenderingIntegrationBranch250811

Conflicts:
Core/Code/Rendering/mitkGeometry2DDataVtkMapper3D.cpp
Core/Code/Rendering/mitkGeometry2DDataVtkMapper3D.h
Core/Code/Rendering/mitkImageMapperGL2D.cpp
Core/Code/Rendering/mitkImageMapperGL2D.h
Core/Code/Rendering/mitkVtkPropRenderer.cpp
Core/Code/Rendering/vtkMitkRenderProp.cpp
Modules/Bundles/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp
Modules/DiffusionImaging/Rendering/mitkOdfVtkMapper2D.txx
Modules/MitkExt/Algorithms/mitkExtractDirectedPlaneImageFilter.cpp

Details

Provenance

Authored on Aug 25 2011, 10:57 AM

Parents

rMITK8bd31ce8e7eb: Merge branch 'bug-3257-RGBAlevelWindow' into bug-7027-2DRendering
rMITKea0c9bd9588e: Merge branch 'bug-8033-FixVirtualTrackingDeviceTest'

Branches

Unknown

Tags

Unknown

Event Timeline

• kilgus committed rMITK8d8901792521: Merge branch 'bug-7027-2DRendering' into RenderingIntegrationBranch250811 (authored by • kilgus).Aug 25 2011, 10:57 AM

Merged Changes

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

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
d2d5ddd0b2ff Cleaned up code.
Author
• kilgus
Browse Repository
No Builds
No Audits
7d152c7a76c2 Removed debugging output. Found high clipping range which works good.
Author
• kilgus
Browse Repository
No Builds
No Audits
942cc70ad5b0 Replaced the vtkTransformationFilter by SetUserTransform. CameraDebugging…
Author
• kilgus
Browse Repository
No Builds
No Audits
fc73136fdb34 Currently a fixed clipping range seems to work.
Author
• kilgus
Browse Repository
No Builds
No Audits
d1908772e839 Removed some output for the integration branch and set the background to black.
Author
• kilgus
Browse Repository
No Builds
No Audits
857dea97d3ad Refactored some lines. Removed RenderInfo completely (even from the 3D part).
Author
• kilgus
Browse Repository
No Builds
No Audits
b8f40b3f8263 Removed the unnecessary enabled/disbale methods from the composite mapper.
Author
• kilgus
Browse Repository
No Builds
No Audits
a839cb4bb524 Fixed a bug that the 3D view was set for all renderwindows (even for 2D) in the…
Author
• kilgus
Browse Repository
No Builds
No Audits
b51686b7352b Outcommented code in mitkCameraController, whole body example buggy.
Author
• kilgus
Browse Repository
No Builds
No Audits
d67945c84e0a Refactored the contouring code and fixed a bug when image spacing was not taken…
Author
• kilgus
Browse Repository
No Builds
No Audits
274066be3a01 Outline Binary working.
Author
• kilgus
Browse Repository
No Builds
No Audits
cc4d45a2a389 First version of CreateOutlinePolyData.
Author
• kilgus
Browse Repository
No Builds
No Audits
1c5f675e28b0 Contiuned last commit with UnitSpacingFilter and ThickSliceFilter.
Author
• kilgus
Browse Repository
No Builds
No Audits
4bb318f85f32 Started combining localStorage and RenderInfo: UpdateTime, Reslicer.
Author
• kilgus
Browse Repository
No Builds
No Audits
210997b45c6d Some minor refactoring, first version of binary outline.
Author
• kilgus
Browse Repository
No Builds
No Audits
a117c7cb3ee9 Fixed the swivel mode
Author
• kilgus
Browse Repository
No Builds
No Audits
c274b2be5b0b Fixed an issue where the user-defined lut would not use the level window.
Author
• kilgus
Browse Repository
No Builds
No Audits
e7ce61903e37 Quick fix for updating properties: this->Update()
Author
• kilgus
Browse Repository
No Builds
No Audits
843bf1c7c245 Refactored more code, removed unused variables, added docu etc.. Outcommented…
Author
• kilgus
Browse Repository
No Builds
No Audits
a47bbffd4fd3 Refactored the rest of GenerateData() as good as possible
Author
• kilgus
Browse Repository
No Builds
No Audits
e46a0bddbd59 Refactored GenerateData() until line 330. Added some TODOs.
Author
• kilgus
Browse Repository
No Builds
No Audits
e1f7547d8ca0 Refactored includes
Author
• kilgus
Browse Repository
No Builds
No Audits
36424e06aa8b Refactored header file
Author
• kilgus
Browse Repository
No Builds
No Audits
5a4931ff15d0 Fixed the translucent crosshair issue with a workarround. The crosshair is now…
Author
• kilgus
Browse Repository
No Builds
No Audits
d49e239a8c36 Removed some output.
Author
• kilgus
Browse Repository
No Builds
No Audits

Changes (41)

Path

Size

Applications/

Tutorial/

Core/

Code/

Algorithms/

mitkCoreObjectFactory.cpp

Controllers/

mitkCameraController.cpp

mitkRenderingManager.cpp

Rendering/

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

CoreUI/

Qmitk/

QmitkStdMultiWidget.cpp

Documentation/

Doxygen/

ImageMapperdisplayGeometry.png

cameraPositioning.png

cameraPositioning3D.png

imageVtkMapper2Darchitecture.png

texturedPlane.png

Modules/

Bundles/

org.mitk.gui.qt.basicimageprocessing/

src/

internal/

QmitkBasicImageProcessingView.cpp

QmitkBasicImageProcessingView.h

QmitkBasicImageProcessingViewControls.ui

DiffusionImaging/

Rendering/

mitkCompositeMapper.h

mitkDiffusionImageMapper.cpp

mitkDiffusionImageMapper.h

mitkOdfVtkMapper2D.h

mitkOdfVtkMapper2D.txx

IGT/

IGTFilters/

mitkCameraVisualization.cpp

MitkExt/

Rendering/

vtkMitkOpenGLGPUVolumeRayCastMapper.cpp

	Modules/	DiffusionImaging/	Rendering/	mitkCompositeMapper.cpp/
	CoreUI/	Bundles/	org.mitk.gui.qt.application/	src/


	QmitkActionBarAdvisor.cpp

rMITK8d8901792521

Applications/Tutorial/Step6.cpp

Loading...

Applications/Tutorial/Step8.cpp

Loading...

Core/Code/Algorithms/mitkCoreObjectFactory.cpp

Loading...

Core/Code/Controllers/mitkCameraController.cpp

Loading...

Core/Code/Controllers/mitkRenderingManager.cpp

Loading...

Core/Code/Rendering/mitkGeometry2DDataMapper2D.cpp

Loading...

Core/Code/Rendering/mitkGeometry2DDataVtkMapper3D.h

Loading...

Core/Code/Rendering/mitkImageMapperGL2D.cpp

Loading...

Core/Code/Rendering/mitkImageMapperGL2D.h

Loading...

Core/Code/Rendering/mitkImageVtkMapper2D.cpp

Loading...

Core/Code/Rendering/mitkImageVtkMapper2D.h

Loading...

Core/Code/Rendering/mitkPointSetGLMapper2D.cpp

Loading...

Core/Code/Rendering/mitkPointSetGLMapper2D.h

Loading...

Core/Code/Rendering/mitkPointSetVtkMapper3D.cpp

Loading...

Core/Code/Rendering/mitkPointSetVtkMapper3D.h

Loading...

Core/Code/Rendering/mitkVtkMapper2D.h

Loading...

Core/Code/Rendering/mitkVtkPropRenderer.cpp

Loading...

Core/Code/Rendering/mitkVtkPropRenderer.h

Loading...

Core/Code/Rendering/vtkMitkApplyLevelWindowToRGBFilter.cpp

Loading...

Core/Code/Rendering/vtkMitkApplyLevelWindowToRGBFilter.h

Loading...

Core/Code/Rendering/vtkMitkRenderProp.cpp

Loading...

Core/Code/Testing/mitkDataNodeTest.cpp

Loading...

Core/Code/files.cmake

Loading...

CoreUI/Qmitk/QmitkStdMultiWidget.cpp

Loading...

Documentation/Doxygen/ImageMapperdisplayGeometry.png

Loading...

Documentation/Doxygen/cameraPositioning.png

Loading...

Documentation/Doxygen/cameraPositioning3D.png

Loading...

Documentation/Doxygen/imageVtkMapper2Darchitecture.png

Loading...

Documentation/Doxygen/scaling.png

Loading...

Documentation/Doxygen/texturedPlane.png

Loading...

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

Loading...

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

Loading...

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

Loading...

Modules/DiffusionImaging/Rendering/mitkCompositeMapper.cpp

Loading...

Modules/DiffusionImaging/Rendering/mitkCompositeMapper.h

Loading...

Modules/DiffusionImaging/Rendering/mitkDiffusionImageMapper.cpp

Loading...

Modules/DiffusionImaging/Rendering/mitkDiffusionImageMapper.h

Loading...

Modules/DiffusionImaging/Rendering/mitkOdfVtkMapper2D.h

Loading...

Modules/DiffusionImaging/Rendering/mitkOdfVtkMapper2D.txx

Loading...

Modules/IGT/IGTFilters/mitkCameraVisualization.cpp

Loading...

Modules/MitkExt/Rendering/vtkMitkOpenGLGPUVolumeRayCastMapper.cpp

Loading...