Add logic to the presenter and model

Author: MohamedAlmaki

qt/scientific_interfaces/Indirect/Reduction/ISISEnergyTransferModel.cpp

@@ -103,12 +103,13 @@ void IETModel::setAnalysisProperties(IAlgorithmRuntimeProps &properties, IETAnal
 }
 
 void IETModel::setOutputProperties(IAlgorithmRuntimeProps &properties, IETOutputData const &outputData,
-                                   std::string const &outputGroupName) {
+                                   std::string const &outputGroupName, std::string const &outputLabel) {
   if (outputData.getUseDeltaEInWavenumber()) {
     Mantid::API::AlgorithmProperties::update("UnitX", std::string("DeltaE_inWavenumber"), properties);
   }
   Mantid::API::AlgorithmProperties::update("FoldMultipleFrames", outputData.getFoldMultipleFrames(), properties);
   Mantid::API::AlgorithmProperties::update("OutputWorkspace", outputGroupName, properties);
+  Mantid::API::AlgorithmProperties::update("OutputSuffix", outputLabel, properties);
 }
 
 std::string IETModel::getOutputGroupName(InstrumentData const &instData, std::string const &inputText) {
@@ -119,8 +120,8 @@ std::string IETModel::getOutputGroupName(InstrumentData const &instData, std::st
   return instrument + inputText + "_" + analyser + "_" + reflection + "_Reduced";
 }
 
-MantidQt::API::IConfiguredAlgorithm_sptr IETModel::energyTransferAlgorithm(InstrumentData const &instData,
-                                                                           IETRunData &runData) {
+MantidQt::API::IConfiguredAlgorithm_sptr
+IETModel::energyTransferAlgorithm(InstrumentData const &instData, IETRunData &runData, std::string const &outputLabel) {
   auto properties = runData.groupingProperties();
 
   setInstrumentProperties(*properties, instData);
@@ -131,7 +132,7 @@ MantidQt::API::IConfiguredAlgorithm_sptr IETModel::energyTransferAlgorithm(Instr
   setAnalysisProperties(*properties, runData.getAnalysisData());
 
   m_outputGroupName = getOutputGroupName(instData, runData.getInputData().getInputText());
-  setOutputProperties(*properties, runData.getOutputData(), m_outputGroupName);
+  setOutputProperties(*properties, runData.getOutputData(), m_outputGroupName, outputLabel);
 
   auto reductionAlg = AlgorithmManager::Instance().create("ISISIndirectEnergyTransfer");
   reductionAlg->initialize();

qt/scientific_interfaces/Indirect/Reduction/ISISEnergyTransferModel.h

@@ -27,8 +27,8 @@ class MANTIDQT_INDIRECT_DLL IIETModel {
   virtual std::vector<std::string> validateRunData(IETRunData const &runData) = 0;
   virtual std::vector<std::string> validatePlotData(IETPlotData const &plotData) = 0;
 
-  virtual MantidQt::API::IConfiguredAlgorithm_sptr energyTransferAlgorithm(InstrumentData const &instData,
-                                                                           IETRunData &runParams) = 0;
+  virtual MantidQt::API::IConfiguredAlgorithm_sptr
+  energyTransferAlgorithm(InstrumentData const &instData, IETRunData &runParams, std::string const &outputLabel) = 0;
   virtual std::deque<MantidQt::API::IConfiguredAlgorithm_sptr>
   plotRawAlgorithmQueue(InstrumentData const &instData, IETPlotData const &plotData) const = 0;
 
@@ -56,7 +56,8 @@ class MANTIDQT_INDIRECT_DLL IETModel : public IIETModel {
   std::vector<std::string> validatePlotData(IETPlotData const &plotData) override;
 
   MantidQt::API::IConfiguredAlgorithm_sptr energyTransferAlgorithm(InstrumentData const &instData,
-                                                                   IETRunData &runParams) override;
+                                                                   IETRunData &runParams,
+                                                                   std::string const &outputLabel) override;
   std::deque<MantidQt::API::IConfiguredAlgorithm_sptr>
   plotRawAlgorithmQueue(InstrumentData const &instData, IETPlotData const &plotData) const override;
 
@@ -77,7 +78,7 @@ class MANTIDQT_INDIRECT_DLL IETModel : public IIETModel {
   void setRebinProperties(IAlgorithmRuntimeProps &properties, IETRebinData const &rebinData);
   void setAnalysisProperties(IAlgorithmRuntimeProps &properties, IETAnalysisData const &analysisData);
   void setOutputProperties(IAlgorithmRuntimeProps &properties, IETOutputData const &outputData,
-                           std::string const &outputGroupName);
+                           std::string const &outputGroupName, std::string const &outputLabel);
   std::string getOutputGroupName(InstrumentData const &instData, std::string const &inputFiles);
 
   [[nodiscard]] inline std::string outputGroupName() const noexcept override { return m_outputGroupName; }

qt/scientific_interfaces/Indirect/Reduction/ISISEnergyTransferPresenter.cpp

@@ -18,6 +18,7 @@
 
 #include "MantidQtWidgets/Common/QtJobRunner.h"
 #include "MantidQtWidgets/Common/UserInputValidator.h"
+#include <MantidQtWidgets/Common/ParseKeyValueString.h>
 
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
@@ -56,6 +57,8 @@ IETPresenter::IETPresenter(IDataReduction *idrUI, IIETView *view, std::unique_pt
   m_algorithmRunner->subscribe(this);
   setRunWidgetPresenter(std::make_unique<RunPresenter>(this, m_view->getRunView()));
   setOutputPlotOptionsPresenter(m_view->getPlotOptionsView(), PlotWidget::SpectraSliceSurface);
+  setOutputNamePresenter(m_view->getOutputName());
+  m_outputNamePresenter->enableEditing();
 }
 
 void IETPresenter::validateInstrumentDetails(IUserInputValidator *validator) const {
@@ -140,9 +143,11 @@ void IETPresenter::handleRun() {
   InstrumentData instrumentData = getInstrumentData();
   IETRunData runData = m_view->getRunData();
 
+  std::string outputLabel = m_outputNamePresenter->getCurrentLabel();
+
   m_view->setEnableOutputOptions(false);
 
-  m_algorithmRunner->execute(m_model->energyTransferAlgorithm(instrumentData, runData));
+  m_algorithmRunner->execute(m_model->energyTransferAlgorithm(instrumentData, runData, outputLabel));
 }
 
 void IETPresenter::handleValidation(IUserInputValidator *validator) const {

qt/scientific_interfaces/Indirect/test/Reduction/ISISEnergyTransferModelTest.h

@@ -325,7 +325,7 @@ class ISISEnergyTransferModelTest : public CxxTest::TestSuite {
 
     InstrumentData instData("instrument", "analyser", "reflection");
 
-    auto configuredAlg = m_model->energyTransferAlgorithm(instData, runData);
+    auto configuredAlg = m_model->energyTransferAlgorithm(instData, runData, "Elwin");
     auto &runtimeProps = configuredAlg->getAlgorithmRuntimeProps();
     TS_ASSERT_EQUALS("instrument", runtimeProps.getPropertyValue("Instrument"));
     TS_ASSERT_EQUALS("analyser", runtimeProps.getPropertyValue("Analyser"));