HomePhabricator
Diffusion MITK 765ab05f554f

Merge branch 'T19560-Integration-2016-10-10' into T22595-NavigationModules-2016…
765ab05f554f
Actions

Description

Merge branch 'T19560-Integration-2016-10-10' into T22595-NavigationModules-2016-11

  1. Conflicts:
  2. Plugins/PluginList.cmake

Details

Provenance
franzaAuthored on Jun 9 2017, 2:24 PM
franzaPushed on Jun 9 2017, 2:25 PM
Differential Revision
Restricted Differential Revision
Parents
rMITK766ccf761d79: Merge remote-tracking branch 'remotes/origin/T22815-ToolVisibilityPersistence'…
rMITK17002f05b912: fixed compiler warning
Branches
Loading...
Tags
Loading...

Merged Changes

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

Changes (40)

PathSize
Modules/
IGT/
Algorithms/
TrackingDevices/
IGTBase/
include/
src/
OpenIGTLink/
DeviceSources/
Plugins/
Plugins/
org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/
documentation/
doxygen/
modules.dox/
Documentation/
Doxygen/
3-DeveloperManual/
Starting/
GettingToKnow/
Tutorial/
CMakeLists.txt

rMITK765ab05f554f

View Options

Modules/IGT/Algorithms/mitkNavigationDataEvaluationFilter.cpp

Loading...
View Options

Modules/IGT/TrackingDevices/mitkOpenIGTLinkTrackingDevice.cpp

Loading...
View Options

Modules/IGTBase/include/mitkStaticIGTHelperFunctions.h

Loading...
View Options

Modules/IGTBase/src/mitkStaticIGTHelperFunctions.cpp

Loading...
View Options

Modules/OpenIGTLink/DeviceSources/mitkIGTLTransformDeviceSource.cpp

Loading...
View Options

Modules/OpenIGTLink/mitkIGTLClient.cpp

Loading...
View Options

Modules/OpenIGTLink/mitkIGTLDevice.cpp

Loading...
View Options

Modules/OpenIGTLink/mitkIGTLMessageQueue.cpp

Loading...
View Options

Plugins/PluginList.cmake

Loading...
View Options

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

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/documentation/Manual/Manual.dox

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/documentation/Manual/icon.png

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/documentation/Manual/pipeline.png

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/documentation/Manual/screenshot.png

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/documentation/doxygen/modules.dox

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/files.cmake

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/manifest_headers.cmake

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/plugin.xml

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/resources/QmitkIGTTrackingSemiAutomaticMeasurementView.qrc

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/resources/iconMeasurementEvaluation.svg

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/resources/iconMeasurementTracking.svg

Loading...
View Options

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

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/src/internal/QmitkIGTTrackingDataEvaluationView.h

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/src/internal/QmitkIGTTrackingDataEvaluationViewControls.ui

Loading...
View Options

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

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/src/internal/QmitkIGTTrackingSemiAutomaticMeasurementView.h

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/src/internal/QmitkIGTTrackingSemiAutomaticMeasurementViewControls.ui

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/src/internal/mitkNavigationDataCSVSequentialPlayer.h

Loading...
View Options

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

Loading...
View Options

Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/src/internal/mitkPluginActivator.h

Loading...
MITK · MIC · IMSY · DKFZ