diff --git a/docs/source/release/v5.1.0/reflectometry.rst b/docs/source/release/v5.1.0/reflectometry.rst
index 23087ab418c0c4686d69bbca5ac02dcbe761f41e..0be9fb8adc55ec2a5d15a65ac55e564804735e20 100644
--- a/docs/source/release/v5.1.0/reflectometry.rst
+++ b/docs/source/release/v5.1.0/reflectometry.rst
@@ -9,4 +9,16 @@ Reflectometry Changes
putting new features at the top of the section, followed by
improvements, followed by bug fixes.
-:ref:`Release 5.1.0 <v5.1.0>`
\ No newline at end of file
+ISIS Reflectometry Interface
+############################
+
+Bug fixes
+---------
+
+- Save/Load settings: A bug has been fixed where Experiment/Instrument settings were not being restored if the instrument changes on load.
+- Lost settings on New Batch and Restore Defaults:
+
+ - A bug has been fixed where creating a new Batch would result in the Experiment/Instrument settings of all batches being reset to their defaults.
+ - A bug has been fixed where clicking Restore Defaults on an Experiment/Instrument tab would cause all Experiment and Instrument tabs in every batch to be reset to defaults. Now, only the tab where you click Restore Defaults is changed.
+
+:ref:`Release 5.1.0 <v5.1.0>`
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/Decoder.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/Decoder.cpp
index 5c0aab34b27ff50fe80a72e3af7151edd20ca47a..35089ce4499f0675a05612ced158879ee82a1a53 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/Decoder.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/Decoder.cpp
@@ -77,14 +77,18 @@ void Decoder::decodeBatch(const IMainWindowView *mwv, int batchIndex,
auto runsTablePresenter =
dynamic_cast<RunsTablePresenter *>(runsPresenter->m_tablePresenter.get());
auto reductionJobs = &runsTablePresenter->m_model.m_reductionJobs;
+ // We must do the Runs tab first because this sets the instrument, which
+ // other settings may need to be correct. There is also a notification to set
+ // defaults for this instrument so we need to do that before other settings
+ // or it will override them.
+ decodeRuns(gui->m_runs.get(), reductionJobs, runsTablePresenter,
+ map[QString("runsView")].toMap());
decodeEvent(gui->m_eventHandling.get(), map[QString("eventView")].toMap());
decodeExperiment(gui->m_experiment.get(),
map[QString("experimentView")].toMap());
decodeInstrument(gui->m_instrument.get(),
map[QString("instrumentView")].toMap());
decodeSave(gui->m_save.get(), map[QString("saveView")].toMap());
- decodeRuns(gui->m_runs.get(), reductionJobs, runsTablePresenter,
- map[QString("runsView")].toMap());
}
void Decoder::decodeExperiment(const QtExperimentView *gui,
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.cpp
index da2ad7b330a24bbdc46033c18828192ebfc172cc..61e6016cc89b37bdf659753c196125f5664b696f 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.cpp
@@ -42,8 +42,8 @@ void ExperimentPresenter::notifySettingsChanged() {
void ExperimentPresenter::notifyRestoreDefaultsRequested() {
// Trigger a reload of the instrument to get up-to-date settings.
- // After the instrument is updated, the defaults will be restored.
m_mainPresenter->notifyUpdateInstrumentRequested();
+ restoreDefaults();
}
void ExperimentPresenter::notifySummationTypeChanged() {
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.cpp
index c886b80071be63f6a237d63a19416b81c520bc1e..0efe747cc9d4a74d1575dd0ea6f1aa1e5770b628 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.cpp
@@ -45,8 +45,8 @@ void InstrumentPresenter::notifySettingsChanged() {
void InstrumentPresenter::notifyRestoreDefaultsRequested() {
// Trigger a reload of the instrument to get up-to-date settings.
- // After the instrument is updated, the defaults will be restored.
m_mainPresenter->notifyUpdateInstrumentRequested();
+ restoreDefaults();
}
Instrument const &InstrumentPresenter::instrument() const { return m_model; }
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.cpp
index e6d59d255a92679453de4bf8a2ddc964483d325f..c6fe9441d611a5ceca34144357ed011f5cd7a872 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.cpp
@@ -125,9 +125,16 @@ void MainWindowPresenter::notifyAnyBatchReductionPaused() {
}
void MainWindowPresenter::notifyChangeInstrumentRequested(
- std::string const &instrumentName) {
- // Re-load instrument with the new name
- updateInstrument(instrumentName);
+ std::string const &newInstrumentName) {
+ auto const hasChanged = (newInstrumentName != instrumentName());
+ // Re-load instrument regardless of whether it has changed, e.g. if we are
+ // creating a new batch the instrument may not have changed but we still want
+ // the most up to date settings
+ updateInstrument(newInstrumentName);
+ // However, only perform updates if the instrument has changed, otherwise we
+ // may trigger overriding of user-specified settings
+ if (hasChanged)
+ onInstrumentChanged();
}
void MainWindowPresenter::notifyUpdateInstrumentRequested() {
@@ -245,14 +252,6 @@ void MainWindowPresenter::updateInstrument(const std::string &instrumentName) {
loadAlg->execute();
MatrixWorkspace_sptr instWorkspace = loadAlg->getProperty("OutputWorkspace");
m_instrument = instWorkspace->getInstrument();
-
- // Notify child presenters
- for (auto &batchPresenter : m_batchPresenters)
- batchPresenter->notifyInstrumentChanged(instrumentName);
-
- // Notify the slit calculator
- m_slitCalculator->setCurrentInstrumentName(instrumentName);
- m_slitCalculator->processInstrumentHasBeenChanged();
}
void MainWindowPresenter::setDefaultInstrument(
@@ -272,6 +271,16 @@ void MainWindowPresenter::setDefaultInstrument(
g_log.notice() << "Instrument changed to " << requiredInstrument;
}
}
+
+void MainWindowPresenter::onInstrumentChanged() {
+ // Notify child presenters
+ for (auto &batchPresenter : m_batchPresenters)
+ batchPresenter->notifyInstrumentChanged(instrumentName());
+
+ // Notify the slit calculator
+ m_slitCalculator->setCurrentInstrumentName(instrumentName());
+ m_slitCalculator->processInstrumentHasBeenChanged();
+}
} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.h
index 895a0b2829fadf4f132d82663b6ea1d52e7a2c4f..b07f6ee488a30ba2fe8cda6bc81b6b80dbe81fb5 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.h
@@ -88,9 +88,9 @@ private:
void addNewBatch(IBatchView *batchView);
void initNewBatch(IBatchPresenter *batchPresenter,
std::string const &instrument);
- void changeInstrument(std::string const &instrumentName);
void updateInstrument(const std::string &instrumentName);
void setDefaultInstrument(const std::string &newInstrument);
+ void onInstrumentChanged();
void disableSaveAndLoadBatch();
void enableSaveAndLoadBatch();
@@ -101,4 +101,4 @@ private:
};
} // namespace ISISReflectometry
} // namespace CustomInterfaces
-} // namespace MantidQt
\ No newline at end of file
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/test/ISISReflectometry/Common/DecoderTest.h b/qt/scientific_interfaces/test/ISISReflectometry/Common/DecoderTest.h
index 00e15f9287a1be7d5cb133b421701b3bf2586dde..858234a8e24176804f5d5ed61bb5e601870a69d0 100644
--- a/qt/scientific_interfaces/test/ISISReflectometry/Common/DecoderTest.h
+++ b/qt/scientific_interfaces/test/ISISReflectometry/Common/DecoderTest.h
@@ -19,112 +19,387 @@
#include <QVariant>
namespace {
-const static QString MAINWINDOW_JSON_STRING{
- "{\"batches\": [{\"saveView\": {\"commaRadioButton\": true, "
- "\"spaceRadioButton\": false, \"regexCheckBox\": false, \"savePathEdit\": "
- "\"\", \"saveReductionResultsCheckBox\": false, \"titleCheckBox\": false, "
- "\"filterEdit\": \"\", \"tabRadioButton\": false, \"prefixEdit\": \"\", "
- "\"qResolutionCheckBox\": false, \"fileFormatComboBox\": 0}, \"runsView\": "
- "{\"comboSearchInstrument\": 0, \"runsTable\": {\"projectSave\": true, "
- "\"filterBox\": \"\", \"runsTableModel\": [{\"rows\": "
- "[{\"reductionWorkspaces\": {\"inputRunNumbers\": [\"13460\"], \"iVsQ\": "
- "\"\", \"transPair\": {\"firstTransRuns\": [], \"secondTransRuns\": []}, "
- "\"iVsLambda\": \"\", \"iVsQBinned\": \"\"}, \"transRunNums\": "
- "{\"firstTransRuns\": [], \"secondTransRuns\": []}, "
- "\"scaleFactorPresent\": "
- "false, \"qRangeOutput\": {\"maxPresent\": false, \"stepPresent\": false, "
- "\"minPresent\": false}, \"reductionOptions\": {}, \"theta\": 0.5, "
- "\"runNumbers\": [\"13460\"], \"qRange\": {\"maxPresent\": false, "
- "\"stepPresent\": false, \"minPresent\": false}}], \"name\": \"123\", "
- "\"postprocessedWorkspaceName\": \"\"}]}, \"textSearch\": \"123\"}, "
- "\"eventView\": {\"disabledSlicingButton\": true, \"customEdit\": \"\", "
- "\"logValueButton\": false, \"logValueEdit\": \"\", \"uniformEvenButton\": "
- "false, \"logValueTypeEdit\": \"\", \"uniformButton\": false, "
- "\"uniformEdit\": 1.0, \"customButton\": false, \"uniformEvenEdit\": 1}, "
- "\"experimentView\": {\"perAngleDefaults\": {\"columnsNum\": 9, \"rows\": "
- "[[\"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\"]], \"rowsNum\": "
- "1}, "
- "\"startOverlapEdit\": 10.0, \"analysisModeComboBox\": 0, "
- "\"reductionTypeComboBox\": 0, \"stitchEdit\": \"\", "
- "\"floodWorkspaceWsSelector\": 0, \"includePartialBinsCheckBox\": false, "
- "\"summationTypeComboBox\": 0, \"transScaleRHSCheckBox\": true, "
- "\"debugCheckbox\": false, \"transStitchParamsEdit\": \"\", "
- "\"floodCorComboBox\": 0, \"endOverlapEdit\": 12.0, \"polCorrCheckBox\": "
- "false}, \"instrumentView\": {\"monBgMaxEdit\": 18.0, \"I0MonitorIndex\": "
- "2, "
- "\"lamMinEdit\": 1.5, \"monIntMinEdit\": 4.0, \"intMonCheckBox\": true, "
- "\"monIntMaxEdit\": 10.0, \"detectorCorrectionTypeComboBox\": 0, "
- "\"correctDetectorsCheckBox\": true, \"lamMaxEdit\": 17.0, "
- "\"monBgMinEdit\": "
- "17.0}}, {\"saveView\": {\"commaRadioButton\": true, \"spaceRadioButton\": "
- "false, \"regexCheckBox\": false, \"savePathEdit\": \"\", "
- "\"saveReductionResultsCheckBox\": false, \"titleCheckBox\": false, "
- "\"filterEdit\": \"\", \"tabRadioButton\": false, \"prefixEdit\": \"\", "
- "\"qResolutionCheckBox\": false, \"fileFormatComboBox\": 0}, \"runsView\": "
- "{\"comboSearchInstrument\": 0, \"runsTable\": {\"projectSave\": true, "
- "\"filterBox\": \"\", \"runsTableModel\": [{\"rows\": [{}], \"name\": "
- "\"HiddenGroupName1\", \"postprocessedWorkspaceName\": \"\"}]}, "
- "\"textSearch\": \"\"}, \"eventView\": {\"disabledSlicingButton\": true, "
- "\"customEdit\": \"\", \"logValueButton\": false, \"logValueEdit\": \"\", "
- "\"uniformEvenButton\": false, \"logValueTypeEdit\": \"\", "
- "\"uniformButton\": false, \"uniformEdit\": 1.0, \"customButton\": false, "
- "\"uniformEvenEdit\": 1}, \"experimentView\": {\"perAngleDefaults\": "
- "{\"columnsNum\": 9, \"rows\": [[\"\", \"\", \"\", \"\", \"\", \"\", \"\", "
- "\"\", \"\"]], \"rowsNum\": 1}, \"startOverlapEdit\": 10.0, "
- "\"analysisModeComboBox\": 0, \"reductionTypeComboBox\": 0, "
- "\"stitchEdit\": "
- "\"\", \"floodWorkspaceWsSelector\": 0, \"includePartialBinsCheckBox\": "
- "false, \"summationTypeComboBox\": 0, \"transScaleRHSCheckBox\": true, "
- "\"debugCheckbox\": false, \"transStitchParamsEdit\": \"\", "
- "\"floodCorComboBox\": 0, \"endOverlapEdit\": 12.0, \"polCorrCheckBox\": "
- "false}, \"instrumentView\": {\"monBgMaxEdit\": 18.0, \"I0MonitorIndex\": "
- "2, "
- "\"lamMinEdit\": 1.5, \"monIntMinEdit\": 4.0, \"intMonCheckBox\": true, "
- "\"monIntMaxEdit\": 10.0, \"detectorCorrectionTypeComboBox\": 0, "
- "\"correctDetectorsCheckBox\": true, \"lamMaxEdit\": 17.0, "
- "\"monBgMinEdit\": "
- "17.0}}], \"tag\": \"ISIS Reflectometry\"}"};
-
const static QString BATCH_JSON_STRING{
- "{\"eventView\":{\"customButton\":false,\"customEdit\":\"\", "
- "\"disabledSlicingButton\":false,\"logValueButton\":false,"
- "\"logValueEdit\":"
- "\"\",\"logValueTypeEdit\":\"\",\"uniformButton\":true,\"uniformEdit\":3,"
- "\"uniformEvenButton\":false,\"uniformEvenEdit\":2},\"experimentView\":{"
- "\"analysisModeComboBox\":1,\"debugCheckbox\":true,\"endOverlapEdit\":13,"
- "\"floodCorComboBox\":1,\"floodWorkspaceWsSelector\":0,"
- "\"includePartialBinsCheckBox\":true,\"perAngleDefaults\":{"
- "\"columnsNum\":"
- "9,\"rows\":[[\"123\",\"123\",\"213\",\"123\",\"123\",\"123\",\"123\","
- "\"123\",\"123\"]],\"rowsNum\":1},\"polCorrCheckBox\":false,"
- "\"reductionTypeComboBox\":2,\"startOverlapEdit\":12,\"stitchEdit\":\"\","
- "\"summationTypeComboBox\":1,\"transScaleRHSCheckBox\":true,"
- "\"transStitchParamsEdit\":\"1\"},\"instrumentView\":{\"I0MonitorIndex\":"
- "3,"
- "\"correctDetectorsCheckBox\":false,\"detectorCorrectionTypeComboBox\":1,"
- "\"intMonCheckBox\":false,\"lamMaxEdit\":18,\"lamMinEdit\":2.5,"
- "\"monBgMaxEdit\":20,\"monBgMinEdit\":19,\"monIntMaxEdit\":11,"
- "\"monIntMinEdit\":5},\"runsView\":{\"comboSearchInstrument\":0,"
- "\"runsTable\":{\"filterBox\":\"123\",\"projectSave\":false,"
- "\"runsTableModel\":[{\"name\":\"123\",\"postprocessedWorkspaceName\":"
- "\"\","
- "\"rows\":[{\"qRange\":{\"max\":0.1,\"maxPresent\":true,\"min\":0.1,"
- "\"minPresent\":true,\"step\":0.1,\"stepPresent\":true},\"qRangeOutput\":"
"{"
- "\"maxPresent\":false,\"minPresent\":false,\"stepPresent\":false},"
- "\"reductionOptions\":{\"ProcessingInstructions\":\"1-4\"},"
- "\"reductionWorkspaces\":{\"iVsLambda\":\"\",\"iVsQ\":\"\","
- "\"iVsQBinned\":"
- "\"\",\"inputRunNumbers\":[\"13460\"],\"transPair\":{\"firstTransRuns\":["
- "\"123\"],\"secondTransRuns\":[\"1234\"]}},\"runNumbers\":[\"13460\"],"
- "\"scaleFactor\":2,\"scaleFactorPresent\":true,\"theta\":0.5,"
- "\"transRunNums\":{\"firstTransRuns\":[\"123\"],\"secondTransRuns\":["
- "\"1234\"]}}]}]},\"textSearch\":\"1120015\"},\"saveView\":{"
- "\"commaRadioButton\":false,\"fileFormatComboBox\":1,\"filterEdit\":"
- "\"123\",\"prefixEdit\":\"123\",\"qResolutionCheckBox\":true,"
- "\"regexCheckBox\":true,\"savePathEdit\":\"123\","
- "\"saveReductionResultsCheckBox\":false,\"spaceRadioButton\":true,"
- "\"tabRadioButton\":false,\"titleCheckBox\":true}}"};
+ " \"eventView\": {"
+ " \"customButton\": false,"
+ " \"customEdit\": \"\","
+ " \"disabledSlicingButton\": false,"
+ " \"logValueButton\": false,"
+ " \"logValueEdit\": \"\","
+ " \"logValueTypeEdit\": \"\","
+ " \"uniformButton\": false,"
+ " \"uniformEdit\": 1,"
+ " \"uniformEvenButton\": true,"
+ " \"uniformEvenEdit\": 2"
+ " },"
+ " \"experimentView\": {"
+ " \"analysisModeComboBox\": 1,"
+ " \"debugCheckbox\": true,"
+ " \"endOverlapEdit\": 13,"
+ " \"floodCorComboBox\": 1,"
+ " \"floodWorkspaceWsSelector\": 0,"
+ " \"includePartialBinsCheckBox\": true,"
+ " \"perAngleDefaults\": {"
+ " \"columnsNum\": 9,"
+ " \"rows\": ["
+ " ["
+ " \"0.5\","
+ " \"13463\","
+ " \"13464\","
+ " \"4\","
+ " \"0.01\","
+ " \"0.1\","
+ " \"0.02\","
+ " \"\","
+ " \"4\""
+ " ]"
+ " ],"
+ " \"rowsNum\": 1"
+ " },"
+ " \"polCorrCheckBox\": false,"
+ " \"reductionTypeComboBox\": 2,"
+ " \"startOverlapEdit\": 8,"
+ " \"stitchEdit\": \"Params=0.015\","
+ " \"summationTypeComboBox\": 1,"
+ " \"transScaleRHSCheckBox\": false,"
+ " \"transStitchParamsEdit\": \"0.03\""
+ " },"
+ " \"instrumentView\": {"
+ " \"I0MonitorIndex\": 1,"
+ " \"correctDetectorsCheckBox\": true,"
+ " \"detectorCorrectionTypeComboBox\": 1,"
+ " \"intMonCheckBox\": true,"
+ " \"lamMaxEdit\": 16,"
+ " \"lamMinEdit\": 2.5,"
+ " \"monBgMaxEdit\": 19,"
+ " \"monBgMinEdit\": 14,"
+ " \"monIntMaxEdit\": 11,"
+ " \"monIntMinEdit\": 3"
+ " },"
+ " \"runsView\": {"
+ " \"comboSearchInstrument\": 0,"
+ " \"runsTable\": {"
+ " \"filterBox\": \"\","
+ " \"projectSave\": false,"
+ " \"runsTableModel\": ["
+ " {"
+ " \"itemState\": 0,"
+ " \"name\": \"Si/D2O S2 \","
+ " \"postprocessedWorkspaceName\": \"\","
+ " \"rows\": ["
+ " {"
+ " \"itemState\": 0,"
+ " \"qRange\": {"
+ " \"max\": 0.06,"
+ " \"maxPresent\": true,"
+ " \"min\": 0.01,"
+ " \"minPresent\": true,"
+ " \"step\": 0.04,"
+ " \"stepPresent\": true"
+ " },"
+ " \"qRangeOutput\": {"
+ " \"maxPresent\": false,"
+ " \"minPresent\": false,"
+ " \"stepPresent\": false"
+ " },"
+ " \"reductionOptions\": {"
+ " },"
+ " \"reductionWorkspaces\": {"
+ " \"iVsLambda\": \"\","
+ " \"iVsQ\": \"\","
+ " \"iVsQBinned\": \"\","
+ " \"inputRunNumbers\": ["
+ " \"13460\""
+ " ],"
+ " \"transPair\": {"
+ " \"firstTransRuns\": ["
+ " \"13463\""
+ " ],"
+ " \"secondTransRuns\": ["
+ " \"13464\""
+ " ]"
+ " }"
+ " },"
+ " \"runNumbers\": ["
+ " \"13460\""
+ " ],"
+ " \"scaleFactorPresent\": false,"
+ " \"theta\": 0.5,"
+ " \"transRunNums\": {"
+ " \"firstTransRuns\": ["
+ " \"13463\""
+ " ],"
+ " \"secondTransRuns\": ["
+ " \"13464\""
+ " ]"
+ " }"
+ " },"
+ " {"
+ " \"itemState\": 0,"
+ " \"qRange\": {"
+ " \"max\": 0.3,"
+ " \"maxPresent\": true,"
+ " \"min\": 0.035,"
+ " \"minPresent\": true,"
+ " \"step\": 0.04,"
+ " \"stepPresent\": true"
+ " },"
+ " \"qRangeOutput\": {"
+ " \"maxPresent\": false,"
+ " \"minPresent\": false,"
+ " \"stepPresent\": false"
+ " },"
+ " \"reductionOptions\": {"
+ " },"
+ " \"reductionWorkspaces\": {"
+ " \"iVsLambda\": \"\","
+ " \"iVsQ\": \"\","
+ " \"iVsQBinned\": \"\","
+ " \"inputRunNumbers\": ["
+ " \"13462\""
+ " ],"
+ " \"transPair\": {"
+ " \"firstTransRuns\": ["
+ " \"13463\""
+ " ],"
+ " \"secondTransRuns\": ["
+ " \"13464\""
+ " ]"
+ " }"
+ " },"
+ " \"runNumbers\": ["
+ " \"13462\""
+ " ],"
+ " \"scaleFactorPresent\": false,"
+ " \"theta\": 2.3,"
+ " \"transRunNums\": {"
+ " \"firstTransRuns\": ["
+ " \"13463\""
+ " ],"
+ " \"secondTransRuns\": ["
+ " \"13464\""
+ " ]"
+ " }"
+ " }"
+ " ]"
+ " },"
+ " {"
+ " \"itemState\": 0,"
+ " \"name\": \"Si MAB 500mg/L NaOAc D2O \","
+ " \"postprocessedWorkspaceName\": \"\","
+ " \"rows\": ["
+ " {"
+ " \"itemState\": 0,"
+ " \"qRange\": {"
+ " \"max\": 0.06,"
+ " \"maxPresent\": true,"
+ " \"min\": 0.01,"
+ " \"minPresent\": true,"
+ " \"step\": 0.04,"
+ " \"stepPresent\": true"
+ " },"
+ " \"qRangeOutput\": {"
+ " \"maxPresent\": false,"
+ " \"minPresent\": false,"
+ " \"stepPresent\": false"
+ " },"
+ " \"reductionOptions\": {"
+ " },"
+ " \"reductionWorkspaces\": {"
+ " \"iVsLambda\": \"\","
+ " \"iVsQ\": \"\","
+ " \"iVsQBinned\": \"\","
+ " \"inputRunNumbers\": ["
+ " \"13469\""
+ " ],"
+ " \"transPair\": {"
+ " \"firstTransRuns\": ["
+ " \"13463\""
+ " ],"
+ " \"secondTransRuns\": ["
+ " \"13464\""
+ " ]"
+ " }"
+ " },"
+ " \"runNumbers\": ["
+ " \"13469\""
+ " ],"
+ " \"scaleFactorPresent\": false,"
+ " \"theta\": 0.7,"
+ " \"transRunNums\": {"
+ " \"firstTransRuns\": ["
+ " \"13463\""
+ " ],"
+ " \"secondTransRuns\": ["
+ " \"13464\""
+ " ]"
+ " }"
+ " },"
+ " {"
+ " \"itemState\": 0,"
+ " \"qRange\": {"
+ " \"max\": 0.3,"
+ " \"maxPresent\": true,"
+ " \"min\": 0.035,"
+ " \"minPresent\": true,"
+ " \"step\": 0.04,"
+ " \"stepPresent\": true"
+ " },"
+ " \"qRangeOutput\": {"
+ " \"maxPresent\": false,"
+ " \"minPresent\": false,"
+ " \"stepPresent\": false"
+ " },"
+ " \"reductionOptions\": {"
+ " },"
+ " \"reductionWorkspaces\": {"
+ " \"iVsLambda\": \"\","
+ " \"iVsQ\": \"\","
+ " \"iVsQBinned\": \"\","
+ " \"inputRunNumbers\": ["
+ " \"13470\""
+ " ],"
+ " \"transPair\": {"
+ " \"firstTransRuns\": ["
+ " \"13463\""
+ " ],"
+ " \"secondTransRuns\": ["
+ " \"13464\""
+ " ]"
+ " }"
+ " },"
+ " \"runNumbers\": ["
+ " \"13470\""
+ " ],"
+ " \"scaleFactorPresent\": false,"
+ " \"theta\": 2.3,"
+ " \"transRunNums\": {"
+ " \"firstTransRuns\": ["
+ " \"13463\""
+ " ],"
+ " \"secondTransRuns\": ["
+ " \"13464\""
+ " ]"
+ " }"
+ " }"
+ " ]"
+ " }"
+ " ]"
+ " },"
+ " \"textSearch\": \"1120015\""
+ " },"
+ " \"saveView\": {"
+ " \"commaRadioButton\": false,"
+ " \"fileFormatComboBox\": 1,"
+ " \"filterEdit\": \"IvsQ\","
+ " \"prefixEdit\": \"\","
+ " \"qResolutionCheckBox\": true,"
+ " \"regexCheckBox\": true,"
+ " \"savePathEdit\": \"\","
+ " \"saveReductionResultsCheckBox\": false,"
+ " \"spaceRadioButton\": true,"
+ " \"tabRadioButton\": false,"
+ " \"titleCheckBox\": true"
+ " }"
+ "}"};
+
+const static QString EMPTY_BATCH_JSON_STRING{
+ "{"
+ " \"eventView\": {"
+ " \"customButton\": false,"
+ " \"customEdit\": \"\","
+ " \"disabledSlicingButton\": true,"
+ " \"logValueButton\": false,"
+ " \"logValueEdit\": \"\","
+ " \"logValueTypeEdit\": \"\","
+ " \"uniformButton\": false,"
+ " \"uniformEdit\": 1,"
+ " \"uniformEvenButton\": false,"
+ " \"uniformEvenEdit\": 1"
+ " },"
+ " \"experimentView\": {"
+ " \"analysisModeComboBox\": 0,"
+ " \"debugCheckbox\": false,"
+ " \"endOverlapEdit\": 12,"
+ " \"floodCorComboBox\": 0,"
+ " \"floodWorkspaceWsSelector\": 0,"
+ " \"includePartialBinsCheckBox\": false,"
+ " \"perAngleDefaults\": {"
+ " \"columnsNum\": 9,"
+ " \"rows\": ["
+ " ["
+ " \"\","
+ " \"\","
+ " \"\","
+ " \"\","
+ " \"\","
+ " \"\","
+ " \"\","
+ " \"\","
+ " \"\""
+ " ]"
+ " ],"
+ " \"rowsNum\": 1"
+ " },"
+ " \"polCorrCheckBox\": false,"
+ " \"reductionTypeComboBox\": 0,"
+ " \"startOverlapEdit\": 10,"
+ " \"stitchEdit\": \"\","
+ " \"summationTypeComboBox\": 0,"
+ " \"transScaleRHSCheckBox\": true,"
+ " \"transStitchParamsEdit\": \"\""
+ " },"
+ " \"instrumentView\": {"
+ " \"I0MonitorIndex\": 2,"
+ " \"correctDetectorsCheckBox\": true,"
+ " \"detectorCorrectionTypeComboBox\": 0,"
+ " \"intMonCheckBox\": true,"
+ " \"lamMaxEdit\": 17,"
+ " \"lamMinEdit\": 1.5,"
+ " \"monBgMaxEdit\": 18,"
+ " \"monBgMinEdit\": 17,"
+ " \"monIntMaxEdit\": 10,"
+ " \"monIntMinEdit\": 4"
+ " },"
+ " \"runsView\": {"
+ " \"comboSearchInstrument\": 0,"
+ " \"runsTable\": {"
+ " \"filterBox\": \"\","
+ " \"projectSave\": false,"
+ " \"runsTableModel\": ["
+ " {"
+ " \"itemState\": 0,"
+ " \"name\": \"HiddenGroupName1\","
+ " \"postprocessedWorkspaceName\": \"\","
+ " \"rows\": ["
+ " {"
+ " }"
+ " ]"
+ " }"
+ " ]"
+ " },"
+ " \"textSearch\": \"\""
+ " },"
+ " \"saveView\": {"
+ " \"commaRadioButton\": true,"
+ " \"fileFormatComboBox\": 0,"
+ " \"filterEdit\": \"\","
+ " \"prefixEdit\": \"\","
+ " \"qResolutionCheckBox\": false,"
+ " \"regexCheckBox\": false,"
+ " \"savePathEdit\": \"\","
+ " \"saveReductionResultsCheckBox\": false,"
+ " \"spaceRadioButton\": false,"
+ " \"tabRadioButton\": false,"
+ " \"titleCheckBox\": false"
+ " }"
+ "}"};
+
+const static QString MAINWINDOW_JSON_STRING{
+ QString("{\"batches\": [") + BATCH_JSON_STRING + QString(", ") +
+ EMPTY_BATCH_JSON_STRING + QString("], ") +
+ QString("\"tag\": \"ISIS Reflectometry\"}")};
} // namespace
/**
@@ -171,7 +446,7 @@ public:
"api.FrameworkManager.Instance()");
}
- void test_decode() {
+ void test_decodeMainWindow() {
CoderCommonTester tester;
Decoder decoder;
auto map = MantidQt::API::loadJSONFromString(MAINWINDOW_JSON_STRING);
@@ -180,12 +455,40 @@ public:
tester.testMainWindowView(dynamic_cast<QtMainWindowView *>(widget), map);
}
- void test_decodeBatch() {
+ void test_decodeEmptyBatch() {
+ CoderCommonTester tester;
+ auto map = MantidQt::API::loadJSONFromString(EMPTY_BATCH_JSON_STRING);
+ QtMainWindowView mwv;
+ mwv.initLayout();
+ auto gui = dynamic_cast<QtBatchView *>(mwv.batches()[0]);
+ Decoder decoder;
+ decoder.decodeBatch(&mwv, 0, map);
+
+ tester.testBatch(gui, &mwv, map);
+ }
+
+ void test_decodePopulatedBatch() {
+ CoderCommonTester tester;
+ auto map = MantidQt::API::loadJSONFromString(BATCH_JSON_STRING);
+ QtMainWindowView mwv;
+ mwv.initLayout();
+ auto gui = dynamic_cast<QtBatchView *>(mwv.batches()[0]);
+ Decoder decoder;
+ decoder.decodeBatch(&mwv, 0, map);
+
+ tester.testBatch(gui, &mwv, map);
+ }
+
+ void test_decodeBatchWhenInstrumentChanged() {
CoderCommonTester tester;
auto map = MantidQt::API::loadJSONFromString(BATCH_JSON_STRING);
QtMainWindowView mwv;
mwv.initLayout();
auto gui = dynamic_cast<QtBatchView *>(mwv.batches()[0]);
+ // Set the initial instrument to something different to the one we are
+ // decoding
+ gui->runs()->setSearchInstrument("POLREF");
+
Decoder decoder;
decoder.decodeBatch(&mwv, 0, map);
diff --git a/qt/scientific_interfaces/test/ISISReflectometry/MainWindow/MainWindowPresenterTest.h b/qt/scientific_interfaces/test/ISISReflectometry/MainWindow/MainWindowPresenterTest.h
index 968449ba89e699562b3a1d4ab8d848ea4c033b8f..464a01a69d21a291a902058545e65bd1673cf674 100644
--- a/qt/scientific_interfaces/test/ISISReflectometry/MainWindow/MainWindowPresenterTest.h
+++ b/qt/scientific_interfaces/test/ISISReflectometry/MainWindow/MainWindowPresenterTest.h
@@ -252,6 +252,7 @@ public:
void testChangeInstrumentRequestedUpdatesInstrumentInChildPresenters() {
auto presenter = makePresenter();
+ setupInstrument(presenter, "INTER");
auto const instrument = std::string("POLREF");
EXPECT_CALL(*m_batchPresenters[0], notifyInstrumentChanged(instrument))
.Times(1);
@@ -261,13 +262,24 @@ public:
verifyAndClear();
}
- void testUpdateInstrumentUpdatesInstrumentInChildPresenters() {
+ void testChangeInstrumentRequestedDoesNotUpdateInstrumentIfNotChanged() {
auto presenter = makePresenter();
auto const instrument = setupInstrument(presenter, "POLREF");
EXPECT_CALL(*m_batchPresenters[0], notifyInstrumentChanged(instrument))
- .Times(1);
+ .Times(0);
EXPECT_CALL(*m_batchPresenters[1], notifyInstrumentChanged(instrument))
- .Times(1);
+ .Times(0);
+ presenter.notifyChangeInstrumentRequested(instrument);
+ verifyAndClear();
+ }
+
+ void testUpdateInstrumentDoesNotUpdateInstrumentInChildPresenters() {
+ auto presenter = makePresenter();
+ auto const instrument = setupInstrument(presenter, "POLREF");
+ EXPECT_CALL(*m_batchPresenters[0], notifyInstrumentChanged(instrument))
+ .Times(0);
+ EXPECT_CALL(*m_batchPresenters[1], notifyInstrumentChanged(instrument))
+ .Times(0);
presenter.notifyUpdateInstrumentRequested();
verifyAndClear();
}
@@ -316,32 +328,16 @@ public:
void testSaveBatch() {
auto presenter = makePresenter();
- auto const filename = std::string("test.json");
- auto const map = QMap<QString, QVariant>();
auto const batchIndex = 1;
- EXPECT_CALL(m_messageHandler, askUserForSaveFileName("JSON (*.json)"))
- .Times(1)
- .WillOnce(Return(filename));
- EXPECT_CALL(*m_encoder, encodeBatch(&m_view, batchIndex, false))
- .Times(1)
- .WillOnce(Return(map));
- EXPECT_CALL(m_fileHandler, saveJSONToFile(filename, map)).Times(1);
+ expectBatchIsSavedToFile(batchIndex);
presenter.notifySaveBatchRequested(batchIndex);
verifyAndClear();
}
void testLoadBatch() {
auto presenter = makePresenter();
- auto const filename = std::string("test.json");
- auto const map = QMap<QString, QVariant>();
auto const batchIndex = 1;
- EXPECT_CALL(m_messageHandler, askUserForLoadFileName("JSON (*.json)"))
- .Times(1)
- .WillOnce(Return(filename));
- EXPECT_CALL(m_fileHandler, loadJSONFromFile(filename))
- .Times(1)
- .WillOnce(Return(map));
- EXPECT_CALL(*m_decoder, decodeBatch(&m_view, batchIndex, map)).Times(1);
+ expectBatchIsLoadedFromFile(batchIndex);
presenter.notifyLoadBatchRequested(batchIndex);
verifyAndClear();
}
@@ -489,6 +485,30 @@ private:
EXPECT_CALL(*m_slitCalculator, processInstrumentHasBeenChanged()).Times(1);
}
+ void expectBatchIsSavedToFile(int batchIndex) {
+ auto const filename = std::string("test.json");
+ auto const map = QMap<QString, QVariant>();
+ EXPECT_CALL(m_messageHandler, askUserForSaveFileName("JSON (*.json)"))
+ .Times(1)
+ .WillOnce(Return(filename));
+ EXPECT_CALL(*m_encoder, encodeBatch(&m_view, batchIndex, false))
+ .Times(1)
+ .WillOnce(Return(map));
+ EXPECT_CALL(m_fileHandler, saveJSONToFile(filename, map)).Times(1);
+ }
+
+ void expectBatchIsLoadedFromFile(int batchIndex) {
+ auto const filename = std::string("test.json");
+ auto const map = QMap<QString, QVariant>();
+ EXPECT_CALL(m_messageHandler, askUserForLoadFileName("JSON (*.json)"))
+ .Times(1)
+ .WillOnce(Return(filename));
+ EXPECT_CALL(m_fileHandler, loadJSONFromFile(filename))
+ .Times(1)
+ .WillOnce(Return(map));
+ EXPECT_CALL(*m_decoder, decodeBatch(&m_view, batchIndex, map)).Times(1);
+ }
+
void assertFirstBatchWasRemovedFromModel(
MainWindowPresenterFriend const &presenter) {
TS_ASSERT_EQUALS(presenter.m_batchPresenters.size(), 1);