Diffusion MITK ad523c654115

Merge branch 'bug-17897-UltrasoundMultipleActiveDevices'
ad523c654115
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-17897-UltrasoundMultipleActiveDevices'

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
Plugins/org.mitk.gui.qt.igttracking/src/internal/mitkPluginActivator.cpp
Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupport.cpp
Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupportControls.ui

Details

Provenance

Authored on Jul 9 2014, 1:33 PM

Parents

rMITK3c74ab0ae9c3: cleaned up the code (deleted methods which are not used any more)
rMITK470f04e7585a: Merge branch 'bug-12997-RewriteRecorderTest'

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITKad523c654115: Merge branch 'bug-17897-UltrasoundMultipleActiveDevices' (authored by franza).Jul 9 2014, 1:33 PM

Merged Changes

3c74ab0ae9c3 cleaned up the code (deleted methods which are not used any more)
Author
franza
Browse Repository
No Builds
No Audits
23535492472e fixed a few initialization bugs... working now
Author
franza
Browse Repository
No Builds
No Audits
93d8376d94ad fixed the bug: first working version
Author
franza
Browse Repository
No Builds
No Audits
bd0f446cf1d7 restored fix which was lost during merge
Author
franza
Browse Repository
No Builds
No Audits
889bd59eb755 Merge branch 'bug-17893-CrashesIGTandUltrasound' into personal/franza/US…
Author
franza
Browse Repository
No Builds
No Audits
bf518525e3af some minor fixes...
Author
franza
Browse Repository
No Builds
No Audits
9bc5b00616d6 Merge branch 'personal/wintersa/2014-03-ultrasound-fixes' into…
Author
franza
Browse Repository
No Builds
No Audits
1a8aa8a98131 Merge branch 'bug-17859-method-for-getting-if-at-least-one-calibration-was…
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
b3235a02e11e Merge branch 'bug-17840-USDevice-should-notify-about-property-changes' into…
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
c44b0087023a Merge branch 'bug-17807-combined-modality-does-not-save-calibrations-on-the…
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
4710d2ca6d2d Merge branch 'bug-17824-file-open-dialog-for-QmitkUSNewVideoDeviceWidget' into…
Author
• wintersa
Browse Repository
No Builds
No Audits
f5ee3ac7e30d Merge branch 'bug-17821-USImageAndUSImageMetadataShouldBeMarkedAsDeprecated'…
Author
• wintersa
Browse Repository
No Builds
No Audits
ea61adcb9dd8 Merge branch 'bug-17821-USImageAndUSImageMetadataShouldBeMarkedAsDeprecated'…
Author
• wintersa
Browse Repository
No Builds
No Audits
7adfa5020a88 Merge branch 'bug-17821-USImageAndUSImageMetadataShouldBeMarkedAsDeprecated'…
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
746243fad47a Merge branch 'bug-17807-combined-modality-does-not-save-calibrations-on-the…
Author
• wintersa
Browse Repository
No Builds
No Audits
73e522d06371 Merge branch 'bug-17782-telemed-ultrasound-crashes' into personal/franza/US…
Author
franza
Browse Repository
No Builds
No Audits
a466e9cee68d disabled persistence because of bug 17806
Author
franza
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
d7bff304126e Merge remote-tracking branch 'origin/bug-17789-opencv-video-looping-does-not…
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
f37badce8b02 added a getter for the tracking device to the combined modality
Author
franza
Browse Repository
No Builds
No Audits
35954a4fa969 added new method to get raw displacement data
Author
franza
Browse Repository
No Builds
No Audits

Changes (12)

Path

Size

Modules/

IGTUI/

Qmitk/

QmitkTrackingDeviceConfigurationWidget.cpp

US/

USNavigation/

Filter/

mitkNodeDisplacementFilter.cpp

mitkNodeDisplacementFilter.h

mitkUSCombinedModality.h

USUI/

Qmitk/

QmitkUSDeviceManagerWidget.cpp

QmitkUSDeviceManagerWidget.h

Plugins/

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

QmitkMITKIGTTrackingToolboxView.h

mitkPluginActivator.cpp

org.mitk.gui.qt.ultrasound/

src/

internal/

UltrasoundSupport.cpp

UltrasoundSupport.h

UltrasoundSupportControls.ui

rMITKad523c654115

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidget.cpp

Loading...

Modules/US/USNavigation/Filter/mitkNodeDisplacementFilter.cpp

Loading...

Modules/US/USNavigation/Filter/mitkNodeDisplacementFilter.h

Loading...

Modules/US/USNavigation/mitkUSCombinedModality.h

Loading...

Modules/USUI/Qmitk/QmitkUSDeviceManagerWidget.cpp

Loading...

Modules/USUI/Qmitk/QmitkUSDeviceManagerWidget.h

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupportControls.ui

Loading...