Merge branch 'bug-19609-platform-project-fabian' into bug-19609-platform…
bfaf6e45c931
Actions

Description

Merge branch 'bug-19609-platform-project-fabian' into bug-19609-platform-project-fabian-v2

Details

Provenance

Authored on Mar 14 2016, 4:48 PM

Parents

rMITKf65a7e187f35: added hotspotMaskGenerator, planarFigureMaskGenerator and began working on…
rMITKf95335c066a4: Merge branch 'bug-18521-mac-osx-qt5'

Branches

Unknown

Tags

Unknown

Event Timeline

isensee committed rMITKbfaf6e45c931: Merge branch 'bug-19609-platform-project-fabian' into bug-19609-platform… (authored by isensee).Mar 14 2016, 4:48 PM

Merged Changes

f65a7e187f35 added hotspotMaskGenerator, planarFigureMaskGenerator and began working on…
Author
isensee
Browse Repository
No Builds
No Audits
49423dd80cce same same
Author
isensee
Browse Repository
No Builds
No Audits
312c539f06ca added image statistics miniapp
Author
isensee
Browse Repository
No Builds
No Audits
ea451358bff7 attempt to add and compile extractImageStatistics miniapp
Author
isensee
Browse Repository
No Builds
No Audits

Changes (22)

Path

Size

Packages

Modules/

Core/

include/

mitkDisplayInteractor.h

O1: MITK Reviewer Group I

src/

Interactions/

mitkDisplayInteractor.cpp

O1: MITK Reviewer Group I

DiffusionImaging/

MiniApps/

CMakeLists.txt

ExtractImageStatistics.cpp

HotspotMiniApp.cpp

ImageStatisticsMiniApp.cpp

PlanarFigureMaskCreatorMiniapp.cpp

ImageStatistics/

CMakeLists.txt

O1: MITK Reviewer Group I

files.cmake

O1: MITK Reviewer Group I

	mitkExtendedLabelStatisticsImageFilter.hxx.autosave
	mitkExtendedLabelStatisticsImageFilter.hxx

O1: MITK Reviewer Group I

mitkHotspotCalculator.cpp

O1: MITK Reviewer Group I

mitkHotspotCalculator.h

O1: MITK Reviewer Group I

mitkImageStatisticsCalculator.cpp

O1: MITK Reviewer Group I

mitkImageStatisticsCalculator2.cpp

O1: MITK Reviewer Group I

mitkImageStatisticsCalculator2.h

O1: MITK Reviewer Group I

mitkMaskGenerator.cpp

O1: MITK Reviewer Group I

mitkMaskGenerator.h

O1: MITK Reviewer Group I

mitkMultiLabelMaskGenerator.cpp

O1: MITK Reviewer Group I

mitkMultiLabelMaskGenerator.h

O1: MITK Reviewer Group I

mitkPlanarFigureMaskGenerator.cpp

O1: MITK Reviewer Group I

mitkPlanarFigureMaskGenerator.h

O1: MITK Reviewer Group I

SurfaceInterpolation/

mitkReduceContourSetFilter.cpp

rMITKbfaf6e45c931

View Options

Modules/Core/include/mitkDisplayInteractor.h

View Options

Modules/Core/src/Interactions/mitkDisplayInteractor.cpp

View Options

Modules/DiffusionImaging/MiniApps/CMakeLists.txt

View Options

Modules/DiffusionImaging/MiniApps/ExtractImageStatistics.cpp

View Options

Modules/DiffusionImaging/MiniApps/HotspotMiniApp.cpp

View Options

Modules/DiffusionImaging/MiniApps/ImageStatisticsMiniApp.cpp

View Options

Modules/DiffusionImaging/MiniApps/PlanarFigureMaskCreatorMiniapp.cpp

View Options

Modules/ImageStatistics/CMakeLists.txt

View Options

Modules/ImageStatistics/files.cmake

View Options

Modules/ImageStatistics/mitkExtendedLabelStatisticsImageFilter.hxx.autosave

View Options

Modules/ImageStatistics/mitkHotspotCalculator.cpp

View Options

Modules/ImageStatistics/mitkHotspotCalculator.h

View Options

Modules/ImageStatistics/mitkImageStatisticsCalculator.cpp

View Options

Modules/ImageStatistics/mitkImageStatisticsCalculator2.cpp

View Options

Modules/ImageStatistics/mitkImageStatisticsCalculator2.h

View Options

Modules/ImageStatistics/mitkMaskGenerator.cpp

View Options

Modules/ImageStatistics/mitkMaskGenerator.h

View Options

Modules/ImageStatistics/mitkMultiLabelMaskGenerator.cpp

View Options

Modules/ImageStatistics/mitkMultiLabelMaskGenerator.h

View Options

Modules/ImageStatistics/mitkPlanarFigureMaskGenerator.cpp

View Options

Modules/ImageStatistics/mitkPlanarFigureMaskGenerator.h

View Options

Modules/SurfaceInterpolation/mitkReduceContourSetFilter.cpp

Merge branch 'bug-19609-platform-project-fabian' into bug-19609-platform…bfaf6e45c931Actions

Description

Details

Event Timeline

Merged Changes

Changes (22)

rMITKbfaf6e45c931

Modules/Core/include/mitkDisplayInteractor.h

Modules/Core/src/Interactions/mitkDisplayInteractor.cpp

Modules/DiffusionImaging/MiniApps/CMakeLists.txt

Modules/DiffusionImaging/MiniApps/ExtractImageStatistics.cpp

Modules/DiffusionImaging/MiniApps/HotspotMiniApp.cpp

Modules/DiffusionImaging/MiniApps/ImageStatisticsMiniApp.cpp

Modules/DiffusionImaging/MiniApps/PlanarFigureMaskCreatorMiniapp.cpp

Modules/ImageStatistics/CMakeLists.txt

Modules/ImageStatistics/files.cmake

Modules/ImageStatistics/mitkExtendedLabelStatisticsImageFilter.hxx.autosave

Modules/ImageStatistics/mitkHotspotCalculator.cpp

Modules/ImageStatistics/mitkHotspotCalculator.h

Modules/ImageStatistics/mitkImageStatisticsCalculator.cpp

Modules/ImageStatistics/mitkImageStatisticsCalculator2.cpp

Modules/ImageStatistics/mitkImageStatisticsCalculator2.h

Modules/ImageStatistics/mitkMaskGenerator.cpp

Modules/ImageStatistics/mitkMaskGenerator.h

Modules/ImageStatistics/mitkMultiLabelMaskGenerator.cpp

Modules/ImageStatistics/mitkMultiLabelMaskGenerator.h

Modules/ImageStatistics/mitkPlanarFigureMaskGenerator.cpp

Modules/ImageStatistics/mitkPlanarFigureMaskGenerator.h

Modules/SurfaceInterpolation/mitkReduceContourSetFilter.cpp

Merge branch 'bug-19609-platform-project-fabian' into bug-19609-platform…
bfaf6e45c931
Actions