Diffusion MITK 1686608f1a6f

Merge branch 'bug-8958-ChangeToFStandardFileFormat'
1686608f1a6f
Actions

Description

Merge branch 'bug-8958-ChangeToFStandardFileFormat'

Conflicts:
Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp

Details

Provenance

• mersmann

Authored on Sep 15 2011, 6:23 PM

Parents

rMITK2830ba5fcf81: Merge remote-tracking branch 'remotes/origin/bug-8958…
rMITKb803297bb26a: Merge branch 'bug-9404-DtiToQbi'

Branches

Unknown

Tags

Unknown

Event Timeline

• mersmann committed rMITK1686608f1a6f: Merge branch 'bug-8958-ChangeToFStandardFileFormat' (authored by • mersmann).Sep 15 2011, 6:23 PM

Merged Changes

2830ba5fcf81 Merge remote-tracking branch 'remotes/origin/bug-8958…
Author
• mersmann
Browse Repository
No Builds
No Audits
fd40ad69686d Adapted file filter
Author
seitela
Browse Repository
No Builds
No Audits
c8521147d13e Added missing include
Author
seitela
Browse Repository
No Builds
No Audits
b75488d704a3 Use defined exception
Author
seitela
Browse Repository
No Builds
No Audits
66af1d24d791 code cleanup, adapted the test cases and added new unit test for…
Author
• mersmann
Browse Repository
No Builds
No Audits
aa38c1f6e4aa Changed inheritance of ToFImageWriter. Make NrrdImageWriter work and set .nrrd…
Author
• mersmann
Browse Repository
No Builds
No Audits
4f505f155912 added class and test for nrrd file writing, implemented streaming for nrrd files
Author
• mersmann
Browse Repository
No Builds
No Audits
739e36f99fe1 start to remove .pic files from image recorder
Author
• mersmann
Browse Repository
No Builds
No Audits
0063f560e82e changed standard read file format to .nrrd images, adapted the test to check…
Author
• mersmann
Browse Repository
No Builds
No Audits

Changes (22)

Path

Size

Modules/

ToFHardware/

Testing/

files.cmake

mitkToFCameraMITKPlayerControllerTest.cpp

mitkToFImageCsvWriterTest.cpp

mitkToFImageWriterTest.cpp

	mitkToFNrrdImageWriterTest.cpp
	mitkToFImageWriterTest.cpp

	mitkToFPicImageWriterTest.cpp
	mitkToFImageWriterTest.cpp

files.cmake

mitkToFCameraMITKPlayerController.cpp

mitkToFCameraMITKPlayerController.h

mitkToFCameraPMDMITKPlayerController.cpp

mitkToFImageCsvWriter.cpp

mitkToFImageCsvWriter.h

mitkToFImageRecorder.cpp

mitkToFImageRecorder.h

mitkToFImageWriter.cpp

mitkToFImageWriter.h

mitkToFNrrdImageWriter.cpp

mitkToFNrrdImageWriter.h

	mitkToFPicImageWriter.cpp
	mitkToFImageWriter.cpp

mitkToFPicImageWriter.h

ToFUI/

Qmitk/

QmitkToFConnectionWidget.cpp

QmitkToFRecorderWidget.cpp

rMITK1686608f1a6f

View Options

Modules/ToFHardware/Testing/files.cmake

View Options

Modules/ToFHardware/Testing/mitkToFCameraMITKPlayerControllerTest.cpp

View Options

Modules/ToFHardware/Testing/mitkToFImageCsvWriterTest.cpp

View Options

Modules/ToFHardware/Testing/mitkToFImageWriterTest.cpp

View Options

Modules/ToFHardware/Testing/mitkToFNrrdImageWriterTest.cpp

View Options

Modules/ToFHardware/Testing/mitkToFPicImageWriterTest.cpp

View Options

Modules/ToFHardware/files.cmake

View Options

Modules/ToFHardware/mitkToFCameraMITKPlayerController.cpp

View Options

Modules/ToFHardware/mitkToFCameraMITKPlayerController.h

View Options

Modules/ToFHardware/mitkToFCameraPMDMITKPlayerController.cpp

View Options

Modules/ToFHardware/mitkToFImageCsvWriter.cpp

View Options

Modules/ToFHardware/mitkToFImageCsvWriter.h

View Options

Modules/ToFHardware/mitkToFImageRecorder.cpp

View Options

Modules/ToFHardware/mitkToFImageRecorder.h

View Options

Modules/ToFHardware/mitkToFImageWriter.cpp

View Options

Modules/ToFHardware/mitkToFImageWriter.h

View Options

Modules/ToFHardware/mitkToFNrrdImageWriter.cpp

View Options

Modules/ToFHardware/mitkToFNrrdImageWriter.h

View Options

Modules/ToFHardware/mitkToFPicImageWriter.cpp

View Options

Modules/ToFHardware/mitkToFPicImageWriter.h

View Options

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp

View Options

Modules/ToFUI/Qmitk/QmitkToFRecorderWidget.cpp

Merge branch 'bug-8958-ChangeToFStandardFileFormat'1686608f1a6fActions

Description

Details

Event Timeline

Merged Changes

Changes (22)

rMITK1686608f1a6f

Modules/ToFHardware/Testing/files.cmake

Modules/ToFHardware/Testing/mitkToFCameraMITKPlayerControllerTest.cpp

Modules/ToFHardware/Testing/mitkToFImageCsvWriterTest.cpp

Modules/ToFHardware/Testing/mitkToFImageWriterTest.cpp

Modules/ToFHardware/Testing/mitkToFNrrdImageWriterTest.cpp

Modules/ToFHardware/Testing/mitkToFPicImageWriterTest.cpp

Modules/ToFHardware/files.cmake

Modules/ToFHardware/mitkToFCameraMITKPlayerController.cpp

Modules/ToFHardware/mitkToFCameraMITKPlayerController.h

Modules/ToFHardware/mitkToFCameraPMDMITKPlayerController.cpp

Modules/ToFHardware/mitkToFImageCsvWriter.cpp

Modules/ToFHardware/mitkToFImageCsvWriter.h

Modules/ToFHardware/mitkToFImageRecorder.cpp

Modules/ToFHardware/mitkToFImageRecorder.h

Modules/ToFHardware/mitkToFImageWriter.cpp

Modules/ToFHardware/mitkToFImageWriter.h

Modules/ToFHardware/mitkToFNrrdImageWriter.cpp

Modules/ToFHardware/mitkToFNrrdImageWriter.h

Modules/ToFHardware/mitkToFPicImageWriter.cpp

Modules/ToFHardware/mitkToFPicImageWriter.h

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp

Modules/ToFUI/Qmitk/QmitkToFRecorderWidget.cpp

Merge branch 'bug-8958-ChangeToFStandardFileFormat'
1686608f1a6f
Actions