Diffusion MITK 85334f3f3f85

Merge remote-tracking branch 'remotes/origin/T22595-NavigationModules-2016-11'…
85334f3f3f85
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge remote-tracking branch 'remotes/origin/T22595-NavigationModules-2016-11' into T22595-MasterIntegration-2017-06-09

Conflicts:
CMakeExternals/MatchPoint.cmake
Examples/Annotation/AnnotationExample.cpp
Modules/Annotation/test/mitkColorBarAnnotationTest.cpp
Modules/Annotation/test/mitkLabelAnnotation3DTest.cpp
Modules/Annotation/test/mitkLayoutAnnotationRendererTest.cpp
Modules/Annotation/test/mitkLogoAnnotationTest.cpp
Modules/Annotation/test/mitkManualPlacementAnnotationRendererTest.cpp
Modules/Annotation/test/mitkScaleLegendAnnotationTest.cpp
Modules/Annotation/test/mitkTextAnnotation2DTest.cpp
Modules/Annotation/test/mitkTextAnnotation3DTest.cpp
Modules/Core/TestingHelper/src/mitkRenderingTestHelper.cpp
Modules/Core/include/mitkAnnotation.h
Modules/Core/src/Rendering/mitkAnnotation.cpp
Modules/Core/src/Rendering/mitkRenderWindowBase.cpp
Modules/IGT/IO/mitkNavigationToolWriter.cpp
Plugins/PluginList.cmake
Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepMarkerIntervention.cpp
Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.cpp
Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.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.overlaymanager/src/internal/QmitkAddNewPropertyDialog.h

Details

Provenance

franza	Authored on Jun 9 2017, 3:23 PM
franza	Pushed on Jun 9 2017, 3:23 PM

Differential Revision

Restricted Differential Revision

Parents

rMITK765ab05f554f: Merge branch 'T19560-Integration-2016-10-10' into T22595-NavigationModules-2016…
rMITK189d1d9597d9: Merge remote-tracking branch 'remotes/origin/T22618-PCA-exampleV2'

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITK85334f3f3f85: Merge remote-tracking branch 'remotes/origin/T22595-NavigationModules-2016-11'… (authored by franza).Jun 9 2017, 3:23 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

765ab05f554f Merge branch 'T19560-Integration-2016-10-10' into T22595-NavigationModules-2016…
Author
franza
Browse Repository
No Builds
No Audits
766ccf761d79 Merge remote-tracking branch 'remotes/origin/T22815-ToolVisibilityPersistence'…
Author
franza
Browse Repository
No Builds
No Audits
93e3ad078053 Merge branch 'T22789-FixesPluginEchoTrack' into T22595-NavigationModules-2016-11
Author
franza
Browse Repository
No Builds
No Audits
7f21d84894c4 Merge branch 'T22661-PivotCalibration' into T22595-NavigationModules-2016-11
Author
• house
Browse Repository
No Builds
No Audits
309a701ae8ac Fixed the pivot calibration algorithm, added feature to select number of pivot…
Author
• house
Browse Repository
No Builds
No Audits
103f09e73b45 Merge remote-tracking branch 'remotes/origin/T22854…
Author
seitela
Browse Repository
No Builds
No Audits
066a4b38fc17 Merge branch 'PolhemusIntegration' into T22854-IntegratePolhemusLibertyTracker
Author
seitela
Browse Repository
No Builds
No Audits
8033b933a8c9 made tool visibility persistent
Author
franza
Browse Repository
No Builds
No Audits
85a472ab9a93 fixed a bug: enabled by default
Author
franza
Browse Repository
No Builds
No Audits
17769a1023bb Disabled progress bar in tracking toolbox because it caused a crash
Author
franza
Browse Repository
No Builds
No Audits
7553062f6c5b made UI elements invisible when not used
Author
franza
Browse Repository
No Builds
No Audits
590d6b68dbfc unified alignment: left-justified / corrected typo in UI
Author
franza
Browse Repository
No Builds
No Audits
0b4dcf49d844 converted Qt tool box to stacked widget (looks better)
Author
franza
Browse Repository
No Builds
No Audits
95d7a364b4e1 fixed cmake warnings
Author
franza
Browse Repository
No Builds
No Audits
52a5977f9969 Merge branch 'T22785-FixToolTipCalibrationCrash' into T22595-NavigationModules…
Author
eisenman
Browse Repository
No Builds
No Audits
3ab670b34669 handle uninitialized tools in single reference calibration
Author
eisenman
Browse Repository
No Builds
No Audits
92fbee93d768 Fixed crash in destructor
Author
franza
Browse Repository
No Builds
No Audits
53d7c820eff6 Fixed merge error
Author
seitela
Browse Repository
No Builds
No Audits
f70938720248 Merge branch 'T22595-NavigationModules-2016-11' of https://phabricator.mitk.
Author
seitela
Browse Repository
No Builds
No Audits
08bd31642912 Merge branch 'T22745-PerspectiveForDarkTheme' into T22595-NavigationModules…
Author
franza
Browse Repository
No Builds
No Audits
ce25e479aee9 Merge branch 'T22744-SimpleModeTrackingToolbox' into T22595-NavigationModules…
Author
franza
Browse Repository
No Builds
No Audits
cf4f279e2c50 adapted view to new geometry behavior: sagittal view is now the top view…
Author
franza
Browse Repository
No Builds
No Audits
8292013c4746 extended method to be able to choose the 2D window in the top
Author
franza
Browse Repository
No Builds
No Audits
21260cc4ba9f Merge remote-tracking branch 'remotes/origin/T19786…
Author
seitela
Browse Repository
No Builds
No Audits
d458f2bbc3a8 Made help view optional. It can now be disabled via Cmake.
Author
franza
Browse Repository
No Builds
No Audits
61c2e0dfdd42 adapted perspective
Author
franza
Browse Repository
No Builds
No Audits
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
17002f05b912 fixed compiler warning
Author
franza
Browse Repository
No Builds
No Audits
82591c06f74d Change CMake configuration such that Polhemus tracking device classes and…
Author
seitela
Browse Repository
No Builds
No Audits
2c8fe35e9eb9 Moved pivot calibration class to MITK, however not working correctly yet.
Author
franza
Browse Repository
No Builds
No Audits
12bbe09cdf95 Implemented configuration of hemisphere tracking.
Author
franza
Browse Repository
No Builds
No Audits
0d412a4d2372 implemented auto detection
Author
franza
Browse Repository
No Builds
No Audits
1f2d2e35de4e Merge branch 'T22660-GeneralizeAutoDetectTools' into PolhemusIntegration
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
87c2ce26b6a6 added initialization commands
Author
franza
Browse Repository
No Builds
No Audits
b5636a32c32c added math.h for PI
Author
franza
Browse Repository
No Builds
No Audits
0c09b2ac8869 removed some setup code that is not required
Author
franza
Browse Repository
No Builds
No Audits
f587b2b2abff Fixed a problem with the polhemus tracker widget
Author
franza
Browse Repository
No Builds
No Audits
2b3c0275c736 Fixed problem with continous tracking
Author
franza
Browse Repository
No Builds
No Audits
c82b6fb705e1 fixed a problem in the disconnect method which caused a crash
Author
franza
Browse Repository
No Builds
No Audits
28991daefb18 cleaned up / restructuring
Author
franza
Browse Repository
No Builds
No Audits
94ccd355e1e9 seems to work, however many bugs and hacks left
Author
franza
Browse Repository
No Builds
No Audits
0979ce90a147 First simple version of Polhemus tracker interface together with a test
Author
franza
Browse Repository
No Builds
No Audits
9ff9af5b3f3a integrated Polhemus tacker to MITK cmake project (only working for windows so…
Author
franza
Browse Repository
No Builds
No Audits
374abffbd47d Merge branch 'T22625-PointListWidget-CorruptIDs' into T22595-NavigationModules…
Author
franza
Browse Repository
No Builds
No Audits

Changes (59)

Path

Size

Packages

Applications/

Workbench/

target_libraries.cmake

Modules/

IGT/

Algorithms/

mitkPivotCalibration.cpp

mitkPivotCalibration.h

IO/

mitkNavigationToolReader.cpp

mitkNavigationToolWriter.cpp

MITKIGTHardware.cmake

Testing/

MITKIGTTrackingDeviceHardwareTesting.cmake

mitkPolhemusTrackingDeviceHardwareTest.cpp

TrackingDevices/

mitkNDITrackingDevice.cpp

mitkNDITrackingDevice.h

mitkPolhemusInterface.cpp

mitkPolhemusInterface.h

mitkPolhemusTool.cpp

mitkPolhemusTool.h

mitkPolhemusTrackerTypeInformation.cpp

mitkPolhemusTrackerTypeInformation.h

mitkPolhemusTrackingDevice.cpp

mitkPolhemusTrackingDevice.h

mitkTrackingDevice.cpp

mitkTrackingDevice.h

autoload/

DeviceRegistry/

src/

mitkIGTActivator.cpp

mitkIGTConfig.h.in

IGTUI/

Qmitk/

QmitkPolhemusTrackerWidget.cpp

QmitkPolhemusTrackerWidget.h

QmitkPolhemusTrackerWidget.ui

autoload/

ConfigurationWidgetRegistry/

src/

mitkIGTUIActivator.cpp

QtWidgets/

include/

QmitkStdMultiWidget.h

O3: MITK Reviewer Group II

src/

QmitkStdMultiWidget.cpp

O3: MITK Reviewer Group II

Plugins/

PluginList.cmake

org.mitk.gui.qt.datamanager/

src/

QmitkDataManagerView.cpp

O1: MITK Reviewer Group I

org.mitk.gui.qt.igt.app.echotrack/

src/

internal/

NavigationStepWidgets/

QmitkUSNavigationStepCombinedModality.ui

QmitkUSNavigationStepMarkerIntervention.cpp

QmitkUSNavigationStepPunctuationIntervention.cpp

QmitkUSNavigationStepPunctuationIntervention.ui

QmitkUSNavigationStepZoneMarking.cpp

QmitkUSNavigationStepZoneMarking.h

QmitkUSNavigationStepZoneMarking.ui

QmitkUSNavigationPerspective.cpp

SettingsWidgets/

QmitkUSNavigationCombinedSettingsWidget.ui

USNavigationMarkerPlacement.cpp

USNavigationMarkerPlacement.h

USNavigationMarkerPlacement.ui

Widgets/

QmitkUSNavigationProcessWidget.cpp

QmitkUSNavigationProcessWidget.ui

org_mbi_gui_qt_usnavigation_Activator.cpp

org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/

src/

internal/

mitkHummelProtocolEvaluation.cpp

org.mitk.gui.qt.igttracking/

src/

internal/

IGTNavigationToolCalibration.cpp

IGTNavigationToolCalibration.h

IGTNavigationToolCalibrationControls.ui

QmitkMITKIGTTrackingToolboxView.cpp

QmitkMITKIGTTrackingToolboxView.h

QmitkMITKIGTTrackingToolboxViewControls.ui

org.mitk.gui.qt.ultrasound/

src/

internal/

UltrasoundSupport.cpp

rMITK85334f3f3f85

Applications/Workbench/target_libraries.cmake

Loading...

Modules/IGT/Algorithms/mitkPivotCalibration.cpp

Loading...

Modules/IGT/Algorithms/mitkPivotCalibration.h

Loading...

Modules/IGT/CMakeLists.txt

Loading...

Modules/IGT/IO/mitkNavigationToolReader.cpp

Loading...

Modules/IGT/IO/mitkNavigationToolWriter.cpp

Loading...

Modules/IGT/MITKIGTHardware.cmake

Loading...

Modules/IGT/Testing/CMakeLists.txt

Loading...

Modules/IGT/Testing/MITKIGTTrackingDeviceHardwareTesting.cmake

Loading...

Modules/IGT/Testing/files.cmake

Loading...

Modules/IGT/Testing/mitkPolhemusTrackingDeviceHardwareTest.cpp

Loading...

Modules/IGT/TrackingDevices/mitkNDITrackingDevice.cpp

Loading...

Modules/IGT/TrackingDevices/mitkNDITrackingDevice.h

Loading...

Modules/IGT/TrackingDevices/mitkPolhemusInterface.cpp

Loading...

Modules/IGT/TrackingDevices/mitkPolhemusInterface.h

Loading...

Modules/IGT/TrackingDevices/mitkPolhemusTool.cpp

Loading...

Modules/IGT/TrackingDevices/mitkPolhemusTool.h

Loading...

Modules/IGT/TrackingDevices/mitkPolhemusTrackerTypeInformation.cpp

Loading...

Modules/IGT/TrackingDevices/mitkPolhemusTrackerTypeInformation.h

Loading...

Modules/IGT/TrackingDevices/mitkPolhemusTrackingDevice.cpp

Loading...

Modules/IGT/TrackingDevices/mitkPolhemusTrackingDevice.h

Loading...

Modules/IGT/TrackingDevices/mitkTrackingDevice.cpp

Loading...

Modules/IGT/TrackingDevices/mitkTrackingDevice.h

Loading...

Modules/IGT/autoload/DeviceRegistry/src/mitkIGTActivator.cpp

Loading...

Modules/IGT/files.cmake

Loading...

Modules/IGT/mitkIGTConfig.h.in

Loading...

Modules/IGTUI/Qmitk/QmitkPolhemusTrackerWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkPolhemusTrackerWidget.h

Loading...

Modules/IGTUI/Qmitk/QmitkPolhemusTrackerWidget.ui

Loading...

Modules/IGTUI/autoload/ConfigurationWidgetRegistry/src/mitkIGTUIActivator.cpp

Loading...

Modules/IGTUI/files.cmake

Loading...

Modules/QtWidgets/include/QmitkStdMultiWidget.h

Loading...

Modules/QtWidgets/src/QmitkStdMultiWidget.cpp

Loading...

Plugins/PluginList.cmake

Loading...

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/CMakeLists.txt

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepCombinedModality.ui

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepMarkerIntervention.cpp

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepPunctuationIntervention.cpp

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepPunctuationIntervention.ui

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepZoneMarking.cpp

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepZoneMarking.h

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepZoneMarking.ui

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/QmitkUSNavigationPerspective.cpp

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/SettingsWidgets/QmitkUSNavigationCombinedSettingsWidget.ui

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.cpp

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.h

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.ui

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSNavigationProcessWidget.cpp

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSNavigationProcessWidget.ui

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/org_mbi_gui_qt_usnavigation_Activator.cpp

Loading...

Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/src/internal/mitkHummelProtocolEvaluation.cpp

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupport.cpp

Loading...