Diffusion MITK 4d905b7ccaa0

Merge branch 'bug-17821-USImageAndUSImageMetadataShouldBeMarkedAsDeprecated'
4d905b7ccaa0
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-17821-USImageAndUSImageMetadataShouldBeMarkedAsDeprecated'

Conflicts:
Modules/US/USModel/mitkUSDevice.h

Details

Provenance

Authored on Jun 10 2014, 4:14 PM

Parents

rMITK604019b6c87b: Removed more deprecated macros.
rMITKdec9786b64fd: COMP: Merge branch 'bug-17816-Build-is-broken-when-using-Qt5'

Branches

Unknown

Tags

Unknown

Event Timeline

• wintersa committed rMITK4d905b7ccaa0: Merge branch 'bug-17821-USImageAndUSImageMetadataShouldBeMarkedAsDeprecated' (authored by • wintersa).Jun 10 2014, 4:14 PM

Merged Changes

604019b6c87b Removed more deprecated macros.
Author
• wintersa
Browse Repository
No Builds
No Audits
0c3a7b27c12c Removed deprecated macro as the warning would lead to an error in the current…
Author
• wintersa
Browse Repository
No Builds
No Audits
560b1193c172 Fixed initialization order warnings.
Author
• wintersa
Browse Repository
No Builds
No Audits
4fab58926672 Removed usage of USImageMetadata from the combined modality.
Author
• wintersa
Browse Repository
No Builds
No Audits
be6bff0c0ed6 Removed usage of USImageMetadata from the UltrasoundSupport plugin.
Author
• wintersa
Browse Repository
No Builds
No Audits
c96c67eeb080 Removed USImageMetadata from the QmitkUSNewVideoDeviceWidget.
Author
• wintersa
Browse Repository
No Builds
No Audits
fe74ac329c40 Added setter for manufacturer, name and comment of the USDevice.
Author
• wintersa
Browse Repository
No Builds
No Audits
6c0ab4611b18 Changed documentation of the QmitkServiceListWidget according to…
Author
• wintersa
Browse Repository
No Builds
No Audits
fd485f944fbd Removed usages of USImageMetadata from the ultrasound module.
Author
• wintersa
Browse Repository
No Builds
No Audits
f9664e0be3f5 Documented USImage and USImageMetadata as deprecated.
Author
• wintersa
Browse Repository
No Builds
No Audits

Changes (11)

Path

Size

Packages

Modules/

QtWidgets/

QmitkServiceListWidget.h

O3: MITK Reviewer Group II

US/

USModel/

mitkUSDevice.cpp

mitkUSDevicePersistence.cpp

mitkUSImageMetadata.h

USNavigation/

mitkUSCombinedModality.cpp

USUI/

Qmitk/

QmitkUSNewVideoDeviceWidget.cpp

QmitkUSNewVideoDeviceWidget.h

QmitkUSNewVideoDeviceWidgetControls.ui

Plugins/

org.mitk.gui.qt.ultrasound/

src/

internal/

UltrasoundSupport.cpp

rMITK4d905b7ccaa0

Modules/QtWidgets/QmitkServiceListWidget.h

Loading...

Modules/US/USModel/mitkUSDevice.cpp

Loading...

Modules/US/USModel/mitkUSDevice.h

Loading...

Modules/US/USModel/mitkUSDevicePersistence.cpp

Loading...

Modules/US/USModel/mitkUSImage.h

Loading...

Modules/US/USModel/mitkUSImageMetadata.h

Loading...

Modules/US/USNavigation/mitkUSCombinedModality.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.ultrasound/src/internal/UltrasoundSupport.cpp

Loading...