Merge branch 'T25488-New-controlpoint-type' into T22946-Integration-alpha
b11cf1ce931d
Actions

Description

Merge branch 'T25488-New-controlpoint-type' into T22946-Integration-alpha

Details

Provenance

kalali	Authored on Oct 8 2018, 3:24 PM
kalali	Pushed on Oct 10 2018, 4:45 PM

Parents

rMITKd8c6101d4ec8: Merge branch 'T25293-Multi-header-table' into T22946-Integration-alpha
rMITK5edcb0a390a0: Add examination period that contains the represented control points

Branches

Unknown

Tags

Unknown

Event Timeline

kalali committed rMITKb11cf1ce931d: Merge branch 'T25488-New-controlpoint-type' into T22946-Integration-alpha (authored by kalali).Oct 8 2018, 3:24 PM

Merged Changes

5edcb0a390a0 Add examination period that contains the represented control points
Author
kalali
Browse Repository
No Builds
No Audits
195fd88788e1 Remove data; store date directly in controlpoint; control point does not…
Author
kalali
Browse Repository
No Builds
No Audits

Changes (18)

Path

Size

Modules/

SemanticRelations/

include/

mitkControlPointManager.h

mitkDICOMHelper.h

mitkRelationStorage.h

mitkSemanticRelations.h

mitkSemanticTypes.h

src/

mitkControlPointManager.cpp

mitkDICOMHelper.cpp

mitkRelationStorage.cpp

mitkSemanticRelations.cpp

SemanticRelationsUI/

include/

QmitkControlPointDialog.h

src/

QmitkControlPointDialog.cpp

Plugins/

org.mitk.gui.qt.semanticrelations/

files.cmake

src/

internal/

QmitkDataNodeControlPointAction.cpp

QmitkDataNodeControlPointAction.h

	QmitkDataNodeSetControlPointAction.cpp
	QmitkDataNodeControlPointAction.cpp

	QmitkDataNodeSetControlPointAction.h
	QmitkDataNodeControlPointAction.h

QmitkSemanticRelationsContextMenu.cpp

QmitkSemanticRelationsContextMenu.h

rMITKb11cf1ce931d

View Options

Modules/SemanticRelations/include/mitkControlPointManager.h

View Options

Modules/SemanticRelations/include/mitkDICOMHelper.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/mitkControlPointManager.cpp

View Options

Modules/SemanticRelations/src/mitkDICOMHelper.cpp

View Options

Modules/SemanticRelations/src/mitkRelationStorage.cpp

View Options

Modules/SemanticRelations/src/mitkSemanticRelations.cpp

View Options

Modules/SemanticRelationsUI/include/QmitkControlPointDialog.h

View Options

Modules/SemanticRelationsUI/src/QmitkControlPointDialog.cpp

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

Merge branch 'T25488-New-controlpoint-type' into T22946-Integration-alphab11cf1ce931dActions

Description

Details

Event Timeline

Merged Changes

Changes (18)

rMITKb11cf1ce931d

Modules/SemanticRelations/include/mitkControlPointManager.h

Modules/SemanticRelations/include/mitkDICOMHelper.h

Modules/SemanticRelations/include/mitkRelationStorage.h

Modules/SemanticRelations/include/mitkSemanticRelations.h

Modules/SemanticRelations/include/mitkSemanticTypes.h

Modules/SemanticRelations/src/mitkControlPointManager.cpp

Modules/SemanticRelations/src/mitkDICOMHelper.cpp

Modules/SemanticRelations/src/mitkRelationStorage.cpp

Modules/SemanticRelations/src/mitkSemanticRelations.cpp

Modules/SemanticRelationsUI/include/QmitkControlPointDialog.h

Modules/SemanticRelationsUI/src/QmitkControlPointDialog.cpp

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

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

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

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

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

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

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

Merge branch 'T25488-New-controlpoint-type' into T22946-Integration-alpha
b11cf1ce931d
Actions