Merge branch 'T25562-rethinkGetStatisticsAsOrderedVector' into T24182…
53a69b1a12be
Actions

Description

Merge branch 'T25562-rethinkGetStatisticsAsOrderedVector' into T24182-integrationToMaster

Details

Provenance

hentsch	Authored on Nov 20 2018, 4:25 PM
hentsch	Pushed on Nov 20 2018, 4:25 PM

Parents

rMITK29f1ee92cd34: Moved implementation to cpp file
rMITKf86a9b8d8227: Merge branch 'T25561-optimizeImageStatisticsContainer' into T24182…

Branches

Unknown

Tags

Unknown

Event Timeline

hentsch committed rMITK53a69b1a12be: Merge branch 'T25562-rethinkGetStatisticsAsOrderedVector' into T24182… (authored by hentsch).Nov 20 2018, 4:25 PM

Merged Changes

29f1ee92cd34 Moved implementation to cpp file
Author
hentsch
Browse Repository
No Builds
No Audits
02b600080a36 consistend naming: ImageStatisticsContainer
Author
hentsch
Browse Repository
No Builds
No Audits
0eedeac66f0f Removed superfluous includes
Author
hentsch
Browse Repository
No Builds
No Audits
68e84a64a87a Adapted tests
Author
hentsch
Browse Repository
No Builds
No Audits
6363646f0fe1 adapted deprecated plugin for new structure of ImageStatisticsContainer
Author
hentsch
Browse Repository
No Builds
No Audits
dce267ab2d3f Adapted new imageStatisticsContainer structure in algorithmic classes
Author
hentsch
Browse Repository
No Builds
No Audits
01dc4b2b6ada Added new structure of statistic constants and retrieval of statistics by name…
Author
hentsch
Browse Repository
No Builds
No Audits
3988a4df2b75 Added statistic constants (strings of computed statistic name)
Author
hentsch
Browse Repository
No Builds
No Audits
a89503137e9d Added statistic constants
Author
hentsch
Browse Repository
No Builds
No Audits

Changes (34)

Path

Size

Packages

Modules/

ImageStatistics/

Testing/

mitkImageStatisticsCalculatorTest.cpp

O1: MITK Reviewer Group I

mitkImageStatisticsContainerManagerTest.cpp

O1: MITK Reviewer Group I

mitkImageStatisticsHotspotTest.cpp

O1: MITK Reviewer Group I

files.cmake

O1: MITK Reviewer Group I

mitkImageStatisticsCalculator.cpp

O1: MITK Reviewer Group I

mitkImageStatisticsCalculator.h

O1: MITK Reviewer Group I

mitkImageStatisticsConstants.cpp

O1: MITK Reviewer Group I

mitkImageStatisticsConstants.h

O1: MITK Reviewer Group I

mitkImageStatisticsContainer.cpp

O1: MITK Reviewer Group I

mitkImageStatisticsContainer.h

O1: MITK Reviewer Group I

mitkImageStatisticsContainerManager.cpp

O1: MITK Reviewer Group I

mitkImageStatisticsContainerManager.h

O1: MITK Reviewer Group I

mitkImageStatisticsContainerNodeHelper.cpp

O1: MITK Reviewer Group I

mitkImageStatisticsContainerNodeHelper.h

O1: MITK Reviewer Group I

mitkIntensityProfile.cpp

O1: MITK Reviewer Group I

mitkIntensityProfile.h

O1: MITK Reviewer Group I

mitkPointSetDifferenceStatisticsCalculator.cpp

O1: MITK Reviewer Group I

mitkPointSetDifferenceStatisticsCalculator.h

O1: MITK Reviewer Group I

ImageStatisticsUI/

Qmitk/

QmitkImageStatisticsCalculationJob.cpp

O3: MITK Reviewer Group II

QmitkImageStatisticsCalculationJob.h

O3: MITK Reviewer Group II

QmitkImageStatisticsTableModel.cpp

O3: MITK Reviewer Group II

QmitkImageStatisticsTableModel.h

O3: MITK Reviewer Group II

QmitkImageStatisticsWidget.cpp

O3: MITK Reviewer Group II

QmitkImageStatisticsWidget.h

O3: MITK Reviewer Group II

Segmentation/

Algorithms/

mitkFeatureBasedEdgeDetectionFilter.cpp

O1: MITK Reviewer Group I

SurfaceInterpolation/

mitkImageToPointCloudFilter.cpp

Plugins/

org.mitk.gui.qt.cest/

src/

QmitkImageStatisticsCalculationThread.cpp

O3: MITK Reviewer Group II

QmitkImageStatisticsCalculationThread.h

O3: MITK Reviewer Group II

internal/

QmitkCESTStatisticsView.cpp

O3: MITK Reviewer Group II

QmitkCESTStatisticsView.h

O3: MITK Reviewer Group II

org.mitk.gui.qt.measurementtoolbox/

src/

internal/

QmitkImageStatisticsReloadedView.cpp

O1: MITK Reviewer Group I

QmitkImageStatisticsReloadedView.h

O1: MITK Reviewer Group I

QmitkImageStatisticsView.cpp

O1: MITK Reviewer Group I

QmitkImageStatisticsView.h

O1: MITK Reviewer Group I

rMITK53a69b1a12be

View Options

Modules/ImageStatistics/Testing/mitkImageStatisticsCalculatorTest.cpp

View Options

Modules/ImageStatistics/Testing/mitkImageStatisticsContainerManagerTest.cpp

View Options

Modules/ImageStatistics/Testing/mitkImageStatisticsHotspotTest.cpp

View Options

Modules/ImageStatistics/files.cmake

View Options

Modules/ImageStatistics/mitkImageStatisticsCalculator.cpp

View Options

Modules/ImageStatistics/mitkImageStatisticsCalculator.h

View Options

Modules/ImageStatistics/mitkImageStatisticsConstants.cpp

View Options

Modules/ImageStatistics/mitkImageStatisticsConstants.h

View Options

Modules/ImageStatistics/mitkImageStatisticsContainer.cpp

View Options

Modules/ImageStatistics/mitkImageStatisticsContainer.h

View Options

Modules/ImageStatistics/mitkImageStatisticsContainerManager.cpp

View Options

Modules/ImageStatistics/mitkImageStatisticsContainerManager.h

View Options

Modules/ImageStatistics/mitkImageStatisticsContainerNodeHelper.cpp

View Options

Modules/ImageStatistics/mitkImageStatisticsContainerNodeHelper.h

View Options

Modules/ImageStatistics/mitkIntensityProfile.cpp

View Options

Modules/ImageStatistics/mitkIntensityProfile.h

View Options

Modules/ImageStatistics/mitkPointSetDifferenceStatisticsCalculator.cpp

View Options

Modules/ImageStatistics/mitkPointSetDifferenceStatisticsCalculator.h

View Options

Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsCalculationJob.cpp

View Options

Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsCalculationJob.h

View Options

Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsTableModel.cpp

View Options

Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsTableModel.h

View Options

Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsWidget.cpp

View Options

Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsWidget.h

View Options

Modules/Segmentation/Algorithms/mitkFeatureBasedEdgeDetectionFilter.cpp

View Options

Modules/SurfaceInterpolation/mitkImageToPointCloudFilter.cpp

View Options

Plugins/org.mitk.gui.qt.cest/src/QmitkImageStatisticsCalculationThread.cpp

View Options

Plugins/org.mitk.gui.qt.cest/src/QmitkImageStatisticsCalculationThread.h

View Options

Plugins/org.mitk.gui.qt.cest/src/internal/QmitkCESTStatisticsView.cpp

View Options

Plugins/org.mitk.gui.qt.cest/src/internal/QmitkCESTStatisticsView.h

View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsReloadedView.cpp

View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsReloadedView.h

View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp

View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.h

Merge branch 'T25562-rethinkGetStatisticsAsOrderedVector' into T24182…53a69b1a12beActions

Description

Details

Event Timeline

Merged Changes

Changes (34)

rMITK53a69b1a12be

Modules/ImageStatistics/Testing/mitkImageStatisticsCalculatorTest.cpp

Modules/ImageStatistics/Testing/mitkImageStatisticsContainerManagerTest.cpp

Modules/ImageStatistics/Testing/mitkImageStatisticsHotspotTest.cpp

Modules/ImageStatistics/files.cmake

Modules/ImageStatistics/mitkImageStatisticsCalculator.cpp

Modules/ImageStatistics/mitkImageStatisticsCalculator.h

Modules/ImageStatistics/mitkImageStatisticsConstants.cpp

Modules/ImageStatistics/mitkImageStatisticsConstants.h

Modules/ImageStatistics/mitkImageStatisticsContainer.cpp

Modules/ImageStatistics/mitkImageStatisticsContainer.h

Modules/ImageStatistics/mitkImageStatisticsContainerManager.cpp

Modules/ImageStatistics/mitkImageStatisticsContainerManager.h

Modules/ImageStatistics/mitkImageStatisticsContainerNodeHelper.cpp

Modules/ImageStatistics/mitkImageStatisticsContainerNodeHelper.h

Modules/ImageStatistics/mitkIntensityProfile.cpp

Modules/ImageStatistics/mitkIntensityProfile.h

Modules/ImageStatistics/mitkPointSetDifferenceStatisticsCalculator.cpp

Modules/ImageStatistics/mitkPointSetDifferenceStatisticsCalculator.h

Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsCalculationJob.cpp

Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsCalculationJob.h

Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsTableModel.cpp

Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsTableModel.h

Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsWidget.cpp

Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsWidget.h

Modules/Segmentation/Algorithms/mitkFeatureBasedEdgeDetectionFilter.cpp

Modules/SurfaceInterpolation/mitkImageToPointCloudFilter.cpp

Plugins/org.mitk.gui.qt.cest/src/QmitkImageStatisticsCalculationThread.cpp

Plugins/org.mitk.gui.qt.cest/src/QmitkImageStatisticsCalculationThread.h

Plugins/org.mitk.gui.qt.cest/src/internal/QmitkCESTStatisticsView.cpp

Plugins/org.mitk.gui.qt.cest/src/internal/QmitkCESTStatisticsView.h

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsReloadedView.cpp

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsReloadedView.h

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.h

Merge branch 'T25562-rethinkGetStatisticsAsOrderedVector' into T24182…
53a69b1a12be
Actions