Diffusion MITK bcded5e4d67f

Merge branch 'bug-15959-RedesignNavigationDataPlayerAndRecorder' into bug…
bcded5e4d67f
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-15959-RedesignNavigationDataPlayerAndRecorder' into bug-15959-NavigationdataplayerRedesignIntegrationBranch

Conflicts:
Modules/IGT/IO/mitkNavigationDataPlayer.cpp
Modules/IGT/IO/mitkNavigationDataSequentialPlayer.cpp
Modules/IGT/IO/mitkNavigationDataSequentialPlayer.h
Modules/IGT/Testing/mitkNavigationDataPlayerTest.cpp
Modules/IGT/Testing/mitkNavigationDataRecorderTest.cpp
Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp
Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkNavigationDataPlayerView.cpp
Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkNavigationDataPlayerView.h

Details

Provenance

Esther Wild <e.wild@dkfz.de>

Authored on Apr 16 2014, 2:20 PM

Parents

rMITK0ae16047e824: Documentation and removal of unnecessary code
rMITKd52d5fe9334a: Merge branch 'bug-17573-suppress-link-jam-boost-error'

Branches

Unknown

Tags

Unknown

Event Timeline

• wildes committed rMITKbcded5e4d67f: Merge branch 'bug-15959-RedesignNavigationDataPlayerAndRecorder' into bug… (authored by • wildes).Apr 16 2014, 2:20 PM

Merged Changes

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

0ae16047e824 Documentation and removal of unnecessary code
Author
maerz
Browse Repository
No Builds
No Audits
0b97fe64e6eb Cleaned up class significantly and added timed player
Author
maerz
Browse Repository
No Builds
No Audits
25559ca466e4 First time playing results with the new player!
Author
maerz
Browse Repository
No Builds
No Audits
94d5b6d10720 Added first Signals to the player view
Author
maerz
Browse Repository
No Builds
No Audits
548ba1a0ba48 Added missing Export statements to widgets and updated player Controls
Author
maerz
Browse Repository
No Builds
No Audits
d4a07fff45be Revert "Changes to Player layout"
Author
maerz
Browse Repository
No Builds
No Audits
44340f4d6457 Changes to Player layout
Author
weissersi
Browse Repository
No Builds
No Audits
5b7806f2a488 Removing functionality from old player
Author
unknown <maerz@mbi-nb30.inet.dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
aedeedb496eb Widgets inserted for controlling navigation data players.
Author
• wintersa
Browse Repository
No Builds
No Audits
0d2fd98c674f Getter for current snapshot number in player base.
Author
• wintersa
Browse Repository
No Builds
No Audits
6817232d1748 Corrected file loading for navigation data players.
Author
• wintersa
Browse Repository
No Builds
No Audits
b3bd26271229 NavigationDataPlayer can return its current playing state.
Author
• wintersa
Browse Repository
No Builds
No Audits
0ba76ea3d488 Merge remote-tracking branch 'remotes/origin/bug-15959…
Author
maerz
Browse Repository
No Builds
No Audits
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

Changes (43)

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

Tutorial/

mitkIGTTutorialStep1.cpp

IGTUI/

Qmitk/

QmitkIGTLoggerWidget.cpp

QmitkIGTPlayerWidget.cpp

QmitkIGTPlayerWidget.h

QmitkIGTPlayerWidgetControls.ui

QmitkNavigationDataPlayerControlWidget.cpp

QmitkNavigationDataPlayerControlWidget.h

QmitkNavigationDataPlayerControlWidget.ui

QmitkNavigationDataSequentialPlayerControlWidget.cpp

QmitkNavigationDataSequentialPlayerControlWidget.h

QmitkNavigationDataSequentialPlayerControlWidget.ui

Plugins/

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkNavigationDataPlayerView.cpp

QmitkNavigationDataPlayerView.h

QmitkNavigationDataPlayerViewControls.ui

rMITKbcded5e4d67f

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/Tutorial/mitkIGTTutorialStep1.cpp

Loading...

Modules/IGT/files.cmake

Loading...

Modules/IGTUI/Qmitk/QmitkIGTLoggerWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkIGTPlayerWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkIGTPlayerWidget.h

Loading...

Modules/IGTUI/Qmitk/QmitkIGTPlayerWidgetControls.ui

Loading...

Modules/IGTUI/Qmitk/QmitkNavigationDataPlayerControlWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkNavigationDataPlayerControlWidget.h

Loading...

Modules/IGTUI/Qmitk/QmitkNavigationDataPlayerControlWidget.ui

Loading...

Modules/IGTUI/Qmitk/QmitkNavigationDataSequentialPlayerControlWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkNavigationDataSequentialPlayerControlWidget.h

Loading...

Modules/IGTUI/Qmitk/QmitkNavigationDataSequentialPlayerControlWidget.ui

Loading...

Modules/IGTUI/files.cmake

Loading...

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

Loading...

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

Loading...

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkNavigationDataPlayerViewControls.ui

Loading...