Merge remote-tracking branch 'origin/T23539-variableWithoutInitialization' into…
50900c61e77f
Actions

Description

Merge remote-tracking branch 'origin/T23539-variableWithoutInitialization' into T23077-ProjectShapeComparison2

Details

Provenance

• hempe	Authored on Jan 18 2018, 2:44 PM
• hempe	Pushed on Jan 29 2018, 4:25 PM

Parents

rMITK4ef712f9f125: Merge remote-tracking branch 'origin/T23971-ITKBasedExtractSliceFilter' into…
rMITK9f7c85d6f2a8: Applied cppcheck recommendations of ImageStatistics module

Branches

Unknown

Tags

Unknown

Event Timeline

• hempe committed rMITK50900c61e77f: Merge remote-tracking branch 'origin/T23539-variableWithoutInitialization' into… (authored by • hempe).Jan 18 2018, 2:44 PM

Merged Changes

9f7c85d6f2a8 Applied cppcheck recommendations of ImageStatistics module
Author
hentsch
Browse Repository
No Builds
No Audits
784a09509341 initialized variable
Author
hentsch
Browse Repository
No Builds
No Audits
ef82594e1382 Merge branch 'T23857-hideLegend'
Author
hentsch
Browse Repository
No Builds
No Audits
87e0073d268f Resolved T23857 hiding of legend now possible in MitkChart with widget…
Author
hentsch
Browse Repository
No Builds
No Audits
d1e544d0a08d Merge branch 'T23971-ITKBasedExtractSliceFilter'
Author
kislinsk
Browse Repository
No Builds
No Audits
376ed1d81fd7 Merge branch 'T23971-ITKBasedExtractSliceFilter'
Author
kislinsk
Browse Repository
No Builds
No Audits
5183f2d168b6 Merge branch 'T24012-imageStatisticsHistogramNBins'
Author
hentsch
Browse Repository
No Builds
No Audits
0bf368bb6f9c removed GCC warnings
Author
hentsch
Browse Repository
No Builds
No Audits
e8f6bb2fa13d Merge branch 'T23971-ITKBasedExtractSliceFilter'
Author
kislinsk
Browse Repository
No Builds
No Audits
1c048a5a4be9 Merge branch 'T24012-imageStatisticsHistogramNBins'
Author
hentsch
Browse Repository
No Builds
No Audits
e4bf0b5cb75f Grouped activating of histogram GUI elements instead of multiple elements at…
Author
hentsch
Browse Repository
No Builds
No Audits
8546156f1bb3 Merge branch 'T23971-ITKBasedExtractSliceFilter'
Author
kislinsk
Browse Repository
No Builds
No Audits
3b2ba09fd921 Write to labels directly
Author
hentsch
Browse Repository
No Builds
No Audits
63d8b082ff9c removed unneeded variables and typedefs
Author
hentsch
Browse Repository
No Builds
No Audits
64375f9c3c0c Added timestep as label for copy to clipboard functionality
Author
hentsch
Browse Repository
No Builds
No Audits
643148cf87a8 homogenized includes
Author
hentsch
Browse Repository
No Builds
No Audits
f39d68e48365 Merge branch 'T23971-ITKBasedExtractSliceFilter'
Author
kislinsk
Browse Repository
No Builds
No Audits
c7b3942ed51c Used initializer list
Author
hentsch
Browse Repository
No Builds
No Audits
4e4b37407a35 Renamed groupboxes
Author
hentsch
Browse Repository
No Builds
No Audits
b12a23090b25 Merge branch 'T24021-fix-logo-annotation-test'
Author
• goch
Browse Repository
No Builds
No Audits
3f6294d1831d Update test data hash
Author
• goch
Browse Repository
No Builds
No Audits
368382cd726e Merge branch 'T23915-DiffusionPython2'
Author
neher
Browse Repository
No Builds
No Audits
f781f9c1b1cc Add capability to actually load logos from disk
Author
• goch
Browse Repository
No Builds
No Audits
ab0ea8d764bd Reinit data
Author
neher
Browse Repository
No Builds
No Audits
52f14f9965bc Add bet data as external project
Author
neher
Browse Repository
No Builds
No Audits
68a978ebff80 Resolved T24012: number of bins can now be chosen in GUI for histogram…
Author
hentsch
Browse Repository
No Builds
No Audits
bedd9f1df9fa Renamed elements to #bins
Author
hentsch
Browse Repository
No Builds
No Audits

Changes (41)

Path

Size

Packages

Applications/

Diffusion/

CMakeLists.txt

target_libraries.cmake

CMake/

BuildConfigurations/

DiffusionAll.cmake

O1: MITK Reviewer Group I

DiffusionRelease.cmake

O1: MITK Reviewer Group I

FindBetData.cmake

O1: MITK Reviewer Group I

mitkInstallRules.cmake

O1: MITK Reviewer Group I

	CMake/	PackageDepends/	MITK_BetData_Config.cmake/
	Modules/	Biophotonics/	python/	iMC/	mc/


	__init__.py

O1: MITK Reviewer Group I

CMakeExternals/

BetData.cmake

O1: MITK Reviewer Group I

ExternalProjectList.cmake

O1: MITK Reviewer Group I

MITKData.cmake

O1: MITK Reviewer Group I

	CMakeExternals/	BetData.h.in/
	Plugins/	org.blueberry.core.runtime/	src/	internal/


	berryIBranding.cpp

O1: MITK Reviewer Group I

Modules/

Annotation/

include/

mitkLogoAnnotation.h

src/

mitkLogoAnnotation.cpp

test/

mitkLogoAnnotationTest.cpp

Chart/

include/

QmitkChartData.h

O3: MITK Reviewer Group II

QmitkChartWidget.h

O3: MITK Reviewer Group II

resource/

Chart.js

O3: MITK Reviewer Group II

src/

QmitkChartWidget.cpp

O3: MITK Reviewer Group II

DiffusionImaging/

FiberTracking/

CMakeLists.txt

cmdapps/

TractographyEvaluation/

ExtractSimilarTracts.cpp

ImageStatistics/

mitkExtendedLabelStatisticsImageFilter.h

O1: MITK Reviewer Group I

mitkExtendedStatisticsImageFilter.hxx

O1: MITK Reviewer Group I

mitkHistogramStatisticsCalculator.cpp

O1: MITK Reviewer Group I

mitkHotspotMaskGenerator.cpp

O1: MITK Reviewer Group I

mitkHotspotMaskGenerator.h

O1: MITK Reviewer Group I

mitkImageStatisticsCalculator.cpp

O1: MITK Reviewer Group I

mitkMaskUtilities.h

O1: MITK Reviewer Group I

mitkMinMaxImageFilterWithIndex.hxx

O1: MITK Reviewer Group I

mitkPlanarFigureMaskGenerator.h

O1: MITK Reviewer Group I

mitkPointSetStatisticsCalculator.h

O1: MITK Reviewer Group I

Plugins/

org.mitk.gui.qt.diffusionimaging.denoising/

src/

internal/

QmitkDenoisingViewControls.ui

org.mitk.gui.qt.diffusionimaging.preprocessing/

src/

internal/

QmitkPreprocessingView.cpp

org.mitk.gui.qt.diffusionimaging.python/

CMakeLists.txt

src/

internal/

QmitkBrainExtractionView.cpp

QmitkBrainExtractionView.h

org.mitk.gui.qt.diffusionimaging.registration/

src/

internal/

QmitkSimpleRegistrationView.cpp

org.mitk.gui.qt.measurementtoolbox/

src/

internal/

QmitkImageStatisticsCalculationThread.cpp

O1: MITK Reviewer Group I

QmitkImageStatisticsCalculationThread.h

O1: MITK Reviewer Group I

QmitkImageStatisticsView.cpp

O1: MITK Reviewer Group I

QmitkImageStatisticsView.h

O1: MITK Reviewer Group I

QmitkImageStatisticsViewControls.ui

O1: MITK Reviewer Group I

rMITK50900c61e77f

View Options

Applications/Diffusion/CMakeLists.txt

View Options

Applications/Diffusion/target_libraries.cmake

View Options

CMake/BuildConfigurations/DiffusionAll.cmake

View Options

CMake/BuildConfigurations/DiffusionRelease.cmake

View Options

CMake/FindBetData.cmake

View Options

CMake/PackageDepends/MITK_BetData_Config.cmake

View Options

CMake/mitkInstallRules.cmake

View Options

CMakeExternals/BetData.cmake

View Options

CMakeExternals/BetData.h.in

View Options

CMakeExternals/ExternalProjectList.cmake

View Options

CMakeExternals/MITKData.cmake

View Options

Modules/Annotation/include/mitkLogoAnnotation.h

View Options

Modules/Annotation/src/mitkLogoAnnotation.cpp

View Options

Modules/Annotation/test/mitkLogoAnnotationTest.cpp

View Options

Modules/Chart/include/QmitkChartData.h

View Options

Modules/Chart/include/QmitkChartWidget.h

View Options

Modules/Chart/resource/Chart.js

View Options

Modules/Chart/src/QmitkChartWidget.cpp

View Options

Modules/DiffusionImaging/FiberTracking/CMakeLists.txt

View Options

Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/ExtractSimilarTracts.cpp

View Options

Modules/ImageStatistics/mitkExtendedLabelStatisticsImageFilter.h

View Options

Modules/ImageStatistics/mitkExtendedStatisticsImageFilter.hxx

View Options

Modules/ImageStatistics/mitkHistogramStatisticsCalculator.cpp

View Options

Modules/ImageStatistics/mitkHotspotMaskGenerator.cpp

View Options

Modules/ImageStatistics/mitkHotspotMaskGenerator.h

View Options

Modules/ImageStatistics/mitkImageStatisticsCalculator.cpp

View Options

Modules/ImageStatistics/mitkMaskUtilities.h

View Options

Modules/ImageStatistics/mitkMinMaxImageFilterWithIndex.hxx

View Options

Modules/ImageStatistics/mitkPlanarFigureMaskGenerator.h

View Options

Modules/ImageStatistics/mitkPointSetStatisticsCalculator.h

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.denoising/src/internal/QmitkDenoisingViewControls.ui

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.python/src/internal/QmitkBrainExtractionView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.python/src/internal/QmitkBrainExtractionView.h

View Options

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

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/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

Merge remote-tracking branch 'origin/T23539-variableWithoutInitialization' into…50900c61e77fActions

Description

Details

Event Timeline

Merged Changes

Changes (41)

rMITK50900c61e77f

Applications/Diffusion/CMakeLists.txt

Applications/Diffusion/target_libraries.cmake

CMake/BuildConfigurations/DiffusionAll.cmake

CMake/BuildConfigurations/DiffusionRelease.cmake

CMake/FindBetData.cmake

CMake/PackageDepends/MITK_BetData_Config.cmake

CMake/mitkInstallRules.cmake

CMakeExternals/BetData.cmake

CMakeExternals/BetData.h.in

CMakeExternals/ExternalProjectList.cmake

CMakeExternals/MITKData.cmake

Modules/Annotation/include/mitkLogoAnnotation.h

Modules/Annotation/src/mitkLogoAnnotation.cpp

Modules/Annotation/test/mitkLogoAnnotationTest.cpp

Modules/Chart/include/QmitkChartData.h

Modules/Chart/include/QmitkChartWidget.h

Modules/Chart/resource/Chart.js

Modules/Chart/src/QmitkChartWidget.cpp

Modules/DiffusionImaging/FiberTracking/CMakeLists.txt

Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/ExtractSimilarTracts.cpp

Modules/ImageStatistics/mitkExtendedLabelStatisticsImageFilter.h

Modules/ImageStatistics/mitkExtendedStatisticsImageFilter.hxx

Modules/ImageStatistics/mitkHistogramStatisticsCalculator.cpp

Modules/ImageStatistics/mitkHotspotMaskGenerator.cpp

Modules/ImageStatistics/mitkHotspotMaskGenerator.h

Modules/ImageStatistics/mitkImageStatisticsCalculator.cpp

Modules/ImageStatistics/mitkMaskUtilities.h

Modules/ImageStatistics/mitkMinMaxImageFilterWithIndex.hxx

Modules/ImageStatistics/mitkPlanarFigureMaskGenerator.h

Modules/ImageStatistics/mitkPointSetStatisticsCalculator.h

Plugins/org.mitk.gui.qt.diffusionimaging.denoising/src/internal/QmitkDenoisingViewControls.ui

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

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

Plugins/org.mitk.gui.qt.diffusionimaging.python/src/internal/QmitkBrainExtractionView.cpp

Plugins/org.mitk.gui.qt.diffusionimaging.python/src/internal/QmitkBrainExtractionView.h

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

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

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

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

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

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

Merge remote-tracking branch 'origin/T23539-variableWithoutInitialization' into…
50900c61e77f
Actions