Merge branch 'bug-6228-UseToFDevices'
2f40390c83d0
Actions

Description

Merge branch 'bug-6228-UseToFDevices'

Details

Provenance

Authored on Sep 9 2011, 7:01 PM

Parents

rMITKe53c3dc19082: added and enhanced unit test with new raw data reconstruction mechanisms.
rMITK101d7a103ef0: Merge branch 'bug-9176-RenderingIntegrationTest'

Branches

Unknown

Tags

Unknown

Event Timeline

• mersmann committed rMITK2f40390c83d0: Merge branch 'bug-6228-UseToFDevices' (authored by • mersmann).Sep 9 2011, 7:01 PM

Merged Changes

Changes (24)

Path

Size

Modules/

ToFHardware/

Testing/

files.cmake

mitkThreadedToFRawDataReconstructionTest.cpp

mitkToFCameraPMDControllerTest.cpp

mitkToFCameraPMDRawDataCamBoardDeviceTest.cpp

mitkToFCameraPMDRawDataCamCubeDeviceTest.cpp

	mitkToFCameraPMDRawDataDeviceTest.cpp
	mitkToFCameraPMDDeviceTest.cpp

mitkToFImageGrabberCreatorTest.cpp

files.cmake

mitkThreadedToFRawDataReconstruction.cpp

mitkThreadedToFRawDataReconstruction.h

mitkToFCameraPMDCamCubeController.cpp

mitkToFCameraPMDController.cpp

mitkToFCameraPMDController.h

mitkToFCameraPMDControllerStub.cpp

	mitkToFCameraPMDRawDataCamBoardDevice.cpp
	mitkToFCameraPMDCamBoardDevice.cpp

	mitkToFCameraPMDRawDataCamBoardDevice.h
	mitkToFCameraPMDCamCubeDevice.h

	mitkToFCameraPMDRawDataCamCubeDevice.cpp
	mitkToFCameraPMDCamCubeDevice.cpp

	mitkToFCameraPMDRawDataCamCubeDevice.h
	mitkToFCameraPMDCamCubeDevice.h

	mitkToFCameraPMDRawDataDevice.cpp
	mitkToFCameraPMDDevice.cpp

	mitkToFCameraPMDRawDataDevice.h
	mitkToFCameraPMDDevice.h

mitkToFHardware.cmake

mitkToFImageGrabberCreator.cpp

mitkToFImageGrabberCreator.h

ToFUI/

Qmitk/

QmitkToFConnectionWidget.cpp

rMITK2f40390c83d0

View Options

Modules/ToFHardware/Testing/files.cmake

View Options

Modules/ToFHardware/Testing/mitkThreadedToFRawDataReconstructionTest.cpp

View Options

Modules/ToFHardware/Testing/mitkToFCameraPMDControllerTest.cpp

View Options

Modules/ToFHardware/Testing/mitkToFCameraPMDRawDataCamBoardDeviceTest.cpp

View Options

Modules/ToFHardware/Testing/mitkToFCameraPMDRawDataCamCubeDeviceTest.cpp

View Options

Modules/ToFHardware/Testing/mitkToFCameraPMDRawDataDeviceTest.cpp

View Options

Modules/ToFHardware/Testing/mitkToFImageGrabberCreatorTest.cpp

View Options

Modules/ToFHardware/files.cmake

View Options

Modules/ToFHardware/mitkThreadedToFRawDataReconstruction.cpp

View Options

Modules/ToFHardware/mitkThreadedToFRawDataReconstruction.h

View Options

Modules/ToFHardware/mitkToFCameraPMDCamCubeController.cpp

View Options

Modules/ToFHardware/mitkToFCameraPMDController.cpp

View Options

Modules/ToFHardware/mitkToFCameraPMDController.h

View Options

Modules/ToFHardware/mitkToFCameraPMDControllerStub.cpp

View Options

Modules/ToFHardware/mitkToFCameraPMDRawDataCamBoardDevice.cpp

View Options

Modules/ToFHardware/mitkToFCameraPMDRawDataCamBoardDevice.h

View Options

Modules/ToFHardware/mitkToFCameraPMDRawDataCamCubeDevice.cpp

View Options

Modules/ToFHardware/mitkToFCameraPMDRawDataCamCubeDevice.h

View Options

Modules/ToFHardware/mitkToFCameraPMDRawDataDevice.cpp

View Options

Modules/ToFHardware/mitkToFCameraPMDRawDataDevice.h

View Options

Modules/ToFHardware/mitkToFHardware.cmake

View Options

Modules/ToFHardware/mitkToFImageGrabberCreator.cpp

View Options

Modules/ToFHardware/mitkToFImageGrabberCreator.h

View Options

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp

Merge branch 'bug-6228-UseToFDevices'2f40390c83d0Actions

Description

Details

Event Timeline

Merged Changes

Changes (24)

rMITK2f40390c83d0

Modules/ToFHardware/Testing/files.cmake

Modules/ToFHardware/Testing/mitkThreadedToFRawDataReconstructionTest.cpp

Modules/ToFHardware/Testing/mitkToFCameraPMDControllerTest.cpp

Modules/ToFHardware/Testing/mitkToFCameraPMDRawDataCamBoardDeviceTest.cpp

Modules/ToFHardware/Testing/mitkToFCameraPMDRawDataCamCubeDeviceTest.cpp

Modules/ToFHardware/Testing/mitkToFCameraPMDRawDataDeviceTest.cpp

Modules/ToFHardware/Testing/mitkToFImageGrabberCreatorTest.cpp

Modules/ToFHardware/files.cmake

Modules/ToFHardware/mitkThreadedToFRawDataReconstruction.cpp

Modules/ToFHardware/mitkThreadedToFRawDataReconstruction.h

Modules/ToFHardware/mitkToFCameraPMDCamCubeController.cpp

Modules/ToFHardware/mitkToFCameraPMDController.cpp

Modules/ToFHardware/mitkToFCameraPMDController.h

Modules/ToFHardware/mitkToFCameraPMDControllerStub.cpp

Modules/ToFHardware/mitkToFCameraPMDRawDataCamBoardDevice.cpp

Modules/ToFHardware/mitkToFCameraPMDRawDataCamBoardDevice.h

Modules/ToFHardware/mitkToFCameraPMDRawDataCamCubeDevice.cpp

Modules/ToFHardware/mitkToFCameraPMDRawDataCamCubeDevice.h

Modules/ToFHardware/mitkToFCameraPMDRawDataDevice.cpp

Modules/ToFHardware/mitkToFCameraPMDRawDataDevice.h

Modules/ToFHardware/mitkToFHardware.cmake

Modules/ToFHardware/mitkToFImageGrabberCreator.cpp

Modules/ToFHardware/mitkToFImageGrabberCreator.h

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp

Merge branch 'bug-6228-UseToFDevices'
2f40390c83d0
Actions