Diffusion MITK 19500034a3d0

Merge remote-tracking branch 'MattClarkson/19784-mac-rendering' into T23985…
19500034a3d0
Actions

Description

Merge remote-tracking branch 'MattClarkson/19784-mac-rendering' into T23985-macOS

Details

Provenance

kislinsk	Authored on Dec 21 2017, 2:02 PM
kislinsk	Pushed on Dec 21 2017, 2:31 PM

Parents

rMITK709e1ebc1bd1: Fix syntax error in logging statement caused by outputting Qt::WindowFlags
rMITKf26d293d9b70: Make platform specific switch compatible to macOS

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITK19500034a3d0: Merge remote-tracking branch 'MattClarkson/19784-mac-rendering' into T23985… (authored by kislinsk).Dec 21 2017, 2:02 PM

Merged Changes

709e1ebc1bd1 Fix syntax error in logging statement caused by outputting Qt::WindowFlags
Author
clarkson
Browse Repository
No Builds
No Audits
8e04e20fbb3c Dont delete vtkRenderWindow in mitk::BaseRenderer as noe QVTKOpenGLWidget…
Author
clarkson
Browse Repository
No Builds
No Audits
0857201939d5 Update explanation of overloaded resizeGL.
Author
clarkson
Browse Repository
No Builds
No Audits
8a1e0f18793b Put mitk::RenderWindowBase initialisation back to where it was before.
Author
clarkson
Browse Repository
No Builds
No Audits
41398c4577d6 Force immediate update when resizing.
Author
clarkson
Browse Repository
No Builds
No Audits
77635882ae3c Plug in new QVTKOpenGLWidget, but not updating.
Author
clarkson
Browse Repository
No Builds
No Audits
18b05cb10cd9 Correct use of direct.h for Mac
Author
clarkson
Browse Repository
No Builds
No Audits
c8437808f32d Work-around variable not used warning on Mac.
Author
clarkson
Browse Repository
No Builds
No Audits

Changes (8)

Path

Size

Packages

Modules/

AppUtil/

CMakeLists.txt

src/

mitkBaseApplication.cpp

Core/

src/

Rendering/

mitkRenderWindowBase.cpp

O1: MITK Reviewer Group I

PhotoacousticsLib/

MitkMCxyz/

MitkMCxyz.cpp

src/

Generator/

mitkPASimulationBatchGenerator.cpp

QtWidgets/

include/

QmitkRenderWindow.h

O3: MITK Reviewer Group II

src/

QmitkRenderWindow.cpp

O3: MITK Reviewer Group II

QmitkRenderWindowMenu.cpp

O3: MITK Reviewer Group II

rMITK19500034a3d0

View Options

Modules/AppUtil/CMakeLists.txt

View Options

Modules/AppUtil/src/mitkBaseApplication.cpp

View Options

Modules/Core/src/Rendering/mitkRenderWindowBase.cpp

View Options

Modules/PhotoacousticsLib/MitkMCxyz/MitkMCxyz.cpp

View Options

Modules/PhotoacousticsLib/src/Generator/mitkPASimulationBatchGenerator.cpp

View Options

Modules/QtWidgets/include/QmitkRenderWindow.h

View Options

Modules/QtWidgets/src/QmitkRenderWindow.cpp

View Options

Modules/QtWidgets/src/QmitkRenderWindowMenu.cpp

Merge remote-tracking branch 'MattClarkson/19784-mac-rendering' into T23985…19500034a3d0Actions

Description

Details

Event Timeline

Merged Changes

Changes (8)

rMITK19500034a3d0

Modules/AppUtil/CMakeLists.txt

Modules/AppUtil/src/mitkBaseApplication.cpp

Modules/Core/src/Rendering/mitkRenderWindowBase.cpp

Modules/PhotoacousticsLib/MitkMCxyz/MitkMCxyz.cpp

Modules/PhotoacousticsLib/src/Generator/mitkPASimulationBatchGenerator.cpp

Modules/QtWidgets/include/QmitkRenderWindow.h

Modules/QtWidgets/src/QmitkRenderWindow.cpp

Modules/QtWidgets/src/QmitkRenderWindowMenu.cpp

Merge remote-tracking branch 'MattClarkson/19784-mac-rendering' into T23985…
19500034a3d0
Actions