Merge branch 'T24938-SemanticRelations-storage-inspector' into T22946…
744ccadc0a4d
Actions

Description

Merge branch 'T24938-SemanticRelations-storage-inspector' into T22946-Integration-alpha

Details

Provenance

kalali	Authored on Jul 18 2018, 11:39 AM
kalali	Pushed on Aug 14 2018, 10:05 AM

Parents

rMITK1ec9d41f5ba4: Allow setting the node type to display in a patient table inspector
rMITK7c86b7f091e6: Fix bug so that both DICOM propertys have to be available

Branches

Unknown

Tags

Unknown

Event Timeline

kalali committed rMITK744ccadc0a4d: Merge branch 'T24938-SemanticRelations-storage-inspector' into T22946… (authored by kalali).Jul 18 2018, 11:39 AM

Merged Changes

Changes (17)

Path

Size

Modules/

SemanticRelations/

include/

mitkSemanticRelations.h

src/

mitkSemanticRelations.cpp

SemanticRelationsUI/

files.cmake

include/

QmitkAbstractSemanticRelationsStorageInspector.h

	QmitkAbstractSemanticRelationsStorageModel.h
	QmitkSemanticRelationsModel.h

QmitkPatientTableInspector.h

QmitkPatientTableModel.h

QmitkSemanticRelationsModel.h

src/

	QmitkAbstractSemanticRelationsStorageModel.cpp
	QmitkSemanticRelationsModel.cpp

QmitkPatientTableInspector.cpp

QmitkPatientTableInspector.ui

QmitkPatientTableModel.cpp

QmitkSemanticRelationsModel.cpp

mitkModuleActivator.cpp

Plugins/

org.mitk.gui.qt.semanticrelations/

src/

internal/

QmitkSemanticRelationsNodeSelectionDialog.cpp

QmitkSemanticRelationsNodeSelectionDialog.h

QmitkSemanticRelationsView.cpp

rMITK744ccadc0a4d

View Options

Modules/SemanticRelations/include/mitkSemanticRelations.h

View Options

Modules/SemanticRelations/src/mitkSemanticRelations.cpp

View Options

Modules/SemanticRelationsUI/files.cmake

View Options

Modules/SemanticRelationsUI/include/QmitkAbstractSemanticRelationsStorageInspector.h

View Options

Modules/SemanticRelationsUI/include/QmitkAbstractSemanticRelationsStorageModel.h

View Options

Modules/SemanticRelationsUI/include/QmitkPatientTableInspector.h

View Options

Modules/SemanticRelationsUI/include/QmitkPatientTableModel.h

View Options

Modules/SemanticRelationsUI/include/QmitkSemanticRelationsModel.h

View Options

Modules/SemanticRelationsUI/src/QmitkAbstractSemanticRelationsStorageModel.cpp

View Options

Modules/SemanticRelationsUI/src/QmitkPatientTableInspector.cpp

View Options

Modules/SemanticRelationsUI/src/QmitkPatientTableInspector.ui

View Options

Modules/SemanticRelationsUI/src/QmitkPatientTableModel.cpp

View Options

Modules/SemanticRelationsUI/src/QmitkSemanticRelationsModel.cpp

View Options

Modules/SemanticRelationsUI/src/mitkModuleActivator.cpp

View Options

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

View Options

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

View Options

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

Merge branch 'T24938-SemanticRelations-storage-inspector' into T22946…744ccadc0a4dActions

Description

Details

Event Timeline

Merged Changes

Changes (17)

rMITK744ccadc0a4d

Modules/SemanticRelations/include/mitkSemanticRelations.h

Modules/SemanticRelations/src/mitkSemanticRelations.cpp

Modules/SemanticRelationsUI/files.cmake

Modules/SemanticRelationsUI/include/QmitkAbstractSemanticRelationsStorageInspector.h

Modules/SemanticRelationsUI/include/QmitkAbstractSemanticRelationsStorageModel.h

Modules/SemanticRelationsUI/include/QmitkPatientTableInspector.h

Modules/SemanticRelationsUI/include/QmitkPatientTableModel.h

Modules/SemanticRelationsUI/include/QmitkSemanticRelationsModel.h

Modules/SemanticRelationsUI/src/QmitkAbstractSemanticRelationsStorageModel.cpp

Modules/SemanticRelationsUI/src/QmitkPatientTableInspector.cpp

Modules/SemanticRelationsUI/src/QmitkPatientTableInspector.ui

Modules/SemanticRelationsUI/src/QmitkPatientTableModel.cpp

Modules/SemanticRelationsUI/src/QmitkSemanticRelationsModel.cpp

Modules/SemanticRelationsUI/src/mitkModuleActivator.cpp

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

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

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

Merge branch 'T24938-SemanticRelations-storage-inspector' into T22946…
744ccadc0a4d
Actions