HomePhabricator
Diffusion MITK 2c129dabbde3

Merge branch 'bug-10773-IntegrationBranchKinect' into bug-10773…
2c129dabbde3
Actions

Description

Merge branch 'bug-10773-IntegrationBranchKinect' into bug-10773-IntegrationBranchKinect2

Conflicts:
Modules/ToFHardware/Testing/mitkToFPicImageWriterTest.cpp
Modules/ToFHardware/mitkToFPicImageWriter.cpp
Modules/ToFHardware/mitkToFPicImageWriter.h

Details

Provenance
seitelaAuthored on May 22 2012, 11:17 AM
Parents
rMITK6caa796b7166: Removed tabs
rMITK7f8dd395d064: Merge branch 'bug-11800-overlaycontroller-no-longer-calls-immediate-show…
Branches
Unknown
Tags
Unknown

Merged Changes

Changes (58)

PathSize
Modules/
ToFHardware/
Testing/
mitkKinectDevice.cpp
mitkToFCameraMESADevice.cpp
mitkKinectDevice.h
mitkToFCameraMESADevice.h
ToFUI/
Qmitk/
Plugins/
org.mitk.gui.qt.tofutil/
src/
internal/

rMITK2c129dabbde3

View Options

Modules/ToFHardware/CMakeLists.txt

Loading...
View Options

Modules/ToFHardware/Testing/files.cmake

Loading...
View Options

Modules/ToFHardware/Testing/mitkKinectControllerTest.cpp

Loading...
View Options

Modules/ToFHardware/Testing/mitkKinectDeviceTest.cpp

Loading...
View Options

Modules/ToFHardware/Testing/mitkToFPicImageWriterTest.cpp

Loading...
View Options

Modules/ToFHardware/files.cmake

Loading...
View Options

Modules/ToFHardware/mitkKinectController.cpp

Loading...
View Options

Modules/ToFHardware/mitkKinectController.h

Loading...
View Options

Modules/ToFHardware/mitkKinectControllerStub.cpp

Loading...
View Options

Modules/ToFHardware/mitkKinectDevice.cpp

Loading...
View Options

Modules/ToFHardware/mitkKinectDevice.h

Loading...
View Options

Modules/ToFHardware/mitkToFCameraDevice.cpp

Loading...
View Options

Modules/ToFHardware/mitkToFCameraDevice.h

Loading...
View Options

Modules/ToFHardware/mitkToFCameraMESADevice.cpp

Loading...
View Options

Modules/ToFHardware/mitkToFCameraMESADevice.h

Loading...
View Options

Modules/ToFHardware/mitkToFCameraMESASR4000Device.cpp

Loading...
View Options

Modules/ToFHardware/mitkToFCameraMITKPlayerController.cpp

Loading...
View Options

Modules/ToFHardware/mitkToFCameraMITKPlayerController.h

Loading...
View Options

Modules/ToFHardware/mitkToFCameraMITKPlayerDevice.cpp

Loading...
View Options

Modules/ToFHardware/mitkToFCameraMITKPlayerDevice.h

Loading...
View Options

Modules/ToFHardware/mitkToFCameraPMDCamBoardDevice.cpp

Loading...
View Options

Modules/ToFHardware/mitkToFCameraPMDCamCubeDevice.cpp

Loading...
View Options

Modules/ToFHardware/mitkToFCameraPMDDevice.cpp

Loading...
View Options

Modules/ToFHardware/mitkToFCameraPMDDevice.h

Loading...
View Options

Modules/ToFHardware/mitkToFCameraPMDPlayerDevice.cpp

Loading...
View Options

Modules/ToFHardware/mitkToFCameraPMDRawDataCamBoardDevice.cpp

Loading...
View Options

Modules/ToFHardware/mitkToFCameraPMDRawDataCamCubeDevice.cpp

Loading...
View Options

Modules/ToFHardware/mitkToFCameraPMDRawDataDevice.cpp

Loading...
View Options

Modules/ToFHardware/mitkToFCameraPMDRawDataDevice.h

Loading...
View Options

Modules/ToFHardware/mitkToFConfig.h.in

Loading...
View Options

Modules/ToFHardware/mitkToFHardware.cmake

Loading...
View Options

Modules/ToFHardware/mitkToFImageCsvWriter.cpp

Loading...
View Options

Modules/ToFHardware/mitkToFImageCsvWriter.h

Loading...
View Options

Modules/ToFHardware/mitkToFImageGrabber.cpp

Loading...
View Options

Modules/ToFHardware/mitkToFImageGrabber.h

Loading...
View Options

Modules/ToFHardware/mitkToFImageRecorder.cpp

Loading...
View Options

Modules/ToFHardware/mitkToFImageRecorder.h

Loading...
View Options

Modules/ToFHardware/mitkToFImageRecorderFilter.cpp

Loading...
View Options

Modules/ToFHardware/mitkToFImageWriter.cpp

Loading...
View Options

Modules/ToFHardware/mitkToFImageWriter.h

Loading...
View Options

Modules/ToFHardware/mitkToFNrrdImageWriter.cpp

Loading...
View Options

Modules/ToFHardware/mitkToFNrrdImageWriter.h

Loading...
View Options

Modules/ToFHardware/mitkToFOpenCVImageGrabber.cpp

Loading...
View Options

Modules/ToFHardware/mitkToFPicImageWriter.cpp

Loading...
View Options

Modules/ToFHardware/mitkToFPicImageWriter.h

Loading...
View Options

Modules/ToFUI/Qmitk/QmitkKinectParameterWidget.cpp

Loading...
View Options

Modules/ToFUI/Qmitk/QmitkKinectParameterWidget.h

Loading...
View Options

Modules/ToFUI/Qmitk/QmitkKinectParameterWidgetControls.ui

Loading...
View Options

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp

Loading...
View Options

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.h

Loading...
View Options

Modules/ToFUI/Qmitk/QmitkToFConnectionWidgetControls.ui

Loading...
View Options

Modules/ToFUI/Qmitk/QmitkToFRecorderWidget.cpp

Loading...
View Options

Modules/ToFUI/Qmitk/QmitkToFRecorderWidget.h

Loading...
View Options

Modules/ToFUI/Qmitk/QmitkToFVisualisationSettingsWidget.cpp

Loading...
View Options

Modules/ToFUI/Qmitk/QmitkToFVisualisationSettingsWidget.h

Loading...
View Options

Modules/ToFUI/files.cmake

Loading...
View Options

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp

Loading...
View Options

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.h

Loading...
MITK · MIC · IMSY · DKFZ