Merge branch 'T22946-Integration-beta' into T25767-BlackSwan-release
023be0d87f70
Actions

Description

Merge branch 'T22946-Integration-beta' into T25767-BlackSwan-release

Details

Provenance

kalali	Authored on May 29 2019, 3:07 PM
kalali	Pushed on May 29 2019, 4:41 PM
kalali	Pushed on May 29 2019, 4:40 PM

Parents

rMITK9d7fa17b2e3f: Clean and refactor bone segmentation classes
rMITK8a9a91e8af46: Use RelationStorage inside the control point manager.

Branches

Unknown

Tags

Unknown

Event Timeline

kalali committed rMITK023be0d87f70: Merge branch 'T22946-Integration-beta' into T25767-BlackSwan-release (authored by kalali).May 29 2019, 3:07 PM

Merged Changes

8a9a91e8af46 Use RelationStorage inside the control point manager.
Author
kalali
Browse Repository
No Builds
No Audits
ffc679b70219 Clean classes
Author
kalali
Browse Repository
No Builds
No Audits
80d994fdf88c Merge branch 'T25292-Multi-pixmap-patient-table-inspector' into T22946…
Author
kalali
Browse Repository
No Builds
No Audits
a59b8a842627 Overwrite existing images when using the context menu (set control point /…
Author
kalali
Browse Repository
No Builds
No Audits
9abbcbe66574 Only show examination periods without date
Author
kalali
Browse Repository
No Builds
No Audits
dbaca8cfe10f Allow user input to overwrite existing image at patient table cell
Author
kalali
Browse Repository
No Builds
No Audits
c109d46d2c94 Allow renaming examination periods
Author
kalali
Browse Repository
No Builds
No Audits
b29cf8b0017f Merge branch 'T23606-Lesion-volume-matrix' into T22946-Integration-beta
Author
kalali
Browse Repository
No Builds
No Audits
0bfb16968973 Add comments and clean classes
Author
kalali
Browse Repository
No Builds
No Audits
9344fadd0e8b Compute statistics with the help of the image statistics ui module.
Author
kalali
Browse Repository
No Builds
No Audits
da01cc8a8c3c Remove lesion volume computation from the lesion manager
Author
kalali
Browse Repository
No Builds
No Audits
ddd8db08e2bc Extend semantic relations functions
Author
kalali
Browse Repository
No Builds
No Audits
c5b320323fbe First approach for mask volume computation
Author
kalali
Browse Repository
No Builds
No Audits
0c882afdc8de Add model-view classes for statistics tree
Author
kalali
Browse Repository
No Builds
No Audits

Changes (43)

Path

Size

Modules/

SemanticRelations/

CMakeLists.txt

include/

mitkControlPointManager.h

mitkISemanticRelationsObservable.h

mitkISemanticRelationsObserver.h

mitkLesionData.h

mitkLesionManager.h

mitkNodePredicates.h

mitkRelationStorage.h

mitkSemanticRelationsDataStorageAccess.h

mitkSemanticRelationsInference.h

mitkSemanticRelationsIntegration.h

src/

mitkControlPointManager.cpp

mitkDICOMHelper.cpp

mitkLesionData.cpp

mitkLesionManager.cpp

mitkRelationStorage.cpp

mitkSemanticRelationsDataStorageAccess.cpp

mitkSemanticRelationsInference.cpp

mitkSemanticRelationsIntegration.cpp

SemanticRelationsUI/

files.cmake

include/

QmitkLesionTreeItem.h

QmitkLesionTreeModel.h

QmitkPatientTableModel.h

QmitkStatisticsCalculator.h

	QmitkStatisticsTreeModel.h
	QmitkLesionTreeModel.h

src/

QmitkLesionTreeModel.cpp

QmitkPatientTableModel.cpp

QmitkStatisticsCalculator.cpp

	QmitkStatisticsTreeModel.cpp
	QmitkLesionTreeModel.cpp

Plugins/

org.mitk.gui.qt.semanticrelations/

files.cmake

plugin.xml

resources/

SemanticRelationsStatistics_48.png

src/

QmitkDataNodeAddToSemanticRelationsAction.cpp

QmitkDataNodeAddToSemanticRelationsAction.h

internal/

QmitkDataNodeRemoveFromSemanticRelationsAction.cpp

QmitkDataNodeRemoveFromSemanticRelationsAction.h

QmitkDataNodeSetControlPointAction.cpp

QmitkDataNodeSetInformationTypeAction.cpp

QmitkSemanticRelationsStatisticsControls.ui

QmitkSemanticRelationsStatisticsView.cpp

QmitkSemanticRelationsStatisticsView.h

QmitkSemanticRelationsView.h

mitkPluginActivator.cpp

rMITK023be0d87f70

View Options

Modules/SemanticRelations/CMakeLists.txt

View Options

Modules/SemanticRelations/include/mitkControlPointManager.h

View Options

Modules/SemanticRelations/include/mitkISemanticRelationsObservable.h

View Options

Modules/SemanticRelations/include/mitkISemanticRelationsObserver.h

View Options

Modules/SemanticRelations/include/mitkLesionData.h

View Options

Modules/SemanticRelations/include/mitkLesionManager.h

View Options

Modules/SemanticRelations/include/mitkNodePredicates.h

View Options

Modules/SemanticRelations/include/mitkRelationStorage.h

View Options

Modules/SemanticRelations/include/mitkSemanticRelationsDataStorageAccess.h

View Options

Modules/SemanticRelations/include/mitkSemanticRelationsInference.h

View Options

Modules/SemanticRelations/include/mitkSemanticRelationsIntegration.h

View Options

Modules/SemanticRelations/src/mitkControlPointManager.cpp

View Options

Modules/SemanticRelations/src/mitkDICOMHelper.cpp

View Options

Modules/SemanticRelations/src/mitkLesionData.cpp

View Options

Modules/SemanticRelations/src/mitkLesionManager.cpp

View Options

Modules/SemanticRelations/src/mitkRelationStorage.cpp

View Options

Modules/SemanticRelations/src/mitkSemanticRelationsDataStorageAccess.cpp

View Options

Modules/SemanticRelations/src/mitkSemanticRelationsInference.cpp

View Options

Modules/SemanticRelations/src/mitkSemanticRelationsIntegration.cpp

View Options

Modules/SemanticRelationsUI/files.cmake

View Options

Modules/SemanticRelationsUI/include/QmitkLesionTreeItem.h

View Options

Modules/SemanticRelationsUI/include/QmitkLesionTreeModel.h

View Options

Modules/SemanticRelationsUI/include/QmitkPatientTableModel.h

View Options

Modules/SemanticRelationsUI/include/QmitkStatisticsCalculator.h

View Options

Modules/SemanticRelationsUI/include/QmitkStatisticsTreeModel.h

View Options

Modules/SemanticRelationsUI/src/QmitkLesionTreeModel.cpp

View Options

Modules/SemanticRelationsUI/src/QmitkPatientTableModel.cpp

View Options

Modules/SemanticRelationsUI/src/QmitkStatisticsCalculator.cpp

View Options

Modules/SemanticRelationsUI/src/QmitkStatisticsTreeModel.cpp

View Options

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

View Options

Plugins/org.mitk.gui.qt.semanticrelations/plugin.xml

View Options

Plugins/org.mitk.gui.qt.semanticrelations/resources/SemanticRelationsStatistics_48.png

View Options

Plugins/org.mitk.gui.qt.semanticrelations/src/QmitkDataNodeAddToSemanticRelationsAction.cpp

View Options

Plugins/org.mitk.gui.qt.semanticrelations/src/QmitkDataNodeAddToSemanticRelationsAction.h

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

Merge branch 'T22946-Integration-beta' into T25767-BlackSwan-release023be0d87f70Actions

Description

Details

Event Timeline

Merged Changes

Changes (43)

rMITK023be0d87f70

Modules/SemanticRelations/CMakeLists.txt

Modules/SemanticRelations/include/mitkControlPointManager.h

Modules/SemanticRelations/include/mitkISemanticRelationsObservable.h

Modules/SemanticRelations/include/mitkISemanticRelationsObserver.h

Modules/SemanticRelations/include/mitkLesionData.h

Modules/SemanticRelations/include/mitkLesionManager.h

Modules/SemanticRelations/include/mitkNodePredicates.h

Modules/SemanticRelations/include/mitkRelationStorage.h

Modules/SemanticRelations/include/mitkSemanticRelationsDataStorageAccess.h

Modules/SemanticRelations/include/mitkSemanticRelationsInference.h

Modules/SemanticRelations/include/mitkSemanticRelationsIntegration.h

Modules/SemanticRelations/src/mitkControlPointManager.cpp

Modules/SemanticRelations/src/mitkDICOMHelper.cpp

Modules/SemanticRelations/src/mitkLesionData.cpp

Modules/SemanticRelations/src/mitkLesionManager.cpp

Modules/SemanticRelations/src/mitkRelationStorage.cpp

Modules/SemanticRelations/src/mitkSemanticRelationsDataStorageAccess.cpp

Modules/SemanticRelations/src/mitkSemanticRelationsInference.cpp

Modules/SemanticRelations/src/mitkSemanticRelationsIntegration.cpp

Modules/SemanticRelationsUI/files.cmake

Modules/SemanticRelationsUI/include/QmitkLesionTreeItem.h

Modules/SemanticRelationsUI/include/QmitkLesionTreeModel.h

Modules/SemanticRelationsUI/include/QmitkPatientTableModel.h

Modules/SemanticRelationsUI/include/QmitkStatisticsCalculator.h

Modules/SemanticRelationsUI/include/QmitkStatisticsTreeModel.h

Modules/SemanticRelationsUI/src/QmitkLesionTreeModel.cpp

Modules/SemanticRelationsUI/src/QmitkPatientTableModel.cpp

Modules/SemanticRelationsUI/src/QmitkStatisticsCalculator.cpp

Modules/SemanticRelationsUI/src/QmitkStatisticsTreeModel.cpp

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

Plugins/org.mitk.gui.qt.semanticrelations/plugin.xml

Plugins/org.mitk.gui.qt.semanticrelations/resources/SemanticRelationsStatistics_48.png

Plugins/org.mitk.gui.qt.semanticrelations/src/QmitkDataNodeAddToSemanticRelationsAction.cpp

Plugins/org.mitk.gui.qt.semanticrelations/src/QmitkDataNodeAddToSemanticRelationsAction.h

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

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

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

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

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

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

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

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

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

Merge branch 'T22946-Integration-beta' into T25767-BlackSwan-release
023be0d87f70
Actions