Diffusion MITK f70938720248

phabricator.mitk.
f70938720248
Actions

Description

Merge branch 'T22595-NavigationModules-2016-11' of https://phabricator.mitk.org/source/mitk into T22595-NavigationModules-2016-11

Conflicts:
Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.cpp

Details

Provenance

seitela	Authored on Apr 21 2017, 5:20 PM
seitela	Pushed on Apr 21 2017, 5:32 PM

Differential Revision

Restricted Differential Revision

Parents

rMITK21260cc4ba9f: Merge remote-tracking branch 'remotes/origin/T19786…
rMITK08bd31642912: Merge branch 'T22745-PerspectiveForDarkTheme' into T22595-NavigationModules…

Branches

Unknown

Tags

Unknown

Event Timeline

seitela committed rMITKf70938720248: Merge branch 'T22595-NavigationModules-2016-11' of https://phabricator.mitk. (authored by seitela).Apr 21 2017, 5:20 PM

Merged Changes

08bd31642912 Merge branch 'T22745-PerspectiveForDarkTheme' into T22595-NavigationModules…
Author
franza
Browse Repository
No Builds
No Audits
ce25e479aee9 Merge branch 'T22744-SimpleModeTrackingToolbox' into T22595-NavigationModules…
Author
franza
Browse Repository
No Builds
No Audits
cf4f279e2c50 adapted view to new geometry behavior: sagittal view is now the top view…
Author
franza
Browse Repository
No Builds
No Audits
8292013c4746 extended method to be able to choose the 2D window in the top
Author
franza
Browse Repository
No Builds
No Audits
d458f2bbc3a8 Made help view optional. It can now be disabled via Cmake.
Author
franza
Browse Repository
No Builds
No Audits
61c2e0dfdd42 adapted perspective
Author
franza
Browse Repository
No Builds
No Audits
5101b6a1a663 made simple ui setting persistent
Author
franza
Browse Repository
No Builds
No Audits
a4019bcb238d UI button text and enabling/disabling for simple mode
Author
franza
Browse Repository
No Builds
No Audits
9355bf5ebaaa Added widget for simple mode
Author
franza
Browse Repository
No Builds
No Audits

Changes (11)

Path

Size

Packages

Applications/

Workbench/

target_libraries.cmake

Modules/

QtWidgets/

include/

QmitkStdMultiWidget.h

O3: MITK Reviewer Group II

src/

QmitkStdMultiWidget.cpp

O3: MITK Reviewer Group II

Plugins/

PluginList.cmake

org.mitk.gui.qt.igt.app.echotrack/

src/

internal/

QmitkUSNavigationPerspective.cpp

USNavigationMarkerPlacement.cpp

USNavigationMarkerPlacement.h

USNavigationMarkerPlacement.ui

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

QmitkMITKIGTTrackingToolboxView.h

QmitkMITKIGTTrackingToolboxViewControls.ui

rMITKf70938720248

View Options

Applications/Workbench/target_libraries.cmake

View Options

Modules/QtWidgets/include/QmitkStdMultiWidget.h

View Options

Modules/QtWidgets/src/QmitkStdMultiWidget.cpp

View Options

Plugins/PluginList.cmake

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/QmitkUSNavigationPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.cpp

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.h

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.ui

View Options

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp

View Options

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.h

View Options

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxViewControls.ui

Merge branch 'T22595-NavigationModules-2016-11' of https://phabricator.mitk.f70938720248Actions

Description

Details

Event Timeline

Merged Changes

Changes (11)

rMITKf70938720248

Applications/Workbench/target_libraries.cmake

Modules/QtWidgets/include/QmitkStdMultiWidget.h

Modules/QtWidgets/src/QmitkStdMultiWidget.cpp

Plugins/PluginList.cmake

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/QmitkUSNavigationPerspective.cpp

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.cpp

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.h

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.ui

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.h

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxViewControls.ui

Merge branch 'T22595-NavigationModules-2016-11' of https://phabricator.mitk.
f70938720248
Actions