Merge branch 'T24051-LoggingOf_OIGTLDevice_ActiveByDefault' into T22595…
2c4bd964a881
Actions

Description

Merge branch 'T24051-LoggingOf_OIGTLDevice_ActiveByDefault' into T22595-Masterintegration-2018-01-09

Details

Provenance

Benjamin Mittmann <b.mittmann@dkfz-heidelberg.de>	Authored on Jan 19 2018, 11:23 AM
mittmann	Pushed on Jan 19 2018, 11:24 AM

Parents

rMITK22522fc54e4c: Changed the GUI logic of activating/deactivating the logging of the IGTLDevice.
rMITK05e395929a77: Merge branch 'T24036-FixLinuxCompilationIssues' into T22595-Masterintegration…

Branches

Unknown

Tags

Unknown

Event Timeline

mittmann committed rMITK2c4bd964a881: Merge branch 'T24051-LoggingOf_OIGTLDevice_ActiveByDefault' into T22595… (authored by mittmann).Jan 19 2018, 11:23 AM

Merged Changes

22522fc54e4c Changed the GUI logic of activating/deactivating the logging of the IGTLDevice.
Author
Benjamin Mittmann <b.mittmann@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits

Changes (7)

Path

Size

Modules/

OpenIGTLink/

mitkIGTLDevice.cpp

OpenIGTLinkUI/

Qmitk/

QmitkIGTLDeviceSetupConnectionWidget.cpp

QmitkIGTLDeviceSetupConnectionWidget.h

QmitkIGTLDeviceSetupConnectionWidgetControls.ui

Plugins/

org.mitk.gui.qt.openigtlink/

src/

internal/

OpenIGTLinkManager.cpp

OpenIGTLinkManager.h

OpenIGTLinkManagerControls.ui

rMITK2c4bd964a881

View Options

Modules/OpenIGTLink/mitkIGTLDevice.cpp

View Options

Modules/OpenIGTLinkUI/Qmitk/QmitkIGTLDeviceSetupConnectionWidget.cpp

View Options

Modules/OpenIGTLinkUI/Qmitk/QmitkIGTLDeviceSetupConnectionWidget.h

View Options

Modules/OpenIGTLinkUI/Qmitk/QmitkIGTLDeviceSetupConnectionWidgetControls.ui

View Options

Plugins/org.mitk.gui.qt.openigtlink/src/internal/OpenIGTLinkManager.cpp

View Options

Plugins/org.mitk.gui.qt.openigtlink/src/internal/OpenIGTLinkManager.h

View Options

Plugins/org.mitk.gui.qt.openigtlink/src/internal/OpenIGTLinkManagerControls.ui

Merge branch 'T24051-LoggingOf_OIGTLDevice_ActiveByDefault' into T22595…2c4bd964a881Actions

Description

Details

Event Timeline

Merged Changes

Changes (7)

rMITK2c4bd964a881

Modules/OpenIGTLink/mitkIGTLDevice.cpp

Modules/OpenIGTLinkUI/Qmitk/QmitkIGTLDeviceSetupConnectionWidget.cpp

Modules/OpenIGTLinkUI/Qmitk/QmitkIGTLDeviceSetupConnectionWidget.h

Modules/OpenIGTLinkUI/Qmitk/QmitkIGTLDeviceSetupConnectionWidgetControls.ui

Plugins/org.mitk.gui.qt.openigtlink/src/internal/OpenIGTLinkManager.cpp

Plugins/org.mitk.gui.qt.openigtlink/src/internal/OpenIGTLinkManager.h

Plugins/org.mitk.gui.qt.openigtlink/src/internal/OpenIGTLinkManagerControls.ui

Merge branch 'T24051-LoggingOf_OIGTLDevice_ActiveByDefault' into T22595…
2c4bd964a881
Actions