HomePhabricator
Diffusion MITK de44b9ab3349

Merge remote-tracking branch 'origin/T26277-PhantomBasedUSCalibration' into…
de44b9ab3349
Actions

Description

Merge remote-tracking branch 'origin/T26277-PhantomBasedUSCalibration' into T26277-PhantomBasedUSCalibration-Integration

  1. Conflicts:
  2. Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/QmitkUltrasoundCalibration.cpp
  3. Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/QmitkUltrasoundCalibration.h
  4. Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/QmitkUltrasoundCalibrationControls.ui

Details

Provenance
eisenmanAuthored on Aug 2 2019, 3:02 PM
eisenmanPushed on Aug 2 2019, 3:18 PM
Parents
rMITK26a786a00a28: Merge branch 'T26540-FixWarningAsErrorInUltrasoundTrackingNavigation'
rMITK0e14c9aee6f1: Added matching of annotated point set to phantom geometry
Branches
Unknown
Tags
Unknown

Event Timeline

Merged Changes

Changes (4)

PathSize
Modules/
US/
USNavigation/
Plugins/
org.mitk.gui.qt.igt.app.ultrasoundtrackingnavigation/
src/
internal/

rMITKde44b9ab3349

View Options

Modules/US/USNavigation/mitkUSCombinedModality.cpp

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
MITK · MIC · IMSY · DKFZ