Diffusion MITK f4227fc258a7

Merge branch 'bug-12785…
f4227fc258a7
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-12785-RemoveMitkOpenCVVideoSourceDependencyFromMakeUsImageVideoSource'

Details

Provenance

Authored on Aug 3 2012, 4:05 PM

Parents

rMITKa301bb3f5145: Made NewVideoDeviceWidget support color/greyscale option while I was at it
rMITKe2430dd9e70c: Merge branch 'bug-12268-swivelrendertest'

Branches

Unknown

Tags

Unknown

Event Timeline

maerz committed rMITKf4227fc258a7: Merge branch 'bug-12785… (authored by maerz).Aug 3 2012, 4:05 PM

Merged Changes

Changes (9)

Path

Size

Modules/

US/

USFilters/

mitkUSImageVideoSource.cpp

mitkUSImageVideoSource.h

USModel/

mitkUSVideoDevice.cpp

mitkUSVideoDevice.h

USUI/

Qmitk/

QmitkUSNewVideoDeviceWidget.cpp

QmitkUSNewVideoDeviceWidget.h

QmitkUSNewVideoDeviceWidgetControls.ui

Plugins/

org.mitk.gui.qt.ultrasound/

src/

internal/

UltrasoundSupport.cpp

UltrasoundSupportControls.ui

rMITKf4227fc258a7

Modules/US/USFilters/mitkUSImageVideoSource.cpp

Loading...

Modules/US/USFilters/mitkUSImageVideoSource.h

Loading...

Modules/US/USModel/mitkUSVideoDevice.cpp

Loading...

Modules/US/USModel/mitkUSVideoDevice.h

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

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

Loading...