HomePhabricator
Diffusion MITK a6932dfb2571

Merge remote-tracking branch 'remotes/origin/T22595-MasterIntegration-2017-06…
a6932dfb2571
Actions

Description

Merge remote-tracking branch 'remotes/origin/T22595-MasterIntegration-2017-06-09' into T22595-MasterIntegration-2017-07-07

  1. Conflicts:
  2. Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.cpp
  3. Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/src/internal/mitkHummelProtocolEvaluation.cpp

Details

Provenance
franzaAuthored on Jul 7 2017, 9:43 AM
franzaPushed on Jul 7 2017, 9:55 AM
Differential Revision
Restricted Differential Revision
Parents
rMITK076bc009fade: Merge branch 'T23019-DiffRelease4'
rMITK85334f3f3f85: Merge remote-tracking branch 'remotes/origin/T22595-NavigationModules-2016-11'…
Branches
Unknown
Tags
Unknown

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Changes (57)

PathSizePackages
Applications/
Workbench/
Modules/
IGT/
Algorithms/
IO/
Testing/
TrackingDevices/
autoload/
DeviceRegistry/
src/
IGTUI/
Qmitk/
autoload/
ConfigurationWidgetRegistry/
src/
QtWidgets/
include/
O3: MITK Reviewer Group II
src/
O3: MITK Reviewer Group II
Plugins/
org.mitk.gui.qt.datamanager/
src/
O1: MITK Reviewer Group I
org.mitk.gui.qt.igt.app.echotrack/
src/
internal/
NavigationStepWidgets/
SettingsWidgets/
Widgets/
org.mitk.gui.qt.igttracking/
src/
internal/
org.mitk.gui.qt.ultrasound/
src/
internal/

rMITKa6932dfb2571

View Options

Applications/Workbench/target_libraries.cmake

Loading...
View Options

Modules/IGT/Algorithms/mitkPivotCalibration.cpp

Loading...
View Options

Modules/IGT/Algorithms/mitkPivotCalibration.h

Loading...
View Options

Modules/IGT/CMakeLists.txt

Loading...
View Options

Modules/IGT/IO/mitkNavigationToolReader.cpp

Loading...
View Options

Modules/IGT/IO/mitkNavigationToolWriter.cpp

Loading...
View Options

Modules/IGT/MITKIGTHardware.cmake

Loading...
View Options

Modules/IGT/Testing/CMakeLists.txt

Loading...
View Options

Modules/IGT/Testing/MITKIGTTrackingDeviceHardwareTesting.cmake

Loading...
View Options

Modules/IGT/Testing/files.cmake

Loading...
View Options

Modules/IGT/Testing/mitkPolhemusTrackingDeviceHardwareTest.cpp

Loading...
View Options

Modules/IGT/TrackingDevices/mitkNDITrackingDevice.cpp

Loading...
View Options

Modules/IGT/TrackingDevices/mitkNDITrackingDevice.h

Loading...
View Options

Modules/IGT/TrackingDevices/mitkPolhemusInterface.cpp

Loading...
View Options

Modules/IGT/TrackingDevices/mitkPolhemusInterface.h

Loading...
View Options

Modules/IGT/TrackingDevices/mitkPolhemusTool.cpp

Loading...
View Options

Modules/IGT/TrackingDevices/mitkPolhemusTool.h

Loading...
View Options

Modules/IGT/TrackingDevices/mitkPolhemusTrackerTypeInformation.cpp

Loading...
View Options

Modules/IGT/TrackingDevices/mitkPolhemusTrackerTypeInformation.h

Loading...
View Options

Modules/IGT/TrackingDevices/mitkPolhemusTrackingDevice.cpp

Loading...
View Options

Modules/IGT/TrackingDevices/mitkPolhemusTrackingDevice.h

Loading...
View Options

Modules/IGT/TrackingDevices/mitkTrackingDevice.cpp

Loading...
View Options

Modules/IGT/TrackingDevices/mitkTrackingDevice.h

Loading...
View Options

Modules/IGT/autoload/DeviceRegistry/src/mitkIGTActivator.cpp

Loading...
View Options

Modules/IGT/files.cmake

Loading...
View Options

Modules/IGT/mitkIGTConfig.h.in

Loading...
View Options

Modules/IGTUI/Qmitk/QmitkPolhemusTrackerWidget.cpp

Loading...
View Options

Modules/IGTUI/Qmitk/QmitkPolhemusTrackerWidget.h

Loading...
View Options

Modules/IGTUI/Qmitk/QmitkPolhemusTrackerWidget.ui

Loading...
View Options

Modules/IGTUI/autoload/ConfigurationWidgetRegistry/src/mitkIGTUIActivator.cpp

Loading...
View Options

Modules/IGTUI/files.cmake

Loading...
View Options

Modules/QtWidgets/include/QmitkStdMultiWidget.h

Loading...
View Options

Modules/QtWidgets/src/QmitkStdMultiWidget.cpp

Loading...
View Options

Plugins/PluginList.cmake

Loading...
View Options

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp

Loading...
View Options

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

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

Loading...
View Options

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

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/NavigationStepWidgets/QmitkUSNavigationStepZoneMarking.h

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

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.ui

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

Plugins/org.mitk.gui.qt.igttracking/src/internal/IGTNavigationToolCalibration.h

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.h

Loading...
View Options

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

Loading...
View Options

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

Loading...
MITK · MIC · IMSY · DKFZ