User franza has pushed new remote branch:

bug-19068-MakeUSNavigationSoftwareOpenSource

User franza has pushed new remote branch:

bug-19068-USNavigationBasedOn2015-05-Release

User cheray has pushed new remote branch:

bug-19068-IntegrationUSNavigation11-2015

User cheray has pushed new remote branch:

bug-19068-PlusCalibrationForEchoTrack

User cheray has pushed new remote branch:

bug-19068-ModifyUSDevice

User cheray has pushed new remote branch:

bug-19068-EchoTrackIntegration2016-04

User franza has pushed new remote branch:

bug-19068-Integration-2016-06

[a4874e]: Merge branch 'bug-19068-Integration-2016-06'

Merged commits:

2016-06-01 14:05:29 Alfred Franz [c6bc4b]
Merge branch 'bug-19068-EchoTrackIntegration2016-04' into bug-19068-Integration-2016-06

2016-04-18 16:07:37 Dominique Cheray [93a15e]
Fixes typo in cmake.txt

2016-04-18 15:26:20 Dominique Cheray [4668ff]
Merge branch 'bug-19068-IntegrationUSNavigation11-2015' into bug-19068-EchoTrackIntegration2016-04

2016-04-18 12:42:51 Dominique Cheray [8374fb]
Renamed EchoTrackPlugin to new naming scheme

UsNavigation is now named EchoTrack and all Plugins (USNavigation and
USCalibration) are named following the new naming scheme.

2016-04-04 14:50:26 Dominique Cheray [da40ad]
Fixes build error from previous commit

2016-04-04 14:20:21 Dominique Cheray [bea7b3]
Sligth changes to PLUS Calibration

Removed double initialisation of m_CombinedModality when PLUSCalibration
was started

2016-03-21 17:57:56 Dominique Cheray [88d54c]
Fixed Crash of PLusCalib in DebugMode

When starting PlusCalibration in DegubMode MITK would always crash once
Plus Connected to MITK due to an thread error. This is now fixed.

2016-02-19 10:59:01 Dominique Cheray [8b6def]
Slightly change UI of Calibration for better use

2016-02-15 14:25:47 Dominique Cheray [1f845d]
Fixes minor fault in SpacingCalibration

When NacvigationData was invalid and Freezebutton in Spacing Calibration
was clicked the image would not freeze but you could still add points.
This was becaused the method from the Freezebutton in the PointBased
Calibration was used. There you need trackingdata to calibrate and
therefore it makes no sense to freeze the image without valid
trackingdata. But for the Spacing Calibration you don't need trackingdata so
this needed to be changed.
Also Freezebutton in Spacing Calibration is now disabled when all four
point are collected. There was some typo and the wrong button was
disabled.

2016-02-09 16:38:42 Dominique Cheray [d96bae]
Small fixes to USCalSmall fixes to USCalibration

2016-02-09 14:47:36 Dominique Cheray [d08c5d]
Tiny changes in USCalibrationUI

2016-02-08 16:57:09 Dominique Cheray [e6a025]
Fixes Workbenchcrash when closing USCalibration

Cause of crash was a vector in QmitkToolTrackingStatusWidget which was
sometimes allocated with new sometimes not. But it is always deleted.
Therefore you may try to delete something youd do not need to delete. Now
QmitkToolTrackingStatuisWidget has a flag that becomes true, when new was
used and the vector is only deleted if new was used.

2016-02-08 15:27:19 Dominique Cheray [cee8f1]
Working Workbenchcrash when closing USCalibration

2016-02-08 09:38:16 Dominique Cheray [655f48]
Fixes CombinedModylityWidget

Combined Modality is now registered as Microservice and in the
CombinedModalityWidget only the CombinedModylity is shown no more
USDevices in this widget

2016-02-01 15:39:55 Dominique Cheray [4f2170]
Merge branch 'bug-19068-PlusCalibrationForEchoTrack' into bug-19068-IntegrationUSNavigation11-2015

2016-02-01 15:13:31 Dominique Cheray [2c4a66]
Finishes Revision of USCalibration UI

Now the different parts of the US Calibration are grouped according to
their functions.

2016-02-01 11:20:55 Dominique Cheray [cbd7cd]
Changes layout of USCalibration from TabWidget to ToolBox

First step in revising the USCalibrations UI. Changed the TabWidget into a
ToolBox. Next step is to group the different pages according to their
functionsl.

2016-01-29 14:07:37 Dominique Cheray [f72213]
Calibrate spacing of USVideoDevice

When calibrating EchoTrack you can now choose to determine the spacing of
the image of the USVideoDevice first. This spacing is then applied to the
USImagw. When changing the depth of the probe the spacing will no longer
be applied to the image because new depth means new spacing.
And the VirtualTracker that was always created when USNavigationPlugin was
used is now removed.

2016-01-22 13:37:28 Dominique Cheray [afd2fa]
Dept and probe controls for USVideoDevice

Expands the USVideoDeviceCustomControls by a possibility for setting the
current scanning depth that is used and by a possibility for setting an
identifier for the used probe. This is helpfull when using EchoTrack with
an USVideoDevice and you need to save or load the correct calibration. You
can now set the scanning depth and the probe used with the ultrasound
machine manually in MITK and it is used for saving or loading the correct
calibration of EchoTrack.

2016-01-14 13:21:16 Dominique Cheray [5f244d]
Completes Calibration of EchoTrack with PLUS

You can now calibrate EchoTrack using PLUS and save the Calibration for
later use. PLUS provides the complete ImageToTrackerTransform, so no
calculating in MITK is needed. Just recieve the Transform and save it,
There is still work to do, to use all this with an UltrasoundMachine that
is connected using a framegrabber. For now it just works with the Telemed
device.

2016-01-12 14:42:10 Dominique Cheray [1b26f9]
ImageToProbeTransform from PLUS is processed in MITK

The ImageToProbeProcess received from PLUS after Calibration is now
processed and the ImageToTrackerTransform needed for EchoTrack is
calculated.
Transform is no saved yet and it is still not validatet if the final
calibration reslut really works for EchoTrack as expected.

2016-01-08 09:40:52 Dominique Cheray [2254f3]
Finished Coomunication between EchoTrack and PLUS

When starting the calibration of EchoTrack with PLUS EchoTrack
automatically sets up servers and providers to send Tracking and
Image Data to PLUS. Once PLUS connected to MITK you can start the
streaming of the data und use PLUS to calibrate the probe.
Last step which is currently missing is to process the image to probe
transform recieved from PLUS and to save the final calibration in MITK

2015-12-23 16:31:36 Dominique Cheray [da2bbc]
Begin working on using Plus to calibrate EchoTrack

Modified Calibration UI: It is now possible to chose PLUS for Calibration
of EchoTrack. Then the new tab opens.
In the new PLUS-CalibrationTab you can chose to receive the
ImageToProbeTransform and it really receives somethig.
Still lots of work to to:

• Use the received Transform in a correct way to caculate the calibration
• Lots of UI for the PLUSCalibration
• Start the streaming of the US and the trackingdata in EchoTrack automatically

2015-11-20 10:33:59 Dominique Cheray [f52e74]
Fixes Namingbug of Marker in TumorSeelctionStep

In Step TumorSelection of USNavigation the Body Marker was not recognized
when not named Marker1. Now you can give it every name you want it will be
recognized.

2015-11-18 12:37:40 Dominique Cheray [b8cc98]
Slightly changes USNavigationLogging

If a target zone is removed during the MarkerPlacementIntervention this is
now logged.

2015-11-17 14:09:26 Dominique Cheray [b31c0b]
Deleted unnecessary depenendcy of USNav to IGTIO

Since USNavigationMarkerPlacement desn't need to include the
NavigatinDataSetWriterCSV and NavigationDataSetWriterXML it does not
depend on the IGTIO anymore.

2015-11-16 16:32:01 Dominique Cheray [6502fd]
Fixes wrong count of targetzones in UsNavLogging

Count of Targetzones in USNavigationLogging was always off by one. Is now
fixedFixes wrong count of targetzones in UsNavLogging

Count of Targetzones in USNavigationLogging was always off by one. Is now
fixed.

2015-11-16 14:41:31 Dominique Cheray [9564fd]
Adapts logging of navigation Data in experiment mode

Logging of navigation data now works. Had to use mitk::IOUtil instead of
mitk::NavigationDataSetWriterXML and mitk::NavigationDataSetWriterCSV.
Because usind them lead to workbench crashing.

2015-11-13 16:09:39 Dominique Cheray [fc694b]
Integrates EchoTrack into actual master

org.mitk.gui.qt.usnavigation now depends on IGTIO because of the
NavigationDataSetWriterXML and the NavigationDataSetWriterCSV in this
module. Also the using of those two in mitkUSPointMarkInteractor had to be
adapted to the chanings made in the two writers.
mitkUSZonesInteractor and mitkUSPointMarkInteractor had to be adapted to
the changes made in their superclass.

2015-11-12 16:54:24 Dominique Cheray [c55308]
Merge branch 'bug-19068-USNavigationBasedOn2015-05-Release' into bug-19068-IntegrationUSNavigation11-2015

2015-11-09 17:22:57 Dominique Cheray [1a5df9]
Fixes freezebutton issues in MarkerPlacement

The freezebutton in the step placement planning didn't work correctly. It
did not unfreeze the image when clicked while image was already frozen. Also
the image did not unfreeze after adding a new zone. This was due to not
checking if image was already frozen in the method OnFreeze()
In the step MarkerIntervention when clicked on the freezebutton MITK crashed.
This was because when loading the state machine the wrong us::ModuleRegistry
was loaded.
Signed-off-by: Dominique Cheray <d.cheray@dkfz-heidelberg.de>

2015-09-17 10:05:26 Dominique Cheray [e95e1b]
Fixed use of old class macro

2015-08-07 10:42:16 Alfred Franz [725124]
Merge branch 'bug-19068-MakeUSNavigationSoftwareOpenSource' into bug-19068-USNavigationBasedOn2015-05-Release

2015-08-06 18:32:16 Alfred Franz [d13a6b]
finsihed implementation of quick verification

2015-08-06 18:04:34 Alfred Franz [bf9553]
Implemented creation of reference points

2015-08-06 17:04:52 Alfred Franz [59d368]
Added ui elements for quick calibration verification

2015-06-01 19:53:34 Alfred Franz [8f2a66]
the ablation zones can be edited now...

2015-06-01 18:56:43 Alfred Franz [06a39f]
fixed bug with including state machines: critical structures can now be marked again

2015-06-01 18:55:53 Alfred Franz [7bb0ac]
Fixed bug with navigation data recorder: navigation datas are correctly recorded now

2015-05-13 17:36:05 Alfred Franz [b65b22]
Merge branch 'bug-19065-NavigationToolCalibrationView' into personal/franza/2015-04-FixingUSNavigationInMTIK

2015-05-13 12:57:07 Alfred Franz [9cbb59]
Merge branch 'bug-18354-TrackingToolboxPersistenceBug' into personal/franza/2015-04-FixingUSNavigationInMTIK

2015-05-13 12:02:54 Alfred Franz [32066d]
merged newest changes from MBI into the MITK branch... EchoTrack is now up to date

2015-05-13 10:16:29 Alfred Franz [2e935f]
finally got US navigation working in MITK, at least the plugin is starting, still needs to be tested

2015-05-11 21:54:09 Alfred Franz [ac380b]
Dirty hack: now showing all US devices which includes combined modalities in the widget. So you can at least calibrate if you choose the right device.

2015-05-11 09:42:47 Alfred Franz [645eb5]
moved US navigation (EchoTrack) to open source MITK

[abff6d]: Merge branch 'bug-19068-QuickFix'

Merged commits:

2016-06-01 15:36:13 Alfred Franz [6c0711]
COMP: fixed linux/mac compiler issues