Merge pull request #28136 from mantidproject/28077_FQ_multiple_inputs

FQ multiple inputs crashes when more than one file is loaded

qt/scientific_interfaces/Indirect/IFQFitObserver.h

@@ -10,6 +10,7 @@
 enum DataType {
   WIDTH,
   EISF,
+  ALL,
 };
 
 class IFQFitObserver {

qt/scientific_interfaces/Indirect/IndirectFitAnalysisTab.cpp

@@ -159,7 +159,6 @@ void IndirectFitAnalysisTab::setFitDataPresenter(
 void IndirectFitAnalysisTab::setPlotView(IIndirectFitPlotView *view) {
   m_plotPresenter = std::make_unique<IndirectFitPlotPresenter>(
       m_fittingModel.get(), view, this);
-  m_plotPresenter->disableSpectrumPlotSelection();
 }
 
 void IndirectFitAnalysisTab::setSpectrumSelectionView(
@@ -369,11 +368,11 @@ void IndirectFitAnalysisTab::updateSingleFitOutput(bool error) {
 
   if (error) {
     m_fittingModel->cleanFailedSingleRun(m_fittingAlgorithm,
-                                         TableDatasetIndex{0});
+                                         m_currentTableDatasetIndex);
     m_fittingAlgorithm.reset();
   } else
     m_fittingModel->addSingleFitOutput(m_fittingAlgorithm,
-                                       TableDatasetIndex{0});
+                                       m_currentTableDatasetIndex);
 }
 
 /**
@@ -531,6 +530,7 @@ void IndirectFitAnalysisTab::singleFit(TableDatasetIndex dataIndex,
     enableFitButtons(false);
     enableOutputOptions(false);
     m_fittingModel->setFittingMode(FittingMode::SIMULTANEOUS);
+    m_currentTableDatasetIndex = dataIndex;
     runSingleFit(m_fittingModel->getSingleFit(dataIndex, spectrum));
   }
 }

qt/scientific_interfaces/Indirect/IndirectFitAnalysisTab.h

@@ -161,6 +161,7 @@ private:
   std::unique_ptr<IndirectFitOutputOptionsPresenter> m_outOptionsPresenter;
   IndirectFitPropertyBrowser *m_fitPropertyBrowser{nullptr};
   Mantid::API::IAlgorithm_sptr m_fittingAlgorithm;
+  TableDatasetIndex m_currentTableDatasetIndex;
 };
 
 } // namespace IDA

qt/scientific_interfaces/Indirect/IndirectFitDataPresenter.h

@@ -69,6 +69,7 @@ protected slots:
   void setModelFromSingleData();
   void setModelFromMultipleData();
   void showAddWorkspaceDialog();
+  virtual void handleSampleLoaded(const QString &);
 
   virtual void closeDialog();
 
@@ -100,7 +101,6 @@ protected:
 
 private slots:
   void addData();
-  void handleSampleLoaded(const QString &);
 
 private:
   virtual std::unique_ptr<IAddWorkspaceDialog>

qt/scientific_interfaces/Indirect/IndirectFitPlotPresenter.cpp

@@ -46,17 +46,7 @@ IndirectFitPlotPresenter::IndirectFitPlotPresenter(IndirectFittingModel *model,
       m_plotGuessInSeparateWindow(false),
       m_plotter(std::make_unique<IndirectPlotter>(pythonRunner)) {
   connect(m_view, SIGNAL(selectedFitDataChanged(TableDatasetIndex)), this,
-          SLOT(setActiveIndex(TableDatasetIndex)));
-  connect(m_view, SIGNAL(selectedFitDataChanged(TableDatasetIndex)), this,
-          SLOT(updateAvailableSpectra()));
-  connect(m_view, SIGNAL(selectedFitDataChanged(TableDatasetIndex)), this,
-          SLOT(updatePlots()));
-  connect(m_view, SIGNAL(selectedFitDataChanged(TableDatasetIndex)), this,
-          SLOT(updateFitRangeSelector()));
-  connect(m_view, SIGNAL(selectedFitDataChanged(TableDatasetIndex)), this,
-          SLOT(updateGuess()));
-  connect(m_view, SIGNAL(selectedFitDataChanged(TableDatasetIndex)), this,
-          SIGNAL(selectedFitDataChanged(TableDatasetIndex)));
+          SLOT(handleSelectedFitDataChanged(TableDatasetIndex)));
 
   connect(m_view, SIGNAL(plotSpectrumChanged(WorkspaceIndex)), this,
           SLOT(handlePlotSpectrumChanged(WorkspaceIndex)));
@@ -97,6 +87,16 @@ IndirectFitPlotPresenter::IndirectFitPlotPresenter(IndirectFittingModel *model,
   updateAvailableSpectra();
 }
 
+void IndirectFitPlotPresenter::handleSelectedFitDataChanged(
+    TableDatasetIndex index) {
+  setActiveIndex(index);
+  updateAvailableSpectra();
+  updatePlots();
+  updateFitRangeSelector();
+  updateGuess();
+  emit selectedFitDataChanged(index);
+}
+
 void IndirectFitPlotPresenter::handlePlotSpectrumChanged(
     WorkspaceIndex spectrum) {
   setActiveSpectrum(spectrum);

qt/scientific_interfaces/Indirect/IndirectFitPlotPresenter.h

@@ -84,6 +84,7 @@ private slots:
   void emitFitSingleSpectrum();
   void emitFWHMChanged(double minimum, double maximum);
   void setActiveSpectrum(WorkspaceIndex spectrum);
+  void handleSelectedFitDataChanged(TableDatasetIndex index);
 
 private:
   void disableAllDataSelection();

qt/scientific_interfaces/Indirect/IndirectFunctionBrowser/FQFunctionModel.cpp

@@ -25,8 +25,14 @@ QStringList widthFits = QStringList(
 QStringList eisfFits = QStringList(
     {"None", "EISFDiffCylinder", "EISFDiffSphere", "EISFDiffSphereAlkyl"});
 
-std::unordered_map<DataType, QStringList> dataTypeFitTypeMap(
-    {{DataType::WIDTH, widthFits}, {DataType::EISF, eisfFits}});
+QStringList combinedFits = QStringList(
+    {"None", "ChudleyElliot", "HallRoss", "FickDiffusion", "TeixeiraWater",
+     "EISFDiffCylinder", "EISFDiffSphere", "EISFDiffSphereAlkyl"});
+
+std::unordered_map<DataType, QStringList>
+    dataTypeFitTypeMap({{DataType::WIDTH, widthFits},
+                        {DataType::EISF, eisfFits},
+                        {DataType::ALL, combinedFits}});
 
 FQFunctionModel::FQFunctionModel() {
   for (auto functionName : widthFits + eisfFits) {

qt/scientific_interfaces/Indirect/JumpFit.cpp

@@ -40,9 +40,7 @@ JumpFit::JumpFit(QWidget *parent)
       m_jumpFittingModel, m_uiForm->fitDataView, m_uiForm->cbParameterType,
       m_uiForm->cbParameter, m_uiForm->lbParameterType, m_uiForm->lbParameter,
       templateBrowser));
-  connect(m_dataPresenter.get(), SIGNAL(spectrumChanged(WorkspaceIndex)),
-          m_plotPresenter.get(),
-          SLOT(handlePlotSpectrumChanged(WorkspaceIndex)));
+
   setSpectrumSelectionView(m_uiForm->svSpectrumView);
   setOutputOptionsView(m_uiForm->ovOutputOptionsView);
 

qt/scientific_interfaces/Indirect/JumpFitDataPresenter.cpp

@@ -25,9 +25,9 @@ JumpFitDataPresenter::JumpFitDataPresenter(
       m_lbParameterType(lbParameterType), m_lbParameter(lbParameter),
       m_jumpModel(model) {
   connect(view, SIGNAL(singleDataViewSelected()), this,
-          SLOT(showParameterComboBoxes()));
+          SLOT(handleSingleInputSelected()));
   connect(view, SIGNAL(multipleDataViewSelected()), this,
-          SLOT(hideParameterComboBoxes()));
+          SLOT(handleMultipleInputSelected()));
 
   connect(this, SIGNAL(requestedAddWorkspaceDialog()), this,
           SLOT(updateActiveDataIndex()));
@@ -37,20 +37,40 @@ JumpFitDataPresenter::JumpFitDataPresenter(
   connect(cbParameter, SIGNAL(currentIndexChanged(int)), this,
           SLOT(handleSpectrumSelectionChanged(int)));
 
-  connect(view, SIGNAL(sampleLoaded(const QString &)), this,
-          SLOT(updateAvailableParameterTypes()));
-  connect(view, SIGNAL(sampleLoaded(const QString &)), this,
-          SLOT(updateAvailableParameters()));
-  connect(view, SIGNAL(sampleLoaded(const QString &)), this,
-          SLOT(updateParameterSelectionEnabled()));
-  connect(view, SIGNAL(sampleLoaded(const QString &)), this,
-          SIGNAL(updateAvailableFitTypes()));
-
   updateParameterSelectionEnabled();
   m_notifier = Notifier<IFQFitObserver>();
   m_notifier.subscribe(fQTemplateBrowser);
 }
 
+void JumpFitDataPresenter::handleSampleLoaded(const QString &workspaceName) {
+  setModelWorkspace(workspaceName);
+  updateAvailableParameterTypes();
+  updateAvailableParameters();
+  updateParameterSelectionEnabled();
+  setModelSpectrum(0);
+  emit dataChanged();
+  updateRanges();
+  emit dataChanged();
+  emit updateAvailableFitTypes();
+}
+
+void JumpFitDataPresenter::handleMultipleInputSelected() {
+  hideParameterComboBoxes();
+  m_notifier.notify(
+      [](IFQFitObserver &obs) { obs.updateDataType(DataType::ALL); });
+}
+
+void JumpFitDataPresenter::handleSingleInputSelected() {
+  showParameterComboBoxes();
+  m_dataIndex = TableDatasetIndex{0};
+  std::string currentText = m_cbParameterType->currentText().toStdString();
+  auto dataType = m_cbParameterType->currentText() == QString("Width")
+                      ? DataType::WIDTH
+                      : DataType::EISF;
+  m_notifier.notify(
+      [&dataType](IFQFitObserver &obs) { obs.updateDataType(dataType); });
+}
+
 void JumpFitDataPresenter::hideParameterComboBoxes() {
   m_cbParameter->hide();
   m_cbParameterType->hide();
@@ -193,13 +213,8 @@ void JumpFitDataPresenter::setSingleModelSpectrum(int parameterIndex) {
 }
 
 void JumpFitDataPresenter::handleSpectrumSelectionChanged(int parameterIndex) {
-  // setSingleModelSpectrum(parameterIndex);
-  auto spectra =
-      m_jumpModel->getSpectra(m_dataIndex)[TableRowIndex{parameterIndex}];
-  m_notifier.notify([&parameterIndex](IFQFitObserver &obs) {
-    obs.spectrumChanged(parameterIndex);
-  });
-  emit spectrumChanged(spectra);
+  setSingleModelSpectrum(parameterIndex);
+  emit dataChanged();
 }
 
 void JumpFitDataPresenter::setModelSpectrum(int index) {

qt/scientific_interfaces/Indirect/JumpFitDataPresenter.h

@@ -47,10 +47,15 @@ private slots:
   void setSingleModelSpectrum(int index);
   void handleParameterTypeChanged(const QString &parameter);
   void handleSpectrumSelectionChanged(int parameterIndex);
+  void handleMultipleInputSelected();
+  void handleSingleInputSelected();
 
 signals:
   void spectrumChanged(WorkspaceIndex);
 
+protected slots:
+  void handleSampleLoaded(const QString &) override;
+
 private:
   void setAvailableParameters(const std::vector<std::string> &parameters);
   void addDataToModel(IAddWorkspaceDialog const *dialog) override;

qt/scientific_interfaces/Indirect/JumpFitModel.cpp

@@ -8,6 +8,11 @@
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/TextAxis.h"
+#include "MantidKernel/Logger.h"
+
+namespace {
+Mantid::Kernel::Logger logger("JumpFitModel");
+}
 
 using namespace Mantid::API;
 
@@ -273,9 +278,12 @@ void JumpFitModel::setActiveWidth(std::size_t widthIndex,
   if (parametersIt != m_jumpParameters.end() &&
       parametersIt->second.widthSpectra.size() > widthIndex) {
     const auto &widthSpectra = parametersIt->second.widthSpectra;
-    setSpectra(createSpectra(widthSpectra), dataIndex);
+
+    setSpectra(
+        createSpectra(std::vector<std::size_t>({widthSpectra[widthIndex]})),
+        dataIndex);
   } else
-    throw std::runtime_error("Invalid width index specified.");
+    logger.warning("Invalid width index specified.");
 }
 
 void JumpFitModel::setActiveEISF(std::size_t eisfIndex,
@@ -284,9 +292,11 @@ void JumpFitModel::setActiveEISF(std::size_t eisfIndex,
   if (parametersIt != m_jumpParameters.end() &&
       parametersIt->second.eisfSpectra.size() > eisfIndex) {
     const auto &eisfSpectra = parametersIt->second.eisfSpectra;
-    setSpectra(createSpectra(eisfSpectra), dataIndex);
+    setSpectra(
+        createSpectra(std::vector<std::size_t>({eisfSpectra[eisfIndex]})),
+        dataIndex);
   } else
-    throw std::runtime_error("Invalid EISF index specified.");
+    logger.warning("Invalid EISF index specified.");
 }
 
 void JumpFitModel::setFitType(const std::string &fitType) {