Merge branch 'master' into T26559-ImprovePython3Integration
580d8a62f1c2
Actions

Description

Merge branch 'master' into T26559-ImprovePython3Integration

Details

Provenance

kislinsk	Authored on Aug 5 2019, 3:14 PM
kislinsk	Pushed on Aug 5 2019, 3:43 PM

Parents

rMITK2383486450d8: Merge branch 'T26546-FixCppRestSDKAndBoostIncompatibility'
rMITK65ac50fa40ea: Improve Python3 integration (see T26559)

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

2383486450d8 Merge branch 'T26546-FixCppRestSDKAndBoostIncompatibility'
Author
kislinsk
Browse Repository
No Builds
No Audits
40a0cba15a18 Use patchable tarball for cpprestsdk
Author
kislinsk
Browse Repository
No Builds
No Audits
77b6683f13ea Merge branch 'T26277-PhantomBasedUSCalibration-Integration'
Author
eisenman
Browse Repository
No Builds
No Audits
27114c3df475 Merge branch 'T19683-ShowOnlySelectedNodesCrosshairVisibility-RandomAccess'
Author
• kausch
Browse Repository
No Builds
No Audits
fcefb8576b7b Fixed crosshair visibility for show only selected nodes
Author
• kausch
Browse Repository
No Builds
No Audits
933a50e4f834 Remove unused code
Author
eisenman
Browse Repository
No Builds
No Audits
61b5b9fb77b0 Set index to spacing calibration tab
Author
eisenman
Browse Repository
No Builds
No Audits
cc72d3624dfb Fix initialization order error
Author
eisenman
Browse Repository
No Builds
No Audits
de44b9ab3349 Merge remote-tracking branch 'origin/T26277-PhantomBasedUSCalibration' into…
Author
eisenman
Browse Repository
No Builds
No Audits
0e14c9aee6f1 Added matching of annotated point set to phantom geometry
Author
seitela
Browse Repository
No Builds
No Audits
912593e56f94 Added helper structure to allow more accurate annotation of phantom features in…
Author
seitela
Browse Repository
No Builds
No Audits
7dcab99b366b Clone image instead of initializing it new
Author
seitela
Browse Repository
No Builds
No Audits
2f4842dabbf9 Set spacing after index to world transform to prevent overwriting
Author
seitela
Browse Repository
No Builds
No Audits
47234bddc2f1 Added initial version of phantom based US calibration.
Author
seitela
Browse Repository
No Builds
No Audits

Changes (6)

Path

Size

Packages

CMakeExternals/

cpprestsdk.cmake

O1: MITK Reviewer Group I

Modules/

US/

USNavigation/

mitkUSCombinedModality.cpp

Plugins/

org.mitk.gui.qt.application/

src/

QmitkDataNodeShowSelectedNodesAction.cpp

O1: MITK Reviewer Group I

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

src/

internal/

QmitkUltrasoundCalibration.cpp

QmitkUltrasoundCalibration.h

QmitkUltrasoundCalibrationControls.ui

rMITK580d8a62f1c2

View Options

CMakeExternals/cpprestsdk.cmake

View Options

Modules/US/USNavigation/mitkUSCombinedModality.cpp

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeShowSelectedNodesAction.cpp

View Options

Plugins/org.mitk.gui.qt.igt.app.ultrasoundtrackingnavigation/src/internal/QmitkUltrasoundCalibration.cpp

View Options

Plugins/org.mitk.gui.qt.igt.app.ultrasoundtrackingnavigation/src/internal/QmitkUltrasoundCalibration.h

View Options

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

Merge branch 'master' into T26559-ImprovePython3Integration580d8a62f1c2Actions

Description

Details

Event Timeline

Merged Changes

Changes (6)

rMITK580d8a62f1c2

CMakeExternals/cpprestsdk.cmake

Modules/US/USNavigation/mitkUSCombinedModality.cpp

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeShowSelectedNodesAction.cpp

Plugins/org.mitk.gui.qt.igt.app.ultrasoundtrackingnavigation/src/internal/QmitkUltrasoundCalibration.cpp

Plugins/org.mitk.gui.qt.igt.app.ultrasoundtrackingnavigation/src/internal/QmitkUltrasoundCalibration.h

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

Merge branch 'master' into T26559-ImprovePython3Integration
580d8a62f1c2
Actions