2014-03-ultrasound-fixes' into…
9bc5b00616d6
Actions

Description

Merge branch 'personal/wintersa/2014-03-ultrasound-fixes' into personal/franza/US-Navigation-Experiments-May2014

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

Details

Provenance

franza

Authored on Jun 25 2014, 10:50 AM

Parents

rMITK1a8aa8a98131: Merge branch 'bug-17859-method-for-getting-if-at-least-one-calibration-was…
rMITK73e522d06371: Merge branch 'bug-17782-telemed-ultrasound-crashes' into personal/franza/US…

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITK9bc5b00616d6: Merge branch 'personal/wintersa/2014-03-ultrasound-fixes' into… (authored by franza).Jun 25 2014, 10:50 AM

Merged Changes

1a8aa8a98131 Merge branch 'bug-17859-method-for-getting-if-at-least-one-calibration-was…
Author
• wintersa
Browse Repository
No Builds
No Audits
fbe25ecb1bb4 Added method for getting if at least one calibration is available for the…
Author
• wintersa
Browse Repository
No Builds
No Audits
598a15a13847 Merge branch 'bug-17840-USDevice-should-notify-about-property-changes' into…
Author
• wintersa
Browse Repository
No Builds
No Audits
7800b680670d Use the new message macro instead of manual defining.
Author
• wintersa
Browse Repository
No Builds
No Audits
b3235a02e11e Merge branch 'bug-17840-USDevice-should-notify-about-property-changes' into…
Author
• wintersa
Browse Repository
No Builds
No Audits
92543ae48841 Introduced an mitk message event for the property change.
Author
• wintersa
Browse Repository
No Builds
No Audits
765f2c092eb2 Merge branch 'bug-17807-combined-modality-does-not-save-calibrations-on-the…
Author
• wintersa
Browse Repository
No Builds
No Audits
4a2de4f4ead1 Changed order of probe and depth in method documentations to match the method…
Author
• wintersa
Browse Repository
No Builds
No Audits
ab8a7d8d5430 Added methods for removing a calibration from the combined modality.
Author
• wintersa
Browse Repository
No Builds
No Audits
a16fe4fd27b0 Replacement of '/' with '-' for TinyXML.
Author
• wintersa
Browse Repository
No Builds
No Audits
c44b0087023a Merge branch 'bug-17807-combined-modality-does-not-save-calibrations-on-the…
Author
• wintersa
Browse Repository
No Builds
No Audits
f731ac76c1d4 Calibrations can be got for arbitrary probe names and depths.
Author
• wintersa
Browse Repository
No Builds
No Audits
f08890dcfee6 Merge branch 'bug-17807-combined-modality-does-not-save-calibrations-on-the…
Author
• wintersa
Browse Repository
No Builds
No Audits
a5866e9e092f Added constants for the default probe name and the sepererator.
Author
• wintersa
Browse Repository
No Builds
No Audits
4710d2ca6d2d Merge branch 'bug-17824-file-open-dialog-for-QmitkUSNewVideoDeviceWidget' into…
Author
• wintersa
Browse Repository
No Builds
No Audits
d87030570cf0 Added file open dialog for video files.
Author
• wintersa
Browse Repository
No Builds
No Audits
f5ee3ac7e30d Merge branch 'bug-17821-USImageAndUSImageMetadataShouldBeMarkedAsDeprecated'…
Author
• wintersa
Browse Repository
No Builds
No Audits
be6bff0c0ed6 Removed usage of USImageMetadata from the UltrasoundSupport plugin.
Author
• wintersa
Browse Repository
No Builds
No Audits
ea61adcb9dd8 Merge branch 'bug-17821-USImageAndUSImageMetadataShouldBeMarkedAsDeprecated'…
Author
• wintersa
Browse Repository
No Builds
No Audits
c96c67eeb080 Removed USImageMetadata from the QmitkUSNewVideoDeviceWidget.
Author
• wintersa
Browse Repository
No Builds
No Audits
7adfa5020a88 Merge branch 'bug-17821-USImageAndUSImageMetadataShouldBeMarkedAsDeprecated'…
Author
• wintersa
Browse Repository
No Builds
No Audits
fe74ac329c40 Added setter for manufacturer, name and comment of the USDevice.
Author
• wintersa
Browse Repository
No Builds
No Audits
6c0ab4611b18 Changed documentation of the QmitkServiceListWidget according to…
Author
• wintersa
Browse Repository
No Builds
No Audits
fd485f944fbd Removed usages of USImageMetadata from the ultrasound module.
Author
• wintersa
Browse Repository
No Builds
No Audits
f9664e0be3f5 Documented USImage and USImageMetadata as deprecated.
Author
• wintersa
Browse Repository
No Builds
No Audits
6e82bf9f3f06 Merge branch 'bug-17807-combined-modality-does-not-save-calibrations-on-the…
Author
• wintersa
Browse Repository
No Builds
No Audits
981152516a10 Added an initialization for the microservice properties of the b mode controls.
Author
• wintersa
Browse Repository
No Builds
No Audits
c37e8fcfd6a5 Fixed end interators for the service properties.
Author
• wintersa
Browse Repository
No Builds
No Audits
746243fad47a Merge branch 'bug-17807-combined-modality-does-not-save-calibrations-on-the…
Author
• wintersa
Browse Repository
No Builds
No Audits
689052146f95 CombinedModality is reading the microservice properties of the us device now.
Author
• wintersa
Browse Repository
No Builds
No Audits
2bfdd832934b Merge remote-tracking branch 'origin/bug-17747-invalid-video-device-index' into…
Author
• wintersa
Browse Repository
No Builds
No Audits
8604bbb7b97b Merge branch 'bug-17749-update-level-window-on-dynamic-range-change' into…
Author
• wintersa
Browse Repository
No Builds
No Audits
6e371cc87032 Do not allow '-1' as video device index anymore as at least some backends used…
Author
• wintersa
Browse Repository
No Builds
No Audits
f5a838aea302 Level window is udpated on every change of the dynamic range.
Author
• wintersa
Browse Repository
No Builds
No Audits
d7bff304126e Merge remote-tracking branch 'origin/bug-17789-opencv-video-looping-does-not…
Author
• wintersa
Browse Repository
No Builds
No Audits
c7cc74c04f5f Changed end reached condition to use the frames count instead of the avi ratio.
Author
• wintersa
Browse Repository
No Builds
No Audits
de09e856b07a Merge branch 'bug-17782-telemed-ultrasound-crashes' into personal/wintersa/2014…
Author
• wintersa
Browse Repository
No Builds
No Audits
e0fbafe1b94c Merge branch 'bug-17766-UltrasoundPluginStopsViewingImmediatelyAfterStarting'…
Author
• wintersa
Browse Repository
No Builds
No Audits
0009daad7747 Merge branch 'bug-16682-additional-persistence-for-igt-widgets' into…
Author
• wintersa
Browse Repository
No Builds
No Audits
dc232b437c3c Implemented storing in QSettings as a fallback for the…
Author
• wintersa
Browse Repository
No Builds
No Audits
f060bf0da182 Store and load tracking volume visibility and the file name of the tool storage…
Author
• wintersa
Browse Repository
No Builds
No Audits
524bd5040ca8 Make sure that the tracking tool widget is updated when a device index was…
Author
• wintersa
Browse Repository
No Builds
No Audits
3f9521dadd8a Added linux ports for polaris and aurora to persistence.
Author
• wintersa
Browse Repository
No Builds
No Audits
d8ddb8d50730 Merge branch 'bug-17766-UltrasoundPluginStopsViewingImmediatelyAfterStarting'…
Author
• wintersa
Browse Repository
No Builds
No Audits
938f413a1394 Merge branch 'bug-17734-FixCrashWhenLoadingUltrasoundPlugin' into…
Author
• wintersa
Browse Repository
No Builds
No Audits
9149b5dcdb5f Merge branch 'bug-17744-ModuleUSHardwareTelemedDoesNotCompileWithVisualStudio20…
Author
• wintersa
Browse Repository
No Builds
No Audits
6ee4cab6b70f Fixed error of not moving call to GetOutput() before the check.
Author
• wintersa
Browse Repository
No Builds
No Audits
64ed939d4585 Merge remote-tracking branch 'origin/bug-17734…
Author
• wintersa
Browse Repository
No Builds
No Audits
abe4a5cf71ee Moved check before data node setting, but return only if data wasn't set to the…
Author
• wintersa
Browse Repository
No Builds
No Audits
588c1476dcb7 Commented out some code which is not working as intended and is only used by an…
Author
• wintersa
Browse Repository
No Builds
No Audits

Changes (19)

Path

Size

Packages

Modules/

IGTUI/

Qmitk/

QmitkTrackingDeviceConfigurationWidget.cpp

QtWidgets/

QmitkServiceListWidget.h

O3: MITK Reviewer Group II

US/

USControlInterfaces/

mitkUSControlInterfaceBMode.cpp

mitkUSControlInterfaceBMode.h

USFilters/

mitkUSImageVideoSource.cpp

USModel/

mitkUSDevice.cpp

mitkUSDevice.h

mitkUSDevicePersistence.cpp

mitkUSImage.h

mitkUSImageMetadata.h

USNavigation/

mitkUSCombinedModality.cpp

mitkUSCombinedModality.h

USUI/

Qmitk/

QmitkUSNewVideoDeviceWidget.cpp

QmitkUSNewVideoDeviceWidget.h

QmitkUSNewVideoDeviceWidgetControls.ui

Plugins/

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

QmitkMITKIGTTrackingToolboxView.h

org.mitk.gui.qt.ultrasound/

src/

internal/

UltrasoundSupport.cpp

UltrasoundSupport.h

rMITK9bc5b00616d6

View Options

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidget.cpp

View Options

Modules/QtWidgets/QmitkServiceListWidget.h

View Options

Modules/US/USControlInterfaces/mitkUSControlInterfaceBMode.cpp

View Options

Modules/US/USControlInterfaces/mitkUSControlInterfaceBMode.h

View Options

Modules/US/USFilters/mitkUSImageVideoSource.cpp

View Options

Modules/US/USModel/mitkUSDevice.cpp

View Options

Modules/US/USModel/mitkUSDevice.h

View Options

Modules/US/USModel/mitkUSDevicePersistence.cpp

View Options

Modules/US/USModel/mitkUSImage.h

View Options

Modules/US/USModel/mitkUSImageMetadata.h

View Options

Modules/US/USNavigation/mitkUSCombinedModality.cpp

View Options

Modules/US/USNavigation/mitkUSCombinedModality.h

View Options

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidget.cpp

View Options

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidget.h

View Options

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidgetControls.ui

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupport.cpp

View Options

Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupport.h

Merge branch 'personal/wintersa/2014-03-ultrasound-fixes' into…9bc5b00616d6Actions

Description

Details

Event Timeline

Merged Changes

Changes (19)

rMITK9bc5b00616d6

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidget.cpp

Modules/QtWidgets/QmitkServiceListWidget.h

Modules/US/USControlInterfaces/mitkUSControlInterfaceBMode.cpp

Modules/US/USControlInterfaces/mitkUSControlInterfaceBMode.h

Modules/US/USFilters/mitkUSImageVideoSource.cpp

Modules/US/USModel/mitkUSDevice.cpp

Modules/US/USModel/mitkUSDevice.h

Modules/US/USModel/mitkUSDevicePersistence.cpp

Modules/US/USModel/mitkUSImage.h

Modules/US/USModel/mitkUSImageMetadata.h

Modules/US/USNavigation/mitkUSCombinedModality.cpp

Modules/US/USNavigation/mitkUSCombinedModality.h

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidget.cpp

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidget.h

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidgetControls.ui

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

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

Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupport.cpp

Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupport.h

Merge branch 'personal/wintersa/2014-03-ultrasound-fixes' into…
9bc5b00616d6
Actions