Merge commit 'ffaf13105d2a2ef482175b70da855530c84222ae' into T22946-Integration…
026578353373
Actions

Description

Merge commit 'ffaf13105d2a2ef482175b70da855530c84222ae' into T22946-Integration-alpha

Details

Provenance

kalali	Authored on Aug 14 2018, 11:02 AM
kalali	Pushed on Aug 24 2018, 6:15 PM

Parents

rMITK744ccadc0a4d: Merge branch 'T24938-SemanticRelations-storage-inspector' into T22946…
rMITKffaf13105d2a: Use SemanticRelationsException for exceptions thrown inside the semantic…

Branches

Unknown

Tags

Unknown

Event Timeline

kalali committed rMITK026578353373: Merge commit 'ffaf13105d2a2ef482175b70da855530c84222ae' into T22946-Integration… (authored by kalali).Aug 14 2018, 11:02 AM

Merged Changes

ffaf13105d2a Use SemanticRelationsException for exceptions thrown inside the semantic…
Author
kalali
Browse Repository
No Builds
No Audits
da356710252e Fix removing only valid image- and segmentation-nodes.
Author
kalali
Browse Repository
No Builds
No Audits
54d5b425163e Switch to new signal-slot syntax
Author
kalali
Browse Repository
No Builds
No Audits
38f7823cedfb Use new node selection concept in the lesion info widget; remove old node…
Author
kalali
Browse Repository
No Builds
No Audits
5d98f8d2be5e Move lesion info widget to the semantic relations plugin
Author
kalali
Browse Repository
No Builds
No Audits
fb3fb8d5ac10 Use lesion name for lesion list item text if existent; use lesion UID otherwise
Author
kalali
Browse Repository
No Builds
No Audits
494a2124e1f5 Set the lesion name via a text dialog
Author
kalali
Browse Repository
No Builds
No Audits
9f9a0f12bd6d Add lesion manager and lesion class dialog to set the class type of a lesion…
Author
kalali
Browse Repository
No Builds
No Audits

Changes (32)

Path

Size

Modules/

SemanticRelations/

files.cmake

include/

mitkLesionManager.h

mitkRelationStorage.h

mitkSemanticRelations.h

mitkSemanticTypes.h

src/

mitkDICOMHelper.cpp

mitkLesionManager.cpp

mitkRelationStorage.cpp

mitkSemanticRelations.cpp

SemanticRelationsUI/

files.cmake

include/

QmitkLesionInfoWidget.h

	QmitkLesionTextDialog.h
	QmitkControlPointDialog.h

QmitkSelectNodeDialog.h

QmitkSelectionWidget.h

QmitkSimpleDatamanagerWidget.h

src/

QmitkControlPointDialog.cpp

QmitkLesionInfoWidget.cpp

QmitkLesionInfoWidgetControls.ui

	QmitkLesionTextDialog.cpp
	QmitkControlPointDialog.cpp

QmitkPatientTableInspector.cpp

QmitkSelectNodeDialog.cpp

QmitkSelectionWidget.cpp

QmitkSimpleDatamanagerWidget.cpp

QmitkSimpleDatamanagerWidgetControls.ui

Plugins/

org.mitk.gui.qt.semanticrelations/

files.cmake

src/

internal/

QmitkSemanticRelationsControls.ui

QmitkSemanticRelationsNodeSelectionDialog.cpp

QmitkSemanticRelationsView.cpp

QmitkSemanticRelationsView.h

	Plugins/	org.mitk.gui.qt.semanticrelations/	src/	internal/
	Modules/	SemanticRelationsUI/	src/

QmitkLesionInfoWidget.cpp

QmitkLesionInfoWidgetControls.ui

	Plugins/	org.mitk.gui.qt.semanticrelations/	src/	internal/
		Modules/	SemanticRelationsUI/	include/

QmitkLesionInfoWidget.h

rMITK026578353373

View Options

Modules/SemanticRelations/files.cmake

View Options

Modules/SemanticRelations/include/mitkLesionManager.h

View Options

Modules/SemanticRelations/include/mitkRelationStorage.h

View Options

Modules/SemanticRelations/include/mitkSemanticRelations.h

View Options

Modules/SemanticRelations/include/mitkSemanticTypes.h

View Options

Modules/SemanticRelations/src/mitkDICOMHelper.cpp

View Options

Modules/SemanticRelations/src/mitkLesionManager.cpp

View Options

Modules/SemanticRelations/src/mitkRelationStorage.cpp

View Options

Modules/SemanticRelations/src/mitkSemanticRelations.cpp

View Options

Modules/SemanticRelationsUI/files.cmake

View Options

Modules/SemanticRelationsUI/include/QmitkLesionInfoWidget.h

View Options

Modules/SemanticRelationsUI/include/QmitkLesionTextDialog.h

View Options

Modules/SemanticRelationsUI/include/QmitkSelectNodeDialog.h

View Options

Modules/SemanticRelationsUI/include/QmitkSelectionWidget.h

View Options

Modules/SemanticRelationsUI/include/QmitkSimpleDatamanagerWidget.h

View Options

Modules/SemanticRelationsUI/src/QmitkControlPointDialog.cpp

View Options

Modules/SemanticRelationsUI/src/QmitkLesionInfoWidget.cpp

View Options

Modules/SemanticRelationsUI/src/QmitkLesionInfoWidgetControls.ui

View Options

Modules/SemanticRelationsUI/src/QmitkLesionTextDialog.cpp

View Options

Modules/SemanticRelationsUI/src/QmitkPatientTableInspector.cpp

View Options

Modules/SemanticRelationsUI/src/QmitkSelectNodeDialog.cpp

View Options

Modules/SemanticRelationsUI/src/QmitkSelectionWidget.cpp

View Options

Modules/SemanticRelationsUI/src/QmitkSimpleDatamanagerWidget.cpp

View Options

Modules/SemanticRelationsUI/src/QmitkSimpleDatamanagerWidgetControls.ui

View Options

Plugins/org.mitk.gui.qt.semanticrelations/files.cmake

View Options

Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkLesionInfoWidget.cpp

View Options

Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkLesionInfoWidget.h

View Options

Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkLesionInfoWidgetControls.ui

View Options

Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkSemanticRelationsControls.ui

View Options

Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkSemanticRelationsNodeSelectionDialog.cpp

View Options

Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkSemanticRelationsView.cpp

View Options

Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkSemanticRelationsView.h

Merge commit 'ffaf13105d2a2ef482175b70da855530c84222ae' into T22946-Integration…026578353373Actions

Description

Details

Event Timeline

Merged Changes

Changes (32)

rMITK026578353373

Modules/SemanticRelations/files.cmake

Modules/SemanticRelations/include/mitkLesionManager.h

Modules/SemanticRelations/include/mitkRelationStorage.h

Modules/SemanticRelations/include/mitkSemanticRelations.h

Modules/SemanticRelations/include/mitkSemanticTypes.h

Modules/SemanticRelations/src/mitkDICOMHelper.cpp

Modules/SemanticRelations/src/mitkLesionManager.cpp

Modules/SemanticRelations/src/mitkRelationStorage.cpp

Modules/SemanticRelations/src/mitkSemanticRelations.cpp

Modules/SemanticRelationsUI/files.cmake

Modules/SemanticRelationsUI/include/QmitkLesionInfoWidget.h

Modules/SemanticRelationsUI/include/QmitkLesionTextDialog.h

Modules/SemanticRelationsUI/include/QmitkSelectNodeDialog.h

Modules/SemanticRelationsUI/include/QmitkSelectionWidget.h

Modules/SemanticRelationsUI/include/QmitkSimpleDatamanagerWidget.h

Modules/SemanticRelationsUI/src/QmitkControlPointDialog.cpp

Modules/SemanticRelationsUI/src/QmitkLesionInfoWidget.cpp

Modules/SemanticRelationsUI/src/QmitkLesionInfoWidgetControls.ui

Modules/SemanticRelationsUI/src/QmitkLesionTextDialog.cpp

Modules/SemanticRelationsUI/src/QmitkPatientTableInspector.cpp

Modules/SemanticRelationsUI/src/QmitkSelectNodeDialog.cpp

Modules/SemanticRelationsUI/src/QmitkSelectionWidget.cpp

Modules/SemanticRelationsUI/src/QmitkSimpleDatamanagerWidget.cpp

Modules/SemanticRelationsUI/src/QmitkSimpleDatamanagerWidgetControls.ui

Plugins/org.mitk.gui.qt.semanticrelations/files.cmake

Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkLesionInfoWidget.cpp

Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkLesionInfoWidget.h

Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkLesionInfoWidgetControls.ui

Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkSemanticRelationsControls.ui

Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkSemanticRelationsNodeSelectionDialog.cpp

Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkSemanticRelationsView.cpp

Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkSemanticRelationsView.h

Merge commit 'ffaf13105d2a2ef482175b70da855530c84222ae' into T22946-Integration…
026578353373
Actions