Diffusion MITK 745f2c19aaf8

Merge branch 'bug-18147-CleanUpUITrackingToolbox' into bug-18182…
745f2c19aaf8
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

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

Details

Provenance

Authored on Oct 8 2014, 12:19 PM

Parents

rMITKb4a4d9d35126: now also disabling disconnect button when tracking is running. Disconnecting…
rMITK0bd722e2c20b: Merge branch 'bug-17923-USPluginPersistence' into bug-18182…

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITK745f2c19aaf8: Merge branch 'bug-18147-CleanUpUITrackingToolbox' into bug-18182… (authored by franza).Oct 8 2014, 12:19 PM

Merged Changes

b4a4d9d35126 now also disabling disconnect button when tracking is running. Disconnecting…
Author
franza
Browse Repository
No Builds
No Audits
3c17fa3d9699 reduced number of buttons by using only one button for start/stop tracking and…
Author
franza
Browse Repository
No Builds
No Audits
8004951ce5fd more new icons
Author
franza
Browse Repository
No Builds
No Audits
6b9406bc4e63 further bugfixing: now persistence of selected device should work again
Author
franza
Browse Repository
No Builds
No Audits
bc312ba59022 Further UI clean up...
Author
franza
Browse Repository
No Builds
No Audits
841808297aab unified font sizes
Author
franza
Browse Repository
No Builds
No Audits
c13469b6088c further clean up of the UI of this widget...
Author
franza
Browse Repository
No Builds
No Audits
9f95a3ea29d9 Adapted maximal length of tool storage name to current view size
Author
franza
Browse Repository
No Builds
No Audits
8789fd6eb53d changed alignment of UI elements to make the widget smaller
Author
franza
Browse Repository
No Builds
No Audits
4abd00c2b126 Filename is now trimmed if it's to long to be visualized
Author
franza
Browse Repository
No Builds
No Audits
e5a971096415 fixed a bug: Polaris is now always selected by default at start
Author
franza
Browse Repository
No Builds
No Audits
f8814435d6ae added new icons of design project to US module (special thanks to Carolin…
Author
franza
Browse Repository
No Builds
No Audits
8ed10e3426e9 added labels to the sliders
Author
franza
Browse Repository
No Builds
No Audits
736dde46d4b8 added feature to stop update stream to save runtime if the stream is updated…
Author
franza
Browse Repository
No Builds
No Audits
2defd0651d84 now freezing is possible again (with the new implementation)
Author
franza
Browse Repository
No Builds
No Audits
5c3bff45d36c now taking the image directly from the image source which avoids copying the…
Author
franza
Browse Repository
No Builds
No Audits
54e9b9b22556 made method GetUSImageSource public in all US device classes, added…
Author
franza
Browse Repository
No Builds
No Audits
124168572eaf Merge branch 'bug-17923-USPluginPersistence' into personal/franza/US-Navigation…
Author
franza
Browse Repository
No Builds
No Audits
7732f4ab0078 Merge branch 'bug-17713-TrackingFreeze' into personal/franza/US-Navigation…
Author
franza
Browse Repository
No Builds
No Audits
67daedb8fc5e small fix
Author
franza
Browse Repository
No Builds
No Audits

Changes (31)

Path

Size

Modules/

IGTUI/

Qmitk/

QmitkTrackingDeviceConfigurationWidget.cpp

QmitkTrackingDeviceConfigurationWidgetControls.ui

US/

USHardwareTelemed/

mitkUSTelemedDevice.h

USModel/

USNavigation/

mitkUSCombinedModality.cpp

USUI/

Qmitk/

QmitkUSControlsBModeWidget.ui

resources/

ultrasound01-probe-300ppi-deactivated.png

ultrasound01-probe-300ppi.png

ultrasound01-probe-72ppi-deactivated.png

ultrasound02-scan-300ppi-deactivated.png

ultrasound02-scan-300ppi.png

ultrasound02-scan-72ppi-deactivated.png

ultrasound03-targeting-300ppi-deactivated.png

ultrasound03-targeting-300ppi.png

ultrasound03-targeting-72ppi-deactivated.png

ultrasound04-warning-300ppi-deactivated.png

ultrasound04-warning-300ppi.png

ultrasound04-warning-72ppi-deactivated.png

ultrasound05-criticalStructures-300ppi-deactivated.png

ultrasound05-criticalStructures-300ppi.png

ultrasound05-criticalStructures-72ppi-deactivated.png

ultrasound06-criticalScan-300ppi-deactivated.png

ultrasound06-criticalScan-300ppi.png

ultrasound06-criticalScan-72ppi-deactivated.png

Plugins/

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

QmitkMITKIGTTrackingToolboxView.h

QmitkMITKIGTTrackingToolboxViewControls.ui

org.mitk.gui.qt.ultrasound/

resources/

src/

internal/

UltrasoundSupport.cpp

UltrasoundSupportControls.ui

rMITK745f2c19aaf8

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidgetControls.ui

Loading...

Modules/US/USHardwareTelemed/mitkUSTelemedDevice.h

Loading...

Modules/US/USModel/mitkUSDevice.h

Loading...

Modules/US/USNavigation/mitkUSCombinedModality.cpp

Loading...

Modules/USUI/Qmitk/QmitkUSControlsBModeWidget.ui

Loading...

Modules/USUI/resources/USUI.qrc

Loading...

Modules/USUI/resources/ultrasound01-probe-300ppi-deactivated.png

Loading...

Modules/USUI/resources/ultrasound01-probe-300ppi.png

Loading...

Modules/USUI/resources/ultrasound01-probe-72ppi-deactivated.png

Loading...

Modules/USUI/resources/ultrasound02-scan-300ppi-deactivated.png

Loading...

Modules/USUI/resources/ultrasound02-scan-300ppi.png

Loading...

Modules/USUI/resources/ultrasound02-scan-72ppi-deactivated.png

Loading...

Modules/USUI/resources/ultrasound03-targeting-300ppi-deactivated.png

Loading...

Modules/USUI/resources/ultrasound03-targeting-300ppi.png

Loading...

Modules/USUI/resources/ultrasound03-targeting-72ppi-deactivated.png

Loading...

Modules/USUI/resources/ultrasound04-warning-300ppi-deactivated.png

Loading...

Modules/USUI/resources/ultrasound04-warning-300ppi.png

Loading...

Modules/USUI/resources/ultrasound04-warning-72ppi-deactivated.png

Loading...

Modules/USUI/resources/ultrasound05-criticalStructures-300ppi-deactivated.png

Loading...

Modules/USUI/resources/ultrasound05-criticalStructures-300ppi.png

Loading...

Modules/USUI/resources/ultrasound05-criticalStructures-72ppi-deactivated.png

Loading...

Modules/USUI/resources/ultrasound06-criticalScan-300ppi-deactivated.png

Loading...

Modules/USUI/resources/ultrasound06-criticalScan-300ppi.png

Loading...

Modules/USUI/resources/ultrasound06-criticalScan-72ppi-deactivated.png

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/QmitkMITKIGTTrackingToolboxViewControls.ui

Loading...

Plugins/org.mitk.gui.qt.ultrasound/resources/icon.xpm

Loading...

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

Loading...

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

Loading...