Merge branch 'T22789-FixesPluginEchoTrack' into T22595-NavigationModules-2016-11
93e3ad078053
Actions

Description

Merge branch 'T22789-FixesPluginEchoTrack' into T22595-NavigationModules-2016-11

Conflicts:
Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.cpp

Details

Provenance

franza	Authored on May 30 2017, 3:47 PM
franza	Pushed on May 30 2017, 3:47 PM

Differential Revision

Restricted Differential Revision

Parents

rMITK7f21d84894c4: Merge branch 'T22661-PivotCalibration' into T22595-NavigationModules-2016-11
rMITK85a472ab9a93: fixed a bug: enabled by default

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITK93e3ad078053: Merge branch 'T22789-FixesPluginEchoTrack' into T22595-NavigationModules-2016-11 (authored by franza).May 30 2017, 3:47 PM

Merged Changes

85a472ab9a93 fixed a bug: enabled by default
Author
franza
Browse Repository
No Builds
No Audits
17769a1023bb Disabled progress bar in tracking toolbox because it caused a crash
Author
franza
Browse Repository
No Builds
No Audits
7553062f6c5b made UI elements invisible when not used
Author
franza
Browse Repository
No Builds
No Audits
590d6b68dbfc unified alignment: left-justified / corrected typo in UI
Author
franza
Browse Repository
No Builds
No Audits
0b4dcf49d844 converted Qt tool box to stacked widget (looks better)
Author
franza
Browse Repository
No Builds
No Audits
95d7a364b4e1 fixed cmake warnings
Author
franza
Browse Repository
No Builds
No Audits
92fbee93d768 Fixed crash in destructor
Author
franza
Browse Repository
No Builds
No Audits

Changes (15)

Path

Size

Plugins/

org.mitk.gui.qt.igt.app.echotrack/

CMakeLists.txt

src/

internal/

NavigationStepWidgets/

QmitkUSNavigationStepCombinedModality.ui

QmitkUSNavigationStepPunctuationIntervention.cpp

QmitkUSNavigationStepPunctuationIntervention.ui

QmitkUSNavigationStepZoneMarking.cpp

QmitkUSNavigationStepZoneMarking.h

QmitkUSNavigationStepZoneMarking.ui

QmitkUSNavigationPerspective.cpp

SettingsWidgets/

QmitkUSNavigationCombinedSettingsWidget.ui

USNavigationMarkerPlacement.cpp

Widgets/

QmitkUSNavigationProcessWidget.cpp

QmitkUSNavigationProcessWidget.ui

org_mbi_gui_qt_usnavigation_Activator.cpp

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

org.mitk.gui.qt.ultrasound/

src/

internal/

UltrasoundSupport.cpp

rMITK93e3ad078053

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/CMakeLists.txt

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepCombinedModality.ui

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepPunctuationIntervention.cpp

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepPunctuationIntervention.ui

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepZoneMarking.cpp

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepZoneMarking.h

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepZoneMarking.ui

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/QmitkUSNavigationPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/SettingsWidgets/QmitkUSNavigationCombinedSettingsWidget.ui

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.cpp

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSNavigationProcessWidget.cpp

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSNavigationProcessWidget.ui

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/org_mbi_gui_qt_usnavigation_Activator.cpp

View Options

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

View Options

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

Merge branch 'T22789-FixesPluginEchoTrack' into T22595-NavigationModules-2016-1193e3ad078053Actions

Description

Details

Event Timeline

Merged Changes

Changes (15)

rMITK93e3ad078053

Plugins/org.mitk.gui.qt.igt.app.echotrack/CMakeLists.txt

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepCombinedModality.ui

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepPunctuationIntervention.cpp

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepPunctuationIntervention.ui

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepZoneMarking.cpp

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepZoneMarking.h

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepZoneMarking.ui

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/QmitkUSNavigationPerspective.cpp

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/SettingsWidgets/QmitkUSNavigationCombinedSettingsWidget.ui

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.cpp

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSNavigationProcessWidget.cpp

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSNavigationProcessWidget.ui

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/org_mbi_gui_qt_usnavigation_Activator.cpp

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

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

Merge branch 'T22789-FixesPluginEchoTrack' into T22595-NavigationModules-2016-11
93e3ad078053
Actions