Refactor Inelastic QENS FitTab

qt/scientific_interfaces/Inelastic/QENSFitting/FitDataModel.cpp

@@ -61,6 +61,11 @@ FunctionModelSpectra FitDataModel::getSpectra(WorkspaceID workspaceID) const {
   return FunctionModelSpectra("");
 }
 
+FunctionModelDataset FitDataModel::getDataset(WorkspaceID workspaceID) const {
+  auto const name = getWorkspace(workspaceID)->getName();
+  return FunctionModelDataset(QString::fromStdString(name), getSpectra(workspaceID));
+}
+
 std::string FitDataModel::createDisplayName(WorkspaceID workspaceID) const {
   if (getNumberOfWorkspaces() > workspaceID)
     return getFitDataName(getWorkspaceNames()[workspaceID.value], getSpectra(workspaceID));

qt/scientific_interfaces/Inelastic/QENSFitting/FitDataModel.h

@@ -11,6 +11,7 @@
 #include "IFitDataModel.h"
 
 #include "MantidAPI/MatrixWorkspace.h"
+#include "MantidQtWidgets/Common/FunctionModelDataset.h"
 #include "MantidQtWidgets/Common/FunctionModelSpectra.h"
 #include "MantidQtWidgets/Common/IndexTypes.h"
 
@@ -43,6 +44,7 @@ class MANTIDQT_INELASTIC_DLL FitDataModel : public IFitDataModel {
   void setSpectra(FunctionModelSpectra &&spectra, WorkspaceID workspaceID) override;
   void setSpectra(const FunctionModelSpectra &spectra, WorkspaceID workspaceID) override;
   FunctionModelSpectra getSpectra(WorkspaceID workspaceID) const override;
+  FunctionModelDataset getDataset(WorkspaceID workspaceID) const override;
   size_t getSpectrum(FitDomainIndex index) const override;
   size_t getNumberOfSpectra(WorkspaceID workspaceID) const override;
 

qt/scientific_interfaces/Inelastic/QENSFitting/FitDataPresenter.cpp

@@ -98,8 +98,14 @@ WorkspaceID FitDataPresenter::getNumberOfWorkspaces() const { return m_model->ge
 
 size_t FitDataPresenter::getNumberOfDomains() const { return m_model->getNumberOfDomains(); }
 
-FunctionModelSpectra FitDataPresenter::getSpectra(WorkspaceID workspaceID) const {
-  return m_model->getSpectra(workspaceID);
+QList<FunctionModelDataset> FitDataPresenter::getDatasets() const {
+  QList<FunctionModelDataset> datasets;
+
+  for (auto i = 0u; i < m_model->getNumberOfWorkspaces().value; ++i) {
+    WorkspaceID workspaceID{i};
+    datasets.append(m_model->getDataset(workspaceID));
+  }
+  return datasets;
 }
 
 DataForParameterEstimationCollection

qt/scientific_interfaces/Inelastic/QENSFitting/FitDataPresenter.h

@@ -48,7 +48,7 @@ class MANTIDQT_INELASTIC_DLL FitDataPresenter : public IFitDataPresenter, public
   void updateTableFromModel();
   WorkspaceID getNumberOfWorkspaces() const;
   size_t getNumberOfDomains() const;
-  FunctionModelSpectra getSpectra(WorkspaceID workspaceID) const;
+  QList<FunctionModelDataset> getDatasets() const;
   DataForParameterEstimationCollection getDataForParameterEstimation(const EstimationDataSelector &selector) const;
   std::vector<double> getQValuesForData() const;
   std::vector<std::string> createDisplayNames() const;

qt/scientific_interfaces/Inelastic/QENSFitting/FitTab.cpp

@@ -450,21 +450,9 @@ void FitTab::setupFit(IAlgorithm_sptr fitAlgorithm) {
   connect(m_batchAlgoRunner, SIGNAL(batchComplete(bool)), this, SLOT(fitAlgorithmComplete(bool)));
 }
 
-QList<FunctionModelDataset> FitTab::getDatasets() const {
-  QList<FunctionModelDataset> datasets;
-
-  for (auto i = 0u; i < m_dataPresenter->getNumberOfWorkspaces().value; ++i) {
-    WorkspaceID workspaceID{i};
-
-    auto const name = m_fittingModel->getWorkspace(workspaceID)->getName();
-    datasets.append(FunctionModelDataset(QString::fromStdString(name), m_dataPresenter->getSpectra(workspaceID)));
-  }
-  return datasets;
-}
-
 void FitTab::updateDataReferences() {
   m_fitPropertyBrowser->updateFunctionBrowserData(static_cast<int>(m_dataPresenter->getNumberOfDomains()),
-                                                  getDatasets(), m_dataPresenter->getQValuesForData(),
+                                                  m_dataPresenter->getDatasets(), m_dataPresenter->getQValuesForData(),
                                                   m_dataPresenter->getResolutionsForFit());
   setModelFitFunction();
 }

qt/scientific_interfaces/Inelastic/QENSFitting/FitTab.h

@@ -26,7 +26,6 @@
 #include <optional>
 #include <type_traits>
 
-#include <QList>
 #include <QPair>
 #include <QString>
 
@@ -142,7 +141,6 @@ public slots:
   std::string getOutputBasename() const;
   Mantid::API::WorkspaceGroup_sptr getResultWorkspace() const;
   std::vector<std::string> getFitParameterNames() const;
-  QList<MantidWidgets::FunctionModelDataset> getDatasets() const;
   void enableFitButtons(bool enable);
   void enableOutputOptions(bool enable);
   void setPDFWorkspace(std::string const &workspaceName);

qt/scientific_interfaces/Inelastic/QENSFitting/IFitDataModel.h

@@ -11,6 +11,7 @@
 #include "DllConfig.h"
 #include "FitData.h"
 #include "MantidAPI/MatrixWorkspace.h"
+#include "MantidQtWidgets/Common/FunctionModelDataset.h"
 #include "MantidQtWidgets/Common/FunctionModelSpectra.h"
 #include "MantidQtWidgets/Common/IndexTypes.h"
 
@@ -33,6 +34,7 @@ class MANTIDQT_INELASTIC_DLL IFitDataModel {
   virtual bool hasWorkspace(std::string const &workspaceName) const = 0;
   virtual Mantid::API::MatrixWorkspace_sptr getWorkspace(WorkspaceID workspaceID) const = 0;
   virtual FunctionModelSpectra getSpectra(WorkspaceID workspaceID) const = 0;
+  virtual FunctionModelDataset getDataset(WorkspaceID workspaceID) const = 0;
   virtual WorkspaceID getNumberOfWorkspaces() const = 0;
   virtual size_t getNumberOfSpectra(WorkspaceID workspaceID) const = 0;
   virtual size_t getNumberOfDomains() const = 0;

qt/scientific_interfaces/Inelastic/test/QENSFitting/MockObjects.h

@@ -198,6 +198,7 @@ class MockFitDataModel : public IFitDataModel {
   MOCK_METHOD2(setSpectra, void(FunctionModelSpectra &&spectra, WorkspaceID workspaceID));
   MOCK_METHOD2(setSpectra, void(const FunctionModelSpectra &spectra, WorkspaceID workspaceID));
   MOCK_CONST_METHOD1(getSpectra, FunctionModelSpectra(WorkspaceID workspaceID));
+  MOCK_CONST_METHOD1(getDataset, FunctionModelDataset(WorkspaceID workspaceID));
   MOCK_CONST_METHOD1(getSpectrum, size_t(FitDomainIndex index));
   MOCK_CONST_METHOD1(getNumberOfSpectra, size_t(WorkspaceID workspaceID));