Merge branch 'T19559-PullRequestIntegration' into T22595-NavigationModules-2016…
93e37a323fcc
Actions

Description

Merge branch 'T19559-PullRequestIntegration' into T22595-NavigationModules-2016-11

Details

Provenance

eisenman	Authored on Jun 9 2017, 3:23 PM
eisenman	Pushed on Jun 9 2017, 3:30 PM

Differential Revision

Restricted Differential Revision

Parents

rMITK833f9e8e502a: add check box for skipping invalid data during logging
rMITK765ab05f554f: Merge branch 'T19560-Integration-2016-10-10' into T22595-NavigationModules-2016…

Branches

Tags

Event Timeline

eisenman committed rMITK93e37a323fcc: Merge branch 'T19559-PullRequestIntegration' into T22595-NavigationModules-2016… (authored by eisenman).Jun 9 2017, 3:23 PM

Merged Changes

833f9e8e502a add check box for skipping invalid data during logging
Author
eisenman
Browse Repository
No Builds
No Audits
285f0ebbf133 fix compiler error under Linux
Author
eisenman
Browse Repository
No Builds
No Audits
b64b2066ea76 Merge remote-tracking branch 'm4271n/bug-19559…
Author
eisenman
Browse Repository
No Builds
No Audits
59f2d2acfc63 navigation data recorder can be set up in such way that only valid navigation…
Author
klemmma
Browse Repository
No Builds
No Audits

Changes (5)

Path

Size

Modules/

IGT/

IO/

mitkNavigationDataRecorder.cpp

mitkNavigationDataRecorder.h

Plugins/

org.mitk.gui.qt.igttracking/

src/

internal/

IGTNavigationToolCalibration.cpp

QmitkMITKIGTTrackingToolboxView.cpp

QmitkMITKIGTTrackingToolboxViewControls.ui

rMITK93e37a323fcc

View Options

Modules/IGT/IO/mitkNavigationDataRecorder.cpp

View Options

Modules/IGT/IO/mitkNavigationDataRecorder.h

View Options

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

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 'T19559-PullRequestIntegration' into T22595-NavigationModules-2016…93e37a323fccActions

Description

Details

Event Timeline

Merged Changes

Changes (5)

rMITK93e37a323fcc

Modules/IGT/IO/mitkNavigationDataRecorder.cpp

Modules/IGT/IO/mitkNavigationDataRecorder.h

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

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

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

Merge branch 'T19559-PullRequestIntegration' into T22595-NavigationModules-2016…
93e37a323fcc
Actions