Diffusion MITK c6acd5969c75

Merge remote-tracking branch 'remotes/origin/T25522-FiducialBased-CT-to-US…
c6acd5969c75
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge remote-tracking branch 'remotes/origin/T25522-FiducialBased-CT-to-US-registration' into T25522-MasterIntegrationBranch-14-02-2019

Details

Provenance

Benjamin Mittmann <b.mittmann@dkfz-heidelberg.de>	Authored on Feb 14 2019, 4:50 PM
mittmann	Pushed on Feb 14 2019, 4:52 PM

Parents

rMITK65f16db447df: Cleaning up the code part I
rMITKd265101b5e71: Merge branch 'T26031-FiberfoxSpikes'

Branches

Unknown

Tags

Unknown

Event Timeline

mittmann committed rMITKc6acd5969c75: Merge remote-tracking branch 'remotes/origin/T25522-FiducialBased-CT-to-US… (authored by mittmann).Feb 14 2019, 4:50 PM

Merged Changes

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

Changes (72)

Path

Size

Modules/

IGT/

Algorithms/

mitkNavigationDataDisplacementFilter.cpp

mitkNavigationDataDisplacementFilter.h

DataManagement/

mitkNavigationDataSource.cpp

mitkNavigationDataSource.h

IGTUI/

Qmitk/

QmitkInteractiveTransformationWidgetControls.ui

QmitkNavigationDataSourceSelectionWidget.cpp

OpenIGTLink/

mitkIGTLMessageSource.cpp

US/

USModel/

mitkUSDevice.cpp

mitkUSDeviceReaderWriterConstants.h

mitkUSDeviceReaderXML.cpp

mitkUSDeviceReaderXML.h

mitkUSDeviceWriterXML.cpp

mitkUSDeviceWriterXML.h

mitkUSIGTLDevice.cpp

mitkUSIGTLDevice.h

mitkUSVideoDevice.h

mitkUSVideoDeviceCustomControls.cpp

mitkUSVideoDeviceCustomControls.h

USNavigation/

Testing/

mitkCombinedModalityTest.cpp

mitkAbstractUltrasoundTrackerDevice.cpp

mitkAbstractUltrasoundTrackerDevice.h

mitkTrackedUltrasound.cpp

mitkTrackedUltrasound.h

mitkUSCombinedModality.cpp

mitkUSCombinedModality.h

USUI/

Qmitk/

QmitkUSDeviceManagerWidget.cpp

QmitkUSNewVideoDeviceWidget.cpp

QmitkUSNewVideoDeviceWidget.h

Plugins/

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

src/

internal/

Filter/

mitkFloatingImageToUltrasoundRegistrationFilter.cpp

mitkFloatingImageToUltrasoundRegistrationFilter.h

IO/

mitkUSNavigationCombinedModalityPersistence.cpp

NavigationStepWidgets/

QmitkUSAbstractNavigationStep.cpp

QmitkUSAbstractNavigationStep.h

QmitkUSNavigationStepCombinedModality.cpp

QmitkUSNavigationStepCombinedModality.h

QmitkUSNavigationStepCtUsRegistration.cpp

QmitkUSNavigationStepCtUsRegistration.h

QmitkUSNavigationStepCtUsRegistration.ui

QmitkUSNavigationStepMarkerIntervention.cpp

QmitkUSNavigationStepPlacementPlanning.cpp

QmitkUSNavigationStepPunctuationIntervention.cpp

QmitkUSNavigationStepTumourSelection.cpp

QmitkUSNavigationStepZoneMarking.cpp

QmitkUSNavigationCalibrationsDataModel.cpp

QmitkUSNavigationCalibrationsDataModel.h

QmitkUSNavigationMarkerPlacement.cpp

QmitkUSNavigationMarkerPlacement.h

QmitkUSNavigationMarkerPlacement.ui

QmitkUltrasoundCalibration.cpp

QmitkUltrasoundCalibration.h

SettingsWidgets/

QmitkUSNavigationCombinedSettingsWidget.h

Widgets/

QmitkUSCombinedModalityCreationWidget.cpp

QmitkUSCombinedModalityCreationWidget.h

QmitkUSCombinedModalityCreationWidget.ui

QmitkUSCombinedModalityEditWidget.cpp

QmitkUSCombinedModalityEditWidget.h

QmitkUSCombinedModalityEditWidget.ui

QmitkUSNavigationFreezeButton.cpp

QmitkUSNavigationFreezeButton.h

QmitkUSNavigationProcessWidget.cpp

QmitkUSNavigationProcessWidget.h

QmitkUSNavigationProcessWidget.ui

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkMITKIGTTrackingToolboxViewControls.ui

QmitkMITKIGTTrackingToolboxViewWorker.cpp

QmitkNavigationDataPlayerView.cpp

org.mitk.gui.qt.ultrasound/

src/

internal/

QmitkUltrasoundSupport.cpp

QmitkUltrasoundSupport.h

QmitkUltrasoundSupportControls.ui

rMITKc6acd5969c75

Modules/IGT/Algorithms/mitkNavigationDataDisplacementFilter.cpp

Loading...

Modules/IGT/Algorithms/mitkNavigationDataDisplacementFilter.h

Loading...

Modules/IGT/DataManagement/mitkNavigationDataSource.cpp

Loading...

Modules/IGT/DataManagement/mitkNavigationDataSource.h

Loading...

Modules/IGTUI/Qmitk/QmitkInteractiveTransformationWidgetControls.ui

Loading...

Modules/IGTUI/Qmitk/QmitkNavigationDataSourceSelectionWidget.cpp

Loading...

Modules/OpenIGTLink/mitkIGTLMessageSource.cpp

Loading...

Modules/US/USModel/mitkUSDevice.cpp

Loading...

Modules/US/USModel/mitkUSDevice.h

Loading...

Modules/US/USModel/mitkUSDeviceReaderWriterConstants.h

Loading...

Modules/US/USModel/mitkUSDeviceReaderXML.cpp

Loading...

Modules/US/USModel/mitkUSDeviceReaderXML.h

Loading...

Modules/US/USModel/mitkUSDeviceWriterXML.cpp

Loading...

Modules/US/USModel/mitkUSDeviceWriterXML.h

Loading...

Modules/US/USModel/mitkUSIGTLDevice.cpp

Loading...

Modules/US/USModel/mitkUSIGTLDevice.h

Loading...

Modules/US/USModel/mitkUSVideoDevice.h

Loading...

Modules/US/USModel/mitkUSVideoDeviceCustomControls.cpp

Loading...

Modules/US/USModel/mitkUSVideoDeviceCustomControls.h

Loading...

Modules/US/USNavigation/Testing/mitkCombinedModalityTest.cpp

Loading...

Modules/US/USNavigation/files.cmake

Loading...

Modules/US/USNavigation/mitkAbstractUltrasoundTrackerDevice.cpp

Loading...

Modules/US/USNavigation/mitkAbstractUltrasoundTrackerDevice.h

Loading...

Modules/US/USNavigation/mitkTrackedUltrasound.cpp

Loading...

Modules/US/USNavigation/mitkTrackedUltrasound.h

Loading...

Modules/US/USNavigation/mitkUSCombinedModality.cpp

Loading...

Modules/US/USNavigation/mitkUSCombinedModality.h

Loading...

Modules/USUI/Qmitk/QmitkUSDeviceManagerWidget.cpp

Loading...

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidget.cpp

Loading...

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidget.h

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/CMakeLists.txt

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

Plugins/org.mitk.gui.qt.ultrasound/src/internal/QmitkUltrasoundSupportControls.ui

Loading...