Page MenuHomePhabricator

File reading should happen in NavigationDataPlayerBase instead of doing this in both of its subclasses
Closed, ResolvedPublic

Description

Avoid duplicate code in NavigationDataPlayer and NavigationDataSequentialPlayer by moving general parts into superclass. NavigationDataSequentialPlayer could be obsolete then.

Event Timeline

New remote branch pushed: bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInsteadOfDoingThisInBothOfItsSubclasses

New remote branch pushed: bug-15959-RedesignNavigationDataPlayerAndRecorder

User wildes has pushed new remote branch:

bug-15959-NavigationdataplayerRedesignIntegrationBranch

[5cb1e8]: Merge branch 'bug-15959-NavigationdataplayerRedesignIntegrationBranch'

Merged commits:

2014-05-05 16:25:45 Keno März [f525c3]
Updated Data Repository


2014-05-02 15:08:05 Adrian Winterstein [6c40b9]
Fixed some comments.


2014-05-02 14:49:17 Adrian Winterstein [79ce58]
Navigation data player view changed from QmitkFunctionality to QmitkAbstractView.


2014-05-02 14:31:52 Adrian Winterstein [265e31]
Restart and stop buttons are now working as intended.


2014-05-02 14:08:44 Adrian Winterstein [f4d31d]
Fixed play/pause for navigation data player.


2014-05-02 14:07:15 Adrian Winterstein [75e092]
Merge branch 'bug-15959-NavigationdataplayerRedesignIntegrationBranch' of mitk.org:MITK into bug-15959-NavigationdataplayerRedesignIntegrationBranch


2014-05-02 14:08:21 Keno März [737e79]
Fixed Crash when display was deactivated while widget was running


2014-05-02 13:33:39 Adrian Winterstein [18af38]
Merge branch 'bug-15959-NavigationdataplayerRedesignIntegrationBranch' of mitk.org:MITK into bug-15959-NavigationdataplayerRedesignIntegrationBranch

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


2014-05-02 13:29:49 Adrian Winterstein [0c54c2]
Error handling for loading the navigation data set.


2014-05-02 12:38:50 Keno März [4585d0]
UI and usability improvements, some sanity checks to avoid invalid input.


2014-04-30 17:21:25 Adrian Winterstein [9f3cc3]
Merge branch 'bug-15959-NavigationdataplayerRedesignIntegrationBranch' of mitk.org:MITK into bug-15959-NavigationdataplayerRedesignIntegrationBranch


2014-04-30 17:21:20 Adrian Winterstein [81ae1a]
Button states for navigation data player widgets fixed.


2014-04-30 17:15:45 Adrian Winterstein [8f7630]
Fixed "time stamp since playing", do not reset player on stop and directly test for successor time stamp in GenerateData().


2014-04-30 16:55:44 Esther Wild [4e2923]
Removed unnecessary info.


2014-04-30 16:54:07 Esther Wild [2700b5]
Added filter to open .xml files.


2014-04-30 16:39:05 Adrian Winterstein [ef84e3]
Repeat configuration for the navigation data player view + little code cleanup.


2014-04-30 16:37:55 Adrian Winterstein [92d030]
Moved repeat attribute to the player base class.


2014-04-30 16:24:59 Keno März [e515ed]
Registering as Microservice Works


2014-04-30 16:20:58 Keno März [1e2258]
VirtualTrackingTool can now be constructed publically


2014-04-30 16:20:29 Keno März [bf852e]
NavigationDataSource tests whether Microservice Registration exists before unregistering


2014-04-30 15:22:55 Esther Wild [d7daf9]
TestMode3DMean doesn't work in debug mode. See T17763.


2014-04-30 14:59:27 Keno März [31dae5]
collapsed unnecessary long loop


2014-04-30 14:54:23 Keno März [fcbd86]
Separated Test into three routines


2014-04-30 14:37:05 Keno März [01b8d6]
added deep comparison of recorded dataset to reference


2014-04-30 14:12:24 Keno März [9a5697]
Removed unnecessary code and moved code not related to the recorder to the setup-method


2014-04-30 13:56:29 Keno März [9da1c4]
Made RecorderTest a Test suite


2014-04-24 12:47:00 Keno März [4e0a82]
Fixed invalid connect slot statement in NavigationDataSequentialPlayerControlWidget


2014-04-24 12:33:47 Keno März [5bc132]
PlayerView initializes position of nodes correctly now


2014-04-24 12:11:54 Keno März [29a543]
Sequential Player Test works, moved some tests to more appropriate reader/writer test


2014-04-24 11:41:25 Keno März [ca198d]
Another TEst Case fixed for Sequential DataPlayer


2014-04-24 11:41:07 Keno März [5f788f]
Setting Navigation data or initing the player now updates the outputs too


2014-04-24 11:16:09 Keno März [1baea8]
Standard workflow tests are running now for SequentialDataPlayer


2014-04-24 11:15:35 Keno März [9aec1f]
Fixed SequentialDataPlayer jumping one step ahead of where it should whencalling GoToSnapshot()


2014-04-24 10:43:53 Keno März [3e4d88]
Improved repeat behaviour of SequentialPlayer


2014-04-24 10:13:41 Keno März [b5893d]
SequentialDataPlayerTest now correctly tests order of retrieved navigation Datas


2014-04-24 10:11:58 Keno März [7ecc9d]
NavigationDataSet retrieved wrong index for getNavigationDatafForIndex


2014-04-23 18:26:22 Keno März [7e9a7e]
Moving towards comparing navigation Datas


2014-04-23 17:45:37 Esther Wild [ee003d]
Delete test file, close files and check if file exits.


2014-04-17 11:54:55 Keno März [f4820c]
Test removes the recently written file


2014-04-16 18:39:09 Keno März [7953b7]
Korrekte Pfade im test


2014-04-16 18:21:06 Esther Wild [dacfe6]
Merge branch 'bug-15959-NavigationdataplayerRedesignIntegrationBranch' of mitk.org:MITK into bug-15959-NavigationdataplayerRedesignIntegrationBranch


2014-04-16 18:20:01 Esther Wild [e515d1]
Changed NavigationDataSetReaderWriterTest to cppunit test.


2014-04-16 18:19:18 Keno März [da2df2]
Made Sequentialplayertest a Unit Test


2014-04-16 16:52:52 Keno März [ee8c5b]
Controls now only active once Data is laoded


2014-04-16 16:36:02 Keno März [a44aff]
using ConnectTo Method and give names to nodes


2014-04-16 16:35:26 Keno März [932753]
removed member that counts number of outputs and replaced it with ITK method


2014-04-16 16:10:39 Keno März [1f6ede]
Fixed creation of outputs in NavigationDataPlayerBase


2014-04-16 15:18:38 Keno März [4cfda8]
Adapted Trackingtoolbox to work with new Recorder


2014-04-16 15:16:51 Esther Wild [3ba989]
Adapted IGT Tutorial Step1 to the new NavigationDataRecorder.


2014-04-16 14:20:28 Esther Wild [bcded5]
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


2014-04-15 18:22:08 Keno März [0ae160]
Documentation and removal of unnecessary code


2014-04-15 18:16:31 Keno März [0b97fe]
Cleaned up class significantly and added timed player


2014-04-15 17:40:36 Keno März [25559c]
First time playing results with the new player!


2014-04-15 15:34:58 Keno März [94d5b6]
Added first Signals to the player view


2014-04-15 14:34:52 Keno März [548ba1]
Added missing Export statements to widgets and updated player Controls


2014-04-15 14:30:09 Keno März [d4a07f]
Revert "Changes to Player layout"

This reverts commit 44340f4d6457ee848edc2570be6aa9036e907368.


2014-04-15 11:15:18 Simon Weißer [44340f]
Changes to Player layout


2014-03-13 17:14:59 unknown [5b7806]
Removing functionality from old player


2014-03-11 15:44:20 Adrian Winterstein [aedeed]
Widgets inserted for controlling navigation data players.


2014-03-11 15:39:32 Adrian Winterstein [0d2fd9]
Getter for current snapshot number in player base.


2014-03-11 14:21:37 Adrian Winterstein [681723]
Corrected file loading for navigation data players.


2014-03-11 14:15:55 Adrian Winterstein [b3bd26]
NavigationDataPlayer can return its current playing state.


2013-10-29 16:51:20 Keno Maerz [0ba76e]
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


2013-10-29 16:03:45 Keno Maerz [cbe7e2]
Fixed reset problem of sequential DataPlayer


2013-10-29 15:45:46 Keno Maerz [b4fff6]
Merge branch 'bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInsteadOfDoingThisInBothOfItsSubclasses' of mitk.org:MITK into bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInsteadOfDoingThisInBothOfItsSubclasses


2013-10-29 15:45:35 Keno Maerz [3a5958]
Cleaned up Plugin Code


2013-10-29 15:21:59 Adrian Winterstein [c2ce0f]
Fixed only true test condition.


2013-10-29 15:18:31 Adrian Winterstein [d38d8f]
Merge branch 'bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInsteadOfDoingThisInBothOfItsSubclasses' of mitk.org:MITK into bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInsteadOfDoingThisInBothOfItsSubclasses


2013-10-29 15:17:45 Adrian Winterstein [f399ac]
NavigationDataSequentialPlayer does not go to the next snapshot on Update anymore. Instead GoToNextSnapshot() has to be called.


2013-10-29 14:43:44 Keno Maerz [061395]
Fixed recorder recording +1 ND set when a limit was set


2013-10-29 14:36:14 Keno Maerz [653f8f]
Recorder Test is testing for correct conditions (passing the Test) now


2013-10-29 14:32:14 Keno Maerz [e4cff2]
Merge branch 'bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInsteadOfDoingThisInBothOfItsSubclasses' of mitk.org:MITK into bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInsteadOfDoingThisInBothOfItsSubclasses


2013-10-29 13:40:07 Keno Maerz [194a7b]
Added skip condition to recorder


2013-09-05 13:15:43 Adrian Winterstein [1d7583]
NavigationDataPlayer handles multiple calls of SetNavigationDataSet() correctly.


2013-09-05 13:01:10 Adrian Winterstein [6bf74d]
Fixed 'extra qualifier' compile error.


2013-09-04 18:28:31 Keno Maerz [491985]
Merge branch 'bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInsteadOfDoingThisInBothOfItsSubclasses' of mitk.org:MITK into bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInsteadOfDoingThisInBothOfItsSubclasses


2013-09-04 18:28:14 Keno Maerz [605c51]
Further fixes and corrections


2013-09-04 18:27:45 Adrian Winterstein [07c0ab]
Some documentation and cleanup of player classes.


2013-09-04 18:05:36 Keno Maerz [2efd63]
Recorder is working now!


2013-09-04 17:40:33 Adrian Winterstein [58f9e7]
Adapted widgets to comply with the new NavigationData player and recorder interfaces.
The changes can be compiled, but aren't tested yet.


2013-09-04 17:37:03 Keno Maerz [b36609]
Merge branch 'bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInsteadOfDoingThisInBothOfItsSubclasses' of mitk.org:MITK into bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInsteadOfDoingThisInBothOfItsSubclasses


2013-09-04 17:36:52 Keno Maerz [56a437]
Improving Tests and fixing recorder behaviour


2013-09-04 17:26:42 Adrian Winterstein [c2e737]
IsAtEnd() moved to base class.


2013-09-04 16:32:16 Adrian Winterstein [72da8b]
Fixed call of open() of std::ofstream (char*, openmode).


2013-09-04 16:24:25 Adrian Winterstein [258224]
Merge branch 'bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInsteadOfDoingThisInBothOfItsSubclasses' of mitk.org:MITK into bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInsteadOfDoingThisInBothOfItsSubclasses


2013-09-04 16:23:58 Adrian Winterstein [e55884]
Removed parts of NavigationDataPlayers which are unused now.


2013-09-04 16:10:11 Keno Maerz [e86bce]
XMLReader and Writer work as advertised!


2013-09-04 15:40:22 Keno Maerz [87c6f9]
Merge branch 'bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInsteadOfDoingThisInBothOfItsSubclasses' of mitk.org:MITK into bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInsteadOfDoingThisInBothOfItsSubclasses


2013-09-04 15:37:34 Adrian Winterstein [de80d6]
NavigationDataPlayer and NaivgationDataSequentialPlayer do not read the data files itself anymore. Adapted Test of SequentialPlayer.


2013-09-04 15:37:23 Keno Maerz [3978cc]
Test for XML Reader and Writer (still with hardcoded strings)


2013-09-04 15:36:29 Keno Maerz [fee66f]
Constructor and exports for XML Writer


2013-09-04 15:34:01 Adrian Winterstein [77d879]
Changed reading of version tag for backwards compatibility.


2013-09-04 13:59:41 Adrian Winterstein [afa143]
Merge branch 'bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInsteadOfDoingThisInBothOfItsSubclasses' of mitk.org:MITK into bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInsteadOfDoingThisInBothOfItsSubclasses


2013-09-04 13:58:11 Adrian Winterstein [5c4c7b]

  • changed reader interface (Read() -> Read(string))
  • xml reader can read files directly (without using a stream)

2013-09-04 11:10:59 Keno Maerz [bdf463]
NavigationDataSetWriter for XML (Done) and CSV (Hull only)


2013-09-04 11:10:20 Keno Maerz [a67c73]
New Method: Get NumberOfRecordedSteps


2013-09-04 10:55:52 Adrian Winterstein [cb3f81]
Merge branch 'bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInsteadOfDoingThisInBothOfItsSubclasses' of mitk.org:MITK into bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInsteadOfDoingThisInBothOfItsSubclasses


2013-09-03 20:12:13 Adrian Winterstein [8f400f]
Exports for DataReaders, changes in NavigationDataPlayerTest.


2013-09-03 20:02:58 Keno Maerz [e27f57]
Merge branch 'bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInsteadOfDoingThisInBothOfItsSubclasses' of mitk.org:MITK into bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInsteadOfDoingThisInBothOfItsSubclasses


2013-09-03 20:02:07 Keno Maerz [63051f]
Removed unused imports and an obsolete member


2013-09-03 19:59:59 Keno Maerz [a349a4]
Documentation


2013-09-03 19:54:17 Keno Maerz [f54f1d]
Most functionality for NavigationDataRecorder should be included


2013-09-03 18:27:42 Adrian Winterstein [999d73]
All tests for NaivationDataPlayer are working.


2013-09-03 17:25:25 Adrian Winterstein [3e947f]
Merge branch 'bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInsteadOfDoingThisInBothOfItsSubclasses' of mitk.org:MITK into bug-15959-FileReadingShouldHappenInNavigationDataPlayerBaseInsteadOfDoingThisInBothOfItsSubclasses


2013-09-03 17:24:25 Adrian Winterstein [2ebf82]
Added readers for getting NavigationData from xml and csv files (csv not implemented yet).


2013-09-03 17:02:33 Keno Maerz [c9be0e]
Renamed GetTrackingStreamForTool -> GetDataStreamForTool, Completed Tests


2013-09-03 16:50:36 Keno Maerz [d24f33]
Added new Accessors to NavigationDataSet


2013-09-03 16:05:17 Keno Maerz [432bba]
Documentation


2013-09-03 15:48:49 Keno Maerz [d46381]
implemented .Begin and .End


2013-09-03 15:46:17 Keno Maerz [73f3ce]
Fixed Tests and restored previous functionality


2013-09-03 15:19:34 Keno Maerz [c1dd56]
Further fixing, Repaired Tests


2013-09-03 14:33:56 Keno Maerz [60aee2]
New typedef mitk::NavigationDataSet::NavigationDataSetIterator and correct return types for Begin() and End()


2013-09-03 14:15:43 Keno Maerz [d7119c]
Fixed Typos


2013-09-03 14:08:32 Keno Maerz [b5ed49]
Restructured NavigationDataSet to deliver iterators


2013-09-03 11:51:26 Adrian Winterstein [03d394]
Added methods for getting number of tool and number of data objects to NavigationDataSet.


2013-09-02 18:39:25 Adrian Winterstein [9eff9b]
Added some tests for new NavigationDataSet class.


2013-09-02 16:50:44 Adrian Winterstein [9c989d]
Added NavigationDataSet for handling multiple NavigationData objects.

User wintersa has pushed new remote branch:

bug-15959-NavigationDataPlayerCompBranch

[082b0a]: Merge branch 'bug-15959-NavigationDataPlayerCompBranch'

Merged commits:

2014-05-05 17:12:37 Adrian Winterstein [9c3a7d]
COMP: Fixed compile error on Visual Studio 2008. Using default constructor instead which has the same result.

[9c705a]: Merge branch 'bug-15959-NavigationDataPlayerCompBranch'

Merged commits:

2014-05-05 18:57:11 Keno März [b2f90b]
COMP: Commented out failing test, fix is non trivial and will happen in T17775

User maerz has pushed new remote branch:

bug-15959-ReintroduceDeprecatedNavigationDataRecorder

[c0578c]: Merge branch 'bug-15959-ReintroduceDeprecatedNavigationDataRecorder'

Merged commits:

2014-06-02 12:07:40 Keno März [2a1280]
Reintroduced Old-Style NavigationDataRecorder for backwards compatibility