HomePhabricator
Diffusion MITK 222e63d9525f

Merge branch 'T25688-Render-window-manager-with-custom-multi-widget-beta'

Authored by kalali on Apr 4 2019, 11:10 AM.

Description

Merge branch 'T25688-Render-window-manager-with-custom-multi-widget-beta'

Fixed merge conflicts that arose because part of this merge was already
added to the master and modified later (e.g. data node context menu and
actions, changes in the render window manager (ui), ...).

Details

Committed
kalaliApr 8 2019, 1:27 PM
Pushed
kalaliApr 8 2019, 1:28 PM
Parents
rMITK6b9ff1f5b83d: Remove unnecessary destructors
rMITK515d4bd4ddf5: Merge branch 'T26224-RestructureCppRestSdkModule'
Branches
Unknown
Tags
Unknown

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
6b9ff1f5b83dkalali
Remove unnecessary destructors 
Mar 28
50940d2a7921kalali
Add getter for BaseRenderer 
Mar 28
7186be0331a7kalali
Rename classes and uncomment code 
Mar 28
88cd250817f1kalali
Change corner annotation of new render window widgets 
Mar 28
15e804982de5kalali
Remove unnecessary comments 
Mar 28
79628815fb55kalali
Clean constructors / destructors 
Mar 28
c4a02b3b0330kalali
Add class documentation 
Mar 28
f52a208ca6eekalali
Add class documentation and remove unnecessary code 
Mar 28
8b9eea23e307kalali
Use correct logo / watermark 
Mar 27
132b87186414kalali
Remove unnecessary code and todo-comment 
Mar 27
3f2ac98677abkalali
Rename custom multi widget to mxnmultiwidget 
Mar 27
b04eb005f9a9kalali
Remove dead code 
Mar 27
7b5b75544ee7kalali
Remove documentation noise 
Mar 27
78546258ba03kalali
Remove namespace 
Mar 27
4f44a09c237fkalali
Add and extend class documentation 
Mar 27
4f29e5fbcc3akalali
Remove button; add radio button for 3D view 
Dec 11 2018
102b2affe1e9kalali
Merge branch 'T25726-Fix-GCC-errors' into T25688-Render-window-manager-with… 
Dec 6 2018
b609c49bcf8ckalali
Fix gcc errors 
Dec 6 2018
c0f8b16b8dfdkalali
Merge branch 'T23764-Crosshair-for-single-render-windows' into T25688-Render… 
Dec 5 2018
4e1e267724abkalali
Add function to (de-)activate the crosshair point set of a render window widget 
Dec 5 2018
ebc82ec8102dkalali
Make StdMultiWidget the default editor 
Dec 5 2018
5015f5323320kalali
Remove leftovers of 'show_in' action 
Dec 5 2018
487b4d96bdd0kalali
Refactor comments 
Dec 5 2018
e92a0c51b290kalali
Remove unnecessary code 
Dec 5 2018
f47b902bbc3fkalali
Merge branch 'T25705-Workbench-crash-on-display-switch' into T25688-Render… 
Dec 4 2018
66c35ba1233ckalali
Use WeakPointer to prevent a crash on render window editor switch 
Dec 4 2018
6dbc3a5e9b14kalali
Merge branch 'T25706-Workbench-crash-with-two-displays' into T25688-Render… 
Dec 4 2018
10bdd0678d26kalali
Use weak-pointer for base renderer member 
Dec 4 2018
3d5d934e4e73kalali
Change renderer vector type; change setting the controlled renderer 
Dec 4 2018
1d92b09b8210kalali
Remove view direction change button from the configuration tool bar of the… 
Nov 28 2018
daa00f032ce8kalali
Fix initialization bugs 
Nov 28 2018
7107092e6338kalali
Add changes that have been detected in other related branches (refactoring… 
Nov 28 2018
e904fe1b8320kalali
Merge branch 'T25603-Combine-render-window-manager-w-custom-multi-widget' into… 
Nov 15 2018
58f7ecc07b0bkalali
Apply correct changes 
Nov 13 2018
0d4669ec5f10kalali
Change WeakPointer handling 
Nov 13 2018
fb5519676273kalali
Merge remote-tracking branch 'origin/T23760-Custom-multi-widget-editor' into… 
Nov 13 2018
f906e528931fkalali
Merge branch 'T25645-Base-renderer-aware-context-menu' into T25601-Modernize… 
Nov 13 2018
e18353467c6bkalali
Some refactoring 
Nov 13 2018
6b956e2b3195kalali
Make lookuptable rendering renderer aware 
Nov 13 2018
a629adb5ff9dkalali
Make actions base renderer aware 
Nov 13 2018
41c75ee571e3kalali
Make context menu base renderer aware 
Nov 12 2018
bf121a2648adkalali
Merge branch 'T24936-Extend-render-window-manager-with-context-menu' into… 
Nov 12 2018
c7d2054667e7kalali
Temporary workaround to include only 'local' actions 
Nov 12 2018
588174fad714kalali
Some refactoring 
Nov 12 2018
bc31e15cd269kalali
Add the context menu to the render window manager view 
Nov 12 2018
6cf484dbf0cdkalali
Early return 
Nov 9 2018
137b0d7ba51akalali
Make function non-virtual 
Nov 9 2018
816e7aafa9ddkalali
Force parent to be a QWidget 
Nov 9 2018
f1be6e768ffakalali
Refactor data manager 
Nov 9 2018
c8bf594744ebkalali
Move the info dialog 
Nov 9 2018