Diffusion MITK 2d6fbec933de

Merge branch 'bug-19404-RefactorTrackingDevices_IntBranch_1601'
2d6fbec933de
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-19404-RefactorTrackingDevices_IntBranch_1601'

Details

Provenance

Esther Wild <e.wild@dkfz-heidelberg.de>

Authored on Jan 18 2016, 11:28 AM

Parents

rMITKa234f8cd8093: Merge branch 'bug-19490-slicedgeometry-executeoperation'
rMITK90c630d84953: remove const to avoid warning on linux systems (warnings as errors)

Branches

Unknown

Tags

Unknown

Event Timeline

• wildes committed rMITK2d6fbec933de: Merge branch 'bug-19404-RefactorTrackingDevices_IntBranch_1601' (authored by • wildes).Jan 18 2016, 11:28 AM

Merged Changes

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

90c630d84953 remove const to avoid warning on linux systems (warnings as errors)
Author
• rosst
Browse Repository
No Builds
No Audits
b4f12fcc2790 Fix semicolon for linux compability
Author
• rosst
Browse Repository
No Builds
No Audits
0e05181fd682 Remove unnecessary properties.
Author
Esther Wild <e.wild@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
dbb86d7d9497 Edit documentation
Author
Esther Wild <e.wild@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
c2d2d8ee79be Fix debug autoload behaviour: keep the Load() function as simple as possible…
Author
Esther Wild <e.wild@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
351d83c95524 fix debug mode: add constructors
Author
Esther Wild <e.wild@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
4af5fe3be55e No autoload with core, because the tests will not start (dll not found). Better…
Author
Esther Wild <e.wild@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
f4a7f87831b3 Merge branch 'bug-19404-RefactorTrackingDevices' into bug-19404…
Author
Esther Wild <e.wild@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
87d2a2a686d9 Merge branch 'bug-19404-RefactorTrackingDevices' of mitk.org:MITK into bug…
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
590eeec85f45 Remove refresh button and fix deconstructor bug (see bug 19413, fixed by Janek)
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
56caab97ed45 generalize method for retrieving a widget by device name
Author
eisenman
Browse Repository
No Builds
No Audits
eb08dd700538 fix selection of initial widget
Author
eisenman
Browse Repository
No Builds
No Audits
28603d5fc141 make configuration widget service always returning widget clones and manage…
Author
eisenman
Browse Repository
No Builds
No Audits
6bcaf07c3f01 remove extra tokens
Author
eisenman
Browse Repository
No Builds
No Audits
b69045ae253a fix autoload module structure
Author
eisenman
Browse Repository
No Builds
No Audits
01b824fe6365 remove extra token at end of #include directive
Author
eisenman
Browse Repository
No Builds
No Audits
08da58b8d3f2 remove extra token at end of #include directive
Author
eisenman
Browse Repository
No Builds
No Audits
9bf4f29ff12e fix retrieval of value for 'SelectedDevice' while loading UI settings
Author
eisenman
Browse Repository
No Builds
No Audits
945ccdc7931d fix compile issues under linux systems
Author
eisenman
Browse Repository
No Builds
No Audits
a6260e894540 Add clone method. Not working yet, crashes when closing and reopening toolbox.
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
a9df8d48a379 Microservice TrackingDeviceWidget Collection loaded in module activator
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
141498284805 Add documentation
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
f3574b73b5a0 cleanup unused code
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
57cbc5c77909 BugFix: Loading of old tool storages (with int property) is possible again.
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
28074093430a Adapt tests to new functions
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
ce0b4b384539 Device Data access via Get-functions
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
0dc9684f17fc Autoload Microservice on Module start, always use Microservice, remove…
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
1acebc64e2f0 Removed signals ProgressStarted and ProgressFinished
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
3d8b3ea6343f adapt plugin
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
3b1a610bcb1d Remove unused buttons (finish, reset)
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
702b7eb9db76 Merge branch 'bug-19404-RefactorTrackingDevices' of mitk.org:MITK into bug…
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
9cf73330d6ef Adapt Tests for new TrackingDeviceCollection
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
13b8f5fb3132 Added comment for compile error
Author
• schmidd
Browse Repository
No Builds
No Audits
1a0411c057b8 Merge branch 'bug-19404-RefactorTrackingDevices' of mitk.org:MITK into bug…
Author
• schmidd
Browse Repository
No Builds
No Audits
c08d55d328db small layout fix
Author
• schmidd
Browse Repository
No Builds
No Audits
90d3cde32249 Merge branch 'bug-19404-RefactorTrackingDevices' of mitk.org:MITK into bug…
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
4a4bfc1fdf74 Load and store UI settings
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
01fe5a6ff06c Added static_cast to convert smart pointers for compiling properly under Linux
Author
• schmidd
Browse Repository
No Builds
No Audits
7b53fa842c3e All Tracking devices separated in different classes. Nothing tested yet. No…
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
70cf088bd811 Not Working yet! Separated Widgets for different tracking devices. Careful! No…
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
3a449c3abc51 Merge branch 'bug-19404-RefactorTrackingDevices' of mitk.org:MITK into bug…
Author
• schmidd
Browse Repository
No Builds
No Audits
9258a3793218 Workaround for dynamically loading tracking device type infromation of micro…
Author
• schmidd
Browse Repository
No Builds
No Audits
92a0091c968f Removed DaVinci components from IGT
Author
• schmidd
Browse Repository
No Builds
No Audits
b9ab7fed8711 Commented test out so that MITK compiles - test hasn't been adapted yet
Author
• schmidd
Browse Repository
No Builds
No Audits
c696177d8eda bugfix to compile with windows
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
e29227822576 use micro service for device type registration
Author
eisenman
Browse Repository
No Builds
No Audits
d84ad3ab2ebc add missing include files
Author
eisenman
Browse Repository
No Builds
No Audits
ef013f520cf4 fix typo in class name
Author
eisenman
Browse Repository
No Builds
No Audits
6c372f5cebee replace tracking device type enumeration with string identifier for each type
Author
eisenman
Browse Repository
No Builds
No Audits
e7315bde414d Move tracking device data to corresponding device type information class
Author
eisenman
Browse Repository
No Builds
No Audits

Changes (105)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

Modules/

IGT/

Common/

mitkTrackingTypes.cpp

mitkTrackingTypes.h

DataManagement/

mitkNavigationTool.cpp

mitkTrackingDeviceSourceConfigurator.cpp

mitkTrackingDeviceSourceConfigurator.h

mitkTrackingDeviceTypeCollection.cpp

mitkTrackingDeviceTypeCollection.h

mitkTrackingDeviceTypeInformation.h

Documentation/

doxygen/

IGTHowToImplementATrackingDevice.dox

IO/

mitkNavigationToolReader.cpp

mitkNavigationToolWriter.cpp

Testing/

mitkNDIAuroraHardwareTest.cpp

mitkNDIPolarisHardwareTest.cpp

mitkNavigationToolReaderAndWriterTest.cpp

mitkNavigationToolTest.cpp

mitkTrackingDeviceSourceConfiguratorTest.cpp

mitkTrackingDeviceTest.cpp

mitkTrackingTypesTest.cpp

mitkTrackingVolumeGeneratorTest.cpp

TestingHelper/

mitkNavigationToolStorageTestHelper.cpp

TrackingDevices/

mitkClaronTrackingDevice.cpp

mitkMicronTrackerTypeInformation.cpp

mitkMicronTrackerTypeInformation.h

mitkNDIAuroraTypeInformation.cpp

mitkNDIAuroraTypeInformation.h

mitkNDIPolarisTypeInformation.cpp

mitkNDIPolarisTypeInformation.h

mitkNDIProtocol.cpp

mitkNDIProtocol.h

mitkNDITrackingDevice.cpp

mitkNPOptitrackTrackingTypeInformation.cpp

mitkNPOptitrackTrackingTypeInformation.h

mitkOpenIGTLinkTrackingDevice.cpp

mitkOpenIGTLinkTypeInformation.cpp

mitkOpenIGTLinkTypeInformation.h

mitkTrackingDevice.cpp

mitkTrackingVolumeGenerator.cpp

mitkUnspecifiedTrackingTypeInformation.cpp

mitkUnspecifiedTrackingTypeInformation.h

mitkVirtualTrackerTypeInformation.cpp

mitkVirtualTrackerTypeInformation.h

mitkVirtualTrackingDevice.cpp

mitkVirtualTrackingDevice.h

mitkIGTActivator.cpp

mitkIGTActivator.h

IGTUI/

Qmitk/

QmitkAbstractTrackingDeviceWidget.cpp

QmitkAbstractTrackingDeviceWidget.h

QmitkIGTConnectionWidget.cpp

QmitkMicronTrackerWidget.cpp

QmitkMicronTrackerWidget.h

QmitkMicronTrackerWidget.ui

QmitkNDIAbstractDeviceWidget.cpp

QmitkNDIAbstractDeviceWidget.h

QmitkNDIAuroraWidget.cpp

QmitkNDIAuroraWidget.h

QmitkNDIAuroraWidget.ui

QmitkNDIConfigurationWidget.cpp

QmitkNDIPolarisWidget.cpp

QmitkNDIPolarisWidget.h

QmitkNDIPolarisWidget.ui

QmitkNPOptitrackWidget.cpp

QmitkNPOptitrackWidget.h

QmitkNPOptitrackWidget.ui

QmitkNavigationToolCreationWidget.cpp

QmitkNavigationToolCreationWidget.h

QmitkNavigationToolCreationWidget.ui

QmitkNavigationToolManagementWidget.cpp

QmitkOpenIGTLinkWidget.cpp

QmitkOpenIGTLinkWidget.h

QmitkOpenIGTLinkWidget.ui

QmitkTrackingDeviceConfigurationWidget.cpp

QmitkTrackingDeviceConfigurationWidget.h

QmitkTrackingDeviceConfigurationWidgetConnectionWorker.cpp

QmitkTrackingDeviceConfigurationWidgetConnectionWorker.h

QmitkTrackingDeviceConfigurationWidgetControls.ui

QmitkTrackingDeviceConfigurationWidgetScanPortsWorker.cpp

QmitkTrackingDeviceConfigurationWidgetScanPortsWorker.h

QmitkVirtualTrackerWidget.cpp

QmitkVirtualTrackerWidget.h

QmitkVirtualTrackerWidget.ui

mitkTrackingDeviceWidgetCollection.cpp

mitkTrackingDeviceWidgetCollection.h

ConfigurationWidgetRegistry

mitkIGTUIActivator.cpp

mitkIGTUIActivator.h

Plugins/

org.mitk.gui.qt.igtexamples/

src/

internal/

QmitkIGTTutorialView.cpp

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

QmitkMITKIGTTrackingToolboxView.h

mitkPluginActivator.cpp

mitkPluginActivator.h

rMITK2d6fbec933de

Modules/IGT/CMakeLists.txt

Modules/IGT/Common/mitkTrackingTypes.cpp

Modules/IGT/Common/mitkTrackingTypes.h

Modules/IGT/DataManagement/mitkNavigationTool.cpp

Modules/IGT/DataManagement/mitkTrackingDeviceSourceConfigurator.cpp

Modules/IGT/DataManagement/mitkTrackingDeviceSourceConfigurator.h

Modules/IGT/DataManagement/mitkTrackingDeviceTypeCollection.cpp

Modules/IGT/DataManagement/mitkTrackingDeviceTypeCollection.h

Modules/IGT/DataManagement/mitkTrackingDeviceTypeInformation.h

Modules/IGT/Documentation/doxygen/IGTHowToImplementATrackingDevice.dox

Modules/IGT/Documentation/doxygen/IGTModule.dox

Modules/IGT/IO/mitkNavigationToolReader.cpp

Modules/IGT/IO/mitkNavigationToolWriter.cpp

Modules/IGT/Testing/mitkNDIAuroraHardwareTest.cpp

Modules/IGT/Testing/mitkNDIPolarisHardwareTest.cpp

Modules/IGT/Testing/mitkNavigationToolReaderAndWriterTest.cpp

Modules/IGT/Testing/mitkNavigationToolTest.cpp

Modules/IGT/Testing/mitkTrackingDeviceSourceConfiguratorTest.cpp

Modules/IGT/Testing/mitkTrackingDeviceTest.cpp

Modules/IGT/Testing/mitkTrackingTypesTest.cpp

Modules/IGT/Testing/mitkTrackingVolumeGeneratorTest.cpp

Modules/IGT/TestingHelper/mitkNavigationToolStorageTestHelper.cpp

Modules/IGT/TrackingDevices/CMakeLists.txt

Modules/IGT/TrackingDevices/mitkClaronTrackingDevice.cpp

Modules/IGT/TrackingDevices/mitkMicronTrackerTypeInformation.cpp

Modules/IGT/TrackingDevices/mitkMicronTrackerTypeInformation.h

Modules/IGT/TrackingDevices/mitkNDIAuroraTypeInformation.cpp

Modules/IGT/TrackingDevices/mitkNDIAuroraTypeInformation.h

Modules/IGT/TrackingDevices/mitkNDIPolarisTypeInformation.cpp

Modules/IGT/TrackingDevices/mitkNDIPolarisTypeInformation.h

Modules/IGT/TrackingDevices/mitkNDIProtocol.cpp

Modules/IGT/TrackingDevices/mitkNDIProtocol.h

Modules/IGT/TrackingDevices/mitkNDITrackingDevice.cpp

Modules/IGT/TrackingDevices/mitkNPOptitrackTrackingTypeInformation.cpp

Modules/IGT/TrackingDevices/mitkNPOptitrackTrackingTypeInformation.h

Modules/IGT/TrackingDevices/mitkOpenIGTLinkTrackingDevice.cpp

Modules/IGT/TrackingDevices/mitkOpenIGTLinkTypeInformation.cpp

Modules/IGT/TrackingDevices/mitkOpenIGTLinkTypeInformation.h

Modules/IGT/TrackingDevices/mitkTrackingDevice.cpp

Modules/IGT/TrackingDevices/mitkTrackingVolumeGenerator.cpp

Modules/IGT/TrackingDevices/mitkUnspecifiedTrackingTypeInformation.cpp

Modules/IGT/TrackingDevices/mitkUnspecifiedTrackingTypeInformation.h

Modules/IGT/TrackingDevices/mitkVirtualTrackerTypeInformation.cpp

Modules/IGT/TrackingDevices/mitkVirtualTrackerTypeInformation.h

Modules/IGT/TrackingDevices/mitkVirtualTrackingDevice.cpp

Modules/IGT/TrackingDevices/mitkVirtualTrackingDevice.h

Modules/IGT/autoload/DeviceRegistry/CMakeLists.txt

Modules/IGT/autoload/DeviceRegistry/files.cmake

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

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

Modules/IGT/files.cmake

Modules/IGTUI/CMakeLists.txt

Modules/IGTUI/Qmitk/QmitkAbstractTrackingDeviceWidget.cpp

Modules/IGTUI/Qmitk/QmitkAbstractTrackingDeviceWidget.h

Modules/IGTUI/Qmitk/QmitkIGTConnectionWidget.cpp

Modules/IGTUI/Qmitk/QmitkMicronTrackerWidget.cpp

Modules/IGTUI/Qmitk/QmitkMicronTrackerWidget.h

Modules/IGTUI/Qmitk/QmitkMicronTrackerWidget.ui

Modules/IGTUI/Qmitk/QmitkNDIAbstractDeviceWidget.cpp

Modules/IGTUI/Qmitk/QmitkNDIAbstractDeviceWidget.h

Modules/IGTUI/Qmitk/QmitkNDIAuroraWidget.cpp

Modules/IGTUI/Qmitk/QmitkNDIAuroraWidget.h

Modules/IGTUI/Qmitk/QmitkNDIAuroraWidget.ui

Modules/IGTUI/Qmitk/QmitkNDIConfigurationWidget.cpp

Modules/IGTUI/Qmitk/QmitkNDIPolarisWidget.cpp

Modules/IGTUI/Qmitk/QmitkNDIPolarisWidget.h

Modules/IGTUI/Qmitk/QmitkNDIPolarisWidget.ui

Modules/IGTUI/Qmitk/QmitkNPOptitrackWidget.cpp

Modules/IGTUI/Qmitk/QmitkNPOptitrackWidget.h

Modules/IGTUI/Qmitk/QmitkNPOptitrackWidget.ui

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.h

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.ui

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.cpp

Modules/IGTUI/Qmitk/QmitkOpenIGTLinkWidget.cpp

Modules/IGTUI/Qmitk/QmitkOpenIGTLinkWidget.h

Modules/IGTUI/Qmitk/QmitkOpenIGTLinkWidget.ui

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidget.cpp

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidget.h

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidgetConnectionWorker.cpp

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidgetConnectionWorker.h

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidgetControls.ui

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidgetScanPortsWorker.cpp

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidgetScanPortsWorker.h

Modules/IGTUI/Qmitk/QmitkVirtualTrackerWidget.cpp

Modules/IGTUI/Qmitk/QmitkVirtualTrackerWidget.h

Modules/IGTUI/Qmitk/QmitkVirtualTrackerWidget.ui

Modules/IGTUI/Qmitk/mitkTrackingDeviceWidgetCollection.cpp

Modules/IGTUI/Qmitk/mitkTrackingDeviceWidgetCollection.h

Modules/IGTUI/autoload/ConfigurationWidgetRegistry/CMakeLists.txt

Modules/IGTUI/autoload/ConfigurationWidgetRegistry/files.cmake

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

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

Modules/IGTUI/files.cmake

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

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/mitkPluginActivator.cpp

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