HomePhabricator
Diffusion MITK 36d1eaf5ac60

Merge branch 'master' into T25807-Generalize_PropertyRelationRuleBase
36d1eaf5ac60
Actions

Description

Merge branch 'master' into T25807-Generalize_PropertyRelationRuleBase

  1. Conflicts:
  2. Modules/Core/src/DataManagement/mitkPropertyRelationRuleBase.cpp

Signed-off-by: Ralf Floca <r.floca@dkfz-heidelberg.de>

Details

Provenance
flocaAuthored on Jan 11 2019, 4:36 PM
flocaPushed on Jan 11 2019, 6:22 PM
Parents
rMITKd49c34ab903a: start to rework PropertyRelationRuleBase
rMITK19010687082e: Merge branch 'T25839-FiberGenTest'
Branches
Unknown
Tags
Unknown

Merged Changes

Changes (113)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.
PathSizePackages
Applications/
Diffusion/
CMake/
BuildConfigurations/
O1: MITK Reviewer Group I
Modules/
Chart/
include/
O3: MITK Reviewer Group II
resource/
O3: MITK Reviewer Group II
src/
O3: MITK Reviewer Group II
Classification/
CLMiniApps/
Core/
O1: MITK Reviewer Group I
include/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
src/
DataManagement/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
test/
O1: MITK Reviewer Group I
DicomRT/
autoload/
IO/
DiffusionImaging/
DiffusionCmdApps/
Fiberfox/
DiffusionCore/
src/
IODataStructures/
Properties/
FiberTracking/
Fiberfox/
IODataStructures/
Testing/
ImageStatistics/
Testing/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
ImageStatistics/
Core/
mitkImageStatisticsContainerNodeHelper.cpp/
src/
DataManagement/
mitkNodePredicateUID.cpp
O1: MITK Reviewer Group I
mitkImageStatisticsContainerNodeHelper.h/
src/
DataManagement/
mitkNodePredicateUID.cpp
O1: MITK Reviewer Group I
mitkStatisticsToImageRelationRule.cpp/
src/
DataManagement/
mitkNodePredicateUID.cpp
O1: MITK Reviewer Group I
mitkStatisticsToImageRelationRule.h/
src/
DataManagement/
mitkNodePredicateUID.cpp
O1: MITK Reviewer Group I
mitkStatisticsToMaskRelationRule.cpp/
src/
DataManagement/
mitkNodePredicateUID.cpp
O1: MITK Reviewer Group I
mitkStatisticsToMaskRelationRule.h/
src/
DataManagement/
mitkNodePredicateUID.cpp
O1: MITK Reviewer Group I
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
Segmentation/
Algorithms/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
SurfaceInterpolation/
Modules/
ImageStatisticsUI/
Qmitk/
Plugins/
org.mitk.gui.qt.measurementtoolbox/
src/
QmitkImageStatisticsCalculationJob.cpp/
internal/
QmitkImageStatisticsCalculationThread.cpp
O3: MITK Reviewer Group II
QmitkImageStatisticsCalculationJob.h/
internal/
QmitkImageStatisticsCalculationThread.h
O3: MITK Reviewer Group II
Plugins/
org.mitk.gui.qt.cest/
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
src/
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
internal/
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
org.mitk.gui.qt.diffusionimaging.denoising/
src/
internal/
org.mitk.gui.qt.diffusionimaging.fiberfox/
src/
internal/
org.mitk.gui.qt.diffusionimaging.preprocessing/
src/
internal/
org.mitk.gui.qt.diffusionimaging.registration/
src/
internal/
org.mitk.gui.qt.diffusionimaging.tractography/
src/
internal/
org.mitk.gui.qt.imagecropper/
src/
internal/
O3: MITK Reviewer Group II
org.mitk.gui.qt.measurementtoolbox/
O1: MITK Reviewer Group I
documentation/
UserManual/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
resources/
O1: MITK Reviewer Group I
src/
internal/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
org.mitk.gui.qt.pointsetinteraction/
src/
internal/
O3: MITK Reviewer Group II
org.mitk.gui.qt.python/
O3: MITK Reviewer Group II
org.mitk.gui.qt.segmentation/
src/
internal/
O1: MITK Reviewer Group I

rMITK36d1eaf5ac60

View Options

Applications/Diffusion/CMakeLists.txt

View Options

Applications/Diffusion/target_libraries.cmake

View Options

CMake/BuildConfigurations/DiffusionRelease.cmake

View Options

Modules/Chart/include/QmitkChartWidget.h

View Options

Modules/Chart/resource/Chart.js

View Options

Modules/Chart/src/QmitkChartWidget.cpp

View Options

Modules/Classification/CLMiniApps/CLPlanarFigureToNrrd.cpp

View Options

Modules/Core/files.cmake

View Options

Modules/Core/include/mitkDataNode.h

View Options

Modules/Core/include/mitkNodePredicateUID.h

View Options

Modules/Core/src/DataManagement/mitkNodePredicateUID.cpp

View Options

Modules/Core/src/DataManagement/mitkPropertyRelationRuleBase.cpp

View Options

Modules/Core/test/mitkPropertyRelationRuleBaseTest.cpp

View Options

Modules/DicomRT/autoload/IO/mitkDicomRTIOMimeTypes.cpp

View Options

Modules/DiffusionImaging/DiffusionCmdApps/Fiberfox/Fiberfox.cpp

View Options

Modules/DiffusionImaging/DiffusionCmdApps/Fiberfox/FiberfoxOptimization.cpp

View Options

Modules/DiffusionImaging/DiffusionCmdApps/Fiberfox/RandomFiberPhantom.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/src/IODataStructures/Properties/mitkDiffusionPropertyHelper.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Fiberfox/itkFibersFromPlanarFiguresFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Fiberfox/itkFibersFromPlanarFiguresFilter.h

View Options

Modules/DiffusionImaging/FiberTracking/Fiberfox/itkRandomPhantomFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Fiberfox/itkRandomPhantomFilter.h

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkFiberfoxParameters.cpp

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkFiberfoxParameters.h

View Options

Modules/DiffusionImaging/FiberTracking/Testing/mitkFiberGenerationTest.cpp

View Options

Modules/ImageStatistics/Testing/files.cmake

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/mitkImageStatisticsPredicateHelper.cpp

View Options

Modules/ImageStatistics/mitkImageStatisticsPredicateHelper.h

View Options

Modules/ImageStatistics/mitkIntensityProfile.cpp

View Options

Modules/ImageStatistics/mitkIntensityProfile.h

View Options

Modules/ImageStatistics/mitkMaskGenerator.cpp

View Options

Modules/ImageStatistics/mitkMaskGenerator.h

View Options

Modules/ImageStatistics/mitkPlanarFigureMaskGenerator.cpp

View Options

Modules/ImageStatistics/mitkPlanarFigureMaskGenerator.h

View Options

Modules/ImageStatistics/mitkPointSetDifferenceStatisticsCalculator.cpp

View Options

Modules/ImageStatistics/mitkPointSetDifferenceStatisticsCalculator.h

View Options

Modules/ImageStatistics/mitkStatisticsToImageRelationRule.cpp

View Options

Modules/ImageStatistics/mitkStatisticsToImageRelationRule.h

View Options

Modules/ImageStatistics/mitkStatisticsToMaskRelationRule.cpp

View Options

Modules/ImageStatistics/mitkStatisticsToMaskRelationRule.h

View Options

Modules/ImageStatisticsUI/CMakeLists.txt

View Options

Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.cpp

View Options

Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.h

View Options

Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.ui

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/ImageStatisticsUI/Qmitk/QmitkImageStatisticsWidget.ui

View Options

Modules/ImageStatisticsUI/Qmitk/QmitkIntensityProfileVisualizationWidget.cpp

View Options

Modules/ImageStatisticsUI/Qmitk/QmitkIntensityProfileVisualizationWidget.h

View Options

Modules/ImageStatisticsUI/Qmitk/QmitkIntensityProfileVisualizationWidget.ui

View Options

Modules/ImageStatisticsUI/Qmitk/QmitkTableModelToStringConverter.cpp

View Options

Modules/ImageStatisticsUI/Qmitk/QmitkTableModelToStringConverter.h

View Options

Modules/ImageStatisticsUI/files.cmake

View Options

Modules/ModuleList.cmake

View Options

Modules/Segmentation/Algorithms/mitkFeatureBasedEdgeDetectionFilter.cpp

View Options

Modules/Segmentation/Algorithms/mitkFeatureBasedEdgeDetectionFilter.h

View Options

Modules/SurfaceInterpolation/mitkImageToPointCloudFilter.cpp

View Options

Plugins/org.mitk.gui.qt.cest/CMakeLists.txt

View Options

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

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.cest/src/internal/QmitkCESTStatisticsViewControls.ui

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.denoising/src/internal/QmitkDenoisingView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/QmitkFiberGenerationView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/QmitkFiberfoxView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/QmitkPreprocessingView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/QmitkPreprocessingView.h

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/QmitkPreprocessingViewControls.ui

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.registration/src/internal/QmitkSimpleRegistrationView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkStreamlineTrackingView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkStreamlineTrackingView.h

View Options

Plugins/org.mitk.gui.qt.imagecropper/src/internal/QmitkImageCropper.cpp

View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/CMakeLists.txt

View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/QmitkImageStatisticsReloaded.dox

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/resources/bar-chart2.svg

View Options

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

View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsCalculationThread.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/QmitkImageStatisticsReloadedViewControls.ui

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsViewControls.ui

View Options

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

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.cpp

View Options

Plugins/org.mitk.gui.qt.python/CMakeLists.txt

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationView.cpp

MITK · MIC · IMSY · DKFZ