diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffFittingViewQtWidget.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffFittingViewQtWidget.h index 807371d281e994867b385608d7b54a8a9654a4cb..bb1ee8882eefd1b4116bba23b300512b9b0369a6 100644 --- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffFittingViewQtWidget.h +++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffFittingViewQtWidget.h @@ -180,6 +180,7 @@ private slots: void setBankIdComboBox(int idx) override; void setPeakPick(); void clearPeakList(); + void loadClicked(); void fitClicked(); void fitAllClicked(); void FittingRunNo(); diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFitting.ui b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFitting.ui index 1d7c25442d14fb9512bee85842514a242da3245c..f6b671791b24eb302b727e7a109453ba69706a89 100644 --- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFitting.ui +++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFitting.ui @@ -68,6 +68,13 @@ </property> </widget> </item> + <item> + <widget class="QPushButton" name="pushButton_load"> + <property name="text"> + <string>Load</string> + </property> + </widget> + </item> </layout> </item> <item row="4" column="0"> diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffFittingPresenter.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffFittingPresenter.h index ac7abcbde938e2798284a5d8f22d531a695e96b6..7eaa850752b87b36f050fa6bb64a98aff3521b8f 100644 --- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffFittingPresenter.h +++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffFittingPresenter.h @@ -44,6 +44,7 @@ public: enum Notification { Start, ///< Start and setup interface FittingRunNo, ///< Creates widgets and handles multi/run numbers + Load, ///< Load the focused file to the canvas FitPeaks, ///< Preforms single peak fits FitAllPeaks, ///< Preforms multiple runs in sequence single peak fits addPeaks, ///< Adds peak to the list diff --git a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffFittingViewQtWidget.cpp b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffFittingViewQtWidget.cpp index 2d9e66dfd5b5b77f3265faca5949c040c2148ad7..45860194027df1bdc21d82a4c3c1f5b80d4d7745 100644 --- a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffFittingViewQtWidget.cpp +++ b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffFittingViewQtWidget.cpp @@ -103,6 +103,8 @@ void EnggDiffFittingViewQtWidget::doSetup() { connect(m_ui.pushButton_fitting_browse_peaks, SIGNAL(released()), this, SLOT(browseClicked())); + connect(m_ui.pushButton_load, SIGNAL(released()), this, SLOT(loadClicked())); + connect(m_ui.pushButton_fit, SIGNAL(released()), this, SLOT(fitClicked())); connect(m_ui.pushButton_fit_all, SIGNAL(released()), this, @@ -171,6 +173,7 @@ void EnggDiffFittingViewQtWidget::saveSettings() const { void EnggDiffFittingViewQtWidget::enable(bool enable) { m_ui.pushButton_fitting_browse_run_num->setEnabled(enable); + m_ui.pushButton_load->setEnabled(enable); m_ui.lineEdit_pushButton_run_num->setEnabled(enable); m_ui.pushButton_fitting_browse_peaks->setEnabled(enable); m_ui.lineEdit_fitting_peaks->setEnabled(enable); @@ -214,6 +217,10 @@ EnggDiffFittingViewQtWidget::enggRunPythonCode(const std::string &pyCode) { return m_mainPythonRunner->enggRunPythonCode(pyCode); } +void EnggDiffFittingViewQtWidget::loadClicked() { + m_presenter->notify(IEnggDiffFittingPresenter::Load); +} + void EnggDiffFittingViewQtWidget::fitClicked() { m_presenter->notify(IEnggDiffFittingPresenter::FitPeaks); }