mitk
4ec99d65f137
Actions

Description

Merge branch 'master' of https://phabricator.mitk.org/source/mitk

Please enter a commit message to explain why this merge is necessary,
especially if it merges an updated upstream into a topic branch. #
Lines starting with '#' will be ignored, and an empty message aborts
the commit.

Details

Provenance

kompan	Authored on Jul 22 2019, 8:37 AM
kompan	Pushed on Jul 22 2019, 9:07 AM
kompan	Pushed on Jul 22 2019, 8:37 AM

Differential Revision

Restricted Differential Revision

Parents

rMITK617e8f0688df: Move mitkTestDynamicImageGenerator to mitkCore/TestingHelper
rMITK6e4f328a4a22: Enable MITK mouse mode and allow mode switching

Branches

Unknown

Tags

Unknown

Event Timeline

kompan added an edge: Restricted Differential Revision.Jul 22 2019, 9:08 AM

kompan committed rMITK4ec99d65f137: Merge branch 'master' of https://phabricator.mitk.org/source/mitk (authored by kompan).Jul 22 2019, 8:37 AM

Merged Changes

6e4f328a4a22 Enable MITK mouse mode and allow mode switching
Author
kalali
Browse Repository
No Builds
No Audits
c49c3cc67d23 Add function description
Author
kalali
Browse Repository
No Builds
No Audits
bfcae17d3b8c Add default interaction scheme
Author
kalali
Browse Repository
No Builds
No Audits
2f9722e259e2 Add exception if interaction event handler is not valid
Author
kalali
Browse Repository
No Builds
No Audits
9e687a1442ba Initialize data members using the copy constructor
Author
kalali
Browse Repository
No Builds
No Audits
36bfa18f0d2b Initialize data members using the copy constructor
Author
kalali
Browse Repository
No Builds
No Audits
35f9c9cd4250 Merge branch 'T26348-fix-planar-figure-out-of-image'
Author
• steint
Browse Repository
No Builds
No Audits
5e76f564c825 Fixed linux errors.
Author
• steint
Browse Repository
No Builds
No Audits
e56916a2692f Merge branch 'T26348-fix-planar-figure-out-of-image'
Author
• steint
Browse Repository
No Builds
No Audits
4518136ab9be Refactoring of calculation job ends. Fixes T26348.
Author
• steint
Browse Repository
No Builds
No Audits
45169a22abec Enable changing the mouse mode via the configuration toolbar
Author
kalali
Browse Repository
No Builds
No Audits
c295e27cb164 Merge branch 'T26290-extend-rest-api'
Author
• steint
Browse Repository
No Builds
No Audits
853f3eb23a8b Fix temporary object error on linux
Author
• steint
Browse Repository
No Builds
No Audits
1f9bd5844acf Enable changing the interaction scheme
Author
kalali
Browse Repository
No Builds
No Audits
b47c335da269 Use empty objects when calculation was not successful Refactor statistics view
Author
• steint
Browse Repository
No Builds
No Audits

Changes (18)

Path

Size

Packages

Modules/

Core/

include/

mitkInteractionSchemeSwitcher.h

O1: MITK Reviewer Group I

mitkLookupTable.h

O1: MITK Reviewer Group I

src/

DataManagement/

mitkLookupTable.cpp

O1: MITK Reviewer Group I

Interactions/

mitkInteractionSchemeSwitcher.cpp

O1: MITK Reviewer Group I

QtWidgets/

include/

QmitkMultiWidgetConfigurationToolBar.h

O3: MITK Reviewer Group II

QmitkMxNMultiWidget.h

O3: MITK Reviewer Group II

resource/

Qmitk.qrc

O3: MITK Reviewer Group II

mwMITK.png

O3: MITK Reviewer Group II

mwPACS.png

O3: MITK Reviewer Group II

src/

QmitkInteractionSchemeToolBar.cpp

O3: MITK Reviewer Group II

QmitkMultiWidgetConfigurationToolBar.cpp

O3: MITK Reviewer Group II

QmitkMxNMultiWidget.cpp

O3: MITK Reviewer Group II

REST/

test/

mitkRESTClientTest.cpp

Plugins/

org.mitk.gui.qt.application/

src/

QmitkDataNodeColorMapAction.cpp

O1: MITK Reviewer Group I

org.mitk.gui.qt.measurementtoolbox/

src/

internal/

QmitkImageStatisticsView.cpp

O1: MITK Reviewer Group I

QmitkImageStatisticsView.h

O1: MITK Reviewer Group I

org.mitk.gui.qt.mxnmultiwidgeteditor/

src/

QmitkMxNMultiWidgetEditor.cpp

O1: MITK Reviewer Group I

QmitkMxNMultiWidgetEditor.h

O1: MITK Reviewer Group I

rMITK4ec99d65f137

View Options

Modules/Core/include/mitkInteractionSchemeSwitcher.h

View Options

Modules/Core/include/mitkLookupTable.h

View Options

Modules/Core/src/DataManagement/mitkLookupTable.cpp

View Options

Modules/Core/src/Interactions/mitkInteractionSchemeSwitcher.cpp

View Options

Modules/QtWidgets/include/QmitkMultiWidgetConfigurationToolBar.h

View Options

Modules/QtWidgets/include/QmitkMxNMultiWidget.h

View Options

Modules/QtWidgets/resource/Qmitk.qrc

View Options

Modules/QtWidgets/resource/mwMITK.png

View Options

Modules/QtWidgets/resource/mwPACS.png

View Options

Modules/QtWidgets/src/QmitkInteractionSchemeToolBar.cpp

View Options

Modules/QtWidgets/src/QmitkMultiWidgetConfigurationToolBar.cpp

View Options

Modules/QtWidgets/src/QmitkMxNMultiWidget.cpp

View Options

Modules/REST/test/mitkRESTClientTest.cpp

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeColorMapAction.cpp

View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp

View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.h

View Options

Plugins/org.mitk.gui.qt.mxnmultiwidgeteditor/src/QmitkMxNMultiWidgetEditor.cpp

View Options

Plugins/org.mitk.gui.qt.mxnmultiwidgeteditor/src/QmitkMxNMultiWidgetEditor.h

Merge branch 'master' of https://phabricator.mitk.org/source/mitk4ec99d65f137Actions

Description

Details

Event Timeline

Merged Changes

Changes (18)

rMITK4ec99d65f137

Modules/Core/include/mitkInteractionSchemeSwitcher.h

Modules/Core/include/mitkLookupTable.h

Modules/Core/src/DataManagement/mitkLookupTable.cpp

Modules/Core/src/Interactions/mitkInteractionSchemeSwitcher.cpp

Modules/QtWidgets/include/QmitkMultiWidgetConfigurationToolBar.h

Modules/QtWidgets/include/QmitkMxNMultiWidget.h

Modules/QtWidgets/resource/Qmitk.qrc

Modules/QtWidgets/resource/mwMITK.png

Modules/QtWidgets/resource/mwPACS.png

Modules/QtWidgets/src/QmitkInteractionSchemeToolBar.cpp

Modules/QtWidgets/src/QmitkMultiWidgetConfigurationToolBar.cpp

Modules/QtWidgets/src/QmitkMxNMultiWidget.cpp

Modules/REST/test/mitkRESTClientTest.cpp

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeColorMapAction.cpp

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.h

Plugins/org.mitk.gui.qt.mxnmultiwidgeteditor/src/QmitkMxNMultiWidgetEditor.cpp

Plugins/org.mitk.gui.qt.mxnmultiwidgeteditor/src/QmitkMxNMultiWidgetEditor.h

Merge branch 'master' of https://phabricator.mitk.org/source/mitk
4ec99d65f137
Actions