Diffusion MITK b8a2abb01b76

Merge branch 'bug-19079-RefactorIGTBase' into bug-18998…
b8a2abb01b76
Actions

Description

Merge branch 'bug-19079-RefactorIGTBase' into bug-18998-NewNavigationModuleFeaturesV2

Conflicts:
Modules/IGTBase/files.cmake

Details

Provenance

franza

Authored on May 20 2015, 2:10 PM

Parents

rMITK3b508abb178c: Fixed Streaming behavior in new Writers
rMITK8eed9b3d98b5: fixed a bug: navigation tool calibration crashed when closing the view...

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITKb8a2abb01b76: Merge branch 'bug-19079-RefactorIGTBase' into bug-18998… (authored by franza).May 20 2015, 2:10 PM

Merged Changes

3b508abb178c Fixed Streaming behavior in new Writers
Author
maerz
Browse Repository
No Builds
No Audits
e383446fd631 Registering the new Writers
Author
maerz
Browse Repository
No Builds
No Audits
af70f758e23e Override for IsEmpty in NavigationDataSet
Author
maerz
Browse Repository
No Builds
No Audits
886b228aa9b8 Replaced applications of the writers with their counterpart from MITKIOUtil
Author
maerz
Browse Repository
No Builds
No Audits
d1f031714aaa Patched Const correctness in NavigationDataPlayer
Author
maerz
Browse Repository
No Builds
No Audits
f3d9f4070eaa Added some missing includes
Author
maerz
Browse Repository
No Builds
No Audits
b7b19d45abf8 IGTIO and IGTBase are compiling now
Author
maerz
Browse Repository
No Builds
No Audits
51c8ed8f9171 Fixing problems related to the switch to new IO Framework
Author
maerz
Browse Repository
No Builds
No Audits
453811e9f6dd Fixed several compilation errors, fine tuning new module structure
Author
maerz
Browse Repository
No Builds
No Audits
3d66d7440901 Restructured IGTBase and pulled in first basedatas and IO files. Code does not…
Author
maerz
Browse Repository
No Builds
No Audits

Changes (52)

Path

Size

Modules/

IGT/

Algorithms/

mitkNavigationDataToPointSetFilter.h

DataManagement/

mitkNavigationData.cpp

mitkNavigationData.h

mitkNavigationDataSet.cpp

mitkNavigationDataSet.h

mitkNavigationDataSource.cpp

mitkNavigationDataSource.h

IO/

mitkNavigationDataPlayerBase.h

mitkNavigationDataReaderInterface.h

mitkNavigationDataRecorderDeprecated.h

mitkNavigationDataSetWriterCSV.cpp

mitkNavigationDataSetWriterCSV.h

mitkNavigationDataSetWriterXML.cpp

mitkNavigationDataSetWriterXML.h

Testing/

mitkNavigationDataRecorderTest.cpp

mitkNavigationDataSetReaderWriterCSVTest.cpp

mitkNavigationDataSetReaderWriterXMLTest.cpp

Tutorial/

mitkIGTTutorialStep1.cpp

IGTBase/

	autoload/	IO/

	mitkIGTBaseActivator.cpp
	mitkRealTimeClock.cpp

	mitkIGTBaseActivator.h
	mitkRealTimeClock.cpp

files.cmake

include

	include/

mitkLinuxRealTimeClock.h

mitkRealTimeClock.h

mitkWindowsRealTimeClock.h

mitkLinuxRealTimeClock.cpp

mitkLinuxRealTimeClock.h

mitkRealTimeClock.cpp

mitkRealTimeClock.h

mitkWindowsRealTimeClock.cpp

mitkWindowsRealTimeClock.h

src

	src/

mitkLinuxRealTimeClock.cpp

mitkRealTimeClock.cpp

mitkWindowsRealTimeClock.cpp

	IGTBase/	autoload/	IO/
		IGT/	IO/

mitkNavigationDataSetWriterCSV.cpp

mitkNavigationDataSetWriterCSV.h

mitkNavigationDataSetWriterXML.cpp

mitkNavigationDataSetWriterXML.h

	IGTBase/
	IGT/

	include/
	DataManagement/

mitkNavigationData.h

mitkNavigationDataSet.h

	src/
	DataManagement/

mitkNavigationData.cpp

mitkNavigationDataSet.cpp

IGTUI/

Qmitk/

QmitkIGTLoggerWidget.cpp

Plugins/

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

rMITKb8a2abb01b76

View Options

Modules/IGT/Algorithms/mitkNavigationDataToPointSetFilter.h

View Options

Modules/IGT/DataManagement/mitkNavigationData.cpp

View Options

Modules/IGT/DataManagement/mitkNavigationData.h

View Options

Modules/IGT/DataManagement/mitkNavigationDataSet.cpp

View Options

Modules/IGT/DataManagement/mitkNavigationDataSet.h

View Options

Modules/IGT/DataManagement/mitkNavigationDataSource.cpp

View Options

Modules/IGT/DataManagement/mitkNavigationDataSource.h

View Options

Modules/IGT/IO/mitkNavigationDataPlayerBase.h

View Options

Modules/IGT/IO/mitkNavigationDataReaderInterface.h

View Options

Modules/IGT/IO/mitkNavigationDataRecorderDeprecated.h

View Options

Modules/IGT/IO/mitkNavigationDataSetWriterCSV.cpp

View Options

Modules/IGT/IO/mitkNavigationDataSetWriterCSV.h

View Options

Modules/IGT/IO/mitkNavigationDataSetWriterXML.cpp

View Options

Modules/IGT/IO/mitkNavigationDataSetWriterXML.h

View Options

Modules/IGT/Testing/mitkNavigationDataRecorderTest.cpp

View Options

Modules/IGT/Testing/mitkNavigationDataSetReaderWriterCSVTest.cpp

View Options

Modules/IGT/Testing/mitkNavigationDataSetReaderWriterXMLTest.cpp

View Options

Modules/IGT/Tutorial/mitkIGTTutorialStep1.cpp

View Options

Modules/IGT/files.cmake

View Options

Modules/IGTBase/CMakeLists.txt

View Options

Modules/IGTBase/autoload/CMakeLists.txt

View Options

Modules/IGTBase/autoload/IO/CMakeLists.txt

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/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/mitkLinuxRealTimeClock.h

View Options

Modules/IGTBase/include/mitkNavigationData.h

View Options

Modules/IGTBase/include/mitkNavigationDataSet.h

View Options

Modules/IGTBase/include/mitkRealTimeClock.h

View Options

Modules/IGTBase/include/mitkWindowsRealTimeClock.h

View Options

Modules/IGTBase/mitkLinuxRealTimeClock.cpp

View Options

Modules/IGTBase/mitkLinuxRealTimeClock.h

View Options

Modules/IGTBase/mitkRealTimeClock.cpp

View Options

Modules/IGTBase/mitkRealTimeClock.h

View Options

Modules/IGTBase/mitkWindowsRealTimeClock.cpp

View Options

Modules/IGTBase/mitkWindowsRealTimeClock.h

View Options

Modules/IGTBase/src/mitkLinuxRealTimeClock.cpp

View Options

Modules/IGTBase/src/mitkNavigationData.cpp

View Options

Modules/IGTBase/src/mitkNavigationDataSet.cpp

View Options

Modules/IGTBase/src/mitkRealTimeClock.cpp

View Options

Modules/IGTBase/src/mitkWindowsRealTimeClock.cpp

View Options

Modules/IGTUI/Qmitk/QmitkIGTLoggerWidget.cpp

View Options

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

Merge branch 'bug-19079-RefactorIGTBase' into bug-18998…b8a2abb01b76Actions

Description

Details

Event Timeline

Merged Changes

Changes (52)

rMITKb8a2abb01b76

Modules/IGT/Algorithms/mitkNavigationDataToPointSetFilter.h

Modules/IGT/DataManagement/mitkNavigationData.cpp

Modules/IGT/DataManagement/mitkNavigationData.h

Modules/IGT/DataManagement/mitkNavigationDataSet.cpp

Modules/IGT/DataManagement/mitkNavigationDataSet.h

Modules/IGT/DataManagement/mitkNavigationDataSource.cpp

Modules/IGT/DataManagement/mitkNavigationDataSource.h

Modules/IGT/IO/mitkNavigationDataPlayerBase.h

Modules/IGT/IO/mitkNavigationDataReaderInterface.h

Modules/IGT/IO/mitkNavigationDataRecorderDeprecated.h

Modules/IGT/IO/mitkNavigationDataSetWriterCSV.cpp

Modules/IGT/IO/mitkNavigationDataSetWriterCSV.h

Modules/IGT/IO/mitkNavigationDataSetWriterXML.cpp

Modules/IGT/IO/mitkNavigationDataSetWriterXML.h

Modules/IGT/Testing/mitkNavigationDataRecorderTest.cpp

Modules/IGT/Testing/mitkNavigationDataSetReaderWriterCSVTest.cpp

Modules/IGT/Testing/mitkNavigationDataSetReaderWriterXMLTest.cpp

Modules/IGT/Tutorial/mitkIGTTutorialStep1.cpp

Modules/IGT/files.cmake

Modules/IGTBase/CMakeLists.txt

Modules/IGTBase/autoload/CMakeLists.txt

Modules/IGTBase/autoload/IO/CMakeLists.txt

Modules/IGTBase/autoload/IO/files.cmake

Modules/IGTBase/autoload/IO/mitkIGTBaseActivator.cpp

Modules/IGTBase/autoload/IO/mitkIGTBaseActivator.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/mitkLinuxRealTimeClock.h

Modules/IGTBase/include/mitkNavigationData.h

Modules/IGTBase/include/mitkNavigationDataSet.h

Modules/IGTBase/include/mitkRealTimeClock.h

Modules/IGTBase/include/mitkWindowsRealTimeClock.h

Modules/IGTBase/mitkLinuxRealTimeClock.cpp

Modules/IGTBase/mitkLinuxRealTimeClock.h

Modules/IGTBase/mitkRealTimeClock.cpp

Modules/IGTBase/mitkRealTimeClock.h

Modules/IGTBase/mitkWindowsRealTimeClock.cpp

Modules/IGTBase/mitkWindowsRealTimeClock.h

Modules/IGTBase/src/mitkLinuxRealTimeClock.cpp

Modules/IGTBase/src/mitkNavigationData.cpp

Modules/IGTBase/src/mitkNavigationDataSet.cpp

Modules/IGTBase/src/mitkRealTimeClock.cpp

Modules/IGTBase/src/mitkWindowsRealTimeClock.cpp

Modules/IGTUI/Qmitk/QmitkIGTLoggerWidget.cpp

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

Merge branch 'bug-19079-RefactorIGTBase' into bug-18998…
b8a2abb01b76
Actions