Merge branch 'T19838-ImplementKurtosisFit'
b0727b28f2b1
Actions

Description

Merge branch 'T19838-ImplementKurtosisFit'

Conflicts:
Modules/DiffusionImaging/DiffusionCore/src/IODataStructures/DiffusionWeightedImages/mitkDiffusionImageCreationFilter.cpp

changes in the API were overwritten by the master status ( mainly affecting the RemapToVectorImage function)

Details

Provenance

• hering	Authored on Aug 19 2016, 8:01 PM
• hering	Pushed on Aug 19 2016, 8:02 PM

Parents

rMITK0b2cad024e4d: Merge branch 'T19874-OptionalQtWebEngine'
rMITKd9d27455ceab: Re-enable logarithmic scale fitting

Branches

Unknown

Tags

Unknown

Event Timeline

• hering committed rMITKb0727b28f2b1: Merge branch 'T19838-ImplementKurtosisFit' (authored by • hering).Aug 19 2016, 8:01 PM

Merged Changes

d9d27455ceab Re-enable logarithmic scale fitting
Author
• hering
Browse Repository
No Builds
No Audits
1ce0e0186f89 Enable QwtText for setting plot titles
Author
• hering
Browse Repository
No Builds
No Audits
2d99f2978cf7 Change value plotting
Author
• hering
Browse Repository
No Builds
No Audits
c589fe679d0b Fix minor issues
Author
• hering
Browse Repository
No Builds
No Audits
33b804f90483 Extend the IVIMView UI
Author
• hering
Browse Repository
No Builds
No Audits
a0c02df7c787 Extend the fitting procedure's control
Author
• hering
Browse Repository
No Builds
No Audits
81b6de2325c7 Add K-fit controls to the UI
Author
• hering
Browse Repository
No Builds
No Audits
9d12fe4daa0e Extend API for further control of the fitting procedure
Author
• hering
Browse Repository
No Builds
No Audits
018896d6217c Merge branch 'bug-19822-IVIM-Plot-rendering' into T19838-Implement-Kurtosis…
Author
• hering
Browse Repository
No Builds
No Audits
fd01d690cc18 Fully implement Kurtosis-Widget UI
Author
• hering
Browse Repository
No Builds
No Audits
e344f1dad0f7 Fix measurement scaling in kurt plot
Author
• hering
Browse Repository
No Builds
No Audits
adb1506f6115 Fix missing implementation of SetMask
Author
• hering
Browse Repository
No Builds
No Audits
2dca6913b131 Add KurtosisPlot to IVIM View
Author
• hering
Browse Repository
No Builds
No Audits
df334751b01f Enable a vector image as input in creation filter
Author
• hering
Browse Repository
No Builds
No Audits
d04793ba98ab Fix retrieval of TimeNavCon
Author
• hering
Browse Repository
No Builds
No Audits
b72e6adf60ff Add KurtosisPlotWidget
Author
• hering
Browse Repository
No Builds
No Audits
2cc0dc5b476c Make kurtosisFilter more general
Author
• hering
Browse Repository
No Builds
No Audits
659530419104 Add Kurtosis Fitting MiniApp
Author
• hering
Browse Repository
No Builds
No Audits
28d1d59d8a7c Fix value initialization and masked computation
Author
• hering
Browse Repository
No Builds
No Audits
247a5674944e Add Kurtosis Filter
Author
• hering
Browse Repository
No Builds
No Audits
685105046de8 Make PV Analysis Plot prettier
Author
• hering
Browse Repository
No Builds
No Audits

Changes (16)

Path

Size

Packages

Modules/

DiffusionImaging/

DiffusionCore/

cmdapps/

CMakeLists.txt

DiffusionIVIMFit.cpp

files.cmake

include/

Algorithms/

Reconstruction/

itkDiffusionKurtosisReconstructionImageFilter.cxx

itkDiffusionKurtosisReconstructionImageFilter.h

IODataStructures/

DiffusionWeightedImages/

mitkDiffusionImageCreationFilter.h

src/

IODataStructures/

DiffusionWeightedImages/

mitkDiffusionImageCreationFilter.cpp

QtWidgetsExt/

include/

QmitkPlotWidget.h

O3: MITK Reviewer Group II

src/

QmitkPlotWidget.cpp

O3: MITK Reviewer Group II

Plugins/

org.mitk.gui.qt.diffusionimaging/

files.cmake

src/

QmitkKurtosisWidget.cpp

QmitkKurtosisWidget.h

QmitkPartialVolumeAnalysisWidget.cpp

internal/

QmitkIVIMView.cpp

QmitkIVIMView.h

QmitkIVIMViewControls.ui

rMITKb0727b28f2b1

View Options

Modules/DiffusionImaging/DiffusionCore/cmdapps/CMakeLists.txt

View Options

Modules/DiffusionImaging/DiffusionCore/cmdapps/DiffusionIVIMFit.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/files.cmake

View Options

Modules/DiffusionImaging/DiffusionCore/include/Algorithms/Reconstruction/itkDiffusionKurtosisReconstructionImageFilter.cxx

View Options

Modules/DiffusionImaging/DiffusionCore/include/Algorithms/Reconstruction/itkDiffusionKurtosisReconstructionImageFilter.h

View Options

Modules/DiffusionImaging/DiffusionCore/include/IODataStructures/DiffusionWeightedImages/mitkDiffusionImageCreationFilter.h

View Options

Modules/DiffusionImaging/DiffusionCore/src/IODataStructures/DiffusionWeightedImages/mitkDiffusionImageCreationFilter.cpp

View Options

Modules/QtWidgetsExt/include/QmitkPlotWidget.h

View Options

Modules/QtWidgetsExt/src/QmitkPlotWidget.cpp

View Options

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

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkKurtosisWidget.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkKurtosisWidget.h

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkPartialVolumeAnalysisWidget.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkIVIMView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkIVIMView.h

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkIVIMViewControls.ui

Merge branch 'T19838-ImplementKurtosisFit'b0727b28f2b1Actions

Description

Details

Event Timeline

Merged Changes

Changes (16)

rMITKb0727b28f2b1

Modules/DiffusionImaging/DiffusionCore/cmdapps/CMakeLists.txt

Modules/DiffusionImaging/DiffusionCore/cmdapps/DiffusionIVIMFit.cpp

Modules/DiffusionImaging/DiffusionCore/files.cmake

Modules/DiffusionImaging/DiffusionCore/include/Algorithms/Reconstruction/itkDiffusionKurtosisReconstructionImageFilter.cxx

Modules/DiffusionImaging/DiffusionCore/include/Algorithms/Reconstruction/itkDiffusionKurtosisReconstructionImageFilter.h

Modules/DiffusionImaging/DiffusionCore/include/IODataStructures/DiffusionWeightedImages/mitkDiffusionImageCreationFilter.h

Modules/DiffusionImaging/DiffusionCore/src/IODataStructures/DiffusionWeightedImages/mitkDiffusionImageCreationFilter.cpp

Modules/QtWidgetsExt/include/QmitkPlotWidget.h

Modules/QtWidgetsExt/src/QmitkPlotWidget.cpp

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

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkKurtosisWidget.cpp

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkKurtosisWidget.h

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkPartialVolumeAnalysisWidget.cpp

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkIVIMView.cpp

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkIVIMView.h

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkIVIMViewControls.ui

Merge branch 'T19838-ImplementKurtosisFit'
b0727b28f2b1
Actions