diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MultiDatasetFit.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MultiDatasetFit.h index bec5f57db2599f032bbc41307c9bdbee46ff881f..713f050368f631119a3811507f602eed5bc85cfd 100644 --- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MultiDatasetFit.h +++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MultiDatasetFit.h @@ -119,8 +119,7 @@ private: void fitSimultaneous(); void removeOldOutput(); void showParameterPlot(); - void setFitStatusInfo(const QString &status, const QString &iterations, - const QString &chiSquared); + void setFitStatusInfo(const QString &status, const QString &chiSquared); void clearFitStatusInfo(); /// The form generated by Qt Designer diff --git a/MantidQt/CustomInterfaces/src/MultiDatasetFit/MultiDatasetFit.cpp b/MantidQt/CustomInterfaces/src/MultiDatasetFit/MultiDatasetFit.cpp index cfa05aeb4268c1cc2816bc51daabba286720b1c3..23cb0c4052c90e45403e442164d7040364f6911b 100644 --- a/MantidQt/CustomInterfaces/src/MultiDatasetFit/MultiDatasetFit.cpp +++ b/MantidQt/CustomInterfaces/src/MultiDatasetFit/MultiDatasetFit.cpp @@ -411,10 +411,8 @@ void MultiDatasetFit::editLocalParameterValues(const QString &parName) { /// Set the fit status info string after a fit is finished. /// @param status :: The Fit's status property. -/// @param iterations :: The number of iterations completed. /// @param chiSquared :: The chi squared value returned by Fit. void MultiDatasetFit::setFitStatusInfo(const QString &status, - const QString &iterations, const QString &chiSquared) { auto text(status); text.replace("\n", "<br>"); @@ -422,9 +420,8 @@ void MultiDatasetFit::setFitStatusInfo(const QString &status, if (status != "success") { color = "red"; } - m_fitStatus = - QString("Status: <span style='color:%2'>%1</span><br>Iterations: " - "%3<br>Chi Squared: %4").arg(text, color, iterations, chiSquared); + m_fitStatus = QString("Status: <span style='color:%2'>%1</span>" + "<br>Chi Squared: %4").arg(text, color, chiSquared); showInfo(""); } @@ -449,11 +446,9 @@ void MultiDatasetFit::finishFit(bool error) { updateParameters(*fun); auto status = QString::fromStdString(algorithm->getPropertyValue("OutputStatus")); - auto iterations = QString::fromStdString( - algorithm->getPropertyValue("OutputNIterations")); auto chiSquared = QString::fromStdString( algorithm->getPropertyValue("OutputChi2overDoF")); - setFitStatusInfo(status, iterations, chiSquared); + setFitStatusInfo(status, chiSquared); } else { // After a sequential fit auto paramsWSName = diff --git a/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/FitPropertyBrowser.h b/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/FitPropertyBrowser.h index 83ac79e3c458b8d67098ca9d908c7800f405536a..c6b61085adb8a61d159aeb5303bc5a180276ef33 100644 --- a/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/FitPropertyBrowser.h +++ b/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/FitPropertyBrowser.h @@ -292,7 +292,7 @@ signals: void errorsEnabled(bool enabled); void fitUndone(); void functionLoaded(const QString &); - void fitResultsChanged(const QString &status, const QString &iterations); + void fitResultsChanged(const QString &status); protected slots: /// Get the registered function names @@ -363,7 +363,7 @@ private slots: /// Update structure tooltips for all functions void updateStructureTooltips(); /// Display the status string returned from Fit - void showFitResultStatus(const QString &status, const QString &iterations); + void showFitResultStatus(const QString &status); /// Clear the Fit status display void clearFitResultStatus(); diff --git a/MantidQt/MantidWidgets/src/FitPropertyBrowser.cpp b/MantidQt/MantidWidgets/src/FitPropertyBrowser.cpp index b5d0127530392940916d1aff44ceee7d63ced5ed..83d4c1f3c5b6ac358ae37086397e2913d9ee97c8 100644 --- a/MantidQt/MantidWidgets/src/FitPropertyBrowser.cpp +++ b/MantidQt/MantidWidgets/src/FitPropertyBrowser.cpp @@ -464,9 +464,8 @@ void FitPropertyBrowser::initBasicLayout(QWidget *w) { m_status = new QLabel("Status:", w); m_status->hide(); - connect(this, SIGNAL(fitResultsChanged(const QString &, const QString &)), - this, SLOT(showFitResultStatus(const QString &, const QString &)), - Qt::QueuedConnection); + connect(this, SIGNAL(fitResultsChanged(const QString &)), this, + SLOT(showFitResultStatus(const QString &)), Qt::QueuedConnection); layout->addLayout(buttonsLayout); layout->addWidget(m_tip); @@ -1628,9 +1627,7 @@ void FitPropertyBrowser::finishHandle(const Mantid::API::IAlgorithm *alg) { } // Update Status string auto status = QString::fromStdString(alg->getPropertyValue("OutputStatus")); - auto iterations = - QString::fromStdString(alg->getPropertyValue("OutputNIterations")); - emit fitResultsChanged(status, iterations); + emit fitResultsChanged(status); // update Quality string if (m_displayActionQuality->isChecked()) { double quality = alg->getProperty("OutputChi2overDoF"); @@ -1652,9 +1649,7 @@ void FitPropertyBrowser::finishHandle(const Mantid::API::IAlgorithm *alg) { /// Display the status string returned from Fit /// @param status :: A status string as returned by OutputStatus Fit property. -/// @param iterations :: Number of iterations taken by Fit. -void FitPropertyBrowser::showFitResultStatus(const QString &status, - const QString &iterations) { +void FitPropertyBrowser::showFitResultStatus(const QString &status) { auto text(status); text.replace("\n", "<br>"); QString color("green"); @@ -1662,8 +1657,7 @@ void FitPropertyBrowser::showFitResultStatus(const QString &status, color = "red"; } m_status->setText( - QString("Status: <span style='color:%2'>%1</span><br>Iterations: %3") - .arg(text, color, iterations)); + QString("Status: <span style='color:%2'>%1</span>").arg(text, color)); m_status->show(); }