Merge branch 'T23606-Lesion-volume-matrix' into T22946-Integration-beta
b29cf8b0017f
Actions

Description

Merge branch 'T23606-Lesion-volume-matrix' into T22946-Integration-beta

Details

Provenance

kalali	Authored on May 7 2019, 2:12 PM
kalali	Pushed on May 28 2019, 4:14 PM

Parents

rMITK0bfb16968973: Add comments and clean classes
rMITK605229d139d8: Simplify and remove update functions

Branches

Unknown

Tags

Unknown

Event Timeline

kalali committed rMITKb29cf8b0017f: Merge branch 'T23606-Lesion-volume-matrix' into T22946-Integration-beta (authored by kalali).May 7 2019, 2:12 PM

Merged Changes

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 (25)

Path

Size

Modules/

SemanticRelations/

CMakeLists.txt

include/

mitkLesionData.h

mitkLesionManager.h

mitkSemanticRelationsDataStorageAccess.h

mitkSemanticRelationsInference.h

src/

mitkLesionManager.cpp

mitkSemanticRelationsDataStorageAccess.cpp

mitkSemanticRelationsInference.cpp

SemanticRelationsUI/

files.cmake

include/

QmitkLesionTreeItem.h

QmitkLesionTreeModel.h

QmitkPatientTableModel.h

QmitkStatisticsCalculator.h

	QmitkStatisticsTreeModel.h
	QmitkLesionTreeModel.h

src/

QmitkLesionTreeModel.cpp

QmitkStatisticsCalculator.cpp

	QmitkStatisticsTreeModel.cpp
	QmitkLesionTreeModel.cpp

Plugins/

org.mitk.gui.qt.semanticrelations/

files.cmake

plugin.xml

resources/

SemanticRelationsStatistics_48.png

src/

internal/

	QmitkSemanticRelationsStatisticsControls.ui
	QmitkSemanticRelationsControls.ui

QmitkSemanticRelationsStatisticsView.cpp

QmitkSemanticRelationsStatisticsView.h

QmitkSemanticRelationsView.h

mitkPluginActivator.cpp

rMITKb29cf8b0017f

View Options

Modules/SemanticRelations/CMakeLists.txt

View Options

Modules/SemanticRelations/include/mitkLesionData.h

View Options

Modules/SemanticRelations/include/mitkLesionManager.h

View Options

Modules/SemanticRelations/include/mitkSemanticRelationsDataStorageAccess.h

View Options

Modules/SemanticRelations/include/mitkSemanticRelationsInference.h

View Options

Modules/SemanticRelations/src/mitkLesionManager.cpp

View Options

Modules/SemanticRelations/src/mitkSemanticRelationsDataStorageAccess.cpp

View Options

Modules/SemanticRelations/src/mitkSemanticRelationsInference.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/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/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 'T23606-Lesion-volume-matrix' into T22946-Integration-betab29cf8b0017fActions

Description

Details

Event Timeline

Merged Changes

Changes (25)

rMITKb29cf8b0017f

Modules/SemanticRelations/CMakeLists.txt

Modules/SemanticRelations/include/mitkLesionData.h

Modules/SemanticRelations/include/mitkLesionManager.h

Modules/SemanticRelations/include/mitkSemanticRelationsDataStorageAccess.h

Modules/SemanticRelations/include/mitkSemanticRelationsInference.h

Modules/SemanticRelations/src/mitkLesionManager.cpp

Modules/SemanticRelations/src/mitkSemanticRelationsDataStorageAccess.cpp

Modules/SemanticRelations/src/mitkSemanticRelationsInference.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/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/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 'T23606-Lesion-volume-matrix' into T22946-Integration-beta
b29cf8b0017f
Actions