Merge branch 'bug-12297-ExceptionHandlingIGT'
176b2ffe18fd
Actions

Description

Merge branch 'bug-12297-ExceptionHandlingIGT'

Conflicts:
Modules/IGT/Testing/mitkNavigationToolStorageSerializerAndDeserializerTest.cpp
Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp

Details

Provenance

franza

Authored on Aug 7 2012, 2:21 PM

Parents

rMITKe91cd244c965: removed file which is not needed
rMITK5fba08e1cf8c: Merge branch 'bug-12804-StreamlineRadiusThreshold'

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITK176b2ffe18fd: Merge branch 'bug-12297-ExceptionHandlingIGT' (authored by franza).Aug 7 2012, 2:21 PM

Merged Changes

e91cd244c965 removed file which is not needed
Author
franza
Browse Repository
No Builds
No Audits
1636c41b4850 further implementation of exception handling; documentation
Author
franza
Browse Repository
No Builds
No Audits
f601b128aae3 cleaned up / fixed new exception handling code, also adapted test to exception…
Author
franza
Browse Repository
No Builds
No Audits
e4ea3d0e0a6e added UID to temp path, also fixed a bug with deleting the temp path
Author
franza
Browse Repository
No Builds
No Audits
ec899e6e6173 cleaned up and restructured the test
Author
franza
Browse Repository
No Builds
No Audits
9a153514366f cleaned up/fixed exception handling an also fixed a bug: an exception is thrown…
Author
franza
Browse Repository
No Builds
No Audits
11da29f0adc3 cleaned up/fixed exception handling of navigation data recorder and adapted the…
Author
franza
Browse Repository
No Builds
No Audits
48acc0372c74 further work on exception handling: cleaned up/fixed code, improved…
Author
franza
Browse Repository
No Builds
No Audits
d7a217978b4c DOC: adapted documentation which was wrong before
Author
franza
Browse Repository
No Builds
No Audits
dd17a463f55d Added method to set/get player mode which missed before
Author
• bakbergenuly
Browse Repository
No Builds
No Audits
6edff45d18b0 Merge branch 'bug-12314-AddExceptionHandlingToNavigationToolDeserializerAndSeri…
Author
• bakbergenuly
Browse Repository
No Builds
No Audits
01c83c2d8a53 Merge branch 'bug-12312-AddExceptionHandlingToNavigationDataSequentialPlayer'…
Author
• bakbergenuly
Browse Repository
No Builds
No Audits
4a0870ed1931 Merge branch 'bug-12311-AddExceptionHandlingToNavigationDataRecorder' into bug…
Author
• bakbergenuly
Browse Repository
No Builds
No Audits
63f11c2be39b Merge branch 'bug-12141-ExceptionHandlingNavigationDataPlayer' into bug-12297…
Author
• bakbergenuly
Browse Repository
No Builds
No Audits
459afa85623a Updated Files required for new tests
Author
maerz
Browse Repository
No Builds
No Audits
c3ee7ebe2e52 Updated Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingTo…
Author
maerz
Browse Repository
No Builds
No Audits
4329c0724bbe Update Widgets and Tests to reflect new Exception handling (Ilyas)
Author
maerz
Browse Repository
No Builds
No Audits
44884e33116b Exception HAndling for Serializer(Ilyas)
Author
maerz
Browse Repository
No Builds
No Audits
73bf5ea8d6b7 Exception Handling for Deserializer(Ilyas)
Author
maerz
Browse Repository
No Builds
No Audits
650741e786c1 Exeption handling for DataRecorder (Commit by Ilyas)
Author
maerz
Browse Repository
No Builds
No Audits
dd92f6edb5b3 Added Exception Handling
Author
• bakbergenuly
Browse Repository
No Builds
No Audits
8c196d3da4fc Added additional exception throwing statements
Author
• bakbergenuly
Browse Repository
No Builds
No Audits
741fb224c0f0 adopted player widget to exception handling of navigation data player
Author
franza
Browse Repository
No Builds
No Audits
3903a7f95fcf implemented exception handling and adopted test
Author
• bakbergenuly
Browse Repository
No Builds
No Audits
100fbb379af5 added new exception
Author
• bakbergenuly
Browse Repository
No Builds
No Audits
13ad8e43a9e6 add new exception class IGTIOException
Author
• bakbergenuly
Browse Repository
No Builds
No Audits

Changes (25)

Path

Size

Modules/

IGT/

CMakeLists.txt

IGTExceptionHandling/

	mitkIGTIOException.cpp
	mitkIGTException.cpp

	mitkIGTIOException.h
	mitkIGTHardwareException.h

IGTFilters/

mitkNavigationDataPlayer.cpp

mitkNavigationDataPlayer.h

mitkNavigationDataPlayerBase.cpp

mitkNavigationDataPlayerBase.h

mitkNavigationDataRecorder.cpp

mitkNavigationDataRecorder.h

mitkNavigationDataSequentialPlayer.cpp

mitkNavigationDataSequentialPlayer.h

IGTToolManagement/

mitkNavigationToolStorageDeserializer.cpp

mitkNavigationToolStorageDeserializer.h

mitkNavigationToolStorageSerializer.cpp

mitkNavigationToolStorageSerializer.h

Testing/

Data/

	EmptyZipFile.zip
	Empty.zip

InvalidDataNavigationDataTestData.xml

files.cmake

mitkNavigationDataPlayerTest.cpp

mitkNavigationDataRecorderTest.cpp

mitkNavigationDataSequentialPlayerTest.cpp

mitkNavigationToolStorageSerializerAndDeserializerTest.cpp

files.cmake

IGTUI/

Qmitk/

QmitkIGTPlayerWidget.cpp

Plugins/

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

rMITK176b2ffe18fd

View Options

Modules/IGT/CMakeLists.txt

View Options

Modules/IGT/IGTExceptionHandling/mitkIGTIOException.cpp

View Options

Modules/IGT/IGTExceptionHandling/mitkIGTIOException.h

View Options

Modules/IGT/IGTFilters/mitkNavigationDataPlayer.cpp

View Options

Modules/IGT/IGTFilters/mitkNavigationDataPlayer.h

View Options

Modules/IGT/IGTFilters/mitkNavigationDataPlayerBase.cpp

View Options

Modules/IGT/IGTFilters/mitkNavigationDataPlayerBase.h

View Options

Modules/IGT/IGTFilters/mitkNavigationDataRecorder.cpp

View Options

Modules/IGT/IGTFilters/mitkNavigationDataRecorder.h

View Options

Modules/IGT/IGTFilters/mitkNavigationDataSequentialPlayer.cpp

View Options

Modules/IGT/IGTFilters/mitkNavigationDataSequentialPlayer.h

View Options

Modules/IGT/IGTToolManagement/mitkNavigationToolStorageDeserializer.cpp

View Options

Modules/IGT/IGTToolManagement/mitkNavigationToolStorageDeserializer.h

View Options

Modules/IGT/IGTToolManagement/mitkNavigationToolStorageSerializer.cpp

View Options

Modules/IGT/IGTToolManagement/mitkNavigationToolStorageSerializer.h

View Options

Modules/IGT/Testing/Data/EmptyZipFile.zip

View Options

Modules/IGT/Testing/Data/InvalidDataNavigationDataTestData.xml

View Options

Modules/IGT/Testing/files.cmake

View Options

Modules/IGT/Testing/mitkNavigationDataPlayerTest.cpp

View Options

Modules/IGT/Testing/mitkNavigationDataRecorderTest.cpp

View Options

Modules/IGT/Testing/mitkNavigationDataSequentialPlayerTest.cpp

View Options

Modules/IGT/Testing/mitkNavigationToolStorageSerializerAndDeserializerTest.cpp

View Options

Modules/IGT/files.cmake

View Options

Modules/IGTUI/Qmitk/QmitkIGTPlayerWidget.cpp

View Options

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

Merge branch 'bug-12297-ExceptionHandlingIGT'176b2ffe18fdActions

Description

Details

Event Timeline

Merged Changes

Changes (25)

rMITK176b2ffe18fd

Modules/IGT/CMakeLists.txt

Modules/IGT/IGTExceptionHandling/mitkIGTIOException.cpp

Modules/IGT/IGTExceptionHandling/mitkIGTIOException.h

Modules/IGT/IGTFilters/mitkNavigationDataPlayer.cpp

Modules/IGT/IGTFilters/mitkNavigationDataPlayer.h

Modules/IGT/IGTFilters/mitkNavigationDataPlayerBase.cpp

Modules/IGT/IGTFilters/mitkNavigationDataPlayerBase.h

Modules/IGT/IGTFilters/mitkNavigationDataRecorder.cpp

Modules/IGT/IGTFilters/mitkNavigationDataRecorder.h

Modules/IGT/IGTFilters/mitkNavigationDataSequentialPlayer.cpp

Modules/IGT/IGTFilters/mitkNavigationDataSequentialPlayer.h

Modules/IGT/IGTToolManagement/mitkNavigationToolStorageDeserializer.cpp

Modules/IGT/IGTToolManagement/mitkNavigationToolStorageDeserializer.h

Modules/IGT/IGTToolManagement/mitkNavigationToolStorageSerializer.cpp

Modules/IGT/IGTToolManagement/mitkNavigationToolStorageSerializer.h

Modules/IGT/Testing/Data/EmptyZipFile.zip

Modules/IGT/Testing/Data/InvalidDataNavigationDataTestData.xml

Modules/IGT/Testing/files.cmake

Modules/IGT/Testing/mitkNavigationDataPlayerTest.cpp

Modules/IGT/Testing/mitkNavigationDataRecorderTest.cpp

Modules/IGT/Testing/mitkNavigationDataSequentialPlayerTest.cpp

Modules/IGT/Testing/mitkNavigationToolStorageSerializerAndDeserializerTest.cpp

Modules/IGT/files.cmake

Modules/IGTUI/Qmitk/QmitkIGTPlayerWidget.cpp

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

Merge branch 'bug-12297-ExceptionHandlingIGT'
176b2ffe18fd
Actions