ReleaseCandidates IGT module:

bug-18176-CloneMethodNavigationData
bug-18147-CleanUpUITrackingToolbox
bug-17771-ExtensionNodeDisplacementFilter

also these, but check them first:

bug-17751-igtworkerthread
bug-17853-CSVPlayer

Release Candidates US module:

bug-17924-SpeedUpCombinedModality
bug-17923-USPluginPersistence
bug-17034-USImageLoggingFilterIntegration

User franza has pushed new remote branch:

bug-18182-IGTReleaseIntegration

All branches were merged to the new integration branch except of bug-17034-USImageLoggingFilterIntegration which caused huge merge problems.

bug-17034-USImageLoggingFilterIntegration will be left out for the moment

User heime has pushed new remote branch:

bug-18182-IGT-AICP-ReleaseIntegration

bug-18182-IGTReleaseIntegration was tested and will be included into the 2014-10 release.

The AICP branch will be left out, we can merge it directly after the release.

[e58288]: Merge branch 'bug-18182-IGTReleaseIntegration'

Merged commits:

2014-10-14 17:13:06 MartinKlemm [3c6a5c]
Fixed compile error by setting an include for fstream

2014-10-08 13:54:58 Alfred Franz [dc815a]
fixed compile bug, possibly caused by merge problems

2014-10-08 12:20:13 Alfred Franz [c43458]
Merge branch 'bug-18176-CloneMethodNavigationData' into bug-18182-IGTReleaseIntegration

2014-10-08 12:19:04 Alfred Franz [745f2c]
Merge branch 'bug-18147-CleanUpUITrackingToolbox' into bug-18182-IGTReleaseIntegration

Conflicts:
Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidget.cpp
Modules/US/USModel/mitkUSDevice.h
Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp

2014-10-08 12:11:10 Alfred Franz [0bd722]
Merge branch 'bug-17923-USPluginPersistence' into bug-18182-IGTReleaseIntegration

2014-10-08 12:10:38 Alfred Franz [59b7ec]
Merge branch 'bug-17853-CSVPlayer' into bug-18182-IGTReleaseIntegration

2014-10-08 11:02:50 Alfred Franz [d4a56e]
Merge branch 'bug-17751-igtworkerthread' into bug-18182-IGTReleaseIntegration

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

2014-10-07 18:05:44 Alfred Franz [b4a4d9]
now also disabling disconnect button when tracking is running. Disconnecting and stopping tracking at once led to an error.

2014-10-07 17:56:53 Alfred Franz [3c17fa]
reduced number of buttons by using only one button for start/stop tracking and for connect/disconnect

2014-10-06 17:39:59 Alfred Franz [6ba9ab]
fixed call of clone method

2014-10-06 17:38:23 Alfred Franz [2e5f61]
added equals method for navigation data

2014-10-06 17:38:00 Alfred Franz [9792f2]
added test for clone method

2014-10-06 16:55:40 Alfred Franz [166d5c]
extended test

2014-09-25 18:53:50 Alfred Franz [800495]
more new icons

2014-09-25 18:23:16 Alfred Franz [6b9406]
further bugfixing: now persistence of selected device should work again

2014-09-25 16:58:48 Alfred Franz [bc312b]
Further UI clean up...

2014-09-25 16:45:14 Alfred Franz [841808]
unified font sizes

2014-09-25 16:19:59 Alfred Franz [c13469]
further clean up of the UI of this widget...

2014-09-25 16:14:14 Alfred Franz [9f95a3]
Adapted maximal length of tool storage name to current view size

2014-09-25 16:07:00 Alfred Franz [8789fd]
changed alignment of UI elements to make the widget smaller

2014-09-25 14:13:47 Alfred Franz [4abd00]
Filename is now trimmed if it's to long to be visualized

2014-09-25 14:12:49 Alfred Franz [e5a971]
fixed a bug: Polaris is now always selected by default at start

2014-09-24 18:15:29 Alfred Franz [f88144]
added new icons of design project to US module (special thanks to Carolin Feldmann)

2014-08-27 13:54:42 Justin Iszatt [fa0d33]
minimal changes made
writer seems to stop working

2014-08-19 17:08:34 Justin Iszatt [3a7480]
"Doku" added

2014-08-19 16:46:36 Justin Iszatt [49616d]
Added a csv-reader-writer test and did some changes in igt-test
Some other smal changes were done aswell

2014-08-19 16:08:30 Justin Iszatt [964b3f]
Finished coding the csv-reader. Not been tested

2014-08-19 15:29:15 Justin Iszatt [6cfbdb]
Started implementing CSV-File Reader

2014-07-23 18:39:37 Alfred Franz [8ed10e]
added labels to the sliders

2014-07-18 11:30:48 Alfred Franz [736dde]
added feature to stop update stream to save runtime if the stream is updated somewhere else

2014-07-18 11:30:00 Alfred Franz [2defd0]
now freezing is possible again (with the new implementation)

2014-07-18 11:15:00 Alfred Franz [5c3bff]
now taking the image directly from the image source which avoids copying the image twice

2014-07-18 11:08:49 Alfred Franz [54e9b9]
made method GetUSImageSource public in all US device classes, added documentation

2014-07-17 18:21:16 Alfred Franz [124168]
Merge branch 'bug-17923-USPluginPersistence' into personal/franza/US-Navigation-Experiments-May2014

2014-07-17 18:20:51 Alfred Franz [7732f4]
Merge branch 'bug-17713-TrackingFreeze' into personal/franza/US-Navigation-Experiments-May2014

2014-07-17 18:18:33 Alfred Franz [67daed]
small fix

2014-07-17 17:26:02 Alfred Franz [9efdd0]
Implemented persistence of UI settings of the view itself. Persistence of some widgets is still missing

2014-07-09 15:06:07 Alfred Franz [65d7e8]
started implementation, not working yet.

2014-05-13 16:59:08 Alfred Franz [e2c357]
implemented timeout for method AutoDetectTools,

todo:

• timeout for other methods
• reactivate GUI
• static variable for timeout time

2014-05-13 14:45:39 Eric Heim [6a0d5d]
timeout in worker thread

[1a51a1]: Merge branch 'bug-18182-IGTReleaseIntegration'

Merged commits:

2014-10-20 16:35:53 Alfred Franz [b9bce8]
COMP: Removed call of deprecated methods from tests because dashboard fails otherwise...

The release integration branch was merged to the master. This means all branches except for "bug-17034-USImageLoggingFilterIntegration" have been merged.

So closing this bug.

Reopened Bug for the AICP integration branch.

Can we make a new bug for the AICP integration? Renaming the AICP branch shouldn't be a big deal and then we can close this bug. A good bug description for the AICP integration would also be helpful for the release notes.

Updating target milestone.