Merge branch 'bug-12314…
6edff45d18b0
Actions

Description

Merge branch 'bug-12314-AddExceptionHandlingToNavigationToolDeserializerAndSerializer' into bug-12297-ExceptionHandlingIGT

Conflicts:
Modules/IGTUI/Qmitk/QmitkIGTPlayerWidget.cpp

Details

Provenance

• bakbergenuly

Authored on Jul 3 2012, 10:50 AM

Parents

rMITK459afa85623a: Updated Files required for new tests
rMITK01c83c2d8a53: Merge branch 'bug-12312-AddExceptionHandlingToNavigationDataSequentialPlayer'…

Branches

Unknown

Tags

Unknown

Event Timeline

• bakbergenuly committed rMITK6edff45d18b0: Merge branch 'bug-12314… (authored by • bakbergenuly).Jul 3 2012, 10:50 AM

Merged Changes

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

Changes (10)

Path

Size

Modules/

IGT/

IGTToolManagement/

mitkNavigationToolStorageDeserializer.cpp

mitkNavigationToolStorageDeserializer.h

mitkNavigationToolStorageSerializer.cpp

mitkNavigationToolStorageSerializer.h

Testing/

Data/

InvalidDataNavigationDataTestData.xml

	NavigationDataTestDataInvalidTags.xml
	InvalidDataNavigationDataTestData.xml

mitkNavigationToolStorageSerializerAndDeserializerTest.cpp

	IGT/	Testing/	Data/
		ToFProcessing/	Documentation/

	EmptyZipFile.zip
	CMakeLists.txt

IGTUI/

Qmitk/

QmitkIGTPlayerWidget.cpp

Plugins/

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

rMITK6edff45d18b0

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/Data/NavigationDataTestDataInvalidTags.xml

View Options

Modules/IGT/Testing/mitkNavigationToolStorageSerializerAndDeserializerTest.cpp

View Options

Modules/IGTUI/Qmitk/QmitkIGTPlayerWidget.cpp

View Options

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

Merge branch 'bug-12314…6edff45d18b0Actions

Description

Details

Event Timeline

Merged Changes

Changes (10)

rMITK6edff45d18b0

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/Data/NavigationDataTestDataInvalidTags.xml

Modules/IGT/Testing/mitkNavigationToolStorageSerializerAndDeserializerTest.cpp

Modules/IGTUI/Qmitk/QmitkIGTPlayerWidget.cpp

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

Merge branch 'bug-12314…
6edff45d18b0
Actions