HomePhabricator
Diffusion MITK 73fa36ee6d4f

Merge remote-tracking branch 'remotes/origin/T24287-MasterIntegration-2018-02…
73fa36ee6d4f
Actions

Description

Merge remote-tracking branch 'remotes/origin/T24287-MasterIntegration-2018-02-22' into T24287-Integration-IGTRelease-2018-03

  1. Conflicts:
  2. Modules/US/USModel/mitkUSDevice.h

Details

Provenance
franzaAuthored on Aug 6 2018, 4:22 PM
franzaPushed on Aug 6 2018, 8:35 PM
Parents
rMITK153af5c537f9: Merge branch 'T24355-SetDefaultFocusToBasicInformationTab' into T24059…
rMITKd8b063446e74: removed old xml logging class
Branches
Loading...
Tags
Loading...

Merged Changes

Changes (40)

PathSize
Modules/
IGT/
Algorithms/
US/
USModel/
USNavigation/
Testing/
Plugins/
org.mitk.gui.qt.igt.app.echotrack/
src/
internal/
IO/
NavigationStepWidgets/
SettingsWidgets/
Widgets/

rMITK73fa36ee6d4f

View Options

Modules/IGT/Algorithms/mitkNavigationDataDisplacementFilter.cpp

Loading...
View Options

Modules/IGT/Algorithms/mitkNavigationDataDisplacementFilter.h

Loading...
View Options

Modules/US/USModel/mitkUSDevice.cpp

Loading...
View Options

Modules/US/USModel/mitkUSDevice.h

Loading...
View Options

Modules/US/USNavigation/Testing/mitkCombinedModalityTest.cpp

Loading...
View Options

Modules/US/USNavigation/files.cmake

Loading...
View Options

Modules/US/USNavigation/mitkAbstractUltrasoundTrackerDevice.cpp

Loading...
View Options

Modules/US/USNavigation/mitkAbstractUltrasoundTrackerDevice.h

Loading...
View Options

Modules/US/USNavigation/mitkTrackedUltrasound.cpp

Loading...
View Options

Modules/US/USNavigation/mitkTrackedUltrasound.h

Loading...
View Options

Modules/US/USNavigation/mitkUSCombinedModality.cpp

Loading...
View Options

Modules/US/USNavigation/mitkUSCombinedModality.h

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/IO/mitkUSNavigationCombinedModalityPersistence.cpp

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSAbstractNavigationStep.cpp

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSAbstractNavigationStep.h

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepCombinedModality.cpp

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepCombinedModality.h

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepMarkerIntervention.cpp

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepPlacementPlanning.cpp

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepPunctuationIntervention.cpp

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepTumourSelection.cpp

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepZoneMarking.cpp

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/QmitkUSNavigationCalibrationsDataModel.cpp

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/QmitkUSNavigationCalibrationsDataModel.h

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/QmitkUSNavigationMarkerPlacement.cpp

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/QmitkUSNavigationMarkerPlacement.h

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/SettingsWidgets/QmitkUSNavigationCombinedSettingsWidget.h

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSCombinedModalityCreationWidget.cpp

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSCombinedModalityCreationWidget.h

Loading...
View Options

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

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSCombinedModalityEditWidget.cpp

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSCombinedModalityEditWidget.h

Loading...
View Options

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

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSNavigationFreezeButton.cpp

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSNavigationFreezeButton.h

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSNavigationProcessWidget.cpp

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSNavigationProcessWidget.h

Loading...
MITK · MIC · IMSY · DKFZ