Merge branch 'T22744-SimpleModeTrackingToolbox' into T22595-NavigationModules…
ce25e479aee9
Actions

Description

Merge branch 'T22744-SimpleModeTrackingToolbox' into T22595-NavigationModules-2016-11

Details

Provenance

franza	Authored on Apr 21 2017, 4:00 PM
franza	Pushed on Apr 21 2017, 4:02 PM

Differential Revision

Restricted Differential Revision

Parents

rMITK5101b6a1a663: made simple ui setting persistent
rMITK374abffbd47d: Merge branch 'T22625-PointListWidget-CorruptIDs' into T22595-NavigationModules…

Branches

Tags

Event Timeline

franza committed rMITKce25e479aee9: Merge branch 'T22744-SimpleModeTrackingToolbox' into T22595-NavigationModules… (authored by franza).Apr 21 2017, 4:00 PM

Merged Changes

5101b6a1a663 made simple ui setting persistent
Author
franza
Browse Repository
No Builds
No Audits
a4019bcb238d UI button text and enabling/disabling for simple mode
Author
franza
Browse Repository
No Builds
No Audits
9355bf5ebaaa Added widget for simple mode
Author
franza
Browse Repository
No Builds
No Audits
09ddaad3ca03 Merge branch 'T22660-GeneralizeAutoDetectTools' into T22595-NavigationModules…
Author
franza
Browse Repository
No Builds
No Audits
86f66f1f250f finished task: AutoDetection code is now included in the tracking device itself
Author
franza
Browse Repository
No Builds
No Audits
f62efd8f1ff1 Enabled / Disabled button
Author
franza
Browse Repository
No Builds
No Audits
7b5fcda98dcd Added new methods to tracking device superclass
Author
franza
Browse Repository
No Builds
No Audits

Changes (7)

Path

Size

Modules/

IGT/

TrackingDevices/

mitkNDITrackingDevice.cpp

mitkNDITrackingDevice.h

mitkTrackingDevice.cpp

mitkTrackingDevice.h

Plugins/

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

QmitkMITKIGTTrackingToolboxView.h

QmitkMITKIGTTrackingToolboxViewControls.ui

rMITKce25e479aee9

View Options

Modules/IGT/TrackingDevices/mitkNDITrackingDevice.cpp

View Options

Modules/IGT/TrackingDevices/mitkNDITrackingDevice.h

View Options

Modules/IGT/TrackingDevices/mitkTrackingDevice.cpp

View Options

Modules/IGT/TrackingDevices/mitkTrackingDevice.h

View Options

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

View Options

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

View Options

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

Merge branch 'T22744-SimpleModeTrackingToolbox' into T22595-NavigationModules…ce25e479aee9Actions

Description

Details

Event Timeline

Merged Changes

Changes (7)

rMITKce25e479aee9

Modules/IGT/TrackingDevices/mitkNDITrackingDevice.cpp

Modules/IGT/TrackingDevices/mitkNDITrackingDevice.h

Modules/IGT/TrackingDevices/mitkTrackingDevice.cpp

Modules/IGT/TrackingDevices/mitkTrackingDevice.h

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

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

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

Merge branch 'T22744-SimpleModeTrackingToolbox' into T22595-NavigationModules…
ce25e479aee9
Actions