Diffusion MITK e904fe1b8320

Merge branch 'T25603-Combine-render-window-manager-w-custom-multi-widget' into…
e904fe1b8320
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'T25603-Combine-render-window-manager-w-custom-multi-widget' into T25601-Modernize-render-window-manager

Details

Provenance

kalali	Authored on Nov 15 2018, 1:35 PM
kalali	Pushed on Nov 15 2018, 1:36 PM

Parents

rMITK58f7ecc07b0b: Apply correct changes
rMITKf906e528931f: Merge branch 'T25645-Base-renderer-aware-context-menu' into T25601-Modernize…

Branches

Unknown

Tags

Unknown

Event Timeline

kalali committed rMITKe904fe1b8320: Merge branch 'T25603-Combine-render-window-manager-w-custom-multi-widget' into… (authored by kalali).Nov 15 2018, 1:35 PM

Merged Changes

58f7ecc07b0b Apply correct changes
Author
kalali
Browse Repository
No Builds
No Audits
0d4669ec5f10 Change WeakPointer handling
Author
kalali
Browse Repository
No Builds
No Audits
fb5519676273 Merge remote-tracking branch 'origin/T23760-Custom-multi-widget-editor' into…
Author
kalali
Browse Repository
No Builds
No Audits
503ff3a94faa Merge branch 'T24214-Render-window-names' into T23760-Custom-multi-widget-editor
Author
kalali
Browse Repository
No Builds
No Audits
8768353cb5cd Add widget index as render window name; remove UID
Author
kalali
Browse Repository
No Builds
No Audits
7663c8762ff3 Close layout selection widget after layout has been set
Author
kalali
Browse Repository
No Builds
No Audits
6f48b91e3642 Clean and refactor multi widget editor; use pimpl
Author
kalali
Browse Repository
No Builds
No Audits
cfd95dfe62eb Merge branch 'T24759-Switch-between-different-editors' into T23760-Custom-multi…
Author
kalali
Browse Repository
No Builds
No Audits
e89de62a9cf7 Set extensions to 'mitk' for the custom multi widget editor; set std multi…
Author
kalali
Browse Repository
No Builds
No Audits
9b69e7b24bb4 Add new editor button icon; change editor titles;
Author
kalali
Browse Repository
No Builds
No Audits
d4bd9f5a709c Use different match flag to find editors via ID. Reset controlled render windows
Author
kalali
Browse Repository
No Builds
No Audits
89529a677b19 Add stdMultiWidget action button to start the display from the workbench
Author
kalali
Browse Repository
No Builds
No Audits
eec7a0d7de38 Merge branch 'T24825-Inform-about-layout-change' into T23760-Custom-multi…
Author
kalali
Browse Repository
No Builds
No Audits
70cc701649c4 Fire an event to inform listener about a change in the multi widget editor
Author
kalali
Browse Repository
No Builds
No Audits
f0f3f93271d4 Add function to react to part input changes
Author
kalali
Browse Repository
No Builds
No Audits
e68615a1ae80 Add function to listen to input changes of the render window part
Author
kalali
Browse Repository
No Builds
No Audits
f4e54c841251 Add / remove nullptr check; remove level window widget
Author
kalali
Browse Repository
No Builds
No Audits
bd0dec2184fd Change namespace; set active render window widget
Author
kalali
Browse Repository
No Builds
No Audits
b3aaac806834 Remove event_variant
Author
kalali
Browse Repository
No Builds
No Audits
3ec19c058af4 Move filling of combo box; override functions from 'IRenderWindowPartListener'
Author
kalali
Browse Repository
No Builds
No Audits
21a901502819 Implement 'UpdateStatusBar' in the broadcast class; add nullptr check
Author
kalali
Browse Repository
No Builds
No Audits
503012e84217 T23763: Add button to the render window view to reinitialize the active render…
Author
kalali
Browse Repository
No Builds
No Audits
f2ba867b6938 Add a crosshair as a pointset for each render window widget
Author
kalali
Browse Repository
No Builds
No Audits
448f8acd3553 Add comments and refactor
Author
kalali
Browse Repository
No Builds
No Audits
a7e2334a2f91 Add 'setLevelWindow'-interaction for the PACS mode
Author
kalali
Browse Repository
No Builds
No Audits
9ab09bff137b Add interaction scheme toolbar, extend multi widget configuration toolbar
Author
kalali
Browse Repository
No Builds
No Audits
fd260c26266f Add synchronized display actions and toolbar-button
Author
kalali
Browse Repository
No Builds
No Audits
61b2d9e5e896 Add configuration toolbar with an action button
Author
kalali
Browse Repository
No Builds
No Audits
8383e761c2a3 T24672: Add decoration manager; change preference page; renaming and refactoring
Author
kalali
Browse Repository
No Builds
No Audits
f02ca112df3a Small changes in the display action events
Author
kalali
Browse Repository
No Builds
No Audits
cc46555b9bf7 Refactoring: removed 'default' from names; changed event checks; moved action…
Author
kalali
Browse Repository
No Builds
No Audits
9993086812bb Changed handler classes: std-handler now inherits from base class and uses…
Author
kalali
Browse Repository
No Builds
Audited
eac8b99e0769 Added comments and refactored according to review in T24216
Author
kalali
Browse Repository
No Builds
No Audits
251e40159685 wip: include recent ideas for display action events and their handling
Author
kalali
Browse Repository
No Builds
No Audits
bbb9a1f574ae wip: more small changes
Author
kalali
Browse Repository
No Builds
No Audits
cb08b749890e wip: small changes
Author
kalali
Browse Repository
No Builds
No Audits
fe3e7a8b17eb wip: modified display interactor for testing purposes
Author
kalali
Browse Repository
No Builds
No Audits
72f12a8e992f wip: add three render window (widgets) initially; create individual render…
Author
kalali
Browse Repository
No Builds
No Audits
31056cc61c66 wip: enable mouse mode switcher to load DisplayInteraction xml
Author
kalali
Browse Repository
No Builds
No Audits
196e3c0f1957 wip: fix open editor action: added data storage
Author
kalali
Browse Repository
No Builds
No Audits
8f3f01eb1eff Remove pimpl
Author
kalali
Browse Repository
No Builds
No Audits
c978eae2da75 change widget number to widget id
Author
kalali
Browse Repository
No Builds
No Audits
b6c7afe0e59e Fix custom multi widget editor action
Author
kalali
Browse Repository
No Builds
No Audits
6c929985d92b wip: add editor button / open editor action
Author
kalali
Browse Repository
No Builds
No Audits
8aa7cdbd5ba9 wip: first version
Author
kalali
Browse Repository
No Builds
No Audits
80b5a660ba0b wip: new custom multi widget editor with clean functionality
Author
kalali
Browse Repository
No Builds
No Audits

Changes (83)

Path

Size

Packages

Modules/

Core/

O1: MITK Reviewer Group I

include/

mitkDataStorage.h

O1: MITK Reviewer Group I

mitkDisplayActionEventBroadcast.h

O1: MITK Reviewer Group I

mitkDisplayActionEventFunctions.h

O1: MITK Reviewer Group I

mitkDisplayActionEventHandler.h

O1: MITK Reviewer Group I

mitkDisplayActionEvents.h

O1: MITK Reviewer Group I

mitkDisplayInteractor.h

O1: MITK Reviewer Group I

mitkInteractionSchemeSwitcher.h

O1: MITK Reviewer Group I

mitkSliceNavigationController.h

O1: MITK Reviewer Group I

mitkStdDisplayActionEventHandler.h

O1: MITK Reviewer Group I

mitkStdFunctionCommand.h

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

resource/

Interactions/

DisplayConfigMITK.xml

O1: MITK Reviewer Group I

DisplayConfigMITKRotation.xml

O1: MITK Reviewer Group I

DisplayConfigMITKRotationUnCoupled.xml

O1: MITK Reviewer Group I

src/

Controllers/

mitkSliceNavigationController.cpp

O1: MITK Reviewer Group I

mitkStepper.cpp

O1: MITK Reviewer Group I

DataManagement/

mitkDataStorage.cpp

O1: MITK Reviewer Group I

Interactions/

mitkDisplayActionEventBroadcast.cpp

O1: MITK Reviewer Group I

mitkDisplayActionEventFunctions.cpp

O1: MITK Reviewer Group I

mitkDisplayActionEventHandler.cpp

O1: MITK Reviewer Group I

mitkDisplayInteractor.cpp

O1: MITK Reviewer Group I

mitkInteractionSchemeSwitcher.cpp

O1: MITK Reviewer Group I

mitkStdDisplayActionEventHandler.cpp

O1: MITK Reviewer Group I

QtWidgets/

O3: MITK Reviewer Group II

include/

QmitkCustomMultiWidget.h

O3: MITK Reviewer Group II

QmitkInteractionSchemeToolBar.h

O3: MITK Reviewer Group II

QmitkMouseModeSwitcher.h

O3: MITK Reviewer Group II

QmitkMultiWidgetConfigurationToolBar.h

O3: MITK Reviewer Group II

QmitkMultiWidgetLayoutSelectionWidget.h

O3: MITK Reviewer Group II

QmitkRenderWindowWidget.h

O3: MITK Reviewer Group II

resource/

O3: MITK Reviewer Group II

cmwDesynchronized.png

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

cmwSynchronized.png

O3: MITK Reviewer Group II

cmwViewDirection.png

O3: MITK Reviewer Group II

src/

QmitkCustomMultiWidget.cpp

O3: MITK Reviewer Group II

QmitkInteractionSchemeToolBar.cpp

O3: MITK Reviewer Group II

QmitkMouseModeSwitcher.cpp

O3: MITK Reviewer Group II

QmitkMultiWidgetConfigurationToolBar.cpp

O3: MITK Reviewer Group II

QmitkMultiWidgetLayoutSelectionWidget.cpp

O3: MITK Reviewer Group II

QmitkMultiWidgetLayoutSelectionWidget.ui

O3: MITK Reviewer Group II

QmitkRenderWindowWidget.cpp

O3: MITK Reviewer Group II

RenderWindowManager/

include/

mitkRenderWindowLayerUtilities.h

mitkRenderWindowViewDirectionController.h

src/

mitkRenderWindowViewDirectionController.cpp

Plugins/

PluginList.cmake

org.mitk.gui.common/

src/

mitkIRenderWindowPartListener.h

O1: MITK Reviewer Group I

org.mitk.gui.qt.common/

src/

internal/

QmitkViewCoordinator.cpp

O1: MITK Reviewer Group I

QmitkViewCoordinator.h

O1: MITK Reviewer Group I

org.mitk.gui.qt.custommultiwidgeteditor

manifest_headers.cmake

CustomMultiWidgetEditor.svg

QmitkCustomMultiWidgetEditor.qrc

defaultWatermark.png

QmitkCustomMultiWidgetEditor.cpp

QmitkCustomMultiWidgetEditor.h

QmitkMultiWidgetDecorationManager.cpp

QmitkMultiWidgetDecorationManager.h

QmitkCustomMultiWidgetEditorPreferencePage.cpp

QmitkCustomMultiWidgetEditorPreferencePage.h

QmitkCustomMultiWidgetEditorPreferencePage.ui

mitkPluginActivator.cpp

mitkPluginActivator.h

org.mitk.gui.qt.ext/

O1: MITK Reviewer Group I

resources/

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

org_mitk_gui_qt_ext.qrc

O1: MITK Reviewer Group I

src/

QmitkExtWorkbenchWindowAdvisor.cpp

O1: MITK Reviewer Group I

QmitkExtWorkbenchWindowAdvisor.h

O1: MITK Reviewer Group I

QmitkOpenCustomMultiWidgetEditorAction.cpp

O1: MITK Reviewer Group I

QmitkOpenCustomMultiWidgetEditorAction.h

O1: MITK Reviewer Group I

QmitkOpenStdMultiWidgetEditorAction.cpp

O1: MITK Reviewer Group I

QmitkOpenStdMultiWidgetEditorAction.h

O1: MITK Reviewer Group I

org.mitk.gui.qt.renderwindowmanager/

src/

internal/

QmitkRenderWindowManagerView.cpp

O3: MITK Reviewer Group II

QmitkRenderWindowManagerView.h

O3: MITK Reviewer Group II

org.mitk.gui.qt.stdmultiwidgeteditor/

O1: MITK Reviewer Group I

rMITKe904fe1b8320

Modules/Core/files.cmake

Loading...

Modules/Core/include/mitkDataStorage.h

Loading...

Modules/Core/include/mitkDisplayActionEventBroadcast.h

Loading...

Modules/Core/include/mitkDisplayActionEventFunctions.h

Loading...

Modules/Core/include/mitkDisplayActionEventHandler.h

Loading...

Modules/Core/include/mitkDisplayActionEvents.h

Loading...

Modules/Core/include/mitkDisplayInteractor.h

Loading...

Modules/Core/include/mitkInteractionSchemeSwitcher.h

Loading...

Modules/Core/include/mitkSliceNavigationController.h

Loading...

Modules/Core/include/mitkStdDisplayActionEventHandler.h

Loading...

Modules/Core/include/mitkStdFunctionCommand.h

Loading...

Modules/Core/include/mitkStepper.h

Loading...

Modules/Core/resource/Interactions/DisplayConfigMITK.xml

Loading...

Modules/Core/resource/Interactions/DisplayConfigMITKRotation.xml

Loading...

Modules/Core/resource/Interactions/DisplayConfigMITKRotationUnCoupled.xml

Loading...

Modules/Core/src/Controllers/mitkSliceNavigationController.cpp

Loading...

Modules/Core/src/Controllers/mitkStepper.cpp

Loading...

Modules/Core/src/DataManagement/mitkDataStorage.cpp

Loading...

Modules/Core/src/Interactions/mitkDisplayActionEventBroadcast.cpp

Loading...

Modules/Core/src/Interactions/mitkDisplayActionEventFunctions.cpp

Loading...

Modules/Core/src/Interactions/mitkDisplayActionEventHandler.cpp

Loading...

Modules/Core/src/Interactions/mitkDisplayInteractor.cpp

Loading...

Modules/Core/src/Interactions/mitkInteractionSchemeSwitcher.cpp

Loading...

Modules/Core/src/Interactions/mitkStdDisplayActionEventHandler.cpp

Loading...

Modules/QtWidgets/files.cmake

Loading...

Modules/QtWidgets/include/QmitkCustomMultiWidget.h

Loading...

Modules/QtWidgets/include/QmitkInteractionSchemeToolBar.h

Loading...

Modules/QtWidgets/include/QmitkMouseModeSwitcher.h

Loading...

Modules/QtWidgets/include/QmitkMultiWidgetConfigurationToolBar.h

Loading...

Modules/QtWidgets/include/QmitkMultiWidgetLayoutSelectionWidget.h

Loading...

Modules/QtWidgets/include/QmitkRenderWindowWidget.h

Loading...

Modules/QtWidgets/resource/Qmitk.qrc

Loading...

Modules/QtWidgets/resource/cmwDesynchronized.png

Loading...

Modules/QtWidgets/resource/cmwLayout.png

Loading...

Modules/QtWidgets/resource/cmwSynchronized.png

Loading...

Modules/QtWidgets/resource/cmwViewDirection.png

Loading...

Modules/QtWidgets/src/QmitkCustomMultiWidget.cpp

Loading...

Modules/QtWidgets/src/QmitkInteractionSchemeToolBar.cpp

Loading...

Modules/QtWidgets/src/QmitkMouseModeSwitcher.cpp

Loading...

Modules/QtWidgets/src/QmitkMultiWidgetConfigurationToolBar.cpp

Loading...

Modules/QtWidgets/src/QmitkMultiWidgetLayoutSelectionWidget.cpp

Loading...

Modules/QtWidgets/src/QmitkMultiWidgetLayoutSelectionWidget.ui

Loading...

Modules/QtWidgets/src/QmitkRenderWindowWidget.cpp

Loading...

Modules/RenderWindowManager/include/mitkRenderWindowLayerUtilities.h

Loading...

Modules/RenderWindowManager/include/mitkRenderWindowViewDirectionController.h

Loading...

Modules/RenderWindowManager/src/mitkRenderWindowViewDirectionController.cpp

Loading...

Plugins/PluginList.cmake

Loading...

Plugins/org.mitk.gui.common/src/mitkIRenderWindowPartListener.h

Loading...

Plugins/org.mitk.gui.qt.common/src/internal/QmitkViewCoordinator.cpp

Loading...

Plugins/org.mitk.gui.qt.common/src/internal/QmitkViewCoordinator.h

Loading...

Plugins/org.mitk.gui.qt.custommultiwidgeteditor/CMakeLists.txt

Loading...

Plugins/org.mitk.gui.qt.custommultiwidgeteditor/files.cmake

Loading...

Plugins/org.mitk.gui.qt.custommultiwidgeteditor/manifest_headers.cmake

Loading...

Plugins/org.mitk.gui.qt.custommultiwidgeteditor/plugin.xml

Loading...

Plugins/org.mitk.gui.qt.custommultiwidgeteditor/resources/CustomMultiWidgetEditor.svg

Loading...

Plugins/org.mitk.gui.qt.custommultiwidgeteditor/resources/QmitkCustomMultiWidgetEditor.qrc

Loading...

Plugins/org.mitk.gui.qt.custommultiwidgeteditor/resources/defaultWatermark.png

Loading...

Plugins/org.mitk.gui.qt.custommultiwidgeteditor/src/QmitkCustomMultiWidgetEditor.cpp

Loading...

Plugins/org.mitk.gui.qt.custommultiwidgeteditor/src/QmitkCustomMultiWidgetEditor.h

Loading...

Plugins/org.mitk.gui.qt.custommultiwidgeteditor/src/QmitkMultiWidgetDecorationManager.cpp

Loading...

Plugins/org.mitk.gui.qt.custommultiwidgeteditor/src/QmitkMultiWidgetDecorationManager.h

Loading...

Plugins/org.mitk.gui.qt.custommultiwidgeteditor/src/internal/QmitkCustomMultiWidgetEditorPreferencePage.cpp

Loading...

Plugins/org.mitk.gui.qt.custommultiwidgeteditor/src/internal/QmitkCustomMultiWidgetEditorPreferencePage.h

Loading...

Plugins/org.mitk.gui.qt.custommultiwidgeteditor/src/internal/QmitkCustomMultiWidgetEditorPreferencePage.ui

Loading...

Plugins/org.mitk.gui.qt.custommultiwidgeteditor/src/internal/mitkPluginActivator.cpp

Loading...

Plugins/org.mitk.gui.qt.custommultiwidgeteditor/src/internal/mitkPluginActivator.h

Loading...

Plugins/org.mitk.gui.qt.ext/files.cmake

Loading...

Plugins/org.mitk.gui.qt.ext/resources/Editor.png

Loading...

Plugins/org.mitk.gui.qt.ext/resources/Slider_48.png

Loading...

Plugins/org.mitk.gui.qt.ext/resources/org_mitk_gui_qt_ext.qrc

Loading...

Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp

Loading...

Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.h

Loading...

Plugins/org.mitk.gui.qt.ext/src/QmitkOpenCustomMultiWidgetEditorAction.cpp

Loading...

Plugins/org.mitk.gui.qt.ext/src/QmitkOpenCustomMultiWidgetEditorAction.h

Loading...

Plugins/org.mitk.gui.qt.ext/src/QmitkOpenStdMultiWidgetEditorAction.cpp

Loading...

Plugins/org.mitk.gui.qt.ext/src/QmitkOpenStdMultiWidgetEditorAction.h

Loading...

Plugins/org.mitk.gui.qt.renderwindowmanager/src/internal/QmitkRenderWindowManagerView.cpp

Loading...

Plugins/org.mitk.gui.qt.renderwindowmanager/src/internal/QmitkRenderWindowManagerView.h

Loading...

Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/plugin.xml

Loading...