Merge branch 'release-v3.12' into 22031_phaseQuadGUI (ece6114c) · Commits · mantidproject / mantid

Unverified Commit ece6114c authored 7 years ago by Anthony Committed by GitHub 7 years ago

Browse files

Merge branch 'release-v3.12' into 22031_phaseQuadGUI

parents 0463b4bc be5642e3

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

qt/scientific_interfaces/ISISReflectometry/ReflSettingsTabPresenter.h 3 additions, 3 deletions

...c_interfaces/ISISReflectometry/ReflSettingsTabPresenter.h
qt/scientific_interfaces/ISISReflectometry/ReflSettingsWidget.ui 167 additions, 143 deletions

...ntific_interfaces/ISISReflectometry/ReflSettingsWidget.ui
qt/scientific_interfaces/Indirect/ISISCalibration.cpp 246 additions, 185 deletions

qt/scientific_interfaces/Indirect/ISISCalibration.cpp
qt/scientific_interfaces/Indirect/ISISCalibration.h 33 additions, 3 deletions

qt/scientific_interfaces/Indirect/ISISCalibration.h
qt/scientific_interfaces/Indirect/IndirectDataReductionTab.cpp 2 additions, 2 deletions

...ientific_interfaces/Indirect/IndirectDataReductionTab.cpp
qt/scientific_interfaces/Indirect/IndirectDataReductionTab.h 2 additions, 2 deletions

qt/scientific_interfaces/Indirect/IndirectDataReductionTab.h
qt/scientific_interfaces/Muon/MuonAnalysis.cpp 2 additions, 1 deletion

qt/scientific_interfaces/Muon/MuonAnalysis.cpp
qt/scientific_interfaces/Muon/MuonAnalysisFitDataPresenter.cpp 21 additions, 2 deletions

...ientific_interfaces/Muon/MuonAnalysisFitDataPresenter.cpp
qt/scientific_interfaces/Muon/MuonAnalysisHelper.cpp 5 additions, 1 deletion

qt/scientific_interfaces/Muon/MuonAnalysisHelper.cpp
qt/scientific_interfaces/Muon/MuonSequentialFitDialog.cpp 22 additions, 2 deletions

qt/scientific_interfaces/Muon/MuonSequentialFitDialog.cpp
qt/scientific_interfaces/test/ReflMainWindowPresenterTest.h 8 additions, 6 deletions

qt/scientific_interfaces/test/ReflMainWindowPresenterTest.h
qt/scientific_interfaces/test/ReflMockObjects.h 7 additions, 12 deletions

qt/scientific_interfaces/test/ReflMockObjects.h
qt/scientific_interfaces/test/ReflSettingsPresenterTest.h 42 additions, 95 deletions

qt/scientific_interfaces/test/ReflSettingsPresenterTest.h
qt/scientific_interfaces/test/ReflSettingsTabPresenterTest.h 56 additions, 12 deletions

qt/scientific_interfaces/test/ReflSettingsTabPresenterTest.h
qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h 3 additions, 3 deletions

...dgets/Common/DataProcessorUI/DataProcessorMainPresenter.h
qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h 4 additions, 3 deletions

...ts/Common/DataProcessorUI/GenericDataProcessorPresenter.h
qt/widgets/common/inc/MantidQtWidgets/Common/MuonFitPropertyBrowser.h 2 additions, 0 deletions

...ommon/inc/MantidQtWidgets/Common/MuonFitPropertyBrowser.h
qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp 17 additions, 6 deletions

...mon/src/DataProcessorUI/GenericDataProcessorPresenter.cpp
qt/widgets/common/src/MuonFitDataSelector.cpp 1 addition, 0 deletions

qt/widgets/common/src/MuonFitDataSelector.cpp
qt/widgets/common/src/MuonFitPropertyBrowser.cpp 20 additions, 0 deletions

qt/widgets/common/src/MuonFitPropertyBrowser.cpp

with 663 additions and 481 deletions

Please register or to comment