Diffusion MITK bb7361ec06b9

Merge branch 'bug-10773-KinectIntegration' into bug-10773…
bb7361ec06b9
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

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

Conflicts:
Modules/Bundles/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp
Modules/ToFHardware/files.cmake
Modules/ToFHardware/mitkToFHardware.cmake
Modules/ToFHardware/mitkToFImageGrabberCreator.cpp
Modules/ToFHardware/mitkToFImageGrabberCreator.h
Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp
Modules/ToFUI/files.cmake

Details

Provenance

Authored on May 14 2012, 4:46 PM

Parents

rMITKd4dfa06a3330: Simplified data acquisition
rMITK7aa2bf1c92fd: Merge branch 'bug-10412-CreateModuleMITK-US'

Branches

Unknown

Tags

Unknown

Event Timeline

seitela committed rMITKbb7361ec06b9: Merge branch 'bug-10773-KinectIntegration' into bug-10773… (authored by seitela).May 14 2012, 4:46 PM

Merged Changes

d4dfa06a3330 Simplified data acquisition
Author
seitela
Browse Repository
No Builds
No Audits
59710dc8e93e Allow configuration of Kinect camera via GUI widget. Especially switching…
Author
seitela
Browse Repository
No Builds
No Audits
7449a68040e5 Replaced deprecated call to functions GetScalarValue... of mitk::Image
Author
seitela
Browse Repository
No Builds
No Audits
cdbc481d15be Correctly show intensity / RGB image depending on device chosen
Author
seitela
Browse Repository
No Builds
No Audits
76973f5b5fc9 Changed interface of Get/SetProperty
Author
seitela
Browse Repository
No Builds
No Audits
91c161a87e14 Allow playing of recorded RGB images
Author
seitela
Browse Repository
No Builds
No Audits
24a5074c41ff Removed mitkToFPicImageWriter
Author
seitela
Browse Repository
No Builds
No Audits
e42c3f37fbc9 Removed member for RGB file
Author
seitela
Browse Repository
No Builds
No Audits
29d80cacb0a9 Correctly write data buffer to output file
Author
seitela
Browse Repository
No Builds
No Audits
8437a0adde18 Correctly initialize RGB image for saving
Author
seitela
Browse Repository
No Builds
No Audits
e2f7b1d1028b Added RGB image to ToF image writer classes
Author
seitela
Browse Repository
No Builds
No Audits
70d32b4abe7a Added RGB array to ToFImageRecorder to allow for recording of color images e.g.
Author
seitela
Browse Repository
No Builds
No Audits
d9910ab91f30 Merge branch 'bug-10773-KinectIntegration' of mitk.org:MITK into bug-10773…
Author
seitela
Browse Repository
No Builds
No Audits
fb2f00137d1d Added IR generator to KinectController. Initialize Generators manually and not…
Author
seitela
Browse Repository
No Builds
No Audits
f7f81729a778 Show RGB image (e.g. of Kinect camera) instead of intensity of (e.g. ToF camera)
Author
seitela
Browse Repository
No Builds
No Audits
774dd3b66bf1 Correctly set return value
Author
seitela
Browse Repository
No Builds
No Audits
cffc40eabe21 Simplified data acquisition
Author
seitela
Browse Repository
No Builds
No Audits
fc5a53fc69a5 Integration of RGB image in KinectDevice and dependent classes
Author
seitela
Browse Repository
No Builds
No Audits
0810eb2f6f6e First working version to acquire range images with Kinect
Author
seitela
Browse Repository
No Builds
No Audits
329aac66b5eb Initial version of Kinect controller
Author
seitela
Browse Repository
No Builds
No Audits

Changes (63)

Path

Size

Modules/

org.mitk.gui.qt.tofutil

QmitkToFUtilView.cpp

ToFHardware/

Testing/

	mitkKinectControllerTest.cpp
	mitkToFCameraPMDO3ControllerTest.cpp

	mitkKinectDeviceTest.cpp
	mitkToFCameraPMDO3ControllerTest.cpp

mitkToFPicImageWriterTest.cpp

mitkKinectController.cpp

mitkKinectController.h

mitkKinectControllerStub.cpp

	mitkKinectDevice.cpp
	mitkToFCameraMESADevice.cpp

	mitkKinectDevice.h
	mitkToFCameraMESADevice.h

mitkToFCameraDevice.cpp

mitkToFCameraDevice.h

mitkToFCameraMESADevice.cpp

mitkToFCameraMESADevice.h

mitkToFCameraMESASR4000Device.cpp

mitkToFCameraMITKPlayerController.cpp

mitkToFCameraMITKPlayerController.h

mitkToFCameraMITKPlayerDevice.cpp

mitkToFCameraMITKPlayerDevice.h

mitkToFCameraPMDCamBoardDevice.cpp

mitkToFCameraPMDCamCubeDevice.cpp

mitkToFCameraPMDDevice.cpp

mitkToFCameraPMDDevice.h

mitkToFCameraPMDPlayerDevice.cpp

mitkToFCameraPMDRawDataCamBoardDevice.cpp

mitkToFCameraPMDRawDataCamCubeDevice.cpp

mitkToFCameraPMDRawDataDevice.cpp

mitkToFCameraPMDRawDataDevice.h

mitkToFHardware.cmake

mitkToFImageCsvWriter.cpp

mitkToFImageCsvWriter.h

mitkToFImageGrabber.cpp

mitkToFImageGrabber.h

mitkToFImageGrabberCreator.cpp

mitkToFImageGrabberCreator.h

mitkToFImageRecorder.cpp

mitkToFImageRecorder.h

mitkToFImageRecorderFilter.cpp

mitkToFImageWriter.cpp

mitkToFImageWriter.h

mitkToFNrrdImageWriter.cpp

mitkToFNrrdImageWriter.h

mitkToFOpenCVImageGrabber.cpp

mitkToFPicImageWriter.cpp

mitkToFPicImageWriter.h

ToFUI/

Qmitk/

QmitkKinectParameterWidget.cpp

QmitkKinectParameterWidget.h

QmitkKinectParameterWidgetControls.ui

QmitkToFConnectionWidget.cpp

QmitkToFConnectionWidget.h

QmitkToFConnectionWidgetControls.ui

QmitkToFRecorderWidget.cpp

QmitkToFRecorderWidget.h

QmitkToFVisualisationSettingsWidget.cpp

QmitkToFVisualisationSettingsWidget.h

Plugins/

org.mitk.gui.qt.tofutil/

src/

internal/

QmitkToFUtilView.h

rMITKbb7361ec06b9

Modules/Bundles/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp

Loading...

Modules/ToFHardware/CMakeLists.txt

Loading...

Modules/ToFHardware/Testing/files.cmake

Loading...

Modules/ToFHardware/Testing/mitkKinectControllerTest.cpp

Loading...

Modules/ToFHardware/Testing/mitkKinectDeviceTest.cpp

Loading...

Modules/ToFHardware/Testing/mitkToFPicImageWriterTest.cpp

Loading...

Modules/ToFHardware/files.cmake

Loading...

Modules/ToFHardware/mitkKinectController.cpp

Loading...

Modules/ToFHardware/mitkKinectController.h

Loading...

Modules/ToFHardware/mitkKinectControllerStub.cpp

Loading...

Modules/ToFHardware/mitkKinectDevice.cpp

Loading...

Modules/ToFHardware/mitkKinectDevice.h

Loading...

Modules/ToFHardware/mitkToFCameraDevice.cpp

Loading...

Modules/ToFHardware/mitkToFCameraDevice.h

Loading...

Modules/ToFHardware/mitkToFCameraMESADevice.cpp

Loading...

Modules/ToFHardware/mitkToFCameraMESADevice.h

Loading...

Modules/ToFHardware/mitkToFCameraMESASR4000Device.cpp

Loading...

Modules/ToFHardware/mitkToFCameraMITKPlayerController.cpp

Loading...

Modules/ToFHardware/mitkToFCameraMITKPlayerController.h

Loading...

Modules/ToFHardware/mitkToFCameraMITKPlayerDevice.cpp

Loading...

Modules/ToFHardware/mitkToFCameraMITKPlayerDevice.h

Loading...

Modules/ToFHardware/mitkToFCameraPMDCamBoardDevice.cpp

Loading...

Modules/ToFHardware/mitkToFCameraPMDCamCubeDevice.cpp

Loading...

Modules/ToFHardware/mitkToFCameraPMDDevice.cpp

Loading...

Modules/ToFHardware/mitkToFCameraPMDDevice.h

Loading...

Modules/ToFHardware/mitkToFCameraPMDPlayerDevice.cpp

Loading...

Modules/ToFHardware/mitkToFCameraPMDRawDataCamBoardDevice.cpp

Loading...

Modules/ToFHardware/mitkToFCameraPMDRawDataCamCubeDevice.cpp

Loading...

Modules/ToFHardware/mitkToFCameraPMDRawDataDevice.cpp

Loading...

Modules/ToFHardware/mitkToFCameraPMDRawDataDevice.h

Loading...

Modules/ToFHardware/mitkToFHardware.cmake

Loading...

Modules/ToFHardware/mitkToFImageCsvWriter.cpp

Loading...

Modules/ToFHardware/mitkToFImageCsvWriter.h

Loading...

Modules/ToFHardware/mitkToFImageGrabber.cpp

Loading...

Modules/ToFHardware/mitkToFImageGrabber.h

Loading...

Modules/ToFHardware/mitkToFImageGrabberCreator.cpp

Loading...

Modules/ToFHardware/mitkToFImageGrabberCreator.h

Loading...

Modules/ToFHardware/mitkToFImageRecorder.cpp

Loading...

Modules/ToFHardware/mitkToFImageRecorder.h

Loading...

Modules/ToFHardware/mitkToFImageRecorderFilter.cpp

Loading...

Modules/ToFHardware/mitkToFImageWriter.cpp

Loading...

Modules/ToFHardware/mitkToFImageWriter.h

Loading...

Modules/ToFHardware/mitkToFNrrdImageWriter.cpp

Loading...

Modules/ToFHardware/mitkToFNrrdImageWriter.h

Loading...

Modules/ToFHardware/mitkToFOpenCVImageGrabber.cpp

Loading...

Modules/ToFHardware/mitkToFPicImageWriter.cpp

Loading...

Modules/ToFHardware/mitkToFPicImageWriter.h

Loading...

Modules/ToFUI/Qmitk/QmitkKinectParameterWidget.cpp

Loading...

Modules/ToFUI/Qmitk/QmitkKinectParameterWidget.h

Loading...

Modules/ToFUI/Qmitk/QmitkKinectParameterWidgetControls.ui

Loading...

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp

Loading...

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.h

Loading...

Modules/ToFUI/Qmitk/QmitkToFConnectionWidgetControls.ui

Loading...

Modules/ToFUI/Qmitk/QmitkToFRecorderWidget.cpp

Loading...

Modules/ToFUI/Qmitk/QmitkToFRecorderWidget.h

Loading...

Modules/ToFUI/Qmitk/QmitkToFVisualisationSettingsWidget.cpp

Loading...

Modules/ToFUI/Qmitk/QmitkToFVisualisationSettingsWidget.h

Loading...

Modules/ToFUI/files.cmake

Loading...

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

Loading...