Merge branch 'T24680-AddPersistenceForUSDevice' into T24609-v2018.04-alpha
a8dc0ab443ba
Actions

Description

Merge branch 'T24680-AddPersistenceForUSDevice' into T24609-v2018.04-alpha

Details

Provenance

• sridhara	Authored on Apr 20 2018, 10:20 AM
• sridhara	Pushed on Apr 20 2018, 10:21 AM

Parents

rMITK9d7c2e602eb4: Merge conflicts fixed
rMITK668a0e9268f4: Merge branch 'T24059-DeleteTumorButtonNotWorkinginEchoTrack' into T24609-v2018.

Branches

Unknown

Tags

Unknown

Event Timeline

• sridhara committed rMITKa8dc0ab443ba: Merge branch 'T24680-AddPersistenceForUSDevice' into T24609-v2018.04-alpha (authored by • sridhara).Apr 20 2018, 10:20 AM

Merged Changes

Changes (21)

Path

Size

Modules/

IGTBase/

include/

mitkIGTMimeTypes.h

src/

mitkIGTMimeTypes.cpp

US/

USModel/

mitkUSDevice.cpp

mitkUSDevice.h

mitkUSDeviceReaderWriterConstants.h

mitkUSDeviceReaderXML.cpp

mitkUSDeviceReaderXML.h

mitkUSDeviceWriterXML.cpp

mitkUSDeviceWriterXML.h

mitkUSProbe.cpp

mitkUSProbe.h

mitkUSVideoDevice.cpp

mitkUSVideoDevice.h

mitkUSVideoDeviceCustomControls.cpp

mitkUSVideoDeviceCustomControls.h

files.cmake

USUI/

Qmitk/

QmitkUSControlsCustomVideoDeviceWidget.cpp

QmitkUSNewVideoDeviceWidget.cpp

QmitkUSNewVideoDeviceWidget.h

QmitkUSNewVideoDeviceWidgetControls.ui

Plugins/

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

src/

internal/

QmitkUltrasoundCalibration.cpp

rMITKa8dc0ab443ba

View Options

Modules/IGTBase/include/mitkIGTMimeTypes.h

View Options

Modules/IGTBase/src/mitkIGTMimeTypes.cpp

View Options

Modules/US/USModel/mitkUSDevice.cpp

View Options

Modules/US/USModel/mitkUSDevice.h

View Options

Modules/US/USModel/mitkUSDeviceReaderWriterConstants.h

View Options

Modules/US/USModel/mitkUSDeviceReaderXML.cpp

View Options

Modules/US/USModel/mitkUSDeviceReaderXML.h

View Options

Modules/US/USModel/mitkUSDeviceWriterXML.cpp

View Options

Modules/US/USModel/mitkUSDeviceWriterXML.h

View Options

Modules/US/USModel/mitkUSProbe.cpp

View Options

Modules/US/USModel/mitkUSProbe.h

View Options

Modules/US/USModel/mitkUSVideoDevice.cpp

View Options

Modules/US/USModel/mitkUSVideoDevice.h

View Options

Modules/US/USModel/mitkUSVideoDeviceCustomControls.cpp

View Options

Modules/US/USModel/mitkUSVideoDeviceCustomControls.h

View Options

Modules/US/files.cmake

View Options

Modules/USUI/Qmitk/QmitkUSControlsCustomVideoDeviceWidget.cpp

View Options

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidget.cpp

View Options

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidget.h

View Options

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidgetControls.ui

View Options

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

Merge branch 'T24680-AddPersistenceForUSDevice' into T24609-v2018.04-alphaa8dc0ab443baActions

Description

Details

Event Timeline

Merged Changes

Changes (21)

rMITKa8dc0ab443ba

Modules/IGTBase/include/mitkIGTMimeTypes.h

Modules/IGTBase/src/mitkIGTMimeTypes.cpp

Modules/US/USModel/mitkUSDevice.cpp

Modules/US/USModel/mitkUSDevice.h

Modules/US/USModel/mitkUSDeviceReaderWriterConstants.h

Modules/US/USModel/mitkUSDeviceReaderXML.cpp

Modules/US/USModel/mitkUSDeviceReaderXML.h

Modules/US/USModel/mitkUSDeviceWriterXML.cpp

Modules/US/USModel/mitkUSDeviceWriterXML.h

Modules/US/USModel/mitkUSProbe.cpp

Modules/US/USModel/mitkUSProbe.h

Modules/US/USModel/mitkUSVideoDevice.cpp

Modules/US/USModel/mitkUSVideoDevice.h

Modules/US/USModel/mitkUSVideoDeviceCustomControls.cpp

Modules/US/USModel/mitkUSVideoDeviceCustomControls.h

Modules/US/files.cmake

Modules/USUI/Qmitk/QmitkUSControlsCustomVideoDeviceWidget.cpp

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidget.cpp

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidget.h

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidgetControls.ui

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

Merge branch 'T24680-AddPersistenceForUSDevice' into T24609-v2018.04-alpha
a8dc0ab443ba
Actions