Merge branch 'T24178-CrashOnStartupWhenUSSupportIsEnabled' into T24059…
faf3637d3e6f
Actions

Description

Merge branch 'T24178-CrashOnStartupWhenUSSupportIsEnabled' into T24059-IGTRelease-2018.03

Details

Provenance

seitela	Authored on Mar 2 2018, 3:04 PM
seitela	Pushed on Mar 2 2018, 3:05 PM

Parents

rMITKcfac06ae2ad2: Use correct logging
rMITK473770571f67: Merge branch 'master' of ssh://phabricator.mitk.org:2222/source/mitk

Branches

Unknown

Tags

Unknown

Event Timeline

seitela committed rMITKfaf3637d3e6f: Merge branch 'T24178-CrashOnStartupWhenUSSupportIsEnabled' into T24059… (authored by seitela).Mar 2 2018, 3:04 PM

Merged Changes

cfac06ae2ad2 Use correct logging
Author
seitela
Browse Repository
No Builds
No Audits
25cb6cd432a6 USUICustomWidgetFactory which is now included in…
Author
seitela
Browse Repository
No Builds
No Audits
50299912a8a8 Load individual custom control widgets by instantiating and storing it in vector
Author
seitela
Browse Repository
No Builds
No Audits
a1c124e32ddd Removed USUICustomWidgetFactory as it is internally defined in…
Author
seitela
Browse Repository
No Builds
No Audits
e7e16e04a9f2 Log exception
Author
seitela
Browse Repository
No Builds
No Audits
a710dc17e3a1 Register widget as microservice by calling RegisterService() in constructor.
Author
seitela
Browse Repository
No Builds
No Audits
b0ec10db7c97 Register widget as microservice by calling RegisterService() in constructor.
Author
seitela
Browse Repository
No Builds
No Audits
4235c2c3d6af Added method to register and unregister as microservice using the us…
Author
seitela
Browse Repository
No Builds
No Audits
ef775754041b Revert USUIActivator to original version. Currently there is a double…
Author
seitela
Browse Repository
No Builds
No Audits

Changes (11)

Path

Size

Modules/

USUI/

Qmitk/

QmitkUSAbstractCustomWidget.cpp

QmitkUSAbstractCustomWidget.h

QmitkUSControlsCustomDiPhASDeviceWidget.cpp

QmitkUSControlsCustomDiPhASDeviceWidget.h

QmitkUSControlsCustomVideoDeviceWidget.cpp

QmitkUSControlsCustomVideoDeviceWidget.h

files.cmake

mitkUSUIActivator.cpp

mitkUSUIActivator.h

mitkUSUICustomWidgetFactory.cpp

mitkUSUICustomWidgetFactory.h

rMITKfaf3637d3e6f

View Options

Modules/USUI/Qmitk/QmitkUSAbstractCustomWidget.cpp

View Options

Modules/USUI/Qmitk/QmitkUSAbstractCustomWidget.h

View Options

Modules/USUI/Qmitk/QmitkUSControlsCustomDiPhASDeviceWidget.cpp

View Options

Modules/USUI/Qmitk/QmitkUSControlsCustomDiPhASDeviceWidget.h

View Options

Modules/USUI/Qmitk/QmitkUSControlsCustomVideoDeviceWidget.cpp

View Options

Modules/USUI/Qmitk/QmitkUSControlsCustomVideoDeviceWidget.h

View Options

Modules/USUI/files.cmake

View Options

Modules/USUI/mitkUSUIActivator.cpp

View Options

Modules/USUI/mitkUSUIActivator.h

View Options

Modules/USUI/mitkUSUICustomWidgetFactory.cpp

View Options

Modules/USUI/mitkUSUICustomWidgetFactory.h

Merge branch 'T24178-CrashOnStartupWhenUSSupportIsEnabled' into T24059…faf3637d3e6fActions

Description

Details

Event Timeline

Merged Changes

Changes (11)

rMITKfaf3637d3e6f

Modules/USUI/Qmitk/QmitkUSAbstractCustomWidget.cpp

Modules/USUI/Qmitk/QmitkUSAbstractCustomWidget.h

Modules/USUI/Qmitk/QmitkUSControlsCustomDiPhASDeviceWidget.cpp

Modules/USUI/Qmitk/QmitkUSControlsCustomDiPhASDeviceWidget.h

Modules/USUI/Qmitk/QmitkUSControlsCustomVideoDeviceWidget.cpp

Modules/USUI/Qmitk/QmitkUSControlsCustomVideoDeviceWidget.h

Modules/USUI/files.cmake

Modules/USUI/mitkUSUIActivator.cpp

Modules/USUI/mitkUSUIActivator.h

Modules/USUI/mitkUSUICustomWidgetFactory.cpp

Modules/USUI/mitkUSUICustomWidgetFactory.h

Merge branch 'T24178-CrashOnStartupWhenUSSupportIsEnabled' into T24059…
faf3637d3e6f
Actions