Diffusion MITK baef296a878f

Merge branch 'bug-8364-UseCameraCalibrationInToFProcessing' into bug-8311…
baef296a878f
Actions

Description

Merge branch 'bug-8364-UseCameraCalibrationInToFProcessing' into bug-8311-NavigationDataHandEyeCalibrationFilter

Details

Provenance

seitela

Authored on Jun 4 2011, 2:44 PM

Parents

rMITK63358d3ee67b: Removed mitkPinholeCameraModel
rMITKa819f3096a6a: Added documentation

Branches

Unknown

Tags

Unknown

Event Timeline

seitela committed rMITKbaef296a878f: Merge branch 'bug-8364-UseCameraCalibrationInToFProcessing' into bug-8311… (authored by seitela).Jun 4 2011, 2:44 PM

Merged Changes

63358d3ee67b Removed mitkPinholeCameraModel
Author
seitela
Browse Repository
No Builds
No Audits
da8ee33543b2 Replaced PinholeCameraModel by CameraIntrinsics
Author
seitela
Browse Repository
No Builds
No Audits
9fb2f3f42e32 Replaced PinholeCameraModel with CameraIntrinsics in…
Author
seitela
Browse Repository
No Builds
No Audits
83d354b7492c Merge branch 'bug-8357-camera-calibration-module'
Author
muellerm
Browse Repository
No Builds
No Audits
090ced8325b4 COMP: removed wrong includes
Author
muellerm
Browse Repository
No Builds
No Audits
30f5d9de7202 Merge branch 'bug-8357-camera-calibration-module'
Author
muellerm
Browse Repository
No Builds
No Audits
00156f9727f0 COMP: fixed include type
Author
muellerm
Browse Repository
No Builds
No Audits
cdcaa2e59407 Merge branch 'bug-8357-camera-calibration-module'
Author
muellerm
Browse Repository
No Builds
No Audits
05d45ebbe709 COMP: Inserted correct export macro
Author
muellerm
Browse Repository
No Builds
No Audits
8ada8a82e48d Merge branch 'bug-8357-camera-calibration-module'
Author
muellerm
Browse Repository
No Builds
No Audits
fc3167a42553 Added public CameraCalibration interface classes
Author
muellerm
Browse Repository
No Builds
No Audits
717fc4ff6d82 Merge branch 'bug-8311-NavigationDataHandEyeCalibrationFilter'
Author
seitela
Browse Repository
No Builds
No Audits
e37aa21a5764 Merge branch 'bug-8325-TrackingDeviceSourceConfiguratorTest'
Author
franza
Browse Repository
No Builds
No Audits
84734c2caba3 COMP (#8325): made casts compatible to linux c++ compiler
Author
franza
Browse Repository
No Builds
No Audits
216edb28c8c7 Merge branch 'bug-8325-TrackingDeviceSourceConfiguratorTest'
Author
franza
Browse Repository
No Builds
No Audits
92d3e86e1ee5 Finished implementation of test of TrackingDeviceSourceConfigurator
Author
franza
Browse Repository
No Builds
No Audits
f074880c6208 fixed a bug when the NavigationToolStorage is NULL
Author
franza
Browse Repository
No Builds
No Audits
8529f33144ac Merge branch 'bug-8146-RefactoringGeometry2DDataVtkMapper3D'
Author
• kilgus
Browse Repository
No Builds
No Audits
0d5b996cf335 Merge branch 'bug-8219-dicom-sorter-crash'
Author
nolden
Browse Repository
No Builds
No Audits
f2c165d8e361 Merge branch 'bug-6077-dcmtk-package'
Author
nolden
Browse Repository
No Builds
No Audits
3298b46cfafc Merge branch 'bug-8317-ImproveTestTrackingVolumeGenerator'
Author
franza
Browse Repository
No Builds
No Audits
88f5990c2e78 COMP (#8317): Triggering dashboard, also inserted comment
Author
franza
Browse Repository
No Builds
No Audits
d146b33a0a2b began implementation of test
Author
franza
Browse Repository
No Builds
No Audits
dc71b2f9fb88 Merge branch 'bug-8327-ReadNineComponentTensorImages'
Author
neher
Browse Repository
No Builds
No Audits
0c6bea87ee9b checking for nine component image and reading correct six values to import…
Author
neher
Browse Repository
No Builds
No Audits
ef56c5c23da4 Added DCMTK as a "package" to the MITK build system
Author
nolden
Browse Repository
No Builds
No Audits
44c2bd534c73 Simplified some code
Author
nolden
Browse Repository
No Builds
No Audits
881693b97dda Merge branch 'bug-8317-ImproveTestTrackingVolumeGenerator'
Author
franza
Browse Repository
No Builds
No Audits
e60337bf8214 fixed a bug in case of an invalid tracking device
Author
franza
Browse Repository
No Builds
No Audits
8637758766fc improved test coverage of TrackingVolumeGeneratorTest
Author
franza
Browse Repository
No Builds
No Audits
560d597c2a95 Merge branch 'bug-8012-DuplicateAnchorsInDoxygen'
Author
gergel
Browse Repository
No Builds
No Audits
b195953af3e0 corrected documentation anchors in manual.dox filein manual.dox files
Author
gergel
Browse Repository
No Builds
No Audits
092876e873b3 Merge branch 'bug-6683-tiny-xml-is-not-locale-independant'
Author
• groch
Browse Repository
No Builds
No Audits
ce8329ae5717 Merge branch 'bug-8012-DuplicateAnchorsInDoxygen'
Author
gergel
Browse Repository
No Builds
No Audits
219a92c4a4b5 removed duplicate anchor EVENTS in interaction.dox
Author
gergel
Browse Repository
No Builds
No Audits
839b9740ae1f added the proposed code of metabug 2474 to tiny xml in order to make it locale…
Author
• groch
Browse Repository
No Builds
No Audits
daf581208b46 Added a few checks for DICOM tags that may be missing
Author
nolden
Browse Repository
No Builds
No Audits
49141414feea Added documentation for used properties, the mapper is using the TNodePredicate…
Author
• kilgus
Browse Repository
No Builds
No Audits
89537998a0be removed uneccesary lines
Author
• kilgus
Browse Repository
No Builds
No Audits
c37ce857a6b9 Changed unnecessary members into local variables.
Author
• kilgus
Browse Repository
No Builds
No Audits
3fb838bb41e9 Removed unused method FindPowerOfTwo and added documentation for…
Author
• kilgus
Browse Repository
No Builds
No Audits
699ab86af8b6 Cleaned up GenerateData as good as possible
Author
• kilgus
Browse Repository
No Builds
No Audits
4a0d880cbbb4 removed unused comments and commented out code
Author
• kilgus
Browse Repository
No Builds
No Audits
e8ac8cf95a94 Merge branch 'bug-7557-UseColorProperty'
Author
• kilgus
Browse Repository
No Builds
No Audits
663f70da385c Added Geralds quick fix for the 3D color.
Author
• kilgus
Browse Repository
No Builds
No Audits

Changes (48)

Path

Size

Packages

CMake/

FindDCMTK.cmake

O1: MITK Reviewer Group I

PackageDepends/

MITK_DCMTK_Config.cmake

O1: MITK Reviewer Group I

Core/

Code/

IO/

mitkDicomSeriesReader.cpp

Rendering/

mitkGeometry2DDataVtkMapper3D.cpp

mitkGeometry2DDataVtkMapper3D.h

Documentation/

Doxygen/

Interaction.dox

Modules/

Bundles/

org.mitk.gui.qt.igtnavigationtoolmanager/

documentation/

Manual/

Manual.dox

org.mitk.gui.qt.igttrackingtoolbox/

documentation/

Manual/

Manual.dox

org.mitk.gui.qt.navigationdataplayer/

documentation/

Manual/

Manual.dox

org.mitk.gui.qt.toftutorial/

documentation/

Manual/

Manual.dox

src/

internal/

QmitkToFTutorialView.cpp

mitkCameraIntrinsics.cpp

mitkCameraIntrinsics.h

mitkCvMatFromVnlMatrix.h

mitkCvMatFromVnlVector.h

mitkVnlMatrixFromCvMat.h

mitkVnlVectorCaster.h

mitkVnlVectorFromCvMat.h

mitkXMLSerializable.cpp

mitkXMLSerializable.h

DiffusionImaging/

IODataStructures/

TensorImages/

mitkNrrdTensorImageReader.cpp

IGT/

IGTFilters/

mitkTrackingDeviceSourceConfigurator.cpp

mitkTrackingVolumeGenerator.cpp

Testing/

files.cmake

mitkTrackingDeviceSourceConfiguratorTest.cpp

mitkTrackingVolumeGeneratorTest.cpp

ToFProcessing/

CMakeLists.txt

Testing/

mitkToFDistanceImageToPointSetFilterTest.cpp

mitkToFDistanceImageToSurfaceFilterTest.cpp

files.cmake

mitkPinholeCameraModel.cpp

mitkPinholeCameraModel.h

mitkToFDistanceImageToPointSetFilter.cpp

mitkToFDistanceImageToPointSetFilter.h

mitkToFDistanceImageToSurfaceFilter.cpp

mitkToFDistanceImageToSurfaceFilter.h

Utilities/

tinyxml/

tinyxml.cpp

rMITKbaef296a878f

View Options

CMake/FindDCMTK.cmake

View Options

CMake/PackageDepends/MITK_DCMTK_Config.cmake

View Options

Core/Code/IO/mitkDicomSeriesReader.cpp

View Options

Core/Code/Rendering/mitkGeometry2DDataVtkMapper3D.cpp

View Options

Core/Code/Rendering/mitkGeometry2DDataVtkMapper3D.h

View Options

Documentation/Doxygen/Interaction.dox

View Options

Modules/Bundles/org.mitk.gui.qt.igtnavigationtoolmanager/documentation/Manual/Manual.dox

View Options

Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/documentation/Manual/Manual.dox

View Options

Modules/Bundles/org.mitk.gui.qt.navigationdataplayer/documentation/Manual/Manual.dox

View Options

Modules/Bundles/org.mitk.gui.qt.toftutorial/documentation/Manual/Manual.dox

View Options

Modules/Bundles/org.mitk.gui.qt.toftutorial/src/internal/QmitkToFTutorialView.cpp

View Options

Modules/CMakeLists.txt

View Options

Modules/CameraCalibration/CMakeLists.txt

View Options

Modules/CameraCalibration/files.cmake

View Options

Modules/CameraCalibration/mitkAlgorithm.h

View Options

Modules/CameraCalibration/mitkCameraIntrinsics.cpp

View Options

Modules/CameraCalibration/mitkCameraIntrinsics.h

View Options

Modules/CameraCalibration/mitkCvMatFromVnlMatrix.h

View Options

Modules/CameraCalibration/mitkCvMatFromVnlVector.h

View Options

Modules/CameraCalibration/mitkEndoDebug.cpp

View Options

Modules/CameraCalibration/mitkEndoDebug.h

View Options

Modules/CameraCalibration/mitkEndoMacros.h

View Options

Modules/CameraCalibration/mitkObservable.h

View Options

Modules/CameraCalibration/mitkTransform.cpp

View Options

Modules/CameraCalibration/mitkTransform.h

View Options

Modules/CameraCalibration/mitkVnlMatrixFromCvMat.h

View Options

Modules/CameraCalibration/mitkVnlVectorCaster.h

View Options

Modules/CameraCalibration/mitkVnlVectorFromCvMat.h

View Options

Modules/CameraCalibration/mitkXMLSerializable.cpp

View Options

Modules/CameraCalibration/mitkXMLSerializable.h

View Options

Modules/DiffusionImaging/IODataStructures/TensorImages/mitkNrrdTensorImageReader.cpp

View Options

Modules/IGT/IGTFilters/mitkTrackingDeviceSourceConfigurator.cpp

View Options

Modules/IGT/IGTFilters/mitkTrackingVolumeGenerator.cpp

View Options

Modules/IGT/Testing/files.cmake

View Options

Modules/IGT/Testing/mitkTrackingDeviceSourceConfiguratorTest.cpp

View Options

Modules/IGT/Testing/mitkTrackingVolumeGeneratorTest.cpp

View Options

Modules/ToFProcessing/CMakeLists.txt

View Options

Modules/ToFProcessing/Testing/mitkToFDistanceImageToPointSetFilterTest.cpp

View Options

Modules/ToFProcessing/Testing/mitkToFDistanceImageToSurfaceFilterTest.cpp

View Options

Modules/ToFProcessing/files.cmake

View Options

Modules/ToFProcessing/mitkPinholeCameraModel.cpp

View Options

Modules/ToFProcessing/mitkPinholeCameraModel.h

View Options

Modules/ToFProcessing/mitkToFDistanceImageToPointSetFilter.cpp

View Options

Modules/ToFProcessing/mitkToFDistanceImageToPointSetFilter.h

View Options

Modules/ToFProcessing/mitkToFDistanceImageToSurfaceFilter.cpp

View Options

Modules/ToFProcessing/mitkToFDistanceImageToSurfaceFilter.h

View Options

Utilities/tinyxml/tinyxml.cpp

Merge branch 'bug-8364-UseCameraCalibrationInToFProcessing' into bug-8311…baef296a878fActions

Description

Details

Event Timeline

Merged Changes

Changes (48)

rMITKbaef296a878f

CMake/FindDCMTK.cmake

CMake/PackageDepends/MITK_DCMTK_Config.cmake

Core/Code/IO/mitkDicomSeriesReader.cpp

Core/Code/Rendering/mitkGeometry2DDataVtkMapper3D.cpp

Core/Code/Rendering/mitkGeometry2DDataVtkMapper3D.h

Documentation/Doxygen/Interaction.dox

Modules/Bundles/org.mitk.gui.qt.igtnavigationtoolmanager/documentation/Manual/Manual.dox

Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/documentation/Manual/Manual.dox

Modules/Bundles/org.mitk.gui.qt.navigationdataplayer/documentation/Manual/Manual.dox

Modules/Bundles/org.mitk.gui.qt.toftutorial/documentation/Manual/Manual.dox

Modules/Bundles/org.mitk.gui.qt.toftutorial/src/internal/QmitkToFTutorialView.cpp

Modules/CMakeLists.txt

Modules/CameraCalibration/CMakeLists.txt

Modules/CameraCalibration/files.cmake

Modules/CameraCalibration/mitkAlgorithm.h

Modules/CameraCalibration/mitkCameraIntrinsics.cpp

Modules/CameraCalibration/mitkCameraIntrinsics.h

Modules/CameraCalibration/mitkCvMatFromVnlMatrix.h

Modules/CameraCalibration/mitkCvMatFromVnlVector.h

Modules/CameraCalibration/mitkEndoDebug.cpp

Modules/CameraCalibration/mitkEndoDebug.h

Modules/CameraCalibration/mitkEndoMacros.h

Modules/CameraCalibration/mitkObservable.h

Modules/CameraCalibration/mitkTransform.cpp

Modules/CameraCalibration/mitkTransform.h

Modules/CameraCalibration/mitkVnlMatrixFromCvMat.h

Modules/CameraCalibration/mitkVnlVectorCaster.h

Modules/CameraCalibration/mitkVnlVectorFromCvMat.h

Modules/CameraCalibration/mitkXMLSerializable.cpp

Modules/CameraCalibration/mitkXMLSerializable.h

Modules/DiffusionImaging/IODataStructures/TensorImages/mitkNrrdTensorImageReader.cpp

Modules/IGT/IGTFilters/mitkTrackingDeviceSourceConfigurator.cpp

Modules/IGT/IGTFilters/mitkTrackingVolumeGenerator.cpp

Modules/IGT/Testing/files.cmake

Modules/IGT/Testing/mitkTrackingDeviceSourceConfiguratorTest.cpp

Modules/IGT/Testing/mitkTrackingVolumeGeneratorTest.cpp

Modules/ToFProcessing/CMakeLists.txt

Modules/ToFProcessing/Testing/mitkToFDistanceImageToPointSetFilterTest.cpp

Modules/ToFProcessing/Testing/mitkToFDistanceImageToSurfaceFilterTest.cpp

Modules/ToFProcessing/files.cmake

Modules/ToFProcessing/mitkPinholeCameraModel.cpp

Modules/ToFProcessing/mitkPinholeCameraModel.h

Modules/ToFProcessing/mitkToFDistanceImageToPointSetFilter.cpp

Modules/ToFProcessing/mitkToFDistanceImageToPointSetFilter.h

Modules/ToFProcessing/mitkToFDistanceImageToSurfaceFilter.cpp

Modules/ToFProcessing/mitkToFDistanceImageToSurfaceFilter.h

Utilities/tinyxml/tinyxml.cpp

Merge branch 'bug-8364-UseCameraCalibrationInToFProcessing' into bug-8311…
baef296a878f
Actions