Merge remote-tracking branch 'origin/master' into T27034…
54ccbb31af77
Actions

Description

Merge remote-tracking branch 'origin/master' into T27034-Refactor_segmentation_to_new_selection_concept

Details

Provenance

floca	Authored on Feb 14 2020, 12:13 PM
floca	Pushed on Feb 14 2020, 5:45 PM
floca	Pushed on Feb 14 2020, 12:14 PM

Differential Revision

Restricted Differential Revision

Parents

rMITK80dbfaa2f89b: Merge remote-tracking branch 'origin/T27076-ChangeDesignerBuildFlagToDefault'
rMITK84cd40490b1e: Optimized layout of the utilities view.

Branches

Unknown

Tags

Unknown

Event Timeline

floca committed rMITK54ccbb31af77: Merge remote-tracking branch 'origin/master' into T27034… (authored by floca).Feb 14 2020, 12:13 PM

floca added an edge: Restricted Differential Revision.Apr 30 2020, 9:44 PM

Merged Changes

80dbfaa2f89b Merge remote-tracking branch 'origin/T27076-ChangeDesignerBuildFlagToDefault'
Author
kislinsk
Browse Repository
No Builds
No Audits
f08e6d4e9847 Add timepoint selection for baseline averaging in UI
Author
kompan
Browse Repository
No Builds
No Audits
cc75e7683511 Improve formula readability. Shorter version of CheckBaselineSelectionSetting.
Author
kompan
Browse Repository
No Builds
No Audits
f3c291c1ca4e Fixed T27091 and fixed T27092
Author
floca
Browse Repository
No Builds
No Audits
73be073ac2a5 Fixed T27078
Author
floca
Browse Repository
No Builds
No Audits
f1e6a54bf09f fixed gcc compile errors.
Author
floca
Browse Repository
No Builds
No Audits
b7e9fbe27be5 Fixed T27078
Author
floca
Browse Repository
No Builds
No Audits
e81db0eab7e3 Set max value of baseline selection spin boxes according to size of selected…
Author
kompan
Browse Repository
No Builds
No Audits
0fbe9b8876db Fixed T27091 and fixed T27092
Author
floca
Browse Repository
No Builds
No Audits
d211c3a7fab6 Fixed T26903 in order to allow storing of DICOM seg again.
Author
floca
Browse Repository
No Builds
No Audits
50b9bf46f746 BaselineCheck method instead of individual condition checking.
Author
kompan
Browse Repository
No Builds
No Audits
b818ca572609 Merge branch 'T27049-Measurement-view-with-single-node-selection-widget'
Author
kalali
Browse Repository
No Builds
No Audits
e953353b75e1 Merge branch 'T27082-RectifyImageApp'
Author
kislinsk
Browse Repository
No Builds
No Audits
52b13dde4b88 Move RectifyImage app to BasicImageProcessing
Author
kislinsk
Browse Repository
No Builds
No Audits
3ca9b19f21a7 Intead of double, use PixelType of the image types of the filter input.
Author
kompan
Browse Repository
No Builds
No Audits
b9e792fcbb2f Add brackets for better readability.
Author
kompan
Browse Repository
No Builds
No Audits
bedf7d7a68a3 Merge remote-tracking branch 'origin/personal/kislinsk/RectifyImage' into…
Author
kislinsk
Browse Repository
No Builds
No Audits
cddd8da72039 Enable build of QT designer plugin by default
Author
• thomass
Browse Repository
No Builds
No Audits
218faa8d9a39 Disconnect selection service from the selection widget
Author
kalali
Browse Repository
No Builds
No Audits
c7befa8af7f0 Use node predicate to only allow images for the selection widget
Author
kalali
Browse Repository
No Builds
No Audits
35ec40bc8042 Change selection widget strings
Author
kalali
Browse Repository
No Builds
No Audits
9165f83688a2 Only enable measurement actions if an image node is selected
Author
kalali
Browse Repository
No Builds
No Audits
bdceb643100c Correct path
Author
neher
Browse Repository
No Builds
No Audits
e25b5025fd42 Use loop variable
Author
neher
Browse Repository
No Builds
No Audits
f72f4d871b1e Correct path
Author
neher
Browse Repository
No Builds
Audited
3b7a2d336fc7 Fix comparison of of integers of different signs for for start/end time step.
Author
kompan
Browse Repository
No Builds
No Audits
f54787724cf0 Modernize functions
Author
kalali
Browse Repository
No Builds
No Audits
c9287f9bcd43 Add single node selection widget
Author
kalali
Browse Repository
No Builds
No Audits
d0e24fd4c2c6 Clean class
Author
kalali
Browse Repository
No Builds
No Audits
41e89c6f59cb Remove functions to automatically retrieve / select a data node
Author
kalali
Browse Repository
No Builds
No Audits
23191a9b0c85 Enable time step value selection in UpdateGUIControls().
Author
kompan
Browse Repository
No Builds
No Audits
59a0196aa538 Use ExtractImageFilter and MeanProjectionImage Filter in…
Author
kompan
Browse Repository
No Builds
No Audits
88ba8587edc7 Merge branch 'T27024-FixVolumeTest'
Author
kislinsk
Browse Repository
No Builds
No Audits
5c734ceabe81 Disable randomly failing test
Author
kislinsk
Browse Repository
No Builds
No Audits
d530fc949cb2 Updated CTK and DICOM related toolkits
Author
nolden
Browse Repository
No Builds
No Audits
eedccf5124d6 Fixed CTK URL
Author
nolden
Browse Repository
No Builds
No Audits
24d31e394802 Updated CTK and DICOM related toolkits
Author
nolden
Browse Repository
No Builds
No Audits
b5f4aa5786d3 Start time step counting with 0 instead of 1.
Author
kompan
Browse Repository
No Builds
No Audits
dab41d671711 Rename Start/StopTimePoint label in UI to Start/StopTimeFrame.
Author
kompan
Browse Repository
No Builds
No Audits
382ccdcc10bb Specification of m_BaselineStartTimeStep and m_BaselineStopTimeStep in code.
Author
kompan
Browse Repository
No Builds
No Audits
99b4f94a49df Rename BaselineStartTimePoint to BaselineStartTimeStep. Rename…
Author
kompan
Browse Repository
No Builds
No Audits
1dd5d43ae9ad Update help file text and screenshots with baseline image averaging.
Author
kompan
Browse Repository
No Builds
No Audits
c332cc653314 Clea up: remove commented code.
Author
kompan
Browse Repository
No Builds
No Audits
89bb787478d6 Handle UI contraints for baseline start and end time points.
Author
kompan
Browse Repository
No Builds
No Audits
b10562e946fe In PrepareBaselineImage(), add baseline image averaging functionality.
Author
kompan
Browse Repository
No Builds
No Audits
b8f7753da951 First attempt to average two baseline images.
Author
kompan
Browse Repository
No Builds
No Audits
9b9081f93052 Add timepoint selection for baseline averaging in UI
Author
kompan
Browse Repository
No Builds
No Audits
6572e92d6b29 Support arbitrary pixel spacing
Author
kislinsk
Browse Repository
No Builds
No Audits
29d7d415d35c Support common pixel types and arbitrary geometry origins
Author
kislinsk
Browse Repository
No Builds
No Audits
3076ff7e4062 Add RectifyImage cmdapp
Author
kislinsk
Browse Repository
No Builds
No Audits

Changes (28)

Path

Size

Packages

CMakeExternals/

CTK.cmake

O1: MITK Reviewer Group I

DCMQI.cmake

O1: MITK Reviewer Group I

DCMTK.cmake

O1: MITK Reviewer Group I

GDCM.cmake

O1: MITK Reviewer Group I

QwtCMakeLists.txt

O1: MITK Reviewer Group I

CMakeLists.txt

O1: MITK Reviewer Group I

Modules/

BasicImageProcessing/

MiniApps/

CMakeLists.txt

RectifyImage.cpp

DICOMPM/

autoload/

DICOMPMIO/

mitkDICOMPMIO.cpp

O3: MITK Reviewer Group II

DICOMReader/

src/

mitkITKDICOMSeriesReaderHelper.cpp

DicomUI/

src/

QmitkDicomExternalDataWidget.cpp

O4: MITK Reviewer Group III

QmitkDicomLocalStorageWidget.cpp

O4: MITK Reviewer Group III

MatchPointRegistration/

Helper/

mitkMaskedAlgorithmHelper.cpp

O3: MITK Reviewer Group II

Multilabel/

autoload/

DICOMSegIO/

mitkDICOMSegIOMimeTypes.cpp

O1: MITK Reviewer Group I

Pharmacokinetics/

include/

mitkConcentrationCurveGenerator.h

O4: MITK Reviewer Group III

src/

Common/

mitkConcentrationCurveGenerator.cpp

O4: MITK Reviewer Group III

PhotoacousticsLib/

test/

files.cmake

Plugins/

org.mitk.gui.qt.matchpoint.algorithm.control/

src/

internal/

QmitkMatchPoint.cpp

O3: MITK Reviewer Group II

org.mitk.gui.qt.measurementtoolbox/

src/

internal/

QmitkImageStatisticsView.cpp

O1: MITK Reviewer Group I

QmitkMeasurementView.cpp

O1: MITK Reviewer Group I

QmitkMeasurementView.h

O1: MITK Reviewer Group I

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

documentation/

UserManual/

Manual.dox

O3: MITK Reviewer Group II

dce_mri_concentration.png

O3: MITK Reviewer Group II

dce_mri_config.png

O3: MITK Reviewer Group II

dce_mri_constraint.png

O3: MITK Reviewer Group II

src/

internal/

MRPerfusionView.cpp

O3: MITK Reviewer Group II

MRPerfusionView.h

O3: MITK Reviewer Group II

MRPerfusionViewControls.ui

O3: MITK Reviewer Group II

rMITK54ccbb31af77

View Options

CMakeExternals/CTK.cmake

View Options

CMakeExternals/DCMQI.cmake

View Options

CMakeExternals/DCMTK.cmake

View Options

CMakeExternals/GDCM.cmake

View Options

CMakeExternals/QwtCMakeLists.txt

View Options

CMakeLists.txt

View Options

Modules/BasicImageProcessing/MiniApps/CMakeLists.txt

View Options

Modules/BasicImageProcessing/MiniApps/RectifyImage.cpp

View Options

Modules/DICOMPM/autoload/DICOMPMIO/mitkDICOMPMIO.cpp

View Options

Modules/DICOMReader/src/mitkITKDICOMSeriesReaderHelper.cpp

View Options

Modules/DicomUI/src/QmitkDicomExternalDataWidget.cpp

View Options

Modules/DicomUI/src/QmitkDicomLocalStorageWidget.cpp

View Options

Modules/MatchPointRegistration/Helper/mitkMaskedAlgorithmHelper.cpp

View Options

Modules/Multilabel/autoload/DICOMSegIO/mitkDICOMSegIOMimeTypes.cpp

View Options

Modules/Pharmacokinetics/include/mitkConcentrationCurveGenerator.h

View Options

Modules/Pharmacokinetics/src/Common/mitkConcentrationCurveGenerator.cpp

View Options

Modules/PhotoacousticsLib/test/files.cmake

View Options

Plugins/org.mitk.gui.qt.matchpoint.algorithm.control/src/internal/QmitkMatchPoint.cpp

View Options

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

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.pharmacokinetics.mri/documentation/UserManual/Manual.dox

View Options

Plugins/org.mitk.gui.qt.pharmacokinetics.mri/documentation/UserManual/dce_mri_concentration.png

View Options

Plugins/org.mitk.gui.qt.pharmacokinetics.mri/documentation/UserManual/dce_mri_config.png

View Options

Plugins/org.mitk.gui.qt.pharmacokinetics.mri/documentation/UserManual/dce_mri_constraint.png

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.mri/src/internal/MRPerfusionViewControls.ui

Merge remote-tracking branch 'origin/master' into T27034…54ccbb31af77Actions

Description

Details

Event Timeline

Merged Changes

Changes (28)

rMITK54ccbb31af77

CMakeExternals/CTK.cmake

CMakeExternals/DCMQI.cmake

CMakeExternals/DCMTK.cmake

CMakeExternals/GDCM.cmake

CMakeExternals/QwtCMakeLists.txt

CMakeLists.txt

Modules/BasicImageProcessing/MiniApps/CMakeLists.txt

Modules/BasicImageProcessing/MiniApps/RectifyImage.cpp

Modules/DICOMPM/autoload/DICOMPMIO/mitkDICOMPMIO.cpp

Modules/DICOMReader/src/mitkITKDICOMSeriesReaderHelper.cpp

Modules/DicomUI/src/QmitkDicomExternalDataWidget.cpp

Modules/DicomUI/src/QmitkDicomLocalStorageWidget.cpp

Modules/MatchPointRegistration/Helper/mitkMaskedAlgorithmHelper.cpp

Modules/Multilabel/autoload/DICOMSegIO/mitkDICOMSegIOMimeTypes.cpp

Modules/Pharmacokinetics/include/mitkConcentrationCurveGenerator.h

Modules/Pharmacokinetics/src/Common/mitkConcentrationCurveGenerator.cpp

Modules/PhotoacousticsLib/test/files.cmake

Plugins/org.mitk.gui.qt.matchpoint.algorithm.control/src/internal/QmitkMatchPoint.cpp

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

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

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

Plugins/org.mitk.gui.qt.pharmacokinetics.mri/documentation/UserManual/Manual.dox

Plugins/org.mitk.gui.qt.pharmacokinetics.mri/documentation/UserManual/dce_mri_concentration.png

Plugins/org.mitk.gui.qt.pharmacokinetics.mri/documentation/UserManual/dce_mri_config.png

Plugins/org.mitk.gui.qt.pharmacokinetics.mri/documentation/UserManual/dce_mri_constraint.png

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.mri/src/internal/MRPerfusionViewControls.ui

Merge remote-tracking branch 'origin/master' into T27034…
54ccbb31af77
Actions