Diffusion MITK cfe920942535

Merge branch 'T24059-IGTRelease-2018.03'
cfe920942535
Actions

Description

Merge branch 'T24059-IGTRelease-2018.03'

Conflicts:
Modules/USUI/Qmitk/QmitkUSAbstractCustomWidget.cpp

Details

Provenance

seitela	Authored on Apr 3 2018, 10:53 AM
seitela	Pushed on Apr 3 2018, 10:57 AM

Parents

rMITK8f5e0925f71e: Merge branch 'T24554-ChangeOrderOfDependencies2'
rMITK4ad13b1b7ee9: Merge branch 'T24507-WarningMessageFromNeedleProjectionFilter' into T24059…

Branches

Tags

Event Timeline

seitela committed rMITKcfe920942535: Merge branch 'T24059-IGTRelease-2018.03' (authored by seitela).Apr 3 2018, 10:53 AM

Merged Changes

4ad13b1b7ee9 Merge branch 'T24507-WarningMessageFromNeedleProjectionFilter' into T24059…
Author
seitela
Browse Repository
No Builds
No Audits
887010c304ca Merge branch 'T24523-DarkThemeCompatibilityIGTIcons' into T24059-IGTRelease…
Author
seitela
Browse Repository
No Builds
No Audits
4460b70f7e7b Use magic color in icons to allow for compatibility with dark and light theme
Author
seitela
Browse Repository
No Builds
No Audits
1f25b525355d Merge branch 'T24489-ToolAxisNotAppliedWhenChangedManually' into T24059…
Author
seitela
Browse Repository
No Builds
No Audits
abad4a9f8515 Apply tool axis to NavigationTool when changed manually in spin boxes of…
Author
seitela
Browse Repository
No Builds
No Audits
054d4b7e82be Revert "The warning output console is called on every run of tracking data, so…
Author
• sridhara
Browse Repository
No Builds
No Audits
0d6a3feb517f The warning output console is called on every run of tracking data, so its…
Author
• sridhara
Browse Repository
No Builds
No Audits
89f6a0937c38 Merge branch 'T24508-ToolProjectionShownInWrongDirection' into T24059…
Author
seitela
Browse Repository
No Builds
No Audits
a7cc2ffacedb Changed default tool axis to negative z-Axis
Author
seitela
Browse Repository
No Builds
No Audits
80cc01839af7 Merge branch 'T24505-InvalidServiceRegistrationBaseObject' into T24059…
Author
eisenman
Browse Repository
No Builds
No Audits
25a5cf116c46 Clean-up usage of micro services in USUI
Author
eisenman
Browse Repository
No Builds
No Audits
9872f2868a65 Fix indentation
Author
eisenman
Browse Repository
No Builds
No Audits
77ad833909d6 Fix typo
Author
eisenman
Browse Repository
No Builds
No Audits
db24d48632a4 Merge branch 'T24503-BrokenGUIInEchoTrackCalibration' into T24059-IGTRelease…
Author
seitela
Browse Repository
No Builds
No Audits
9dc4e3b21d14 Fixed arrangement of GUI elements
Author
seitela
Browse Repository
No Builds
No Audits

Changes (19)

Path

Size

Modules/

IGT/

Algorithms/

mitkNeedleProjectionFilter.cpp

DataManagement/

mitkNavigationTool.cpp

US/

USModel/

mitkUSDevice.cpp

USUI/

Qmitk/

QmitkUSAbstractCustomWidget.cpp

QmitkUSAbstractCustomWidget.h

QmitkUSControlsCustomDiPhASDeviceWidget.cpp

QmitkUSControlsCustomVideoDeviceWidget.cpp

mitkUSUIActivator.cpp

Plugins/

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

files.cmake

plugin.xml

resources/

icon2.xpm

icon_US_navigation.svg

src/

internal/

QmitkUltrasoundCalibrationControls.ui

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

resources/

iconMeasurementEvaluation.svg

iconMeasurementTracking.svg

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkIGTNavigationToolCalibration.cpp

QmitkIGTNavigationToolCalibrationControls.ui

QmitkMITKIGTTrackingToolboxViewControls.ui

org.mitk.gui.qt.ultrasound/

src/

internal/

QmitkUltrasoundSupport.cpp

rMITKcfe920942535

View Options

Modules/IGT/Algorithms/mitkNeedleProjectionFilter.cpp

View Options

Modules/IGT/DataManagement/mitkNavigationTool.cpp

View Options

Modules/US/USModel/mitkUSDevice.cpp

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/QmitkUSControlsCustomVideoDeviceWidget.cpp

View Options

Modules/USUI/mitkUSUIActivator.cpp

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/files.cmake

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/plugin.xml

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/resources/icon2.xpm

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/resources/icon_US_navigation.svg

View Options

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

View Options

Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/resources/iconMeasurementEvaluation.svg

View Options

Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/resources/iconMeasurementTracking.svg

View Options

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

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.ultrasound/src/internal/QmitkUltrasoundSupport.cpp

Merge branch 'T24059-IGTRelease-2018.03'cfe920942535Actions

Description

Details

Event Timeline

Merged Changes

Changes (19)

rMITKcfe920942535

Modules/IGT/Algorithms/mitkNeedleProjectionFilter.cpp

Modules/IGT/DataManagement/mitkNavigationTool.cpp

Modules/US/USModel/mitkUSDevice.cpp

Modules/USUI/Qmitk/QmitkUSAbstractCustomWidget.cpp

Modules/USUI/Qmitk/QmitkUSAbstractCustomWidget.h

Modules/USUI/Qmitk/QmitkUSControlsCustomDiPhASDeviceWidget.cpp

Modules/USUI/Qmitk/QmitkUSControlsCustomVideoDeviceWidget.cpp

Modules/USUI/mitkUSUIActivator.cpp

Plugins/org.mitk.gui.qt.igt.app.echotrack/files.cmake

Plugins/org.mitk.gui.qt.igt.app.echotrack/plugin.xml

Plugins/org.mitk.gui.qt.igt.app.echotrack/resources/icon2.xpm

Plugins/org.mitk.gui.qt.igt.app.echotrack/resources/icon_US_navigation.svg

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

Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/resources/iconMeasurementEvaluation.svg

Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/resources/iconMeasurementTracking.svg

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

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

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

Plugins/org.mitk.gui.qt.ultrasound/src/internal/QmitkUltrasoundSupport.cpp

Merge branch 'T24059-IGTRelease-2018.03'
cfe920942535
Actions