Diffusion MITK f133d34fa424

Merge branch 'bug-12100-FinalIntegration'
f133d34fa424
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-12100-FinalIntegration'

Details

Provenance

Authored on Dec 6 2012, 5:37 PM

Parents

rMITK110860f78c1e: Some GUI changes to widgets used in ToFUtil
rMITKdb342dc0e827: Merge branch 'bug-13883-imageAccessor'

Branches

Unknown

Tags

Unknown

Event Timeline

seitela committed rMITKf133d34fa424: Merge branch 'bug-12100-FinalIntegration' (authored by seitela).Dec 6 2012, 5:37 PM

Merged Changes

110860f78c1e Some GUI changes to widgets used in ToFUtil
Author
seitela
Browse Repository
No Builds
No Audits
5abc73fecf86 Changed layout of connection widget
Author
seitela
Browse Repository
No Builds
No Audits
6b6bf69b6f51 Initialize ToFCompositeFilterWidget after creating new object of…
Author
seitela
Browse Repository
No Builds
No Audits
2168f14fa3db Correctly handle IR image
Author
seitela
Browse Repository
No Builds
No Audits
4b72ed7a1a4a Changed names of cameras
Author
seitela
Browse Repository
No Builds
No Audits
c64ef0e678be Correctly re-initialize ToFImageGrabber in OnConnectCamera()
Author
seitela
Browse Repository
No Builds
No Audits
3d95896f78a3 Correctly evaluate return value of hardware interface in KinectController
Author
seitela
Browse Repository
No Builds
No Audits

Changes (15)

Path

Size

Modules/

ToFHardware/

Kinect/

mitkKinectController.cpp

mitkKinectDeviceFactory.h

MesaSR4000/

mitkToFCameraMESASR4000DeviceFactory.h

PMD/

mitkToFCameraPMDCamBoardDeviceFactory.h

mitkToFCameraPMDCamCubeDeviceFactory.h

mitkToFCameraPMDO3DeviceFactory.h

mitkToFCameraPMDPlayerDeviceFactory.h

mitkToFCameraPMDRawDataCamCubeDeviceFactory.h

mitkToFCameraMITKPlayerDeviceFactory.h

mitkToFImageGrabber.cpp

ToFUI/

Qmitk/

QmitkToFCompositeFilterWidgetControls.ui

QmitkToFConnectionWidget.cpp

QmitkToFConnectionWidgetControls.ui

QmitkToFPMDParameterWidgetControls.ui

Plugins/

org.mitk.gui.qt.tofutil/

src/

internal/

QmitkToFUtilView.cpp

rMITKf133d34fa424

Modules/ToFHardware/Kinect/mitkKinectController.cpp

Loading...

Modules/ToFHardware/Kinect/mitkKinectDeviceFactory.h

Loading...

Modules/ToFHardware/MesaSR4000/mitkToFCameraMESASR4000DeviceFactory.h

Loading...

Modules/ToFHardware/PMD/mitkToFCameraPMDCamBoardDeviceFactory.h

Loading...

Modules/ToFHardware/PMD/mitkToFCameraPMDCamCubeDeviceFactory.h

Loading...

Modules/ToFHardware/PMD/mitkToFCameraPMDO3DeviceFactory.h

Loading...

Modules/ToFHardware/PMD/mitkToFCameraPMDPlayerDeviceFactory.h

Loading...

Modules/ToFHardware/PMD/mitkToFCameraPMDRawDataCamCubeDeviceFactory.h

Loading...

Modules/ToFHardware/mitkToFCameraMITKPlayerDeviceFactory.h

Loading...

Modules/ToFHardware/mitkToFImageGrabber.cpp

Loading...

Modules/ToFUI/Qmitk/QmitkToFCompositeFilterWidgetControls.ui

Loading...

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp

Loading...

Modules/ToFUI/Qmitk/QmitkToFConnectionWidgetControls.ui

Loading...

Modules/ToFUI/Qmitk/QmitkToFPMDParameterWidgetControls.ui

Loading...

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

Loading...