Merge branch 'bug-15959-NavigationdataplayerRedesignIntegrationBranch'
5cb1e89c512c
Actions

Description

Merge branch 'bug-15959-NavigationdataplayerRedesignIntegrationBranch'

Conflicts:
CMakeExternals/MITKData.cmake
Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp

Details

Provenance

maerz

Authored on May 5 2014, 4:47 PM

Parents

rMITKf525c3b2ab37: Updated Data Repository
rMITK0525ca076127: Merge branch 'bug-17766-UltrasoundPluginStopsViewingImmediatelyAfterStarting'

Branches

Unknown

Tags

Unknown

Event Timeline

maerz committed rMITK5cb1e89c512c: Merge branch 'bug-15959-NavigationdataplayerRedesignIntegrationBranch' (authored by maerz).May 5 2014, 4:47 PM

Merged Changes

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

f525c3b2ab37 Updated Data Repository
Author
maerz
Browse Repository
No Builds
No Audits
6c40b9a0261d Fixed some comments.
Author
• wintersa
Browse Repository
No Builds
No Audits
79ce58b7d18d Navigation data player view changed from QmitkFunctionality to…
Author
• wintersa
Browse Repository
No Builds
No Audits
265e31b2c4bc Restart and stop buttons are now working as intended.
Author
• wintersa
Browse Repository
No Builds
No Audits
f4d31deb86ed Fixed play/pause for navigation data player.
Author
• wintersa
Browse Repository
No Builds
No Audits
75e0920ac465 Merge branch 'bug-15959-NavigationdataplayerRedesignIntegrationBranch' of mitk.
Author
• wintersa
Browse Repository
No Builds
No Audits
737e79cb28c9 Fixed Crash when display was deactivated while widget was running
Author
maerz
Browse Repository
No Builds
No Audits
18af382cefc5 Merge branch 'bug-15959-NavigationdataplayerRedesignIntegrationBranch' of mitk.
Author
• wintersa
Browse Repository
No Builds
No Audits
0c54c2b285b1 Error handling for loading the navigation data set.
Author
• wintersa
Browse Repository
No Builds
No Audits
4585d07c2508 UI and usability improvements, some sanity checks to avoid invalid input.
Author
maerz
Browse Repository
No Builds
No Audits
9f3cc3237de0 Merge branch 'bug-15959-NavigationdataplayerRedesignIntegrationBranch' of mitk.
Author
• wintersa
Browse Repository
No Builds
No Audits
81ae1a6b952b Button states for navigation data player widgets fixed.
Author
• wintersa
Browse Repository
No Builds
No Audits
8f76309303a5 Fixed "time stamp since playing", do not reset player on stop and directly test…
Author
• wintersa
Browse Repository
No Builds
No Audits
4e292355760d Removed unnecessary info.
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
2700b5660b72 Added filter to open .xml files.
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
ef84e304e13d Repeat configuration for the navigation data player view + little code cleanup.
Author
• wintersa
Browse Repository
No Builds
No Audits
92d030a2d69b Moved repeat attribute to the player base class.
Author
• wintersa
Browse Repository
No Builds
No Audits
e515ed412049 Registering as Microservice Works
Author
maerz
Browse Repository
No Builds
No Audits
1e2258244b6c VirtualTrackingTool can now be constructed publically
Author
maerz
Browse Repository
No Builds
No Audits
bf852ef0c106 NavigationDataSource tests whether Microservice Registration exists before…
Author
maerz
Browse Repository
No Builds
No Audits
d7daf99735ab TestMode3DMean doesn't work in debug mode. See bug 17763.
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
31dae58a5bdc collapsed unnecessary long loop
Author
maerz
Browse Repository
No Builds
No Audits
fcbd869eb8da Separated Test into three routines
Author
maerz
Browse Repository
No Builds
No Audits
01b8d6944a11 added deep comparison of recorded dataset to reference
Author
maerz
Browse Repository
No Builds
No Audits
9a5697c701b6 Removed unnecessary code and moved code not related to the recorder to the…
Author
maerz
Browse Repository
No Builds
No Audits
9da1c4589cdd Made RecorderTest a Test suite
Author
maerz
Browse Repository
No Builds
No Audits
4e0a82b21f6f Fixed invalid connect slot statement in NavigationDataSequentialPlayerControlWi…
Author
maerz
Browse Repository
No Builds
No Audits
5bc1321ba6ed PlayerView initializes position of nodes correctly now
Author
maerz
Browse Repository
No Builds
No Audits
29a5435c29b8 Sequential Player Test works, moved some tests to more appropriate…
Author
maerz
Browse Repository
No Builds
No Audits
ca198de5a58d Another TEst Case fixed for Sequential DataPlayer
Author
maerz
Browse Repository
No Builds
No Audits
5f788fa64778 Setting Navigation data or initing the player now updates the outputs too
Author
maerz
Browse Repository
No Builds
No Audits
1baea8292cff Standard workflow tests are running now for SequentialDataPlayer
Author
maerz
Browse Repository
No Builds
No Audits
9aec1f244d41 Fixed SequentialDataPlayer jumping one step ahead of where it should…
Author
maerz
Browse Repository
No Builds
No Audits
3e4d882df31e Improved repeat behaviour of SequentialPlayer
Author
maerz
Browse Repository
No Builds
No Audits
b5893d64b26d SequentialDataPlayerTest now correctly tests order of retrieved navigation Datas
Author
maerz
Browse Repository
No Builds
No Audits
7ecc9d943d66 NavigationDataSet retrieved wrong index for getNavigationDatafForIndex
Author
maerz
Browse Repository
No Builds
No Audits
7e9a7e340280 Moving towards comparing navigation Datas
Author
maerz
Browse Repository
No Builds
No Audits
ee003dabb702 Delete test file, close files and check if file exits.
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
f4820c016e9f Test removes the recently written file
Author
maerz
Browse Repository
No Builds
No Audits
7953b75f1979 Korrekte Pfade im test
Author
maerz
Browse Repository
No Builds
No Audits
dacfe6ecce9a Merge branch 'bug-15959-NavigationdataplayerRedesignIntegrationBranch' of mitk.
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
e515d170b1db Changed NavigationDataSetReaderWriterTest to cppunit test.
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
da2df2aea306 Made Sequentialplayertest a Unit Test
Author
maerz
Browse Repository
No Builds
No Audits
ee8c5b045560 Controls now only active once Data is laoded
Author
maerz
Browse Repository
No Builds
No Audits
a44affd93e7d using ConnectTo Method and give names to nodes
Author
maerz
Browse Repository
No Builds
No Audits
9327537e8f04 removed member that counts number of outputs and replaced it with ITK method
Author
maerz
Browse Repository
No Builds
No Audits
1f6ede57fb5a Fixed creation of outputs in NavigationDataPlayerBase
Author
maerz
Browse Repository
No Builds
No Audits
4cfda8c2da08 Adapted Trackingtoolbox to work with new Recorder
Author
maerz
Browse Repository
No Builds
No Audits
3ba98952199a Adapted IGT Tutorial Step1 to the new NavigationDataRecorder.
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
bcded5e4d67f Merge branch 'bug-15959-RedesignNavigationDataPlayerAndRecorder' into bug-15959…
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits

Changes (47)

Path

Size

Packages

CMakeExternals/

MITKData.cmake

O1: MITK Reviewer Group I

Modules/

IGT/

DataManagement/

mitkNavigationDataSet.cpp

mitkNavigationDataSet.h

mitkNavigationDataSource.cpp

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/

files.cmake

mitkNavigationDataPlayerTest.cpp

mitkNavigationDataRecorderTest.cpp

mitkNavigationDataSequentialPlayerTest.cpp

mitkNavigationDataSetReaderWriterTest.cpp

mitkNavigationDataSetTest.cpp

mitkNavigationDataToPointSetFilterTest.cpp

TrackingDevices/

mitkVirtualTrackingTool.h

Tutorial/

mitkIGTTutorialStep1.cpp

files.cmake

IGTUI/

Qmitk/

QmitkIGTLoggerWidget.cpp

QmitkIGTPlayerWidget.cpp

QmitkIGTPlayerWidget.h

QmitkIGTPlayerWidgetControls.ui

QmitkNavigationDataPlayerControlWidget.cpp

QmitkNavigationDataPlayerControlWidget.h

QmitkNavigationDataPlayerControlWidget.ui

QmitkNavigationDataSequentialPlayerControlWidget.cpp

QmitkNavigationDataSequentialPlayerControlWidget.h

QmitkNavigationDataSequentialPlayerControlWidget.ui

files.cmake

Plugins/

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

QmitkNavigationDataPlayerView.cpp

QmitkNavigationDataPlayerView.h

QmitkNavigationDataPlayerViewControls.ui

rMITK5cb1e89c512c

View Options

CMakeExternals/MITKData.cmake

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/IO/mitkNavigationDataPlayer.cpp

View Options

Modules/IGT/IO/mitkNavigationDataPlayer.h

View Options

Modules/IGT/IO/mitkNavigationDataPlayerBase.cpp

View Options

Modules/IGT/IO/mitkNavigationDataPlayerBase.h

View Options

Modules/IGT/IO/mitkNavigationDataReaderCSV.cpp

View Options

Modules/IGT/IO/mitkNavigationDataReaderCSV.h

View Options

Modules/IGT/IO/mitkNavigationDataReaderInterface.cpp

View Options

Modules/IGT/IO/mitkNavigationDataReaderInterface.h

View Options

Modules/IGT/IO/mitkNavigationDataReaderXML.cpp

View Options

Modules/IGT/IO/mitkNavigationDataReaderXML.h

View Options

Modules/IGT/IO/mitkNavigationDataRecorder.cpp

View Options

Modules/IGT/IO/mitkNavigationDataRecorder.h

View Options

Modules/IGT/IO/mitkNavigationDataSequentialPlayer.cpp

View Options

Modules/IGT/IO/mitkNavigationDataSequentialPlayer.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/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/mitkNavigationDataSetReaderWriterTest.cpp

View Options

Modules/IGT/Testing/mitkNavigationDataSetTest.cpp

View Options

Modules/IGT/Testing/mitkNavigationDataToPointSetFilterTest.cpp

View Options

Modules/IGT/TrackingDevices/mitkVirtualTrackingTool.h

View Options

Modules/IGT/Tutorial/mitkIGTTutorialStep1.cpp

View Options

Modules/IGT/files.cmake

View Options

Modules/IGTUI/Qmitk/QmitkIGTLoggerWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkIGTPlayerWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkIGTPlayerWidget.h

View Options

Modules/IGTUI/Qmitk/QmitkIGTPlayerWidgetControls.ui

View Options

Modules/IGTUI/Qmitk/QmitkNavigationDataPlayerControlWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkNavigationDataPlayerControlWidget.h

View Options

Modules/IGTUI/Qmitk/QmitkNavigationDataPlayerControlWidget.ui

View Options

Modules/IGTUI/Qmitk/QmitkNavigationDataSequentialPlayerControlWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkNavigationDataSequentialPlayerControlWidget.h

View Options

Modules/IGTUI/Qmitk/QmitkNavigationDataSequentialPlayerControlWidget.ui

View Options

Modules/IGTUI/files.cmake

View Options

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

View Options

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

View Options

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

View Options

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

Merge branch 'bug-15959-NavigationdataplayerRedesignIntegrationBranch'5cb1e89c512cActions

Description

Details

Event Timeline

Merged Changes

Changes (47)

rMITK5cb1e89c512c

CMakeExternals/MITKData.cmake

Modules/IGT/DataManagement/mitkNavigationDataSet.cpp

Modules/IGT/DataManagement/mitkNavigationDataSet.h

Modules/IGT/DataManagement/mitkNavigationDataSource.cpp

Modules/IGT/IO/mitkNavigationDataPlayer.cpp

Modules/IGT/IO/mitkNavigationDataPlayer.h

Modules/IGT/IO/mitkNavigationDataPlayerBase.cpp

Modules/IGT/IO/mitkNavigationDataPlayerBase.h

Modules/IGT/IO/mitkNavigationDataReaderCSV.cpp

Modules/IGT/IO/mitkNavigationDataReaderCSV.h

Modules/IGT/IO/mitkNavigationDataReaderInterface.cpp

Modules/IGT/IO/mitkNavigationDataReaderInterface.h

Modules/IGT/IO/mitkNavigationDataReaderXML.cpp

Modules/IGT/IO/mitkNavigationDataReaderXML.h

Modules/IGT/IO/mitkNavigationDataRecorder.cpp

Modules/IGT/IO/mitkNavigationDataRecorder.h

Modules/IGT/IO/mitkNavigationDataSequentialPlayer.cpp

Modules/IGT/IO/mitkNavigationDataSequentialPlayer.h

Modules/IGT/IO/mitkNavigationDataSetWriterCSV.cpp

Modules/IGT/IO/mitkNavigationDataSetWriterCSV.h

Modules/IGT/IO/mitkNavigationDataSetWriterXML.cpp

Modules/IGT/IO/mitkNavigationDataSetWriterXML.h

Modules/IGT/Testing/files.cmake

Modules/IGT/Testing/mitkNavigationDataPlayerTest.cpp

Modules/IGT/Testing/mitkNavigationDataRecorderTest.cpp

Modules/IGT/Testing/mitkNavigationDataSequentialPlayerTest.cpp

Modules/IGT/Testing/mitkNavigationDataSetReaderWriterTest.cpp

Modules/IGT/Testing/mitkNavigationDataSetTest.cpp

Modules/IGT/Testing/mitkNavigationDataToPointSetFilterTest.cpp

Modules/IGT/TrackingDevices/mitkVirtualTrackingTool.h

Modules/IGT/Tutorial/mitkIGTTutorialStep1.cpp

Modules/IGT/files.cmake

Modules/IGTUI/Qmitk/QmitkIGTLoggerWidget.cpp

Modules/IGTUI/Qmitk/QmitkIGTPlayerWidget.cpp

Modules/IGTUI/Qmitk/QmitkIGTPlayerWidget.h

Modules/IGTUI/Qmitk/QmitkIGTPlayerWidgetControls.ui

Modules/IGTUI/Qmitk/QmitkNavigationDataPlayerControlWidget.cpp

Modules/IGTUI/Qmitk/QmitkNavigationDataPlayerControlWidget.h

Modules/IGTUI/Qmitk/QmitkNavigationDataPlayerControlWidget.ui

Modules/IGTUI/Qmitk/QmitkNavigationDataSequentialPlayerControlWidget.cpp

Modules/IGTUI/Qmitk/QmitkNavigationDataSequentialPlayerControlWidget.h

Modules/IGTUI/Qmitk/QmitkNavigationDataSequentialPlayerControlWidget.ui

Modules/IGTUI/files.cmake

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

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

Merge branch 'bug-15959-NavigationdataplayerRedesignIntegrationBranch'
5cb1e89c512c
Actions