For ultrasound navigation applications using a compact field generator a combined modality consisting of an ultrasound device and a tracking device is needed.

An USNavigation module should be created containing, the combined modality and some filters (node displacement, needle projection). Additionally an USNavigaionUI module could be created, containing some widgets for ultrasound navigation applications.

New remote branch pushed: bug-16305-CreateACombinedModalityOfUltrasoundDeviceAndTrackingDevice

User wintersa has pushed new remote branch:

bug-16305-CreateACombinedModalityOfUltrasoundDeviceAndTrackingDevice-IntegrationBranch

[8d4eba]: Merge branch 'bug-16305-CreateACombinedModalityOfUltrasoundDeviceAndTr

Merged commits:

2014-03-07 17:56:33 Adrian Winterstein [07291a]
Removed unused code in ultrasound plugin.

2014-03-07 17:46:46 Adrian Winterstein [83250e]
Fixed "static initialization order fiasco" for us devices.

2014-03-07 13:56:29 Adrian Winterstein [65ca0b]
Module name removed as it can be got from the directory name.

2014-03-06 10:50:05 Adrian Winterstein [adadf2]
Merge branch 'bug-16305-CreateACombinedModalityOfUltrasoundDeviceAndTrackingDevice' into bug-16305-CreateACombinedModalityOfUltrasoundDeviceAndTrackingDevice-IntegrationBranch

Conflicts:
Modules/IGT/files.cmake
Modules/OpenCVVideoSupport/Commands/mitkBasicCombinationOpenCVImageFilter.cpp
Modules/OpenCVVideoSupport/Commands/mitkConvertGrayscaleOpenCVImageFilter.cpp
Modules/OpenCVVideoSupport/Commands/mitkGrabCutOpenCVImageFilter.h
Modules/OpenCVVideoSupport/Testing/CMakeLists.txt
Modules/OpenCVVideoSupport/Testing/mitkGrabCutOpenCVImageFilterTest.cpp
Modules/US/CMakeLists.txt
Modules/US/USFilters/mitkUSImageToUSImageFilter.h
Modules/US/USModel/mitkUSImageMetadata.h
Modules/US/USService/mitkUSDeviceService.h
Modules/USUI/CMakeLists.txt

2014-03-06 09:47:54 Adrian Winterstein [9097a8]
Merge branch 'bug-16305-CreateACombinedModalityOfUltrasoundDeviceAndTrackingDevice' of mitk.org:MITK into bug-16305-CreateACombinedModalityOfUltrasoundDeviceAndTrackingDevice

2014-03-05 18:31:02 Adrian Winterstein [84bd0d]
Test for invalid top left corner in cropping filter.

2014-03-04 12:41:29 Adrian Winterstein [92b358]
Made navigation data filter pipeline of the Combined Modality configurable.

2014-03-03 20:24:19 Adrian Winterstein [3bcb6c]
Extended NodeDisplacementFilterTest for testing rotation.

2014-03-03 19:08:43 Adrian Winterstein [c8a941]
Fixed compiler warnings in USImageLoggingFilter and corresponding test.

2014-03-03 18:53:33 Adrian Winterstein [3049d1]
Additional icon + fixing of compiler warning for UltrasoundSupport.

2014-03-03 18:51:02 Adrian Winterstein [419e1a]
Fixed compile errors on linux in USImageLoggingFilterTest.

2014-03-03 18:02:31 Adrian Winterstein [dc6e34]
Copy buffer into image at OpenCV filter image methods to fix problems with cropping.

2014-03-03 17:45:37 Adrian Winterstein [736787]
Fixed microservice property for dynamic range.

2014-03-03 17:40:36 Adrian Winterstein [39edf3]
Merge branch 'bug-16305-CreateACombinedModalityOfUltrasoundDeviceAndTrackingDevice' of mitk.org:MITK into bug-16305-CreateACombinedModalityOfUltrasoundDeviceAndTrackingDevice

2014-03-03 17:41:18 Adrian Winterstein [2544b5]
Copy images in Telemed image source.

2014-03-03 17:36:51 Adrian Winterstein [ab81e8]
Dynamic range control added for b mode ultrasound.

2014-03-03 17:00:54 Adrian Winterstein [f6afd8]
Stop viewing at UltrasoundSupport if the image stream node was changed outside.

2014-03-03 16:59:45 Adrian Winterstein [f4c5e6]
Connect and activate USDevice inside CombinedModality only if it isn't already.
+ get custom controls on combined modality.

2014-02-28 09:54:13 Adrian Winterstein [6edb3f]
Merge remote-tracking branch 'origin/bug-17034-USImageLoggingFilterIntegration' into bug-16305-CreateACombinedModalityOfUltrasoundDeviceAndTrackingDevice

2014-02-28 09:49:29 Adrian Winterstein [d9fe36]
Resources removed from files.cmake, too.

2014-02-27 19:52:59 Adrian Winterstein [66fd55]
Interactors removed from USNavigation module as they aren't supposed to be in MITK for now.

2014-02-20 13:43:15 Adrian Winterstein [29adcc]
USNavigationUI is not supposed to be a part of MITK for now.

2014-02-13 13:40:36 Adrian Winterstein [b9f271]
Fixed needle path direction of NeedleProjectionFilter, when needle is not pointing to the image plane.

2014-02-12 20:18:36 Adrian Winterstein [3dc8a3]
Fixed braces in NodeDisplacementFilter.

2014-02-12 20:07:17 Adrian Winterstein [6bef8a]
Merge branch 'bug-16305-CreateACombinedModalityOfUltrasoundDeviceAndTrackingDevice' of mitk.org:MITK into bug-16305-CreateACombinedModalityOfUltrasoundDeviceAndTrackingDevice

2014-02-11 10:53:00 Alfred Franz [bceaf1]
set high precision to avoid loss of digits

2014-02-11 10:44:22 Alfred Franz [cd3380]
added second method instead of default parameters to avoid linux compiler problems.

2014-02-10 16:16:43 Adrian Winterstein [cca550]
Merge remote-tracking branch 'origin/bug-17034-USImageLoggingFilterIntegration' into bug-16305-CreateACombinedModalityOfUltrasoundDeviceAndTrackingDevice

2014-02-10 16:03:13 Alfred Franz [89af9c]
extended test to new method

2014-02-10 16:02:43 Alfred Franz [9a590e]
added method for different file extensions for the saved images

2014-02-10 15:34:43 Alfred Franz [c9e298]
Adapted test to exception.

2014-02-10 15:34:31 Alfred Franz [9bcd78]
Improved error handling: now a defined mitk::exception is thrown if the given path is not valid.

2014-02-07 11:06:46 Adrian Winterstein [2cd003]
Combined modality persistence moved to MBI plugin (4930cc54).

2014-02-07 10:22:56 Adrian Winterstein [3ff785]
Cleanup of NodeDispaclementFilter.

2014-02-06 19:44:09 Adrian Winterstein [6bcd2e]
Releasing VideoCapture on disconnect of ultrasound video device.

2014-02-06 19:39:53 Adrian Winterstein [da76c1]
Disconnect device in QmitkUSDeviceManagerWidget is button is pressed.

2014-02-06 19:39:23 Adrian Winterstein [5fc49b]
Code cleanup in UltrasoundSupport.

2014-02-05 12:05:42 Alfred Franz [114491]
minor changes (only todo comment)

2014-02-05 12:03:59 Alfred Franz [0a1a9e]
finished conversion of test. Also added a new test method which is failing at the moment (wrong exception when an invalid path is given).

2014-02-05 12:03:22 Alfred Franz [742c9d]
test commit

2014-02-04 18:48:40 Adrian Winterstein [25c480]
Merge remote-tracking branch 'origin/bug-17034-USImageLoggingFilterIntegration' into bug-16305-CreateACombinedModalityOfUltrasoundDeviceAndTrackingDevice

2014-02-04 18:42:46 Adrian Winterstein [a81e11]
Freeze tracking in CombinedModality.

2014-02-04 18:32:12 Alfred Franz [6ab91f]
started conversion of test to cpp unit (not finished yet)

2014-02-04 18:15:21 Alfred Franz [593a3b]
cleaned up depencies

2014-02-04 18:03:08 Alfred Franz [99ba1f]
Merge branch 'bug-17034-USImageLoggingFilter' into bug-17034-USImageLoggingFilterIntegration

Conflicts:
Modules/US/CMakeLists.txt

2014-02-04 16:36:32 Alfred Franz [21cb52]
started working on redirection of inputs to outputs... not working yet

2014-02-04 16:19:52 Alfred Franz [30d341]
DOC: added documentation to class

2014-02-04 16:06:15 Alfred Franz [f4a00b]
finished first version of implementation and wrote a first simple test

2014-02-04 16:03:27 Alfred Franz [46aeb7]
temporary add dependency to IGT, this could by switched to IGT base on the new master (it's because of realtime clock)

2014-02-03 15:33:16 Alfred Franz [25184c]
added test for mitkUSImageLoggingFiler

2014-02-03 14:49:43 Alfred Franz [82e4ff]
created new class USImageLoggingFilter

2014-01-30 18:25:21 Adrian Winterstein [08b336]
Record icon added.

2014-01-30 18:24:23 Adrian Winterstein [591fe9]
USZoneManagementWidget signals that a zone was removed.

2014-01-30 18:23:20 Adrian Winterstein [91951c]
Higher sphere resolution and additional test for data in USZonesInteractor.

2014-01-28 08:02:51 Adrian Winterstein [f1842c]
Test for NodeDistplacementFilter added.

2014-01-28 07:58:33 Adrian Winterstein [5483a7]
Fixed order of member initialization.

2014-01-26 14:19:54 Adrian Winterstein [20bd80]
Merge branch 'bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2' into bug-16305-CreateACombinedModalityOfUltrasoundDeviceAndTrackingDevice

Conflicts:
Modules/IGT/files.cmake
Modules/OpenCVVideoSupport/Testing/CMakeLists.txt
Modules/OpenCVVideoSupport/Testing/files.cmake
Modules/US/Testing/mitkUSPipelineTest.cpp
Modules/US/USFilters/mitkUSImageSource.cpp
Modules/US/USModel/mitkUSDevice.cpp
Modules/USUI/Qmitk/QmitkUSAbstractCustomWidget.h

2014-01-25 15:27:11 Adrian Winterstein [300296]
Needle projection and node displacement filter are subclasses of NavigationDataPassThroughFilter now.

2014-01-24 13:40:18 Adrian Winterstein [51ec05]
Fixed tracking start and stop in CombinedModality.

2014-01-23 17:19:12 Adrian Winterstein [5453b6]
Merge branch 'bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2' of mitk.org:MITK into bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2

2014-01-23 17:18:53 Adrian Winterstein [655dd8]
Stop icon added.

2014-01-23 13:41:49 Adrian Winterstein [74b0ad]
Simplified PointMarkInteractor.

2014-01-22 11:42:42 Adrian Winterstein [edd8ac]
Merge branch 'bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2' of mitk.org:MITK into bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2

2014-01-22 11:41:10 Adrian Winterstein [f85a13]
Nodes can be removed from the NodeDisplacementFilter.

2014-01-20 15:00:15 Adrian Winterstein [a5d630]
Start and stop tracking in Combined Modality.

2014-01-19 18:23:03 Adrian Winterstein [281847]
Connect slots before initializing the service list widgets.

For not losing any signals.

2014-01-19 18:21:29 Adrian Winterstein [98adbe]
Minor rearrangement of ultrasound support GUI.

2014-01-19 18:20:02 Adrian Winterstein [e18e15]
Added device persistence for Combined Modality.

2014-01-19 18:19:22 Adrian Winterstein [a48e20]
Thread for asynchronous device connection.

2014-01-19 18:16:13 Adrian Winterstein [9f0f86]
Minor GUI improvements for NewVideoDeviceWidget.

2014-01-18 22:00:11 Adrian Winterstein [5c79f3]
Set device state to initialized before registering as micro service.

There could be an infinite loop be caused by the combined modality
under some circumstances.

2014-01-18 19:09:39 Adrian Winterstein [af63cd]
Added accept button.

2014-01-18 17:53:44 Adrian Winterstein [248d85]
Interactors moved to subdirectory.

2014-01-18 17:50:44 Adrian Winterstein [c4179c]
Forward declaration of filters in combined modality.

2014-01-13 11:29:45 Adrian Winterstein [f67f4e]
Fixed CMake path selection for Telemed SDK.

2014-01-09 13:41:05 Adrian Winterstein [79cba6]
Point mark interactor sends a signal on coordinate change.

2014-01-08 08:05:16 Adrian Winterstein [69c6a4]
Merge branch 'bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2' of mitk.org:MITK into bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2

2014-01-07 22:08:55 Adrian Winterstein [c76fbe]
Merge branch 'bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2' of mitk.org:MITK into bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2

2014-01-07 19:21:11 Adrian Winterstein [3df753]
Ineractor for marking one point added.

2014-01-07 16:33:21 Adrian Winterstein [b8fcc3]
Forward declaration of control interfaces.

2014-01-04 16:27:09 Adrian Winterstein [e974e1]
Zone color can be changed by a QColorDialog.

2014-01-04 14:36:57 Adrian Winterstein [550d41]
More documentation and code cleanup for ultrasound navigation.

2014-01-04 14:24:23 Adrian Winterstein [e8329f]
All USDevices are handled in the USActivator now.

2014-01-04 12:46:28 Adrian Winterstein [787fbc]
Removed some classes and resources which aren't used anymore.

2014-01-03 20:57:17 Adrian Winterstein [84c5c8]
Code cleanup and more comments for GrabCutOpenCVImageFilter.

2014-01-03 19:41:24 Adrian Winterstein [403fae]
Added vendor field at combined modality creation.

2014-01-03 11:01:01 Adrian Winterstein [da6c93]
Merge branch 'bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2' of mitk.org:MITK into bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2

2014-01-03 11:00:28 Adrian Winterstein [386245]
Fixed loop indices of smoothing filter + some code cleanup.

2014-01-03 09:31:28 Adrian Winterstein [649b8a]
Documentation of GrabCutOpenCVImageFilter.

2014-01-02 22:52:51 Adrian Winterstein [e5d3cb]
Non-available resource removed from Cmake.

2014-01-02 18:49:27 Adrian Winterstein [f30055]
GrabCut image filter test extended.

2014-01-02 17:27:44 Adrian Winterstein [43be7e]
Getter for model points region, fix of bounding box width and height and testing for model sizes.

2013-12-20 17:56:06 Adrian Winterstein [f1f770]
Check for wrong pixel index.

2013-12-20 14:40:47 Adrian Winterstein [0daa60]
Merge branch 'bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2' of mitk.org:MITK into bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2

2013-12-20 14:38:31 Adrian Winterstein [802ff8]
Method for getting only the contour around a given pixel.

2013-12-20 10:32:07 Adrian Winterstein [fd716d]
Got rid of IplImage.

2013-12-19 18:59:21 Adrian Winterstein [a078e3]
No IplImage is needed anymore for converting MitkImage to OpenCVImage.

2013-12-19 18:56:52 Adrian Winterstein [816529]
GrabCut OpenCV image filter converts image to rgb if necessary.

2013-12-17 10:05:00 Adrian Winterstein [a8882a]
Combined Modality does not spawn an own image acquiring thread anymore.

2013-12-15 15:19:24 Adrian Winterstein [2e8b3c]
Removed functions which do the same in their superclass implementation.

2013-12-15 15:17:36 Adrian Winterstein [fc3ef9]
Fixed some compiler warnings.

2013-12-15 14:39:53 Adrian Winterstein [99fc3e]
Removed two unused classes.

2013-12-14 16:56:06 Adrian Winterstein [f9ab0a]
Conditional 2d pipeline filter pushing.

2013-12-14 14:37:56 Adrian Winterstein [2d205c]
Fixed height of combined modality creation widget.

2013-12-13 19:20:03 Adrian Winterstein [e352b4]
Added base filter for passing navigation data without any changes to the outputs.

2013-12-12 19:18:49 Adrian Winterstein [5227e9]
Fixed usage of additional interaction state machine.

2013-12-12 16:27:13 Adrian Winterstein [b33ffc]
OpenCV GrabCut filter can return the contours of segmented objects and the model points can be set as mask.

2013-12-12 16:25:58 Adrian Winterstein [1ca25a]
Fixed method call for image filtering.

2013-12-11 18:22:14 Adrian Winterstein [1800a1]
Merge branch 'bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2' of mitk.org:MITK into bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2

2013-12-11 18:21:31 Adrian Winterstein [2a0c79]
Give image count into OpenCV filters and save it into the mitk result image.

2013-12-11 18:20:41 Adrian Winterstein [9a6adb]
Extended OpenCV image filters by image ids.

2013-12-11 17:42:24 Adrian Winterstein [889d9d]
Extended OpenCV image filters by image ids.

2013-12-10 14:38:17 Adrian Winterstein [dd26c3]
Getter for ImageFilter of USImageSource adapted to usage of BasicCombinationOpenCVImageFilter.

2013-12-10 14:36:59 Adrian Winterstein [613a9a]
Setter for points dilation size implemented.

2013-12-09 19:22:58 Adrian Winterstein [f575a1]
Merge branch 'bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2' of mitk.org:MITK into bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2

2013-12-09 19:22:48 Adrian Winterstein [e50ed0]
Image filtering is not done in USImageSource. if basic combination filter is empty.

2013-12-09 19:15:12 Adrian Winterstein [37af7d]
Merge branch 'bug-16623-MakeOpenCVGrabCutAlgorithmAvailableInMITK-v2013.09.0' into bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2

Conflicts:
Modules/OpenCVVideoSupport/Testing/CMakeLists.txt
Modules/OpenCVVideoSupport/Testing/files.cmake
Modules/OpenCVVideoSupport/files.cmake

2013-12-09 19:07:39 Adrian Winterstein [be2dc2]
Filter window can be defined for grab cut filter.

Conflicts:
Modules/OpenCVVideoSupport/Testing/CMakeLists.txt

2013-12-07 12:03:24 Adrian Winterstein [6b1a15]
Mutex of condition variable has to be locked only once.

2013-12-06 20:07:30 Adrian Winterstein [2e6649]
Result count for GrabCut filter + Test addition.

2013-12-06 19:30:46 Adrian Winterstein [9c5b36]
Threading for GrabCut filter.

2013-12-06 10:01:10 Adrian Winterstein [a348d1]
Testing cropped image.

2013-12-09 19:05:52 Adrian Winterstein [788348]
Testing GrabCut filter.

Conflicts:
Modules/OpenCVVideoSupport/Testing/files.cmake

2013-12-09 19:04:20 Adrian Winterstein [e2cc02]
First version of an image filter using OpenCV's GrabCut algorithm.

Conflicts:
Modules/OpenCVVideoSupport/files.cmake

2013-12-09 13:01:41 Adrian Winterstein [db62f1]
Image processing filters can be added and removed for an ultrasound device.

+ Fix: Update dimensions of us device output image.

2013-12-05 13:35:13 Adrian Winterstein [3d357e]
Test for invalid thread id before terminating thread.

2013-12-01 13:45:52 Adrian Winterstein [7dccb2]
State machine can be changed for zone management.

2013-12-01 12:11:53 Adrian Winterstein [8779ab]
Added some null pointer tests in QmitkUSZoneManagementWidget.

2013-11-26 11:30:42 Adrian Winterstein [3f6644]
Ultrasound plugin makes reinit just on image and doesn't create the image stream node anymore if it already present.

2013-11-26 10:27:18 Adrian Winterstein [7f4ea6]
Merge branch 'bug-16479-ServiceListWidgetLosesSelectionWhenServicePropertiesChanges' into bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2

2013-11-25 12:05:05 Adrian Winterstein [d19953]
Fixed data validitiy setting of NavigationDataSmoothingFilter.

2013-11-23 16:01:40 Adrian Winterstein [5889d0]
Test for data storage null pointers.

2013-11-22 16:48:26 Adrian Winterstein [9ef723]
Static method for updating sphere in USZonesInteractor + Listener fix in QmitkUSZonesDataModel

2013-11-21 17:10:15 Adrian Winterstein [79cdf2]
Combined Modality freezes contained Ultrasound Device.

2013-11-21 16:51:59 Adrian Winterstein [cf24ee]
Merge branch 'bug-16479-ServiceListWidgetLosesSelectionWhenServicePropertiesChanges' into bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2

2013-11-19 16:36:54 Adrian Winterstein [da9266]
Zone base node and listeners are removed when widget is deleted.

2013-11-18 18:57:49 Adrian Winterstein [5a08ef]
Widget added for creating combined modalities.

2013-11-18 17:42:00 Adrian Winterstein [1f131b]
Merge branch 'bug-16331-fix-intermediate-autoload-path-handling' into bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2

2013-11-18 17:16:27 Adrian Winterstein [38d84b]
Removed USNavigation plugin as it was moved back to MBI.

2013-11-18 17:02:57 Adrian Winterstein [dbc631]
Merge branch 'bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2' of mitk.org:MITK into bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2

2013-11-18 17:01:15 Adrian Winterstein [5146c4]
Removed USCalibration plugin as it was moved back to MBI.

2013-11-18 16:16:00 Adrian Winterstein [4d5519]
Compatiblity fixes of USNavigation plugin zone meters.

2013-11-17 16:20:41 Adrian Winterstein [5fe077]
Added getter for calibration status of currently selected probe and zoom level of USCombinedModality.

2013-11-17 16:19:15 Adrian Winterstein [4f0972]
Replaced icons of USUI with icons of the Tango icon set (which is public domain).

2013-11-15 11:24:16 Adrian Winterstein [1b7d93]
Merge branch 'bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2' of mitk.org:MITK into bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2

2013-11-15 11:23:11 Adrian Winterstein [dd912e]
Caibration is not set to default calibration anymore on every calibration stopping.

Fixes crash on closing calibration plugin.

2013-11-14 16:04:25 Adrian Winterstein [1cf407]
Reinit on ultrasound image stream in USNavigation plugin

2013-11-14 14:50:14 Adrian Winterstein [3466be]
Serialization and deserialization of calibration in USCombinedModality uses translation instead of offset.

Fixes crash when rendering an calibrated image.

2013-11-14 10:27:39 Adrian Winterstein [60a73e]
Merge branch 'bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2' of mitk.org:MITK into bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2

2013-11-14 10:27:13 Adrian Winterstein [8f37bc]
Image reading and writing is locked by a mutex in USDevice now.

This is a fix for crashes of the ultrasound plugin.

2013-11-14 10:15:03 Adrian Winterstein [579513]
Added some icons for USUI and made them available in USNavigationUI, too.

2013-11-12 17:10:33 Adrian Winterstein [3ce32f]
Merge branch 'bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2' of mitk.org:MITK into bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2

Conflicts:
Plugins/org.mitk.gui.qt.usnavigation/src/internal/USNavigation.h

2013-11-12 17:04:13 Adrian Winterstein [5ba1cd]
Zone adding of ZoneManagementWidget is synchronised with freeze button of USNavigation plugin.

2013-11-11 19:22:16 Adrian Winterstein [2e4b24]
Ultrasound calibration can be stopped und restarted now.

Additionally, the plugin listens for device zoom events.

2013-11-11 19:19:10 Adrian Winterstein [b8bbde]
Calibration loading for ultrasound navigation plugin implemented again for new calibrations.

2013-11-11 19:18:10 Adrian Winterstein [37f665]
Transformation is done on output now in GenerateData method.

2013-11-11 13:28:11 Adrian Winterstein [988b1d]
USDevice and USCombinedModality are set modified before every update.

2013-11-11 11:20:16 Adrian Winterstein [369189]
Connect and activate order of ultrasound device fixed in calibration plugin.

2013-11-11 11:15:47 Adrian Winterstein [bf850e]
Merge branch 'bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2' of mitk.org:MITK into bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2

2013-11-11 11:10:39 Adrian Winterstein [057964]
GenerateData moved to superclass (USDevice).

Copies slice into output.

2013-11-08 19:18:53 Adrian Winterstein [c20451]
Abort state for zone interactor + slider for zone size moved outside the table.

2013-11-08 10:30:41 Adrian Winterstein [7d7e0b]
Missing test for active probes interface added when constructing service properties in USDevice.

2013-11-08 09:54:08 Keno Maerz [e1fc72]
Removed Depreated Tests

2013-11-07 18:20:04 Adrian Winterstein [adb294]
Compatibility of Telemed classes to us module changes.

2013-11-07 17:45:29 Adrian Winterstein [5df2f6]
Merge branch 'bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2' of mitk.org:MITK into bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2

2013-11-07 17:44:23 Adrian Winterstein [54263c]
Probe changes are propagated from control interface to us device.

USCombinedModality is getting the probe name from the ServiceProperties.

2013-11-07 17:02:05 Keno Maerz [96ce82]
Removed two more deprectated fields

2013-11-07 16:54:38 Keno Maerz [a79373]
Removed methods that were commented out

2013-11-07 16:43:06 Keno Maerz [e51ada]
Removed all deprecated Methods, Removed USImage from Pipeline, we only use mitk::Images now

2013-11-07 16:39:20 Adrian Winterstein [b27a6b]
Fixed forward declaration of PrototypeServiceFactory.

2013-11-07 14:36:22 Adrian Winterstein [e5d0b0]
Zone list can be got fro USZoneManagementWidget and all zones can be removed by calling a slot.

2013-11-07 14:18:33 Adrian Winterstein [ead594]
Merge branch 'bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2' of mitk.org:MITK into bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2

2013-11-07 14:17:15 Adrian Winterstein [7a05c5]
Fixed missing return value.

2013-11-07 11:53:52 Keno Maerz [78ef06]
fixed uninitialized Variable

2013-11-07 11:48:46 Keno Maerz [da8f12]
Updated documentation for NodeDisplacementFilter

2013-11-07 10:02:25 Adrian Winterstein [f8495b]
Merge branch 'bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2' of mitk.org:MITK into bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource-v2

2013-11-07 10:01:40 Adrian Winterstein [d9375c]
USZonesDataModel listens for node changes to update table accordingly.

2013-11-06 19:08:49 Keno Maerz [aafe34]
Fixed Deserializatio issue, everthing works as advertised!

2013-11-06 18:59:06 Keno Maerz [1e9492]
Some fixes, Serialization works, Deserialization still fails because of a TinyXML error, probably related to encoding.

2013-11-06 17:53:31 Keno Maerz [d3e9a4]
Added Serialization and Deserialization to mitkCombinedModality, added a Test Driver for USNavigation and tests for Combined Modality

2013-11-05 15:35:53 Keno Maerz [7fc5a4]
Added Method stubs for Calibration Serialization and deserialization

2013-11-04 18:55:39 Adrian Winterstein [371b33]
USZonesDataModel listens to events of the data storate (add, remove).

2013-11-04 16:35:02 Adrian Winterstein [7ec580]
Zones can be added by interacting with the image rendering now.

2013-11-04 16:13:51 Adrian Winterstein [3d35af]
Added creation of image stream again (was removed due to a mistake).

2013-11-04 16:12:52 Adrian Winterstein [fdacce]
CombinedModality is set in UltrasoundCalibration not before start calibration was clicked.

2013-11-04 16:08:07 Adrian Winterstein [ebcf4d]
Fixed initialisation of pipeline in CombinedModality. Outputs are grafted instead of cloned in DelayFilter.

2013-11-03 11:02:44 Adrian Winterstein [3b285a]
Interactions for zone creation implemented.

2013-11-03 11:01:16 Adrian Winterstein [a52516]
Delegates created for zones table (combo box and slider).
Zones table rows can change background colors and items can be added to zones model and removed from the model.

2013-10-31 15:20:03 Adrian Winterstein [9c3e1b]
Added widget for zones management and corresponding data model.

2013-10-31 09:38:38 Adrian Winterstein [982d85]
Compatibility of USNavigatin plugin to CombinedModality.

2013-10-30 10:38:30 Adrian Winterstein [7e9187]
Added USNavigation plugin from MBI.

2013-10-30 10:37:23 Adrian Winterstein [600345]
Compatibility for GCC.

2013-10-30 10:29:57 Adrian Winterstein [f5e5b5]
Added NodeDisplacementFilter from MBI.

2013-10-30 09:53:49 Adrian Winterstein [20eddf]
ConvertPointSetToVtkPolyData is temporarily part of the UltrasoundCalibration plugin.

2013-10-29 19:24:39 Adrian Winterstein [04a171]
Combined modalities can be removed by the manager widget.

2013-10-29 18:04:57 Adrian Winterstein [2c32cf]
Merge branch 'bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource' of mitk.org:MITK into bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource

2013-10-29 18:03:49 Adrian Winterstein [854735]
ServiceListWidgets in QmitkUSCombinedModalityManagerWidget show correct devices now.

2013-10-28 18:38:00 Keno Maerz [57d432]
More complete DelayFilter, Combined modality initializes it's own delay filter, Documentation

2013-10-28 17:15:34 Adrian Winterstein [06e881]
Constructor of Combined Modality wants devices as parameters now.

2013-10-28 15:56:56 Keno Maerz [9b1b61]
Renamend DelayFilter to NavigationDataDelayFilter

2013-10-28 15:44:52 Keno Maerz [b868fb]
Finished first version of delayFilter (untested)

2013-10-28 15:09:45 Keno Maerz [7c9eab]
Basic Implementation of GenerateData (Not fully functional yet)

2013-10-28 15:44:32 Adrian Winterstein [f81582]
Merge branch 'bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource' of mitk.org:MITK into bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource

2013-10-28 15:34:37 Adrian Winterstein [746211]
Changed Ultrasound Calibration Plugin for using Combined Modality.

2013-10-28 14:17:27 Keno Maerz [04071b]
Fixed DelayFilter (Now inherits from NavigationDataToNavigationDataFilter)

2013-10-28 13:51:06 Adrian Winterstein [82c9ce]
Merge branch 'bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource' of mitk.org:MITK into bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource

2013-10-28 13:47:08 Adrian Winterstein [96ab80]
Added Ultrasound Calibration Plugin from MBI.

2013-10-28 13:19:50 Keno Maerz [5230d5]
Export Fix

2013-10-28 13:08:59 Keno Maerz [51118e]
First steps to introduce getters for navigation data source

2013-10-28 13:04:46 Adrian Winterstein [006d22]
Fixed exports of USCombinedModality.

2013-10-25 17:03:24 Adrian Winterstein [7927cb]
Extended Combined Modality: Filters

2013-10-25 16:59:39 Adrian Winterstein [9f4abc]
Copied navigation data smoothing filter from MBI. Added frame for delay filter.

2013-10-25 16:58:36 Adrian Winterstein [7a3a42]
Sub module added for us navigation ui widgets.

2013-10-25 16:56:43 Adrian Winterstein [f8bea0]
Fixed CMake problem with QT submodules (will be handled in a seperate bug in the master too).

2013-10-25 11:15:39 Adrian Winterstein [546633]
Submodule of CombinedModality renamed to be used as general ultrasound navigation module.

2013-10-25 10:59:56 Adrian Winterstein [60010e]
Marked some methods and members deprecated in USDevice.

2013-10-24 17:02:18 Adrian Winterstein [54ecd3]
Probe based calibration is used in GenerateData now.

2013-10-24 16:37:25 Adrian Winterstein [440a98]
Calibrations for probes and depths can be set and get in Combined Modality.

2013-10-23 18:02:26 Adrian Winterstein [3e91b5]
Submodule and class added for Combined Modality.

2013-10-22 10:25:18 Adrian Winterstein [7a66ff]
Merge branch 'bug-15615-IntegrateTelemedUltrasoundApiIntoMITK-US-BasedOnNewMaster' into bug-16305-UltrasoundNavigationPluginsShouldBeMadeAvailableInOpenSource

Conflicts:
Modules/OpenCVVideoSupport/Testing/files.cmake

[9f2bec]: Merge branch 'bug-16305-CreateACombinedModalityOfUltrasoundDeviceAndTr

Merged commits:

2014-03-07 18:53:53 Adrian Winterstein [f09e9d]
COMP: Using double instead of float for higher precision.