Diffusion MITK 0ba76ea3d488

Merge remote-tracking branch 'remotes/origin/bug-15959…
0ba76ea3d488
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge remote-tracking branch 'remotes/origin/bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInsteadOfDoingThisInBothOfItsSubclasses' into bug-15959-RedesignNavigationDataPlayerAndRecorder

Conflicts:
Modules/IGT/IO/mitkNavigationDataSequentialPlayer.cpp
Modules/IGT/IO/mitkNavigationDataSequentialPlayer.h
Modules/IGT/Testing/mitkNavigationDataPlayerTest.cpp
Modules/IGT/Testing/mitkNavigationDataRecorderTest.cpp
Modules/IGT/Testing/mitkNavigationDataToPointSetFilterTest.cpp

Details

Provenance

Authored on Oct 29 2013, 4:51 PM

Parents

rMITKcbe7e2e357a5: Fixed reset problem of sequential DataPlayer
rMITK22d3fd92fcc9: Merge branch 'bug-15911-AddMissingBaudRates' into bug-15963-IGTCodingBase2

Branches

Unknown

Tags

Unknown

Event Timeline

maerz committed rMITK0ba76ea3d488: Merge remote-tracking branch 'remotes/origin/bug-15959… (authored by maerz).Oct 29 2013, 4:51 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

cbe7e2e357a5 Fixed reset problem of sequential DataPlayer
Author
maerz
Browse Repository
No Builds
No Audits
b4fff678592d Merge branch 'bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInstea…
Author
maerz
Browse Repository
No Builds
No Audits
3a5958139aeb Cleaned up Plugin Code
Author
maerz
Browse Repository
No Builds
No Audits
c2ce0f6fe425 Fixed only true test condition.
Author
• wintersa
Browse Repository
No Builds
No Audits
d38d8fa07c12 Merge branch 'bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInstea…
Author
• wintersa
Browse Repository
No Builds
No Audits
f399acc36a77 NavigationDataSequentialPlayer does not go to the next snapshot on Update…
Author
• wintersa
Browse Repository
No Builds
No Audits
06139522e6f7 Fixed recorder recording +1 ND set when a limit was set
Author
maerz
Browse Repository
No Builds
No Audits
653f8f09373a Recorder Test is testing for correct conditions (passing the Test) now
Author
maerz
Browse Repository
No Builds
No Audits
e4cff2228e05 Merge branch 'bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInstea…
Author
maerz
Browse Repository
No Builds
No Audits
194a7b0e1d65 Added skip condition to recorder
Author
maerz
Browse Repository
No Builds
No Audits
1d758396549c NavigationDataPlayer handles multiple calls of SetNavigationDataSet() correctly.
Author
• wintersa
Browse Repository
No Builds
No Audits
6bf74d8a48e3 Fixed 'extra qualifier' compile error.
Author
• wintersa
Browse Repository
No Builds
No Audits
491985cb1b44 Merge branch 'bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInstea…
Author
maerz
Browse Repository
No Builds
No Audits
605c51af1cf0 Further fixes and corrections
Author
maerz
Browse Repository
No Builds
No Audits
07c0abed55c8 Some documentation and cleanup of player classes.
Author
• wintersa
Browse Repository
No Builds
No Audits
2efd63379d55 Recorder is working now!
Author
maerz
Browse Repository
No Builds
No Audits
58f9e78e253d Adapted widgets to comply with the new NavigationData player and recorder…
Author
• wintersa
Browse Repository
No Builds
No Audits
b36609ce9010 Merge branch 'bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInstea…
Author
maerz
Browse Repository
No Builds
No Audits
56a437daabad Improving Tests and fixing recorder behaviour
Author
maerz
Browse Repository
No Builds
No Audits
c2e737eada59 IsAtEnd() moved to base class.
Author
• wintersa
Browse Repository
No Builds
No Audits
72da8b7d32b7 Fixed call of open() of std::ofstream (char*, openmode).
Author
• wintersa
Browse Repository
No Builds
No Audits
258224a904b2 Merge branch 'bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInstea…
Author
• wintersa
Browse Repository
No Builds
No Audits
e5588414f30d Removed parts of NavigationDataPlayers which are unused now.
Author
• wintersa
Browse Repository
No Builds
No Audits
e86bce053d12 XMLReader and Writer work as advertised!
Author
maerz
Browse Repository
No Builds
No Audits
87c6f93d375b Merge branch 'bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInstea…
Author
maerz
Browse Repository
No Builds
No Audits
de80d6295dea NavigationDataPlayer and NaivgationDataSequentialPlayer do not read the data…
Author
• wintersa
Browse Repository
No Builds
No Audits
3978ccad8e96 Test for XML Reader and Writer (still with hardcoded strings)
Author
maerz
Browse Repository
No Builds
No Audits
fee66fc02bd6 Constructor and exports for XML Writer
Author
maerz
Browse Repository
No Builds
No Audits
77d8790be60f Changed reading of version tag for backwards compatibility.
Author
• wintersa
Browse Repository
No Builds
No Audits
afa1433b4946 Merge branch 'bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInstea…
Author
• wintersa
Browse Repository
No Builds
No Audits
5c4c7b2ef0c1 - changed reader interface (Read() -> Read(string)) - xml reader can read files…
Author
• wintersa
Browse Repository
No Builds
No Audits
bdf463f3727a NavigationDataSetWriter for XML (Done) and CSV (Hull only)
Author
maerz
Browse Repository
No Builds
No Audits
a67c73a97d84 New Method: Get NumberOfRecordedSteps
Author
maerz
Browse Repository
No Builds
No Audits
cb3f8164a7f7 Merge branch 'bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInstea…
Author
• wintersa
Browse Repository
No Builds
No Audits
8f400ff13272 Exports for DataReaders, changes in NavigationDataPlayerTest.
Author
• wintersa
Browse Repository
No Builds
No Audits
e27f57d776a9 Merge branch 'bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInstea…
Author
maerz
Browse Repository
No Builds
No Audits
63051fdae9e8 Removed unused imports and an obsolete member
Author
maerz
Browse Repository
No Builds
No Audits
a349a42b37a2 Documentation
Author
maerz
Browse Repository
No Builds
No Audits
f54f1d2faa91 Most functionality for NavigationDataRecorder should be included
Author
maerz
Browse Repository
No Builds
No Audits
999d73b32c1e All tests for NaivationDataPlayer are working.
Author
• wintersa
Browse Repository
No Builds
No Audits
3e947f180bb2 Merge branch 'bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInstea…
Author
• wintersa
Browse Repository
No Builds
No Audits
2ebf824314f6 Added readers for getting NavigationData from xml and csv files (csv not…
Author
• wintersa
Browse Repository
No Builds
No Audits
c9be0e53be50 Renamed GetTrackingStreamForTool -> GetDataStreamForTool, Completed Tests
Author
maerz
Browse Repository
No Builds
No Audits
d24f33e7a198 Added new Accessors to NavigationDataSet
Author
maerz
Browse Repository
No Builds
No Audits
432bba004580 Documentation
Author
maerz
Browse Repository
No Builds
No Audits
d46381692942 implemented .Begin and .End
Author
maerz
Browse Repository
No Builds
No Audits
73f3cedfe1ad Fixed Tests and restored previous functionality
Author
maerz
Browse Repository
No Builds
No Audits
c1dd56249b04 Further fixing, Repaired Tests
Author
maerz
Browse Repository
No Builds
No Audits
60aee27a95b9 New typedef mitk::NavigationDataSet::NavigationDataSetIterator and correct…
Author
maerz
Browse Repository
No Builds
No Audits
d7119c3f23bc Fixed Typos
Author
maerz
Browse Repository
No Builds
No Audits

Changes (33)

Path

Size

Modules/

IGT/

DataManagement/

mitkNavigationDataSet.cpp

mitkNavigationDataSet.h

IO/

mitkNavigationDataPlayer.cpp

mitkNavigationDataPlayer.h

mitkNavigationDataPlayerBase.cpp

mitkNavigationDataPlayerBase.h

mitkNavigationDataReaderCSV.cpp

mitkNavigationDataReaderCSV.h

mitkNavigationDataReaderInterface.cpp

mitkNavigationDataReaderInterface.h

mitkNavigationDataReaderXML.cpp

mitkNavigationDataReaderXML.h

mitkNavigationDataRecorder.cpp

mitkNavigationDataRecorder.h

mitkNavigationDataSequentialPlayer.cpp

mitkNavigationDataSequentialPlayer.h

mitkNavigationDataSetWriterCSV.cpp

mitkNavigationDataSetWriterCSV.h

mitkNavigationDataSetWriterXML.cpp

mitkNavigationDataSetWriterXML.h

Testing/

mitkNavigationDataPlayerTest.cpp

mitkNavigationDataRecorderTest.cpp

mitkNavigationDataSequentialPlayerTest.cpp

mitkNavigationDataSetReaderWriterTest.cpp

mitkNavigationDataSetTest.cpp

mitkNavigationDataToPointSetFilterTest.cpp

IGTUI/

Qmitk/

QmitkIGTLoggerWidget.cpp

QmitkIGTPlayerWidget.cpp

Plugins/

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

QmitkNavigationDataPlayerView.cpp

QmitkNavigationDataPlayerView.h

rMITK0ba76ea3d488

Modules/IGT/DataManagement/mitkNavigationDataSet.cpp

Loading...

Modules/IGT/DataManagement/mitkNavigationDataSet.h

Loading...

Modules/IGT/IO/mitkNavigationDataPlayer.cpp

Loading...

Modules/IGT/IO/mitkNavigationDataPlayer.h

Loading...

Modules/IGT/IO/mitkNavigationDataPlayerBase.cpp

Loading...

Modules/IGT/IO/mitkNavigationDataPlayerBase.h

Loading...

Modules/IGT/IO/mitkNavigationDataReaderCSV.cpp

Loading...

Modules/IGT/IO/mitkNavigationDataReaderCSV.h

Loading...

Modules/IGT/IO/mitkNavigationDataReaderInterface.cpp

Loading...

Modules/IGT/IO/mitkNavigationDataReaderInterface.h

Loading...

Modules/IGT/IO/mitkNavigationDataReaderXML.cpp

Loading...

Modules/IGT/IO/mitkNavigationDataReaderXML.h

Loading...

Modules/IGT/IO/mitkNavigationDataRecorder.cpp

Loading...

Modules/IGT/IO/mitkNavigationDataRecorder.h

Loading...

Modules/IGT/IO/mitkNavigationDataSequentialPlayer.cpp

Loading...

Modules/IGT/IO/mitkNavigationDataSequentialPlayer.h

Loading...

Modules/IGT/IO/mitkNavigationDataSetWriterCSV.cpp

Loading...

Modules/IGT/IO/mitkNavigationDataSetWriterCSV.h

Loading...

Modules/IGT/IO/mitkNavigationDataSetWriterXML.cpp

Loading...

Modules/IGT/IO/mitkNavigationDataSetWriterXML.h

Loading...

Modules/IGT/Testing/files.cmake

Loading...

Modules/IGT/Testing/mitkNavigationDataPlayerTest.cpp

Loading...

Modules/IGT/Testing/mitkNavigationDataRecorderTest.cpp

Loading...

Modules/IGT/Testing/mitkNavigationDataSequentialPlayerTest.cpp

Loading...

Modules/IGT/Testing/mitkNavigationDataSetReaderWriterTest.cpp

Loading...

Modules/IGT/Testing/mitkNavigationDataSetTest.cpp

Loading...

Modules/IGT/Testing/mitkNavigationDataToPointSetFilterTest.cpp

Loading...

Modules/IGT/files.cmake

Loading...

Modules/IGTUI/Qmitk/QmitkIGTLoggerWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkIGTPlayerWidget.cpp

Loading...

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

Loading...

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

Loading...

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

Loading...