Merge branch 'T18922-FinalFixes'
e85a7c901292
Actions

Description

Merge branch 'T18922-FinalFixes'

Details

Provenance

kislinsk	Authored on Aug 22 2017, 1:53 AM
kislinsk	Pushed on Aug 22 2017, 1:53 AM

Parents

rMITK73b319ee8c59: Remove OpenViewCore and QmlItems modules
rMITK474fa3d7c410: Merge branch 'T18922-FinalFixes'

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITKe85a7c901292: Merge branch 'T18922-FinalFixes' (authored by kislinsk).Aug 22 2017, 1:53 AM

Merged Changes

73b319ee8c59 Remove OpenViewCore and QmlItems modules
Author
kislinsk
Browse Repository
No Builds
No Audits

Changes (80)

Path

Size

Modules/

QVTKFramebufferObjectRenderer.h

QVTKMitkInteractorAdapter.h

QVTKQuickItem.h

vtkQtConnection.h

src

QVTKFramebufferObjectRenderer.cxx

QVTKMitkInteractorAdapter.cxx

QVTKQuickItem.cxx

vtkInternalOpenGLRenderWindow.cxx

vtkInternalOpenGLRenderWindow.h

QmitkEventAdapter.cpp

QmlMitkBigRenderLock.h

QmlMitkColorTransferFunctionCanvas.h

QmlMitkDatamanager.h

QmlMitkImageNavigator.h

QmlMitkPiecewiseFunctionCanvas.h

QmlMitkProperties.h

QmlMitkRenderWindowItem.h

QmlMitkRenderingManager.h

QmlMitkRenderingManagerFactory.h

QmlMitkSliderLevelWindowItem.h

QmlMitkSliderNavigatorItem.h

QmlMitkStdMultiItem.h

QmlMitkTransferFunctionCanvas.h

QmlMitkTransferFunctionItem.h

qml-classes-mitk.jpg

resource

MitkDataManager.qml

MitkImageNavigator.qml

fontawesome-webfont.ttf

src

QmlAxisOverlay.cpp

QmlMitkBigRenderLock.cpp

QmlMitkColorTransferFunctionCanvas.cpp

QmlMitkDatamanager.cpp

QmlMitkImageNavigator.cpp

QmlMitkPiecewiseFunctionCanvas.cpp

QmlMitkProperties.cpp

QmlMitkRenderWindowItem.cpp

QmlMitkRenderingManager.cpp

QmlMitkRenderingManagerFactory.cpp

QmlMitkSliderLevelWindowItem.cpp

QmlMitkSliderNavigatorItem.cpp

QmlMitkStdMultiItem.cpp

QmlMitkTransferFunctionCanvas.cpp

QmlMitkTransferFunctionItem.cpp

rMITKe85a7c901292

View Options

Modules/ModuleList.cmake

View Options

Modules/OpenViewCore

View Options

Modules/OpenViewCore/CMakeLists.txt

View Options

Modules/OpenViewCore/LICENSE

View Options

Modules/OpenViewCore/QVTKQuickItem.cxx

View Options

Modules/OpenViewCore/README

View Options

Modules/OpenViewCore/files.cmake

View Options

Modules/OpenViewCore/include

View Options

Modules/OpenViewCore/include/QVTKFramebufferObjectRenderer.h

View Options

Modules/OpenViewCore/include/QVTKMitkInteractorAdapter.h

View Options

Modules/OpenViewCore/include/QVTKQuickItem.h

View Options

Modules/OpenViewCore/include/vtkQtConnection.h

View Options

Modules/OpenViewCore/src

View Options

Modules/OpenViewCore/src/QVTKFramebufferObjectRenderer.cxx

View Options

Modules/OpenViewCore/src/QVTKMitkInteractorAdapter.cxx

View Options

Modules/OpenViewCore/src/QVTKQuickItem.cxx

View Options

Modules/OpenViewCore/src/vtkInternalOpenGLRenderWindow.cxx

View Options

Modules/OpenViewCore/src/vtkInternalOpenGLRenderWindow.h

View Options

Modules/OpenViewCore/src/vtkQtConnection.cxx

View Options

Modules/QmlItems

View Options

Modules/QmlItems/CMakeLists.txt

View Options

Modules/QmlItems/InteractionLegacy

View Options

Modules/QmlItems/InteractionLegacy/QmitkEventAdapter.cpp

View Options

Modules/QmlItems/InteractionLegacy/QmitkEventAdapter.h

View Options

Modules/QmlItems/README

View Options

Modules/QmlItems/files.cmake

View Options

Modules/QmlItems/include

View Options

Modules/QmlItems/include/QmlAxisOverlay.h

View Options

Modules/QmlItems/include/QmlMitkBigRenderLock.h

View Options

Modules/QmlItems/include/QmlMitkColorTransferFunctionCanvas.h

View Options

Modules/QmlItems/include/QmlMitkDatamanager.h

View Options

Modules/QmlItems/include/QmlMitkImageNavigator.h

View Options

Modules/QmlItems/include/QmlMitkPiecewiseFunctionCanvas.h

View Options

Modules/QmlItems/include/QmlMitkProperties.h

View Options

Modules/QmlItems/include/QmlMitkRenderWindowItem.h

View Options

Modules/QmlItems/include/QmlMitkRenderingManager.h

View Options

Modules/QmlItems/include/QmlMitkRenderingManagerFactory.h

View Options

Modules/QmlItems/include/QmlMitkSliderLevelWindowItem.h

View Options

Modules/QmlItems/include/QmlMitkSliderNavigatorItem.h

View Options

Modules/QmlItems/include/QmlMitkStdMultiItem.h

View Options

Modules/QmlItems/include/QmlMitkTransferFunctionCanvas.h

View Options

Modules/QmlItems/include/QmlMitkTransferFunctionItem.h

View Options

Modules/QmlItems/qml-classes-mitk.jpg

View Options

Modules/QmlItems/resource

View Options

Modules/QmlItems/resource/MitkDataManager.qml

View Options

Modules/QmlItems/resource/MitkImageNavigator.qml

View Options

Modules/QmlItems/resource/MitkItems.qrc

View Options

Modules/QmlItems/resource/MitkProperties.qml

View Options

Modules/QmlItems/resource/MitkStdMultiItem.qml

View Options

Modules/QmlItems/resource/components

View Options

Modules/QmlItems/resource/components/Checkbox.qml

View Options

Modules/QmlItems/resource/components/Combobox.qml

View Options

Modules/QmlItems/resource/components/DataToolbar.qml

View Options

Modules/QmlItems/resource/components/MultiToolbar.qml

View Options

Modules/QmlItems/resource/components/Slider.qml

View Options

Modules/QmlItems/resource/components/SliderNavigator.qml

View Options

Modules/QmlItems/resource/components/Spinbox.qml

View Options

Modules/QmlItems/resource/components/TextField.qml

View Options

Modules/QmlItems/resource/components/TransferFunction.qml

View Options

Modules/QmlItems/resource/components/TransferOverlay.qml

View Options

Modules/QmlItems/resource/components/VectorIcon.qml

View Options

Modules/QmlItems/resource/fonts

View Options

Modules/QmlItems/resource/fonts/font-awesome

View Options

Modules/QmlItems/resource/fonts/font-awesome/fontawesome-webfont.ttf

View Options

Modules/QmlItems/src

View Options

Modules/QmlItems/src/QmlAxisOverlay.cpp

View Options

Modules/QmlItems/src/QmlMitkBigRenderLock.cpp

View Options

Modules/QmlItems/src/QmlMitkColorTransferFunctionCanvas.cpp

View Options

Modules/QmlItems/src/QmlMitkDatamanager.cpp

View Options

Modules/QmlItems/src/QmlMitkImageNavigator.cpp

View Options

Modules/QmlItems/src/QmlMitkPiecewiseFunctionCanvas.cpp

View Options

Modules/QmlItems/src/QmlMitkProperties.cpp

View Options

Modules/QmlItems/src/QmlMitkRenderWindowItem.cpp

View Options

Modules/QmlItems/src/QmlMitkRenderingManager.cpp

View Options

Modules/QmlItems/src/QmlMitkRenderingManagerFactory.cpp

View Options

Modules/QmlItems/src/QmlMitkSliderLevelWindowItem.cpp

View Options

Modules/QmlItems/src/QmlMitkSliderNavigatorItem.cpp

View Options

Modules/QmlItems/src/QmlMitkStdMultiItem.cpp

View Options

Modules/QmlItems/src/QmlMitkTransferFunctionCanvas.cpp

View Options

Modules/QmlItems/src/QmlMitkTransferFunctionItem.cpp

Merge branch 'T18922-FinalFixes'e85a7c901292Actions

Description

Details

Event Timeline

Merged Changes

Changes (80)

rMITKe85a7c901292

Modules/ModuleList.cmake

Modules/OpenViewCore

Modules/OpenViewCore/CMakeLists.txt

Modules/OpenViewCore/LICENSE

Modules/OpenViewCore/QVTKQuickItem.cxx

Modules/OpenViewCore/README

Modules/OpenViewCore/files.cmake

Modules/OpenViewCore/include

Modules/OpenViewCore/include/QVTKFramebufferObjectRenderer.h

Modules/OpenViewCore/include/QVTKMitkInteractorAdapter.h

Modules/OpenViewCore/include/QVTKQuickItem.h

Modules/OpenViewCore/include/vtkQtConnection.h

Modules/OpenViewCore/src

Modules/OpenViewCore/src/QVTKFramebufferObjectRenderer.cxx

Modules/OpenViewCore/src/QVTKMitkInteractorAdapter.cxx

Modules/OpenViewCore/src/QVTKQuickItem.cxx

Modules/OpenViewCore/src/vtkInternalOpenGLRenderWindow.cxx

Modules/OpenViewCore/src/vtkInternalOpenGLRenderWindow.h

Modules/OpenViewCore/src/vtkQtConnection.cxx

Modules/QmlItems

Modules/QmlItems/CMakeLists.txt

Modules/QmlItems/InteractionLegacy

Modules/QmlItems/InteractionLegacy/QmitkEventAdapter.cpp

Modules/QmlItems/InteractionLegacy/QmitkEventAdapter.h

Modules/QmlItems/README

Modules/QmlItems/files.cmake

Modules/QmlItems/include

Modules/QmlItems/include/QmlAxisOverlay.h

Modules/QmlItems/include/QmlMitkBigRenderLock.h

Modules/QmlItems/include/QmlMitkColorTransferFunctionCanvas.h

Modules/QmlItems/include/QmlMitkDatamanager.h

Modules/QmlItems/include/QmlMitkImageNavigator.h

Modules/QmlItems/include/QmlMitkPiecewiseFunctionCanvas.h

Modules/QmlItems/include/QmlMitkProperties.h

Modules/QmlItems/include/QmlMitkRenderWindowItem.h

Modules/QmlItems/include/QmlMitkRenderingManager.h

Modules/QmlItems/include/QmlMitkRenderingManagerFactory.h

Modules/QmlItems/include/QmlMitkSliderLevelWindowItem.h

Modules/QmlItems/include/QmlMitkSliderNavigatorItem.h

Modules/QmlItems/include/QmlMitkStdMultiItem.h

Modules/QmlItems/include/QmlMitkTransferFunctionCanvas.h

Modules/QmlItems/include/QmlMitkTransferFunctionItem.h

Modules/QmlItems/qml-classes-mitk.jpg

Modules/QmlItems/resource

Modules/QmlItems/resource/MitkDataManager.qml

Modules/QmlItems/resource/MitkImageNavigator.qml

Modules/QmlItems/resource/MitkItems.qrc

Modules/QmlItems/resource/MitkProperties.qml

Modules/QmlItems/resource/MitkStdMultiItem.qml

Modules/QmlItems/resource/components

Modules/QmlItems/resource/components/Checkbox.qml

Modules/QmlItems/resource/components/Combobox.qml

Modules/QmlItems/resource/components/DataToolbar.qml

Modules/QmlItems/resource/components/MultiToolbar.qml

Modules/QmlItems/resource/components/Slider.qml

Modules/QmlItems/resource/components/SliderNavigator.qml

Modules/QmlItems/resource/components/Spinbox.qml

Modules/QmlItems/resource/components/TextField.qml

Modules/QmlItems/resource/components/TransferFunction.qml

Modules/QmlItems/resource/components/TransferOverlay.qml

Modules/QmlItems/resource/components/VectorIcon.qml

Modules/QmlItems/resource/fonts

Modules/QmlItems/resource/fonts/font-awesome

Modules/QmlItems/resource/fonts/font-awesome/fontawesome-webfont.ttf

Modules/QmlItems/src

Modules/QmlItems/src/QmlAxisOverlay.cpp

Modules/QmlItems/src/QmlMitkBigRenderLock.cpp

Modules/QmlItems/src/QmlMitkColorTransferFunctionCanvas.cpp

Modules/QmlItems/src/QmlMitkDatamanager.cpp

Modules/QmlItems/src/QmlMitkImageNavigator.cpp

Modules/QmlItems/src/QmlMitkPiecewiseFunctionCanvas.cpp

Modules/QmlItems/src/QmlMitkProperties.cpp

Modules/QmlItems/src/QmlMitkRenderWindowItem.cpp

Merge branch 'T18922-FinalFixes'
e85a7c901292
Actions