Merge branch 'bug-15825-IntegrationBranch_2_TrackingVolume' into bug-15963…
b0947fbb6ecb
Actions

Description

Merge branch 'bug-15825-IntegrationBranch_2_TrackingVolume' into bug-15963-IGTCodingBase2

Details

Provenance

Authored on Oct 16 2013, 7:32 PM

Parents

rMITKbf5eb4622feb: some documentation / cosmetic changes
rMITK864f670a335e: Merge branch 'bug-15715-IntegrationBranch' into bug-15963-IGTCodingBase2…

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITKb0947fbb6ecb: Merge branch 'bug-15825-IntegrationBranch_2_TrackingVolume' into bug-15963… (authored by franza).Oct 16 2013, 7:32 PM

Merged Changes

bf5eb4622feb some documentation / cosmetic changes
Author
franza
Browse Repository
No Builds
No Audits
31e64ae356ed some documentation and renaming
Author
franza
Browse Repository
No Builds
No Audits
24cb75a81ad4 Extended Pyramid added in cmakelist.txt
Author
• engelhsa
Browse Repository
No Builds
No Audits
6f2c07a325c3 hardware hexcode added in trackingDeviceData.
Author
• engelhsa
Browse Repository
No Builds
No Audits
0262fad12003 working version without hexcode. enum NDITrackingVolume is deleted.
Author
• engelhsa
Browse Repository
No Builds
No Audits
4ff9419acc4a working extended pyramid api call
Author
• engelhsa
Browse Repository
No Builds
No Audits

Changes (12)

Path

Size

Modules/

IGT/

CMakeLists.txt

Common/

mitkTrackingTypes.h

Resources/

NDIPolaris.stl

	NDIPolarisOldModel.stl
	StandardVolume.stl

NDIPolarisSpectra.stl

NDIPolarisSpectraExtendedPyramid.stl

StandardVolume.stl

TrackingDevices/

mitkNDIProtocol.cpp

mitkNDIProtocol.h

mitkNDITrackingDevice.cpp

mitkNDITrackingDevice.h

files.cmake

rMITKb0947fbb6ecb

View Options

Modules/IGT/CMakeLists.txt

View Options

Modules/IGT/Common/mitkTrackingTypes.h

View Options

Modules/IGT/Resources/NDIPolaris.stl

View Options

Modules/IGT/Resources/NDIPolarisOldModel.stl

View Options

Modules/IGT/Resources/NDIPolarisSpectra.stl

View Options

Modules/IGT/Resources/NDIPolarisSpectraExtendedPyramid.stl

View Options

Modules/IGT/Resources/StandardVolume.stl

View Options

Modules/IGT/TrackingDevices/mitkNDIProtocol.cpp

View Options

Modules/IGT/TrackingDevices/mitkNDIProtocol.h

View Options

Modules/IGT/TrackingDevices/mitkNDITrackingDevice.cpp

View Options

Modules/IGT/TrackingDevices/mitkNDITrackingDevice.h

View Options

Merge branch 'bug-15825-IntegrationBranch_2_TrackingVolume' into bug-15963…b0947fbb6ecbActions

Description

Details

Event Timeline

Merged Changes

Changes (12)

rMITKb0947fbb6ecb

Modules/IGT/CMakeLists.txt

Modules/IGT/Common/mitkTrackingTypes.h

Modules/IGT/Resources/NDIPolaris.stl

Modules/IGT/Resources/NDIPolarisOldModel.stl

Modules/IGT/Resources/NDIPolarisSpectra.stl

Modules/IGT/Resources/NDIPolarisSpectraExtendedPyramid.stl

Modules/IGT/Resources/StandardVolume.stl

Modules/IGT/TrackingDevices/mitkNDIProtocol.cpp

Modules/IGT/TrackingDevices/mitkNDIProtocol.h

Modules/IGT/TrackingDevices/mitkNDITrackingDevice.cpp

Modules/IGT/TrackingDevices/mitkNDITrackingDevice.h

Modules/IGT/files.cmake

Merge branch 'bug-15825-IntegrationBranch_2_TrackingVolume' into bug-15963…
b0947fbb6ecb
Actions