Merge branch 'bug-6888-AllowConfigurationOfToFDevicesViaConfigurationFile'
35a760afaa77
Actions

Description

Merge branch 'bug-6888-AllowConfigurationOfToFDevicesViaConfigurationFile'

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

Details

Provenance

seitela

Authored on Jan 14 2013, 1:22 PM

Parents

rMITK43d60be8b21b: Allow user to load CameraIntrinsics when connecting to camera
rMITK7fec77c4d23e: Merge branch 'bug-13725-cleanupMultiShellQballReconstructionFilter'

Branches

Unknown

Tags

Unknown

Event Timeline

seitela committed rMITK35a760afaa77: Merge branch 'bug-6888-AllowConfigurationOfToFDevicesViaConfigurationFile' (authored by seitela).Jan 14 2013, 1:22 PM

Merged Changes

43d60be8b21b Allow user to load CameraIntrinsics when connecting to camera
Author
seitela
Browse Repository
No Builds
No Audits
c3b6d227fb05 Added property for CameraIntrinsics
Author
seitela
Browse Repository
No Builds
No Audits
a676c5245c11 Added property
Author
seitela
Browse Repository
No Builds
No Audits
2b5c042a8571 Added property for CameraIntrinsics object
Author
seitela
Browse Repository
No Builds
No Audits

Changes (9)

Path

Size

Modules/

CameraCalibration/

files.cmake

ToFHardware/

mitkToFImageGrabber.cpp

ToFUI/

Qmitk/

QmitkToFConnectionWidget.cpp

QmitkToFPointSetWidget.cpp

QmitkToFPointSetWidget.h

	Modules/	CameraCalibration/
	Core/	Code/

	mitkCameraIntrinsicsProperty.cpp/
	DataManagement/


	mitkTransferFunctionProperty.cpp

	mitkCameraIntrinsicsProperty.h/
	DataManagement/


	mitkTransferFunctionProperty.h

Plugins/

org.mitk.gui.qt.tofutil/

src/

internal/

QmitkToFUtilView.cpp

QmitkToFUtilView.h

rMITK35a760afaa77

View Options

Modules/CameraCalibration/files.cmake

View Options

Modules/CameraCalibration/mitkCameraIntrinsicsProperty.cpp

View Options

Modules/CameraCalibration/mitkCameraIntrinsicsProperty.h

View Options

Modules/ToFHardware/mitkToFImageGrabber.cpp

View Options

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp

View Options

Modules/ToFUI/Qmitk/QmitkToFPointSetWidget.cpp

View Options

Modules/ToFUI/Qmitk/QmitkToFPointSetWidget.h

View Options

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

View Options

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

Merge branch 'bug-6888-AllowConfigurationOfToFDevicesViaConfigurationFile'35a760afaa77Actions

Description

Details

Event Timeline

Merged Changes

Changes (9)

rMITK35a760afaa77

Modules/CameraCalibration/files.cmake

Modules/CameraCalibration/mitkCameraIntrinsicsProperty.cpp

Modules/CameraCalibration/mitkCameraIntrinsicsProperty.h

Modules/ToFHardware/mitkToFImageGrabber.cpp

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp

Modules/ToFUI/Qmitk/QmitkToFPointSetWidget.cpp

Modules/ToFUI/Qmitk/QmitkToFPointSetWidget.h

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

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

Merge branch 'bug-6888-AllowConfigurationOfToFDevicesViaConfigurationFile'
35a760afaa77
Actions