Merge remote-tracking branch 'origin/T24285-CEST-reader-test' into T24609-v2018.
a615c6c2c051
Actions

Description

Merge remote-tracking branch 'origin/T24285-CEST-reader-test' into T24609-v2018.04-alpha

Conflicts:
CMakeExternals/MITKData.cmake
Modules/CEST/src/mitkCustomTagParser.cpp

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

Details

Provenance

floca	Authored on Apr 24 2018, 9:53 AM
floca	Pushed on Apr 24 2018, 9:54 AM

Parents

rMITKc94d07230967: Merge branch 'T24702-IGTPlugin-UifixesAlphaRelease' into T24609-v2018.04-alpha
rMITK5ebd2980c8b5: Extend test and update data

Branches

Unknown

Tags

Unknown

Event Timeline

floca committed rMITKa615c6c2c051: Merge remote-tracking branch 'origin/T24285-CEST-reader-test' into T24609-v2018. (authored by floca).Apr 24 2018, 9:53 AM

Merged Changes

5ebd2980c8b5 Extend test and update data
Author
• goch
Browse Repository
No Builds
No Audits
92d57989f519 Add test for CEST reading
Author
• goch
Browse Repository
No Builds
No Audits
1f36679ff588 Handle non-consecutive data points by sorting all vectors before plotting
Author
• goch
Browse Repository
No Builds
No Audits
0d048d41a47f Make data validation crosshair position capable
Author
• goch
Browse Repository
No Builds
No Audits

Changes (6)

Path

Size

Packages

Modules/

CEST/

files.cmake

O4: MITK Reviewer Group III

include/

mitkCustomTagParser.h

O4: MITK Reviewer Group III

resource/

1485.json

O4: MITK Reviewer Group III

test/

files.cmake

O4: MITK Reviewer Group III

mitkCESTDICOMReaderServiceTest.cpp

O4: MITK Reviewer Group III

Plugins/

org.mitk.gui.qt.cest/

src/

internal/

QmitkCESTStatisticsView.cpp

O3: MITK Reviewer Group II

rMITKa615c6c2c051

View Options

Modules/CEST/files.cmake

View Options

Modules/CEST/include/mitkCustomTagParser.h

View Options

Modules/CEST/resource/1485.json

View Options

Modules/CEST/test/files.cmake

View Options

Modules/CEST/test/mitkCESTDICOMReaderServiceTest.cpp

View Options

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

Merge remote-tracking branch 'origin/T24285-CEST-reader-test' into T24609-v2018.a615c6c2c051Actions

Description

Details

Event Timeline

Merged Changes

Changes (6)

rMITKa615c6c2c051

Modules/CEST/files.cmake

Modules/CEST/include/mitkCustomTagParser.h

Modules/CEST/resource/1485.json

Modules/CEST/test/files.cmake

Modules/CEST/test/mitkCESTDICOMReaderServiceTest.cpp

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

Merge remote-tracking branch 'origin/T24285-CEST-reader-test' into T24609-v2018.
a615c6c2c051
Actions