T24287-MasterIntegration-2018-02…
73fa36ee6d4f
Actions

Description

Merge remote-tracking branch 'remotes/origin/T24287-MasterIntegration-2018-02-22' into T24287-Integration-IGTRelease-2018-03

Conflicts:
Modules/US/USModel/mitkUSDevice.h

Details

Provenance

franza	Authored on Aug 6 2018, 4:22 PM
franza	Pushed on Aug 6 2018, 8:35 PM

Parents

rMITK153af5c537f9: Merge branch 'T24355-SetDefaultFocusToBasicInformationTab' into T24059…
rMITKd8b063446e74: removed old xml logging class

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITK73fa36ee6d4f: Merge remote-tracking branch 'remotes/origin/T24287-MasterIntegration-2018-02… (authored by franza).Aug 6 2018, 4:22 PM

Merged Changes

d8b063446e74 removed old xml logging class
Author
franza
Browse Repository
No Builds
No Audits
7cf4dca568dd unused UI elements are hidden now
Author
franza
Browse Repository
No Builds
No Audits
3e68f7e54f55 changed exception to warning
Author
franza
Browse Repository
No Builds
No Audits
baffe0f9b815 removed unused code
Author
franza
Browse Repository
No Builds
No Audits
e2417aa4e372 Merge remote-tracking branch 'remotes/origin/T24287-SupportTrackedUltrasound…
Author
franza
Browse Repository
No Builds
No Audits
0d7c05e24d5b Now more than 2 tools can be used in combination with tracked ultrasound, as…
Author
Benjamin Mittmann <b.mittmann@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
ca198d8d7bb8 Integrated TrackedUltrasound possibility into…
Author
Benjamin Mittmann <b.mittmann@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
985249cf9b8c Merge branch 'T24287-PluginRestructuring' into T24287-MasterIntegration-2018-02…
Author
franza
Browse Repository
No Builds
No Audits
399f9aa63aa9 Merge remote-tracking branch 'remotes/origin/T24287-PluginRestructuring' into…
Author
Benjamin Mittmann <b.mittmann@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
7ed2b2ba5137 small workaround for bug
Author
franza
Browse Repository
No Builds
No Audits
861b24dfa303 Added TrackedUltrasound class. Preparation steps for tracked ultrasound -->…
Author
Benjamin Mittmann <b.mittmann@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
c7c5d5945ae1 fixed bug in US calibration (images was not updated, fix is a workaround)
Author
franza
Browse Repository
No Builds
No Audits
73b2b5097887 removed more code
Author
franza
Browse Repository
No Builds
No Audits
6c44ce8b384d removed unused code
Author
franza
Browse Repository
No Builds
No Audits
23c9d96ffd17 connected signal of new settings widget
Author
franza
Browse Repository
No Builds
No Audits
acab63dbe33c removed methods which are not in use
Author
franza
Browse Repository
No Builds
No Audits
bd3137643ce6 removed listener
Author
franza
Browse Repository
No Builds
No Audits
918c77401f54 now using new settings widget
Author
franza
Browse Repository
No Builds
No Audits
be7d7ce63270 cleaned up
Author
franza
Browse Repository
No Builds
No Audits
e21c248f1f70 first step of cleanup
Author
franza
Browse Repository
No Builds
No Audits
f7f79ac4205c finally: working with new structure; still TODO: a lot of cleanup
Author
franza
Browse Repository
No Builds
No Audits
25e5b21609a7 added setting widget to new part of the UI
Author
franza
Browse Repository
No Builds
No Audits
a11d9968298c added image stream, navigation should work now (not tested yet)
Author
franza
Browse Repository
No Builds
No Audits
7bb02fcf9eec navigation step working...
Author
franza
Browse Repository
No Builds
No Audits
d4ed8b7f5826 critical structure marking also working
Author
franza
Browse Repository
No Builds
No Audits
cb14a241491d tumor marking is working now
Author
franza
Browse Repository
No Builds
No Audits
4fc022b9c7d2 UI restructuring
Author
franza
Browse Repository
No Builds
No Audits
8d5303440cbf renamed microservice to new abstract class, adapted code to renaming. Only…
Author
franza
Browse Repository
No Builds
No Audits
d47cd36f6674 moved all microservice code to superclass except for method…
Author
franza
Browse Repository
No Builds
No Audits
edded787e83b moved microservice to new superclass AbstractUltrasoundTrackerDevice
Author
franza
Browse Repository
No Builds
No Audits
d3b75324ac81 Restructured the USCombinedModality class: Added new base class -->…
Author
Benjamin Mittmann <b.mittmann@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
2cc1eb27e407 Changed the base class of the USCombinedModality: former base class was…
Author
Benjamin Mittmann <b.mittmann@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits

Changes (40)

Path

Size

Modules/

IGT/

Algorithms/

mitkNavigationDataDisplacementFilter.cpp

mitkNavigationDataDisplacementFilter.h

US/

USModel/

mitkUSDevice.cpp

mitkUSDevice.h

USNavigation/

Testing/

mitkCombinedModalityTest.cpp

files.cmake

mitkAbstractUltrasoundTrackerDevice.cpp

	mitkAbstractUltrasoundTrackerDevice.h
	mitkUSCombinedModality.h

mitkTrackedUltrasound.cpp

mitkTrackedUltrasound.h

mitkUSCombinedModality.cpp

mitkUSCombinedModality.h

Plugins/

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

src/

internal/

IO/

mitkUSNavigationCombinedModalityPersistence.cpp

NavigationStepWidgets/

QmitkUSAbstractNavigationStep.cpp

QmitkUSAbstractNavigationStep.h

QmitkUSNavigationStepCombinedModality.cpp

QmitkUSNavigationStepCombinedModality.h

QmitkUSNavigationStepMarkerIntervention.cpp

QmitkUSNavigationStepPlacementPlanning.cpp

QmitkUSNavigationStepPunctuationIntervention.cpp

QmitkUSNavigationStepTumourSelection.cpp

QmitkUSNavigationStepZoneMarking.cpp

QmitkUSNavigationCalibrationsDataModel.cpp

QmitkUSNavigationCalibrationsDataModel.h

QmitkUSNavigationMarkerPlacement.cpp

QmitkUSNavigationMarkerPlacement.h

QmitkUSNavigationMarkerPlacement.ui

QmitkUltrasoundCalibration.cpp

QmitkUltrasoundCalibration.h

SettingsWidgets/

QmitkUSNavigationCombinedSettingsWidget.h

Widgets/

QmitkUSCombinedModalityCreationWidget.cpp

QmitkUSCombinedModalityCreationWidget.h

QmitkUSCombinedModalityCreationWidget.ui

QmitkUSCombinedModalityEditWidget.cpp

QmitkUSCombinedModalityEditWidget.h

QmitkUSCombinedModalityEditWidget.ui

QmitkUSNavigationFreezeButton.cpp

QmitkUSNavigationFreezeButton.h

QmitkUSNavigationProcessWidget.cpp

QmitkUSNavigationProcessWidget.h

rMITK73fa36ee6d4f

View Options

Modules/IGT/Algorithms/mitkNavigationDataDisplacementFilter.cpp

View Options

Modules/IGT/Algorithms/mitkNavigationDataDisplacementFilter.h

View Options

Modules/US/USModel/mitkUSDevice.cpp

View Options

Modules/US/USModel/mitkUSDevice.h

View Options

Modules/US/USNavigation/Testing/mitkCombinedModalityTest.cpp

View Options

Modules/US/USNavigation/files.cmake

View Options

Modules/US/USNavigation/mitkAbstractUltrasoundTrackerDevice.cpp

View Options

Modules/US/USNavigation/mitkAbstractUltrasoundTrackerDevice.h

View Options

Modules/US/USNavigation/mitkTrackedUltrasound.cpp

View Options

Modules/US/USNavigation/mitkTrackedUltrasound.h

View Options

Modules/US/USNavigation/mitkUSCombinedModality.cpp

View Options

Modules/US/USNavigation/mitkUSCombinedModality.h

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

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/QmitkUSNavigationStepTumourSelection.cpp

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/QmitkUSNavigationCalibrationsDataModel.cpp

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSCombinedModalityCreationWidget.h

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSCombinedModalityEditWidget.h

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSNavigationFreezeButton.h

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.h

Merge remote-tracking branch 'remotes/origin/T24287-MasterIntegration-2018-02…73fa36ee6d4fActions

Description

Details

Event Timeline

Merged Changes

Changes (40)

rMITK73fa36ee6d4f

Modules/IGT/Algorithms/mitkNavigationDataDisplacementFilter.cpp

Modules/IGT/Algorithms/mitkNavigationDataDisplacementFilter.h

Modules/US/USModel/mitkUSDevice.cpp

Modules/US/USModel/mitkUSDevice.h

Modules/US/USNavigation/Testing/mitkCombinedModalityTest.cpp

Modules/US/USNavigation/files.cmake

Modules/US/USNavigation/mitkAbstractUltrasoundTrackerDevice.cpp

Modules/US/USNavigation/mitkAbstractUltrasoundTrackerDevice.h

Modules/US/USNavigation/mitkTrackedUltrasound.cpp

Modules/US/USNavigation/mitkTrackedUltrasound.h

Modules/US/USNavigation/mitkUSCombinedModality.cpp

Modules/US/USNavigation/mitkUSCombinedModality.h

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSCombinedModalityCreationWidget.h

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

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

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSCombinedModalityEditWidget.h

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

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

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSNavigationFreezeButton.h

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.h

Merge remote-tracking branch 'remotes/origin/T24287-MasterIntegration-2018-02…
73fa36ee6d4f
Actions