Merge branch 'bug-18998-NewNavigationModuleFeaturesV2'
9a37cb7698f8
Actions

Description

Merge branch 'bug-18998-NewNavigationModuleFeaturesV2'

Details

Provenance

Authored on May 21 2015, 1:55 PM

Parents

rMITK986d359cf313: XML reader tests now expects the correct exception
rMITKd425eee66add: Merge branch 'bug-18998-fixDashboard'

Branches

Unknown

Tags

Unknown

Event Timeline

maerz committed rMITK9a37cb7698f8: Merge branch 'bug-18998-NewNavigationModuleFeaturesV2' (authored by maerz).May 21 2015, 1:55 PM

Merged Changes

986d359cf313 XML reader tests now expects the correct exception
Author
maerz
Browse Repository
No Builds
No Audits
5d738f393b79 Merge branch 'bug-19079-RefactorIGTBase' into bug-18998…
Author
maerz
Browse Repository
No Builds
No Audits
aefc2670bec8 NavigationDataReaderXML now without crashes!
Author
maerz
Browse Repository
No Builds
No Audits
0542fdfd7e68 Fixed DatasetReader Usage in IGT Plugins
Author
maerz
Browse Repository
No Builds
No Audits
8464fedd9eec Getting the moved and restructured Readers to work again...
Author
maerz
Browse Repository
No Builds
No Audits
e81152fac388 Moved NavigationDatasetWriter/ReaderXML to IGTBase Module Added IGTMimeTypes
Author
maerz
Browse Repository
No Builds
No Audits
7a58abf688df Added class for IGTMimeTypes
Author
maerz
Browse Repository
No Builds
No Audits
a22c6a1cb73c Moved IGTExceptions to IGTBase
Author
maerz
Browse Repository
No Builds
No Audits

Changes (34)

Path

Size

Modules/

IGT/

IO/

mitkNavigationDataPlayer.cpp

mitkNavigationDataReaderCSV.cpp

mitkNavigationDataReaderCSV.h

mitkNavigationDataReaderXML.cpp

mitkNavigationDataReaderXML.h

Testing/

mitkNavigationDataRecorderTest.cpp

mitkNavigationDataSequentialPlayerTest.cpp

mitkNavigationDataSetReaderWriterCSVTest.cpp

mitkNavigationDataSetReaderWriterXMLTest.cpp

mitkNavigationDataToIGTLMessageFilterTest.cpp

mitkNavigationDataToPointSetFilterTest.cpp

files.cmake

IGTBase/

autoload/

IO/

files.cmake

mitkIGTBaseActivator.cpp

mitkIGTBaseActivator.h

mitkNavigationDataSetWriterCSV.cpp

mitkNavigationDataSetWriterCSV.h

mitkNavigationDataSetWriterXML.cpp

mitkNavigationDataSetWriterXML.h

files.cmake

src/

mitkIGTMimeTypes.cpp

	IGTBase/	autoload/	IO/
		IGT/	IO/

mitkNavigationDataReaderCSV.cpp

mitkNavigationDataReaderCSV.h

mitkNavigationDataReaderXML.cpp

mitkNavigationDataReaderXML.h

	IGTBase/
	IGT/

	include/
	ExceptionHandling/

mitkIGTException.h

mitkIGTHardwareException.h

mitkIGTIOException.h

	src/
	ExceptionHandling/

mitkIGTException.cpp

mitkIGTHardwareException.cpp

mitkIGTIOException.cpp

	IGTBase/	include/
	Core/	include/

	mitkIGTMimeTypes.h
	mitkCrosshairPositionEvent.h

IGTUI/

Qmitk/

QmitkIGTPlayerWidget.cpp

Plugins/

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkNavigationDataPlayerView.cpp

rMITK9a37cb7698f8

View Options

Modules/IGT/IO/mitkNavigationDataPlayer.cpp

View Options

Modules/IGT/IO/mitkNavigationDataReaderCSV.cpp

View Options

Modules/IGT/IO/mitkNavigationDataReaderCSV.h

View Options

Modules/IGT/IO/mitkNavigationDataReaderXML.cpp

View Options

Modules/IGT/IO/mitkNavigationDataReaderXML.h

View Options

Modules/IGT/Testing/mitkNavigationDataRecorderTest.cpp

View Options

Modules/IGT/Testing/mitkNavigationDataSequentialPlayerTest.cpp

View Options

Modules/IGT/Testing/mitkNavigationDataSetReaderWriterCSVTest.cpp

View Options

Modules/IGT/Testing/mitkNavigationDataSetReaderWriterXMLTest.cpp

View Options

Modules/IGT/Testing/mitkNavigationDataToIGTLMessageFilterTest.cpp

View Options

Modules/IGT/Testing/mitkNavigationDataToPointSetFilterTest.cpp

View Options

Modules/IGT/files.cmake

View Options

Modules/IGTBase/autoload/IO/files.cmake

View Options

Modules/IGTBase/autoload/IO/mitkIGTBaseActivator.cpp

View Options

Modules/IGTBase/autoload/IO/mitkIGTBaseActivator.h

View Options

Modules/IGTBase/autoload/IO/mitkNavigationDataReaderCSV.cpp

View Options

Modules/IGTBase/autoload/IO/mitkNavigationDataReaderCSV.h

View Options

Modules/IGTBase/autoload/IO/mitkNavigationDataReaderXML.cpp

View Options

Modules/IGTBase/autoload/IO/mitkNavigationDataReaderXML.h

View Options

Modules/IGTBase/autoload/IO/mitkNavigationDataSetWriterCSV.cpp

View Options

Modules/IGTBase/autoload/IO/mitkNavigationDataSetWriterCSV.h

View Options

Modules/IGTBase/autoload/IO/mitkNavigationDataSetWriterXML.cpp

View Options

Modules/IGTBase/autoload/IO/mitkNavigationDataSetWriterXML.h

View Options

Modules/IGTBase/files.cmake

View Options

Modules/IGTBase/include/mitkIGTException.h

View Options

Modules/IGTBase/include/mitkIGTHardwareException.h

View Options

Modules/IGTBase/include/mitkIGTIOException.h

View Options

Modules/IGTBase/include/mitkIGTMimeTypes.h

View Options

Modules/IGTBase/src/mitkIGTException.cpp

View Options

Modules/IGTBase/src/mitkIGTHardwareException.cpp

View Options

Modules/IGTBase/src/mitkIGTIOException.cpp

View Options

Modules/IGTBase/src/mitkIGTMimeTypes.cpp

View Options

Modules/IGTUI/Qmitk/QmitkIGTPlayerWidget.cpp

View Options

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

Merge branch 'bug-18998-NewNavigationModuleFeaturesV2'9a37cb7698f8Actions

Description

Details

Event Timeline

Merged Changes

Changes (34)

rMITK9a37cb7698f8

Modules/IGT/IO/mitkNavigationDataPlayer.cpp

Modules/IGT/IO/mitkNavigationDataReaderCSV.cpp

Modules/IGT/IO/mitkNavigationDataReaderCSV.h

Modules/IGT/IO/mitkNavigationDataReaderXML.cpp

Modules/IGT/IO/mitkNavigationDataReaderXML.h

Modules/IGT/Testing/mitkNavigationDataRecorderTest.cpp

Modules/IGT/Testing/mitkNavigationDataSequentialPlayerTest.cpp

Modules/IGT/Testing/mitkNavigationDataSetReaderWriterCSVTest.cpp

Modules/IGT/Testing/mitkNavigationDataSetReaderWriterXMLTest.cpp

Modules/IGT/Testing/mitkNavigationDataToIGTLMessageFilterTest.cpp

Modules/IGT/Testing/mitkNavigationDataToPointSetFilterTest.cpp

Modules/IGT/files.cmake

Modules/IGTBase/autoload/IO/files.cmake

Modules/IGTBase/autoload/IO/mitkIGTBaseActivator.cpp

Modules/IGTBase/autoload/IO/mitkIGTBaseActivator.h

Modules/IGTBase/autoload/IO/mitkNavigationDataReaderCSV.cpp

Modules/IGTBase/autoload/IO/mitkNavigationDataReaderCSV.h

Modules/IGTBase/autoload/IO/mitkNavigationDataReaderXML.cpp

Modules/IGTBase/autoload/IO/mitkNavigationDataReaderXML.h

Modules/IGTBase/autoload/IO/mitkNavigationDataSetWriterCSV.cpp

Modules/IGTBase/autoload/IO/mitkNavigationDataSetWriterCSV.h

Modules/IGTBase/autoload/IO/mitkNavigationDataSetWriterXML.cpp

Modules/IGTBase/autoload/IO/mitkNavigationDataSetWriterXML.h

Modules/IGTBase/files.cmake

Modules/IGTBase/include/mitkIGTException.h

Modules/IGTBase/include/mitkIGTHardwareException.h

Modules/IGTBase/include/mitkIGTIOException.h

Modules/IGTBase/include/mitkIGTMimeTypes.h

Modules/IGTBase/src/mitkIGTException.cpp

Modules/IGTBase/src/mitkIGTHardwareException.cpp

Modules/IGTBase/src/mitkIGTIOException.cpp

Modules/IGTBase/src/mitkIGTMimeTypes.cpp

Modules/IGTUI/Qmitk/QmitkIGTPlayerWidget.cpp

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

Merge branch 'bug-18998-NewNavigationModuleFeaturesV2'
9a37cb7698f8
Actions