Diffusion MITK b4d85d680925

Merge remote-tracking branch 'remotes/origin/T24287-SupportTrackedUltrasound-v1…
b4d85d680925
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge remote-tracking branch 'remotes/origin/T24287-SupportTrackedUltrasound-v1-ReleaseIntegration' into T24287-Integration-IGTRelease-2018-03

Conflicts:
Modules/US/USModel/mitkUSDevice.h
Modules/US/USNavigation/mitkAbstractUltrasoundTrackerDevice.cpp
Modules/US/USNavigation/mitkTrackedUltrasound.cpp
Modules/US/USNavigation/mitkUSCombinedModality.cpp
Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/QmitkUSNavigationMarkerPlacement.cpp

Details

Provenance

franza	Authored on Aug 6 2018, 7:44 PM
franza	Pushed on Aug 6 2018, 8:35 PM

Parents

rMITK2092cef5ebeb: Merge remote-tracking branch 'remotes/origin/T24287-MasterIntegration-2018-02…
rMITK10b5086aaa3e: Fixed type mismatches

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITKb4d85d680925: Merge remote-tracking branch 'remotes/origin/T24287-SupportTrackedUltrasound-v1… (authored by franza).Aug 6 2018, 7:44 PM

Merged Changes

Changes (27)

Path

Size

Modules/

IGTBase/

include/

mitkIGTMimeTypes.h

src/

mitkIGTMimeTypes.cpp

US/

USModel/

mitkUSDevice.cpp

mitkUSDeviceReaderWriterConstants.h

mitkUSDeviceReaderXML.cpp

mitkUSDeviceReaderXML.h

mitkUSDeviceWriterXML.cpp

mitkUSDeviceWriterXML.h

mitkUSProbe.cpp

mitkUSVideoDevice.cpp

mitkUSVideoDevice.h

mitkUSVideoDeviceCustomControls.cpp

mitkUSVideoDeviceCustomControls.h

USNavigation/

mitkAbstractUltrasoundTrackerDevice.cpp

mitkAbstractUltrasoundTrackerDevice.h

mitkTrackedUltrasound.cpp

mitkUSCombinedModality.cpp

USUI/

Qmitk/

QmitkUSControlsCustomVideoDeviceWidget.cpp

QmitkUSNewVideoDeviceWidget.cpp

QmitkUSNewVideoDeviceWidget.h

QmitkUSNewVideoDeviceWidgetControls.ui

Plugins/

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

src/

internal/

QmitkUSNavigationMarkerPlacement.cpp

QmitkUltrasoundCalibration.cpp

QmitkUltrasoundCalibration.h

rMITKb4d85d680925

Modules/IGTBase/include/mitkIGTMimeTypes.h

Loading...

Modules/IGTBase/src/mitkIGTMimeTypes.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/mitkUSProbe.cpp

Loading...

Modules/US/USModel/mitkUSProbe.h

Loading...

Modules/US/USModel/mitkUSVideoDevice.cpp

Loading...

Modules/US/USModel/mitkUSVideoDevice.h

Loading...

Modules/US/USModel/mitkUSVideoDeviceCustomControls.cpp

Loading...

Modules/US/USModel/mitkUSVideoDeviceCustomControls.h

Loading...

Modules/US/USNavigation/mitkAbstractUltrasoundTrackerDevice.cpp

Loading...

Modules/US/USNavigation/mitkAbstractUltrasoundTrackerDevice.h

Loading...

Modules/US/USNavigation/mitkTrackedUltrasound.cpp

Loading...

Modules/US/USNavigation/mitkUSCombinedModality.cpp

Loading...

Modules/US/files.cmake

Loading...

Modules/USUI/Qmitk/QmitkUSControlsCustomVideoDeviceWidget.cpp

Loading...

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidget.cpp

Loading...

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidget.h

Loading...

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidgetControls.ui

Loading...

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

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