Diffusion MITK c05c6afd158d

Merge branch 'bug-8124-MESAIntegration'
c05c6afd158d
Actions

Description

Merge branch 'bug-8124-MESAIntegration'

Conflicts:
Modules/ToFProcessing/mitkToFDistanceImageToSurfaceFilter.cpp

Details

Provenance

• yung

Authored on Aug 9 2011, 4:01 PM

Parents

rMITKe539aa7d0b44: Added widget to control parameters of MESA camera
rMITKf33eccb4d9ee: Merge branch 'bug-8506-create-unittest-for-planarsubdivisionpolygon' COMP

Branches

Unknown

Tags

Unknown

Event Timeline

• yung committed rMITKc05c6afd158d: Merge branch 'bug-8124-MESAIntegration' (authored by • yung).Aug 9 2011, 4:01 PM

Merged Changes

e539aa7d0b44 Added widget to control parameters of MESA camera
Author
• yung
Browse Repository
No Builds
No Audits
7ad5d728a038 Initial integration of MESA4000
Author
• yung
Browse Repository
No Builds
No Audits
dd710bb71c6a Initial integration of MESA4000
Author
unknown <yung@.inet.dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
f759582d7f05 Merge remote-tracking branch 'origin/bug-8364…
Author
unknown <yung@.inet.dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits

Changes (25)

Path

Size

Modules/

ToFHardware/

CMakeLists.txt

files.cmake

mitkToFCameraMESAController.cpp

	mitkToFCameraMESAController.h
	mitkToFCameraPMDController.h

	mitkToFCameraMESADevice.cpp
	mitkToFCameraPMDDevice.cpp

	mitkToFCameraMESADevice.h
	mitkToFCameraPMDDevice.h

mitkToFCameraMESASR4000Controller.cpp

mitkToFCameraMESASR4000Controller.h

	mitkToFCameraMESASR4000ControllerStub.cpp
	mitkToFCameraPMDO3ControllerStub.cpp

mitkToFCameraMESASR4000Device.cpp

	mitkToFCameraMESASR4000Device.h
	mitkToFCameraPMDCamBoardDevice.h

mitkToFHardware.cmake

mitkToFImageGrabberCreator.cpp

mitkToFImageGrabberCreator.h

ToFProcessing/

mitkToFDistanceImageToSurfaceFilter.cpp

ToFUI/

Qmitk/

QmitkToFConnectionWidget.cpp

QmitkToFConnectionWidget.h

QmitkToFConnectionWidgetControls.ui

QmitkToFMESAParameterWidget.cpp

	QmitkToFMESAParameterWidget.h
	QmitkToFConnectionWidget.h

QmitkToFMESAParameterWidgetControls.ui

QmitkToFPMDParameterWidget.cpp

	QmitkToFPMDParameterWidget.h
	QmitkToFConnectionWidget.h

QmitkToFPMDParameterWidgetControls.ui

files.cmake

rMITKc05c6afd158d

View Options

Modules/ToFHardware/CMakeLists.txt

View Options

Modules/ToFHardware/files.cmake

View Options

Modules/ToFHardware/mitkToFCameraMESAController.cpp

View Options

Modules/ToFHardware/mitkToFCameraMESAController.h

View Options

Modules/ToFHardware/mitkToFCameraMESADevice.cpp

View Options

Modules/ToFHardware/mitkToFCameraMESADevice.h

View Options

Modules/ToFHardware/mitkToFCameraMESASR4000Controller.cpp

View Options

Modules/ToFHardware/mitkToFCameraMESASR4000Controller.h

View Options

Modules/ToFHardware/mitkToFCameraMESASR4000ControllerStub.cpp

View Options

Modules/ToFHardware/mitkToFCameraMESASR4000Device.cpp

View Options

Modules/ToFHardware/mitkToFCameraMESASR4000Device.h

View Options

Modules/ToFHardware/mitkToFHardware.cmake

View Options

Modules/ToFHardware/mitkToFImageGrabberCreator.cpp

View Options

Modules/ToFHardware/mitkToFImageGrabberCreator.h

View Options

Modules/ToFProcessing/mitkToFDistanceImageToSurfaceFilter.cpp

View Options

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp

View Options

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.h

View Options

Modules/ToFUI/Qmitk/QmitkToFConnectionWidgetControls.ui

View Options

Modules/ToFUI/Qmitk/QmitkToFMESAParameterWidget.cpp

View Options

Modules/ToFUI/Qmitk/QmitkToFMESAParameterWidget.h

View Options

Modules/ToFUI/Qmitk/QmitkToFMESAParameterWidgetControls.ui

View Options

Modules/ToFUI/Qmitk/QmitkToFPMDParameterWidget.cpp

View Options

Modules/ToFUI/Qmitk/QmitkToFPMDParameterWidget.h

View Options

Modules/ToFUI/Qmitk/QmitkToFPMDParameterWidgetControls.ui

View Options

Merge branch 'bug-8124-MESAIntegration'c05c6afd158dActions

Description

Details

Event Timeline

Merged Changes

Changes (25)

rMITKc05c6afd158d

Modules/ToFHardware/CMakeLists.txt

Modules/ToFHardware/files.cmake

Modules/ToFHardware/mitkToFCameraMESAController.cpp

Modules/ToFHardware/mitkToFCameraMESAController.h

Modules/ToFHardware/mitkToFCameraMESADevice.cpp

Modules/ToFHardware/mitkToFCameraMESADevice.h

Modules/ToFHardware/mitkToFCameraMESASR4000Controller.cpp

Modules/ToFHardware/mitkToFCameraMESASR4000Controller.h

Modules/ToFHardware/mitkToFCameraMESASR4000ControllerStub.cpp

Modules/ToFHardware/mitkToFCameraMESASR4000Device.cpp

Modules/ToFHardware/mitkToFCameraMESASR4000Device.h

Modules/ToFHardware/mitkToFHardware.cmake

Modules/ToFHardware/mitkToFImageGrabberCreator.cpp

Modules/ToFHardware/mitkToFImageGrabberCreator.h

Modules/ToFProcessing/mitkToFDistanceImageToSurfaceFilter.cpp

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.h

Modules/ToFUI/Qmitk/QmitkToFConnectionWidgetControls.ui

Modules/ToFUI/Qmitk/QmitkToFMESAParameterWidget.cpp

Modules/ToFUI/Qmitk/QmitkToFMESAParameterWidget.h

Modules/ToFUI/Qmitk/QmitkToFMESAParameterWidgetControls.ui

Modules/ToFUI/Qmitk/QmitkToFPMDParameterWidget.cpp

Modules/ToFUI/Qmitk/QmitkToFPMDParameterWidget.h

Modules/ToFUI/Qmitk/QmitkToFPMDParameterWidgetControls.ui

Modules/ToFUI/files.cmake

Merge branch 'bug-8124-MESAIntegration'
c05c6afd158d
Actions