Fixed T25390
f3ad28e9c695
Actions

Description

Merge branch 'T25390-Refactor_CEST_and_ModelFitInspector2'

Details

Provenance

floca	Authored on Oct 10 2018, 4:19 PM
floca	Pushed on Oct 10 2018, 4:48 PM

Parents

rMITK9141ea630abc: fixed gcc compile errors
rMITK96b95c4dd935: Corrected SceneIO test to regard preconditions of mitk::PropertyList…

Branches

Unknown

Tags

Unknown

Tasks

T25390: Refactor CEST StatisticView and ModelFitInspector to be more synergistic

Event Timeline

floca added a task: T25390: Refactor CEST StatisticView and ModelFitInspector to be more synergistic.Oct 10 2018, 4:48 PM

floca committed rMITKf3ad28e9c695: Fixed T25390 (authored by floca).Oct 10 2018, 4:19 PM

Merged Changes

9141ea630abc fixed gcc compile errors
Author
floca
Browse Repository
No Builds
No Audits
475f074a7562 Removed redundant generic models from pharmacokinetics models service.
Author
floca
Browse Repository
No Builds
No Audits
a064b49f914e Fixed unnecessary offsets determination for T1 datasets.
Author
floca
Browse Repository
No Builds
No Audits
8162e4833265 Fixed test errors
Author
floca
Browse Repository
No Builds
No Audits
e3e9817b2fd6 Extracted time grid supersampling
Author
floca
Browse Repository
No Builds
No Audits
19a58b7f8722 gcc compile issues
Author
floca
Browse Repository
No Builds
No Audits
f2cf2f1ef0d4 Improvments in UI and business logic.
Author
floca
Browse Repository
No Builds
No Audits
32639d21ae09 Refactored ModelFit inspector
Author
floca
Browse Repository
No Builds
No Audits
be8664702bd7 Added fitName to ModelFitInfo
Author
floca
Browse Repository
No Builds
No Audits
b399b2c1ca37 Extracted functions to calculate plot curves
Author
floca
Browse Repository
No Builds
No Audits

Changes (54)

Path

Size

Packages

Modules/

CEST/

files.cmake

O4: MITK Reviewer Group III

include/

mitkCESTImageDetectionHelper.h

O4: MITK Reviewer Group III

mitkCESTImageNormalizationFilter.h

O4: MITK Reviewer Group III

mitkCustomTagParser.h

O4: MITK Reviewer Group III

resource/

1494.json

O4: MITK Reviewer Group III

src/

mitkCESTImageDetectionHelper.cpp

O4: MITK Reviewer Group III

mitkCESTImageNormalizationFilter.cpp

O4: MITK Reviewer Group III

mitkCustomTagParser.cpp

O4: MITK Reviewer Group III

test/

mitkCESTDICOMReaderServiceTest.cpp

O4: MITK Reviewer Group III

mitkCustomTagParserTest.cpp

O4: MITK Reviewer Group III

ModelFit/

autoload/

IO/

mitkModelFitIOActivator.cpp

O3: MITK Reviewer Group II

files.cmake

O3: MITK Reviewer Group II

include/

mitkModelFitConstants.h

O3: MITK Reviewer Group II

mitkModelFitInfo.h

O3: MITK Reviewer Group II

mitkModelFitPlotDataHelper.h

O3: MITK Reviewer Group II

mitkModelFitResultHelper.h

O3: MITK Reviewer Group II

mitkTimeGridHelper.h

O3: MITK Reviewer Group II

src/

Common/

mitkModelFitConstants.cpp

O3: MITK Reviewer Group II

mitkModelFitInfo.cpp

O3: MITK Reviewer Group II

mitkModelFitPlotDataHelper.cpp

O3: MITK Reviewer Group II

mitkModelFitResultHelper.cpp

O3: MITK Reviewer Group II

mitkTimeGridHelper.cpp

O3: MITK Reviewer Group II

test/

mitkModelFitInfoTest.cpp

O3: MITK Reviewer Group II

ModelFitUI/

Qmitk/

QmitkFitParameterModel.cpp

O4: MITK Reviewer Group III

QmitkFitParameterModel.h

O4: MITK Reviewer Group III

QmitkFitParameterWidget.cpp

O4: MITK Reviewer Group III

QmitkFitParameterWidget.h

O4: MITK Reviewer Group III

QmitkFitParameterWidget.ui

O4: MITK Reviewer Group III

QmitkFitPlotDataModel.cpp

O4: MITK Reviewer Group III

QmitkFitPlotDataModel.h

O4: MITK Reviewer Group III

QmitkFitPlotDataWidget.cpp

O4: MITK Reviewer Group III

QmitkFitPlotDataWidget.h

O4: MITK Reviewer Group III

QmitkFitPlotDataWidget.ui

O4: MITK Reviewer Group III

QmitkInspectionPositionWidget.cpp

O4: MITK Reviewer Group III

QmitkInspectionPositionWidget.h

O4: MITK Reviewer Group III

QmitkInspectionPositionWidget.ui

O4: MITK Reviewer Group III

QmitkParameterFitBackgroundJob.cpp

O4: MITK Reviewer Group III

QmitkParameterFitBackgroundJob.h

O4: MITK Reviewer Group III

files.cmake

O4: MITK Reviewer Group III

Pharmacokinetics/

autoload/

Models/

mitkPharmacokineticModelsActivator.cpp

O4: MITK Reviewer Group III

src/

Models/

mitkTwoTissueCompartmentFDGModel.cpp

O4: MITK Reviewer Group III

mitkTwoTissueCompartmentModel.cpp

O4: MITK Reviewer Group III

Plugins/

org.mitk.gui.qt.cest/

src/

internal/

QmitkCESTNormalizeView.cpp

O3: MITK Reviewer Group II

org.mitk.gui.qt.fit.demo/

src/

internal/

FitGeneratorDemoView.cpp

org.mitk.gui.qt.fit.genericfitting/

src/

internal/

GenericDataFittingView.cpp

O3: MITK Reviewer Group II

GenericDataFittingView.h

O3: MITK Reviewer Group II

org.mitk.gui.qt.fit.inspector/

src/

internal/

ModelFitInspectorView.cpp

O3: MITK Reviewer Group II

ModelFitInspectorView.h

O3: MITK Reviewer Group II

ModelFitInspectorViewControls.ui

O3: MITK Reviewer Group II

org.mitk.gui.qt.matchpoint.evaluator/

src/

internal/

QmitkMatchPointRegistrationEvaluator.h

O3: MITK Reviewer Group II

org.mitk.gui.qt.pharmacokinetics.mri/

src/

internal/

MRPerfusionView.cpp

O3: MITK Reviewer Group II

MRPerfusionView.h

O3: MITK Reviewer Group II

org.mitk.gui.qt.pharmacokinetics.pet/

src/

internal/

PETDynamicView.cpp

O3: MITK Reviewer Group II

PETDynamicView.h

O3: MITK Reviewer Group II

rMITKf3ad28e9c695

View Options

Modules/CEST/files.cmake

View Options

Modules/CEST/include/mitkCESTImageDetectionHelper.h

View Options

Modules/CEST/include/mitkCESTImageNormalizationFilter.h

View Options

Modules/CEST/include/mitkCustomTagParser.h

View Options

Modules/CEST/resource/1494.json

View Options

Modules/CEST/src/mitkCESTImageDetectionHelper.cpp

View Options

Modules/CEST/src/mitkCESTImageNormalizationFilter.cpp

View Options

Modules/CEST/src/mitkCustomTagParser.cpp

View Options

Modules/CEST/test/mitkCESTDICOMReaderServiceTest.cpp

View Options

Modules/CEST/test/mitkCustomTagParserTest.cpp

View Options

Modules/ModelFit/autoload/IO/mitkModelFitIOActivator.cpp

View Options

Modules/ModelFit/files.cmake

View Options

Modules/ModelFit/include/mitkModelFitConstants.h

View Options

Modules/ModelFit/include/mitkModelFitInfo.h

View Options

Modules/ModelFit/include/mitkModelFitPlotDataHelper.h

View Options

Modules/ModelFit/include/mitkModelFitResultHelper.h

View Options

Modules/ModelFit/include/mitkTimeGridHelper.h

View Options

Modules/ModelFit/src/Common/mitkModelFitConstants.cpp

View Options

Modules/ModelFit/src/Common/mitkModelFitInfo.cpp

View Options

Modules/ModelFit/src/Common/mitkModelFitPlotDataHelper.cpp

View Options

Modules/ModelFit/src/Common/mitkModelFitResultHelper.cpp

View Options

Modules/ModelFit/src/Common/mitkTimeGridHelper.cpp

View Options

Modules/ModelFit/test/mitkModelFitInfoTest.cpp

View Options

Modules/ModelFitUI/Qmitk/QmitkFitParameterModel.cpp

View Options

Modules/ModelFitUI/Qmitk/QmitkFitParameterModel.h

View Options

Modules/ModelFitUI/Qmitk/QmitkFitParameterWidget.cpp

View Options

Modules/ModelFitUI/Qmitk/QmitkFitParameterWidget.h

View Options

Modules/ModelFitUI/Qmitk/QmitkFitParameterWidget.ui

View Options

Modules/ModelFitUI/Qmitk/QmitkFitPlotDataModel.cpp

View Options

Modules/ModelFitUI/Qmitk/QmitkFitPlotDataModel.h

View Options

Modules/ModelFitUI/Qmitk/QmitkFitPlotDataWidget.cpp

View Options

Modules/ModelFitUI/Qmitk/QmitkFitPlotDataWidget.h

View Options

Modules/ModelFitUI/Qmitk/QmitkFitPlotDataWidget.ui

View Options

Modules/ModelFitUI/Qmitk/QmitkInspectionPositionWidget.cpp

View Options

Modules/ModelFitUI/Qmitk/QmitkInspectionPositionWidget.h

View Options

Modules/ModelFitUI/Qmitk/QmitkInspectionPositionWidget.ui

View Options

Modules/ModelFitUI/Qmitk/QmitkParameterFitBackgroundJob.cpp

View Options

Modules/ModelFitUI/Qmitk/QmitkParameterFitBackgroundJob.h

View Options

Modules/ModelFitUI/files.cmake

View Options

Modules/Pharmacokinetics/autoload/Models/mitkPharmacokineticModelsActivator.cpp

View Options

Modules/Pharmacokinetics/src/Models/mitkTwoTissueCompartmentFDGModel.cpp

View Options

Modules/Pharmacokinetics/src/Models/mitkTwoTissueCompartmentModel.cpp

View Options

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

View Options

Plugins/org.mitk.gui.qt.fit.demo/src/internal/FitGeneratorDemoView.cpp

View Options

Plugins/org.mitk.gui.qt.fit.genericfitting/src/internal/GenericDataFittingView.cpp

View Options

Plugins/org.mitk.gui.qt.fit.genericfitting/src/internal/GenericDataFittingView.h

View Options

Plugins/org.mitk.gui.qt.fit.inspector/src/internal/ModelFitInspectorView.cpp

View Options

Plugins/org.mitk.gui.qt.fit.inspector/src/internal/ModelFitInspectorView.h

View Options

Plugins/org.mitk.gui.qt.fit.inspector/src/internal/ModelFitInspectorViewControls.ui

View Options

Plugins/org.mitk.gui.qt.matchpoint.evaluator/src/internal/QmitkMatchPointRegistrationEvaluator.h

View Options

Plugins/org.mitk.gui.qt.pharmacokinetics.mri/src/internal/MRPerfusionView.cpp

View Options

Plugins/org.mitk.gui.qt.pharmacokinetics.mri/src/internal/MRPerfusionView.h

View Options

Plugins/org.mitk.gui.qt.pharmacokinetics.pet/src/internal/PETDynamicView.cpp

View Options

Plugins/org.mitk.gui.qt.pharmacokinetics.pet/src/internal/PETDynamicView.h

Fixed T25390f3ad28e9c695Actions

Description

Details

Event Timeline

Merged Changes

Changes (54)

rMITKf3ad28e9c695

Modules/CEST/files.cmake

Modules/CEST/include/mitkCESTImageDetectionHelper.h

Modules/CEST/include/mitkCESTImageNormalizationFilter.h

Modules/CEST/include/mitkCustomTagParser.h

Modules/CEST/resource/1494.json

Modules/CEST/src/mitkCESTImageDetectionHelper.cpp

Modules/CEST/src/mitkCESTImageNormalizationFilter.cpp

Modules/CEST/src/mitkCustomTagParser.cpp

Modules/CEST/test/mitkCESTDICOMReaderServiceTest.cpp

Modules/CEST/test/mitkCustomTagParserTest.cpp

Modules/ModelFit/autoload/IO/mitkModelFitIOActivator.cpp

Modules/ModelFit/files.cmake

Modules/ModelFit/include/mitkModelFitConstants.h

Modules/ModelFit/include/mitkModelFitInfo.h

Modules/ModelFit/include/mitkModelFitPlotDataHelper.h

Modules/ModelFit/include/mitkModelFitResultHelper.h

Modules/ModelFit/include/mitkTimeGridHelper.h

Modules/ModelFit/src/Common/mitkModelFitConstants.cpp

Modules/ModelFit/src/Common/mitkModelFitInfo.cpp

Modules/ModelFit/src/Common/mitkModelFitPlotDataHelper.cpp

Modules/ModelFit/src/Common/mitkModelFitResultHelper.cpp

Modules/ModelFit/src/Common/mitkTimeGridHelper.cpp

Modules/ModelFit/test/mitkModelFitInfoTest.cpp

Modules/ModelFitUI/Qmitk/QmitkFitParameterModel.cpp

Modules/ModelFitUI/Qmitk/QmitkFitParameterModel.h

Modules/ModelFitUI/Qmitk/QmitkFitParameterWidget.cpp

Modules/ModelFitUI/Qmitk/QmitkFitParameterWidget.h

Modules/ModelFitUI/Qmitk/QmitkFitParameterWidget.ui

Modules/ModelFitUI/Qmitk/QmitkFitPlotDataModel.cpp

Modules/ModelFitUI/Qmitk/QmitkFitPlotDataModel.h

Modules/ModelFitUI/Qmitk/QmitkFitPlotDataWidget.cpp

Modules/ModelFitUI/Qmitk/QmitkFitPlotDataWidget.h

Modules/ModelFitUI/Qmitk/QmitkFitPlotDataWidget.ui

Modules/ModelFitUI/Qmitk/QmitkInspectionPositionWidget.cpp

Modules/ModelFitUI/Qmitk/QmitkInspectionPositionWidget.h

Modules/ModelFitUI/Qmitk/QmitkInspectionPositionWidget.ui

Modules/ModelFitUI/Qmitk/QmitkParameterFitBackgroundJob.cpp

Modules/ModelFitUI/Qmitk/QmitkParameterFitBackgroundJob.h

Modules/ModelFitUI/files.cmake

Modules/Pharmacokinetics/autoload/Models/mitkPharmacokineticModelsActivator.cpp

Modules/Pharmacokinetics/src/Models/mitkTwoTissueCompartmentFDGModel.cpp

Modules/Pharmacokinetics/src/Models/mitkTwoTissueCompartmentModel.cpp

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

Plugins/org.mitk.gui.qt.fit.demo/src/internal/FitGeneratorDemoView.cpp

Plugins/org.mitk.gui.qt.fit.genericfitting/src/internal/GenericDataFittingView.cpp

Plugins/org.mitk.gui.qt.fit.genericfitting/src/internal/GenericDataFittingView.h

Plugins/org.mitk.gui.qt.fit.inspector/src/internal/ModelFitInspectorView.cpp

Plugins/org.mitk.gui.qt.fit.inspector/src/internal/ModelFitInspectorView.h

Plugins/org.mitk.gui.qt.fit.inspector/src/internal/ModelFitInspectorViewControls.ui

Plugins/org.mitk.gui.qt.matchpoint.evaluator/src/internal/QmitkMatchPointRegistrationEvaluator.h

Plugins/org.mitk.gui.qt.pharmacokinetics.mri/src/internal/MRPerfusionView.cpp

Plugins/org.mitk.gui.qt.pharmacokinetics.mri/src/internal/MRPerfusionView.h

Plugins/org.mitk.gui.qt.pharmacokinetics.pet/src/internal/PETDynamicView.cpp

Plugins/org.mitk.gui.qt.pharmacokinetics.pet/src/internal/PETDynamicView.h

Fixed T25390
f3ad28e9c695
Actions