Merge remote-tracking branch 'origin/T19736…
33f2d99b5800
Actions

Description

Merge remote-tracking branch 'origin/T19736-NavigationModuleDocumentation_2016_07' into T19736-NavigationModuleDocumentation_QTWorking_2016_09

Details

Provenance

• wildes	Authored on Sep 2 2016, 12:40 PM
• wildes	Pushed on Sep 2 2016, 1:00 PM

Parents

rMITK20e286c761ed: Merge branch 'T19851-ShareOpenGLContextWithWebEngine'
rMITKd5e34e3a515c: new images

Branches

Unknown

Tags

Unknown

Event Timeline

• wildes committed rMITK33f2d99b5800: Merge remote-tracking branch 'origin/T19736… (authored by • wildes).Sep 2 2016, 12:40 PM

Merged Changes

d5e34e3a515c new images
Author
Most <mostl@ad.dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
a9888c099c40 Added more examples to the 'deeper look' tutorial
Author
Esther Wild <e.wild@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
44738e5f5f79 Merge branch 'bug-19736-NavigationModuleDocumentation_2016_05' into bug-19736…
Author
Esther Wild <e.wild@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
1cd43a4bf8f3 Some more documentation on step 4 and 5, not finished yet.
Author
Wild <wildes@ad.dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
36a27fa64dd5 Add documentation to QmitkIGTTutorialView
Author
Esther Wild <e.wild@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
9e1870b8ec18 Add plugin path to doxygen, so that example code can be found
Author
Esther Wild <e.wild@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
ef69349c4c05 Finished IGT tutorial step 3.
Author
Esther Wild <e.wild@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
230f5ce19534 Finish Step 1.
Author
Esther Wild <e.wild@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
fa0e968ea1db Adapt documentation for overview, Step 0, Tool manager, Tracking toolbox and…
Author
Esther Wild <e.wild@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
4062611af1d9 New structure for IGT tutorial and documentation. Not completed yet.
Author
Esther Wild <e.wild@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
872856ee9839 Fix bug in Tutorial step 1: use Sequential navigation data player instead of…
Author
Esther Wild <e.wild@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits

Changes (64)

Path

Size

Documentation/

Doxygen/

3-DeveloperManual/

Toolkit/

ModuleManuals/

MITKModuleManualsList.dox

doxygen.conf.in

Modules/

IGT/

Documentation/

doxygen/

IGTHowToImplementATrackingDevice.dox

IGTModule.dox

IGTTutorialOverview.dox

IGTTutorialStep0.dox

IGTTutorialStep1.dox

IGTTutorialStep1_buildInstrLinux.png

IGTTutorialStep1_buildInstrWindows.png

IGTTutorialStep1_output.png

IGTTutorialStep2.dox

IGTTutorialStep2_end.png

IGTTutorialStep2_init.png

IGTTutorialStep2_overview.png

IGTTutorialStep2_track.png

IGTTutorialStep3.dox

IGTTutorialStep3_cmake.png

IGTTutorialStep4.dox

IGTTutorialStep5.dox

IGTTutorialStep6.dox

Tutorial/

mitkIGTTutorialStep1.cpp

mitkIGTTutorialStep2.cpp

IGTUI/

Qmitk/

QmitkNavigationToolManagementWidget.cpp

QmitkNavigationToolManagementWidget.h

US/

Documentation/

doxygen/

USModule.dox

Plugins/

org.mitk.gui.qt.igtexamples/

documentation/

UserManual/

	QmitkIGTTrackingLab.dox
	QmitkIGTTtrackingLab.dox

QmitkIGTTtrackingLab.dox

QmitkIGTTutorial.dox

doxygen/

IGTExampleIGT_QT_Tutorial_PluginView.png

IGT_TrackingLab_PluginView.png

plugin.xml

resources/

IGTTutorial.png

IgtTrackingLab.png

QmitkIGTTrackingLabView.qrc

QmitkIGTTutorialView.qrc

example.png

icon.xpm

provider.png

src/

internal/

QmitkIGTTutorialView.cpp

QmitkIGTTutorialView.h

org.mitk.gui.qt.igttracking/

documentation/

UserManual/

QmitkIGTTracking.dox

QmitkIGTTracking_ConfigurationWidget.png

QmitkIGTTracking_IconNavigationDataPlayer.png

QmitkIGTTracking_IconNavigationToolManager.png

QmitkIGTTracking_LogFile.png

QmitkIGTTracking_LoggingWidget.png

QmitkIGTTracking_NavigationToolManagementAddTool.png

QmitkIGTTracking_NavigationToolManagement_TrackingTools.png

QmitkIGTTracking_Options.png

QmitkIGTTracking_ScreenshotMitk.png

QmitkIGTTracking_ScreenshotMitk.svg

QmitkIGTTracking_TrackingControl.png

QmitkIGTTracking_TrackingToolsWidget.png

QmitkMITKIGTNavigationToolManager.dox

QmitkMITKIGTTrackingToolbox.dox

QmitkNavigationDataPlayer.dox

resources/

iconFiducialRegistration.png

iconNavigationDataPlayer.png

iconNavigationToolCalibration.xpm

iconNavigationToolManager.xpm

iconTrackingToolBox.xpm

src/

internal/

QmitkMITKIGTNavigationToolManagerView.cpp

QmitkMITKIGTNavigationToolManagerView.h

QmitkMITKIGTTrackingToolboxView.cpp

rMITK33f2d99b5800

View Options

Documentation/Doxygen/3-DeveloperManual/Toolkit/ModuleManuals/MITKModuleManualsList.dox

View Options

Documentation/doxygen.conf.in

View Options

Modules/IGT/Documentation/doxygen/IGTHowToImplementATrackingDevice.dox

View Options

Modules/IGT/Documentation/doxygen/IGTModule.dox

View Options

Modules/IGT/Documentation/doxygen/IGTTutorialOverview.dox

View Options

Modules/IGT/Documentation/doxygen/IGTTutorialStep0.dox

View Options

Modules/IGT/Documentation/doxygen/IGTTutorialStep1.dox

View Options

Modules/IGT/Documentation/doxygen/IGTTutorialStep1_buildInstrLinux.png

View Options

Modules/IGT/Documentation/doxygen/IGTTutorialStep1_buildInstrWindows.png

View Options

Modules/IGT/Documentation/doxygen/IGTTutorialStep1_output.png

View Options

Modules/IGT/Documentation/doxygen/IGTTutorialStep2.dox

View Options

Modules/IGT/Documentation/doxygen/IGTTutorialStep2_end.png

View Options

Modules/IGT/Documentation/doxygen/IGTTutorialStep2_init.png

View Options

Modules/IGT/Documentation/doxygen/IGTTutorialStep2_overview.png

View Options

Modules/IGT/Documentation/doxygen/IGTTutorialStep2_track.png

View Options

Modules/IGT/Documentation/doxygen/IGTTutorialStep3.dox

View Options

Modules/IGT/Documentation/doxygen/IGTTutorialStep3_cmake.png

View Options

Modules/IGT/Documentation/doxygen/IGTTutorialStep4.dox

View Options

Modules/IGT/Documentation/doxygen/IGTTutorialStep5.dox

View Options

Modules/IGT/Documentation/doxygen/IGTTutorialStep6.dox

View Options

Modules/IGT/Tutorial/mitkIGTTutorialStep1.cpp

View Options

Modules/IGT/Tutorial/mitkIGTTutorialStep2.cpp

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.h

View Options

Modules/US/Documentation/doxygen/USModule.dox

View Options

Plugins/org.mitk.gui.qt.igtexamples/documentation/UserManual/QmitkIGTTrackingLab.dox

View Options

Plugins/org.mitk.gui.qt.igtexamples/documentation/UserManual/QmitkIGTTtrackingLab.dox

View Options

Plugins/org.mitk.gui.qt.igtexamples/documentation/UserManual/QmitkIGTTutorial.dox

View Options

Plugins/org.mitk.gui.qt.igtexamples/documentation/doxygen/IGTExampleIGT_QT_Tutorial_PluginView.png

View Options

Plugins/org.mitk.gui.qt.igtexamples/documentation/doxygen/IGT_TrackingLab_PluginView.png

View Options

Plugins/org.mitk.gui.qt.igtexamples/plugin.xml

View Options

Plugins/org.mitk.gui.qt.igtexamples/resources/IGTTutorial.png

View Options

Plugins/org.mitk.gui.qt.igtexamples/resources/IgtTrackingLab.png

View Options

Plugins/org.mitk.gui.qt.igtexamples/resources/QmitkIGTTrackingLabView.qrc

View Options

Plugins/org.mitk.gui.qt.igtexamples/resources/QmitkIGTTutorialView.qrc

View Options

Plugins/org.mitk.gui.qt.igtexamples/resources/example.png

View Options

Plugins/org.mitk.gui.qt.igtexamples/resources/icon.xpm

View Options

Plugins/org.mitk.gui.qt.igtexamples/resources/provider.png

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking.dox

View Options

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking_ConfigurationWidget.png

View Options

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking_IconNavigationDataPlayer.png

View Options

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking_IconNavigationToolManager.png

View Options

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking_LogFile.png

View Options

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking_LoggingWidget.png

View Options

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking_NavigationToolManagementAddTool.png

View Options

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking_NavigationToolManagement_TrackingTools.png

View Options

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking_Options.png

View Options

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking_ScreenshotMitk.png

View Options

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking_ScreenshotMitk.svg

View Options

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking_TrackingControl.png

View Options

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking_TrackingToolsWidget.png

View Options

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkMITKIGTNavigationToolManager.dox

View Options

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkMITKIGTTrackingToolbox.dox

View Options

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkNavigationDataPlayer.dox

View Options

Plugins/org.mitk.gui.qt.igttracking/resources/iconFiducialRegistration.png

View Options

Plugins/org.mitk.gui.qt.igttracking/resources/iconNavigationDataPlayer.png

View Options

Plugins/org.mitk.gui.qt.igttracking/resources/iconNavigationToolCalibration.xpm

View Options

Plugins/org.mitk.gui.qt.igttracking/resources/iconNavigationToolManager.xpm

View Options

Plugins/org.mitk.gui.qt.igttracking/resources/iconTrackingToolBox.xpm

View Options

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

View Options

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

View Options

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

Merge remote-tracking branch 'origin/T19736…33f2d99b5800Actions

Description

Details

Event Timeline

Merged Changes

Changes (64)

rMITK33f2d99b5800

Documentation/Doxygen/3-DeveloperManual/Toolkit/ModuleManuals/MITKModuleManualsList.dox

Documentation/doxygen.conf.in

Modules/IGT/Documentation/doxygen/IGTHowToImplementATrackingDevice.dox

Modules/IGT/Documentation/doxygen/IGTModule.dox

Modules/IGT/Documentation/doxygen/IGTTutorialOverview.dox

Modules/IGT/Documentation/doxygen/IGTTutorialStep0.dox

Modules/IGT/Documentation/doxygen/IGTTutorialStep1.dox

Modules/IGT/Documentation/doxygen/IGTTutorialStep1_buildInstrLinux.png

Modules/IGT/Documentation/doxygen/IGTTutorialStep1_buildInstrWindows.png

Modules/IGT/Documentation/doxygen/IGTTutorialStep1_output.png

Modules/IGT/Documentation/doxygen/IGTTutorialStep2.dox

Modules/IGT/Documentation/doxygen/IGTTutorialStep2_end.png

Modules/IGT/Documentation/doxygen/IGTTutorialStep2_init.png

Modules/IGT/Documentation/doxygen/IGTTutorialStep2_overview.png

Modules/IGT/Documentation/doxygen/IGTTutorialStep2_track.png

Modules/IGT/Documentation/doxygen/IGTTutorialStep3.dox

Modules/IGT/Documentation/doxygen/IGTTutorialStep3_cmake.png

Modules/IGT/Documentation/doxygen/IGTTutorialStep4.dox

Modules/IGT/Documentation/doxygen/IGTTutorialStep5.dox

Modules/IGT/Documentation/doxygen/IGTTutorialStep6.dox

Modules/IGT/Tutorial/mitkIGTTutorialStep1.cpp

Modules/IGT/Tutorial/mitkIGTTutorialStep2.cpp

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.cpp

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.h

Modules/US/Documentation/doxygen/USModule.dox

Plugins/org.mitk.gui.qt.igtexamples/documentation/UserManual/QmitkIGTTrackingLab.dox

Plugins/org.mitk.gui.qt.igtexamples/documentation/UserManual/QmitkIGTTtrackingLab.dox

Plugins/org.mitk.gui.qt.igtexamples/documentation/UserManual/QmitkIGTTutorial.dox

Plugins/org.mitk.gui.qt.igtexamples/documentation/doxygen/IGTExampleIGT_QT_Tutorial_PluginView.png

Plugins/org.mitk.gui.qt.igtexamples/documentation/doxygen/IGT_TrackingLab_PluginView.png

Plugins/org.mitk.gui.qt.igtexamples/plugin.xml

Plugins/org.mitk.gui.qt.igtexamples/resources/IGTTutorial.png

Plugins/org.mitk.gui.qt.igtexamples/resources/IgtTrackingLab.png

Plugins/org.mitk.gui.qt.igtexamples/resources/QmitkIGTTrackingLabView.qrc

Plugins/org.mitk.gui.qt.igtexamples/resources/QmitkIGTTutorialView.qrc

Plugins/org.mitk.gui.qt.igtexamples/resources/example.png

Plugins/org.mitk.gui.qt.igtexamples/resources/icon.xpm

Plugins/org.mitk.gui.qt.igtexamples/resources/provider.png

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

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

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking.dox

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking_ConfigurationWidget.png

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking_IconNavigationDataPlayer.png

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking_IconNavigationToolManager.png

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking_LogFile.png

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking_LoggingWidget.png

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking_NavigationToolManagementAddTool.png

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking_NavigationToolManagement_TrackingTools.png

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking_Options.png

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking_ScreenshotMitk.png

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking_ScreenshotMitk.svg

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking_TrackingControl.png

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkIGTTracking_TrackingToolsWidget.png

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkMITKIGTNavigationToolManager.dox

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkMITKIGTTrackingToolbox.dox

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkNavigationDataPlayer.dox

Plugins/org.mitk.gui.qt.igttracking/resources/iconFiducialRegistration.png

Plugins/org.mitk.gui.qt.igttracking/resources/iconNavigationDataPlayer.png

Plugins/org.mitk.gui.qt.igttracking/resources/iconNavigationToolCalibration.xpm

Plugins/org.mitk.gui.qt.igttracking/resources/iconNavigationToolManager.xpm

Plugins/org.mitk.gui.qt.igttracking/resources/iconTrackingToolBox.xpm

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

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

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

Merge remote-tracking branch 'origin/T19736…
33f2d99b5800
Actions