Diffusion MITK aaeb389dc6cf

Merge branch 'bug-12952-IGTTrackingLabCleanUp' into bug-12952…
aaeb389dc6cf
Actions

Description

Merge branch 'bug-12952-IGTTrackingLabCleanUp' into bug-12952-IGTTrackingLabIntegrationAugust2013

Conflicts:
Plugins/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTrackingLabView.cpp

Details

Provenance

franza

Authored on Aug 28 2013, 1:58 PM

Parents

rMITK65357b97b5bf: introduced "inverse mode" in the UI for backward compatibility, will be…
rMITKaba2e3242c34: Merge branch 'bug-15915-TrkFilesComp'

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITKaaeb389dc6cf: Merge branch 'bug-12952-IGTTrackingLabCleanUp' into bug-12952… (authored by franza).Aug 28 2013, 1:58 PM

Merged Changes

65357b97b5bf introduced "inverse mode" in the UI for backward compatibility, will be removed…
Author
franza
Browse Repository
No Builds
No Audits
3e36bd258370 Updated documentation with some warnings for the programmer.
Author
franza
Browse Repository
No Builds
No Audits
d14e103875b4 adapted TrackingLab to changes
Author
franza
Browse Repository
No Builds
No Audits
acafb6eee4c5 reverted changes on mitk::transform which are not needed any more
Author
franza
Browse Repository
No Builds
No Audits
d5a79e401c30 Improved test: added tests for all constructors
Author
franza
Browse Repository
No Builds
No Audits
d5e837428492 now the permanent registration of the image is also done with the filter
Author
franza
Browse Repository
No Builds
No Audits
b99620120596 adapted toolbox to rotation modes of visualization filter
Author
franza
Browse Repository
No Builds
No Audits
9be70288056a added rotation modes to the visualization filter
Author
franza
Browse Repository
No Builds
No Audits
a535b25067ff activated filter for transform => better pipelining example now
Author
franza
Browse Repository
No Builds
No Audits
17bcb1192d93 some temporary changes to keep TrackingLab running
Author
franza
Browse Repository
No Builds
No Audits
804d2780dc18 changed the rotation mode to transpose for VNL compatibility of following…
Author
franza
Browse Repository
No Builds
No Audits
df9014e5155a removed unneeded character in file
Author
franza
Browse Repository
No Builds
No Audits
e962cd58ca1c added new feature: rotation mode. The device now has an option to set the…
Author
franza
Browse Repository
No Builds
No Audits
5045a67b734b removed unused member
Author
franza
Browse Repository
No Builds
No Audits
145565cb335e some fine-tuning and other default parameters for the registration
Author
franza
Browse Repository
No Builds
No Audits
5f189d6afde8 add distance depending update timer
Author
• kolbch
Browse Repository
No Builds
No Audits
17cf2911fe7a fixed bug when no image is selected
Author
franza
Browse Repository
No Builds
No Audits
fbecd52ddfaf hack for rotation calculation
Author
franza
Browse Repository
No Builds
No Audits
f48c9114b247 a lot of hacks: permanent registration of CT image finally working
Author
franza
Browse Repository
No Builds
No Audits
ac79bd50cb80 Quickfix of the wrong turn: multiplied the quaternion with (-1). This fixes the…
Author
franza
Browse Repository
No Builds
No Audits
e83f77488c55 changed rotation calculation method to the one of mitk::transform, so both can…
Author
franza
Browse Repository
No Builds
No Audits
f376f3e449d2 added separate method for rotation calculation
Author
franza
Browse Repository
No Builds
No Audits
ee21af4de611 changed transform mode to rigid body
Author
franza
Browse Repository
No Builds
No Audits
864fa2ba784b runs now, but still has some problems, maybe because of low (float) precision
Author
franza
Browse Repository
No Builds
No Audits
66d0175f2999 extended mitkTransform by methods for compatibility with mitk::AffineTransform3d
Author
franza
Browse Repository
No Builds
No Audits
5f13d2de09ce finished implementation of additional CT image and added null pointer check
Author
franza
Browse Repository
No Builds
No Audits
94a370fc4957 further cleanup (removed unused methods)
Author
franza
Browse Repository
No Builds
No Audits
5058034cb4fe started implementation of optional transformation of a CT image
Author
franza
Browse Repository
No Builds
No Audits
4e4e414767aa implemented needle view Added display of FRE after registration & cleaned up…
Author
franza
Browse Repository
No Builds
No Audits
1ea3055a0a71 Fixed a few bugs: plugin does not crash any more if inputs are missing but is…
Author
franza
Browse Repository
No Builds
No Audits
ba7b7dc6bc28 Merge branch 'bug-12952-TutorialIGTTrackingLabBasedOnNewMaster' into bug-12952…
Author
franza
Browse Repository
No Builds
No Audits
f06018f76d9e started heavy cleanup of TrackingLab: removed a couple on unused methods and…
Author
franza
Browse Repository
No Builds
No Audits
a7850862498b improved connection testing of tracking device configuration widget
Author
franza
Browse Repository
No Builds
No Audits
a57958514cd3 Further restructuring of tracking lab: initial and permanent registration is…
Author
franza
Browse Repository
No Builds
No Audits
42a3b9e454f7 ENH: added an offset feature. You can now optionally add an offset for every…
Author
franza
Browse Repository
No Builds
No Audits
8b4f5cb5475a Merge branch 'bug-12952-RedesignIGTTrackingLab' into bug-12952…
Author
franza
Browse Repository
No Builds
No Audits
2e84a66277b7 removed trailing whitespaces
Author
franza
Browse Repository
No Builds
No Audits
0529d12d640c further work on restructuring TrackingLab (not finished yet)
Author
franza
Browse Repository
No Builds
No Audits
ed1f1dd15e84 further work on new signals (signal is giving parameter NULL when no source is…
Author
franza
Browse Repository
No Builds
No Audits
4b7cfa98638e Started redesign of TrackingLab: Mircoservices are integrated now, but view is…
Author
franza
Browse Repository
No Builds
No Audits
4c91c1972c2e added new signals when navigation data source selection is changed
Author
franza
Browse Repository
No Builds
No Audits
cbfe59d99752 moved UI components from manual implementation in cpp file to ui file / Qt…
Author
franza
Browse Repository
No Builds
No Audits

Changes (17)

Path

Size

Modules/

IGT/

IGTFilters/

mitkCameraVisualization.cpp

mitkNavigationDataObjectVisualizationFilter.cpp

mitkNavigationDataObjectVisualizationFilter.h

IGTTrackingDevices/

mitkNDIProtocol.cpp

mitkNDITrackingDevice.cpp

mitkNDITrackingDevice.h

mitkTrackingDevice.cpp

mitkTrackingDevice.h

IGTUI/

Qmitk/

QmitkNavigationDataSourceSelectionWidget.cpp

QmitkNavigationDataSourceSelectionWidget.h

QmitkTrackingDeviceConfigurationWidget.cpp

Plugins/

org.mitk.gui.qt.igtexamples/

CMakeLists.txt

src/

internal/

QmitkIGTTrackingLabView.cpp

QmitkIGTTrackingLabView.h

QmitkIGTTrackingLabViewControls.ui

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

QmitkMITKIGTTrackingToolboxViewControls.ui

rMITKaaeb389dc6cf

View Options

Modules/IGT/IGTFilters/mitkCameraVisualization.cpp

View Options

Modules/IGT/IGTFilters/mitkNavigationDataObjectVisualizationFilter.cpp

View Options

Modules/IGT/IGTFilters/mitkNavigationDataObjectVisualizationFilter.h

View Options

Modules/IGT/IGTTrackingDevices/mitkNDIProtocol.cpp

View Options

Modules/IGT/IGTTrackingDevices/mitkNDITrackingDevice.cpp

View Options

Modules/IGT/IGTTrackingDevices/mitkNDITrackingDevice.h

View Options

Modules/IGT/IGTTrackingDevices/mitkTrackingDevice.cpp

View Options

Modules/IGT/IGTTrackingDevices/mitkTrackingDevice.h

View Options

Modules/IGTUI/Qmitk/QmitkNavigationDataSourceSelectionWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkNavigationDataSourceSelectionWidget.h

View Options

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidget.cpp

View Options

Plugins/org.mitk.gui.qt.igtexamples/CMakeLists.txt

View Options

Plugins/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTrackingLabView.cpp

View Options

Plugins/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTrackingLabView.h

View Options

Plugins/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTrackingLabViewControls.ui

View Options

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp

View Options

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxViewControls.ui

Merge branch 'bug-12952-IGTTrackingLabCleanUp' into bug-12952…aaeb389dc6cfActions

Description

Details

Event Timeline

Merged Changes

Changes (17)

rMITKaaeb389dc6cf

Modules/IGT/IGTFilters/mitkCameraVisualization.cpp

Modules/IGT/IGTFilters/mitkNavigationDataObjectVisualizationFilter.cpp

Modules/IGT/IGTFilters/mitkNavigationDataObjectVisualizationFilter.h

Modules/IGT/IGTTrackingDevices/mitkNDIProtocol.cpp

Modules/IGT/IGTTrackingDevices/mitkNDITrackingDevice.cpp

Modules/IGT/IGTTrackingDevices/mitkNDITrackingDevice.h

Modules/IGT/IGTTrackingDevices/mitkTrackingDevice.cpp

Modules/IGT/IGTTrackingDevices/mitkTrackingDevice.h

Modules/IGTUI/Qmitk/QmitkNavigationDataSourceSelectionWidget.cpp

Modules/IGTUI/Qmitk/QmitkNavigationDataSourceSelectionWidget.h

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidget.cpp

Plugins/org.mitk.gui.qt.igtexamples/CMakeLists.txt

Plugins/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTrackingLabView.cpp

Plugins/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTrackingLabView.h

Plugins/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTrackingLabViewControls.ui

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxViewControls.ui

Merge branch 'bug-12952-IGTTrackingLabCleanUp' into bug-12952…
aaeb389dc6cf
Actions