We want to include the code kindly provided in the following pull request
https://github.com/MITK/MITK/pull/123
Description
Event Timeline
[e88042]: Merge branch 'bug-19728-include-quick-render-pull-request'
Merged commits:
2016-05-11 16:20:12 Caspar Goch [ac9b2f]
Do not mirror y position
2016-05-11 15:41:43 Caspar Goch [f8e89e]
Incorporated QML pull request
This commit contains the squashed commits of the following pull request:
https://github.com/MITK/MITK/pull/123
In addition to just squashing the commits the following changes were made:
- Re-formated to fit our requirements and added copyright headers
- Exports added/adjusted as needed
- Removed a QVTKInteractor and QVTKInteractorInternal as they are already provided by VTK 7
- A couple of dependency issues were fixed to ensure the code compiles
- Original commit messages -----------
- A couple of dependency issues were fixed to ensure the code compiles
Contribution to use the Qt user interface markup language Qml in MITK:
added QmlMitkStdMultiItem, which replaces the QmlMitkFourRenderWindowWidget different approach to register QmlMitkRenderWindowItems resembles more the QmitkStdMultiWidget (e.g. storing planes...) added the respective qml file: MitkStdMultiItem.qml update QmlMitkRenderWindowItem removed interaction legacy updated interactions update QVTKQuickItem paint method to vertically mirror the displaying texture enabled glDepthMask (depth buffer writing) to accurately display 3D objects added example implementations for dataManager and image properties added an example application in the CTK plugin system (Qmlbench)
required minimum qt version Qt5.5
(based on Matt Tylors pull request: https://github.com/nocnokneo/MITK/tree/bug-18393-qml-rendering-improvements)
added missing plugin.xml
added Level/Window and TransferFunction
added support for OSX Retina displays
moved to MITK examples folder
Signed-off-by: Alexander Zehner <Zehner.Alexander@gmail.com>
[f716e0]: Merge branch 'bug-19728-compile-fixes'
Merged commits:
2016-05-13 11:54:31 Caspar Goch [bd42f0]
COMP: Fix include
[74af90]: Merge branch 'bug-19728-compile-fixes'
Merged commits:
2016-05-13 14:52:34 Caspar Goch [391d6e]
COMP: remove identical file and rename custom adapter
There is still an issue in release mode, which leads to a crash when an image is first rendered after loading. This crash can be fixed by strategically adding console output in the slice navigation controller, so I assume it is due to some race condition.
Does not happen anymore on my MSVS 2015 build. I will close this bug for now and open a new one if the need arises.