From def1dd2cdcf3600971b21383ccfa0a310b28dfbc Mon Sep 17 00:00:00 2001
From: Anthony Lim <anthony.lim@stfc.ac.uk>
Date: Tue, 26 Jun 2018 12:51:32 +0100
Subject: [PATCH] refs #21718 fixed muon TFAsymm GUI build failures
---
qt/scientific_interfaces/Muon/MuonAnalysis.cpp | 4 ++--
qt/scientific_interfaces/Muon/MuonAnalysis.h | 3 +--
qt/widgets/common/src/MuonFitPropertyBrowser.cpp | 8 +++++---
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/qt/scientific_interfaces/Muon/MuonAnalysis.cpp b/qt/scientific_interfaces/Muon/MuonAnalysis.cpp
index 21bc1f409e5..f01a22cf54f 100644
--- a/qt/scientific_interfaces/Muon/MuonAnalysis.cpp
+++ b/qt/scientific_interfaces/Muon/MuonAnalysis.cpp
@@ -2046,7 +2046,7 @@ void MuonAnalysis::selectMultiPeak(const QString &wsName) {
* MUSRauto_E.tmp
*/
void MuonAnalysis::selectMultiPeakNoUpdate(
- const QString &wsName, const boost::optional<QString> &filePath) {
+ const QString &wsName) {
disableAllTools();
if (!plotExists(wsName)) {
plotSpectrum(wsName);
@@ -2084,7 +2084,7 @@ void MuonAnalysis::selectMultiPeakNoUpdate(
* @param wsName Name of the selected workspace
*/
void MuonAnalysis::selectMultiPeakNoUpdate(const QString &wsName) {
- selectMultiPeakNoUpdate(wsName, boost::optional<QString>());
+ selectMultiPeakNoUpdate(wsName);
}
/**
diff --git a/qt/scientific_interfaces/Muon/MuonAnalysis.h b/qt/scientific_interfaces/Muon/MuonAnalysis.h
index 86fd16c9a46..71d6885a3cb 100644
--- a/qt/scientific_interfaces/Muon/MuonAnalysis.h
+++ b/qt/scientific_interfaces/Muon/MuonAnalysis.h
@@ -210,8 +210,7 @@ private slots:
/// Enable PP tool for the plot of the given WS overload to take just a ws
void selectMultiPeak(const QString &wsName);
/// Enable PP tool for the plot of the given WS and optional filepath
- void selectMultiPeakNoUpdate(const QString &wsName,
- const boost::optional<QString> &filePath);
+ void selectMultiPeakNoUpdate(const QString &wsName);
/// Enable PP tool for the plot of the given WS overload to take just a ws
void selectMultiPeakNoUpdate(const QString &wsName);
diff --git a/qt/widgets/common/src/MuonFitPropertyBrowser.cpp b/qt/widgets/common/src/MuonFitPropertyBrowser.cpp
index 3e68c8c7023..54b6c6879ed 100644
--- a/qt/widgets/common/src/MuonFitPropertyBrowser.cpp
+++ b/qt/widgets/common/src/MuonFitPropertyBrowser.cpp
@@ -872,7 +872,8 @@ void MuonFitPropertyBrowser::showEvent(QShowEvent *e) {
* @param ws :: The workspace
*/
bool MuonFitPropertyBrowser::isWorkspaceValid(Workspace_sptr ws) const {
- QString workspaceName(QString::fromStdString(ws->getName()));
+ auto fsad = ws->getName();
+ QString workspaceName(QString::fromStdString(ws->getName()));
if ((workspaceName.contains("_Raw")) ||
(workspaceName.contains("MuonAnalysis")))
@@ -1035,7 +1036,7 @@ void MuonFitPropertyBrowser::finishAfterSimultaneousFit(
* After a TF simultaneous fit, insert extra information into parameters table
* (i.e. what runs, groups, periods "f0", "f1" etc were)
* and group the output workspaces
-* @param fitAlg :: [input] Pointer to fit algorithm that just finished
+* @param alg :: [input] Pointer to fit algorithm that just finished
* @param baseName :: [input] The common name of the workspaces of interest
*/
void MuonFitPropertyBrowser::finishAfterTFSimultaneousFit(
@@ -1047,7 +1048,7 @@ void MuonFitPropertyBrowser::finishAfterTFSimultaneousFit(
std::string paramTableName = baseName + "_Parameters";
const auto paramTable = ads.retrieveWS<ITableWorkspace>(paramTableName);
if (paramTable) {
- for (int i = 0; i < wsList.size(); i++) {
+ for (size_t i = 0; i < wsList.size(); i++) {
const std::string suffix = boost::lexical_cast<std::string>(i);
const auto wsName = wsList[i];
@@ -1306,6 +1307,7 @@ void MuonFitPropertyBrowser::updateTFPlot() {
/**
* Adds an extra widget in between the fit buttons and the browser
* @param widget :: [input] Pointer to widget to add
+ * @param functionBrowser :: [input] pointer to the function browser
*/
void MuonFitPropertyBrowser::addFitBrowserWidget(
QWidget *widget,
--
GitLab