From b0a6d9ed8ec198274924da9b49e60a03bd39effe Mon Sep 17 00:00:00 2001
From: Anthony Lim <anthony.lim@stfc.ac.uk>
Date: Thu, 13 Jul 2017 15:37:55 +0100
Subject: [PATCH] refs #19987 control TFSaymm mode via data nalysis tab
---
.../Muon/MuonAnalysis.h | 3 -
.../Muon/MuonAnalysis.ui | 86 ++++++++-----------
.../Muon/MuonAnalysisFitFunctionPresenter.h | 4 -
.../Muon/MuonAnalysisHelper.h | 2 -
.../Muon/MuonAnalysisOptionTab.h | 6 +-
.../src/Muon/MuonAnalysis.cpp | 67 ++++-----------
.../Muon/MuonAnalysisFitFunctionPresenter.cpp | 12 +--
.../src/Muon/MuonAnalysisOptionTab.cpp | 15 +---
.../MuonAnalysisFitFunctionPresenterTest.h | 12 ---
.../MuonFitPropertyBrowser.h | 1 +
.../src/MuonFitPropertyBrowser.cpp | 7 ++
11 files changed, 66 insertions(+), 149 deletions(-)
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysis.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysis.h
index 823693bf1e6..546f67bf3c9 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysis.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysis.h
@@ -252,9 +252,6 @@ private slots:
/// Called when "enable multi fit" checkbox is turned on/off
void multiFitCheckboxChanged(int state);
- /// Called when "TF Asymmetry" checkbox is turned on/off
- void changedTFAsymmCheckbox(int state);
- void setTFAsymm(Muon::TFAsymmState);
/// Called when "overwrite" is changed
void updateDataPresenterOverwrite(int state);
// update norm
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysis.ui b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysis.ui
index 66b372aea07..1def9782983 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysis.ui
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysis.ui
@@ -1594,7 +1594,7 @@ p, li { white-space: pre-wrap; }
<string>Include</string>
</property>
<property name="textAlignment">
- <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+ <set>AlignCenter</set>
</property>
</column>
</widget>
@@ -2490,16 +2490,6 @@ p, li { white-space: pre-wrap; }
<layout class="QGridLayout" name="gridLayout_20">
<item row="3" column="0">
<layout class="QGridLayout" name="gridLayout_21">
- <item row="3" column="0">
- <widget class="QLabel" name="lblEnableMultiFit">
- <property name="toolTip">
- <string><html><head/><body><p>Enables the new UI for the &quot;Data Analysis&quot; tab introduced in Mantid 3.8.</p><p>In this mode, simultaneous fits of multiple datasets are possible.</p></body></html></string>
- </property>
- <property name="text">
- <string>Enable multiple fitting:</string>
- </property>
- </widget>
- </item>
<item row="0" column="2">
<widget class="QComboBox" name="plotCreation">
<property name="sizePolicy">
@@ -2530,6 +2520,30 @@ p, li { white-space: pre-wrap; }
</item>
</widget>
</item>
+ <item row="1" column="2">
+ <widget class="QComboBox" name="newPlotPolicy">
+ <item>
+ <property name="text">
+ <string>Create new window</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Use previous window</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_14">
+ <property name="toolTip">
+ <string><html><head/><body><p>Choose whether a new window will be created for each plot, or whether the same plot window will be reused each time.</p></body></html></string>
+ </property>
+ <property name="text">
+ <string>New plot policy:</string>
+ </property>
+ </widget>
+ </item>
<item row="0" column="3">
<spacer name="horizontalSpacer_23">
<property name="orientation">
@@ -2546,6 +2560,16 @@ p, li { white-space: pre-wrap; }
</property>
</spacer>
</item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="lblEnableMultiFit">
+ <property name="toolTip">
+ <string><html><head/><body><p>Enables the new UI for the &quot;Data Analysis&quot; tab introduced in Mantid 3.8.</p><p>In this mode, simultaneous fits of multiple datasets are possible.</p></body></html></string>
+ </property>
+ <property name="text">
+ <string>Enable multiple fitting:</string>
+ </property>
+ </widget>
+ </item>
<item row="0" column="0">
<widget class="QLabel" name="label_7">
<property name="toolTip">
@@ -2560,30 +2584,6 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
- <item row="1" column="2">
- <widget class="QComboBox" name="newPlotPolicy">
- <item>
- <property name="text">
- <string>Create new window</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Use previous window</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_14">
- <property name="toolTip">
- <string><html><head/><body><p>Choose whether a new window will be created for each plot, or whether the same plot window will be reused each time.</p></body></html></string>
- </property>
- <property name="text">
- <string>New plot policy:</string>
- </property>
- </widget>
- </item>
<item row="1" column="3">
<widget class="QStackedWidget" name="newPlotPolicyOptions">
<property name="currentIndex">
@@ -2625,7 +2625,7 @@ p, li { white-space: pre-wrap; }
<x>0</x>
<y>0</y>
<width>131</width>
- <height>22</height>
+ <height>23</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_KeepNPlots">
@@ -2682,20 +2682,6 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
- <item row="4" column="2">
- <widget class="QCheckBox" name="chkTFAsymm">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="lblTFAsymmetry">
- <property name="text">
- <string>TF Asymmetry</string>
- </property>
- </widget>
- </item>
</layout>
</item>
<item row="6" column="0">
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisFitFunctionPresenter.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisFitFunctionPresenter.h
index a26f1ea3cd5..e829ed1655c 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisFitFunctionPresenter.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisFitFunctionPresenter.h
@@ -47,8 +47,6 @@ public:
MantidQt::MantidWidgets::IFunctionBrowser *funcBrowser);
/// Toggle multiple fitting mode
void setMultiFitState(Muon::MultiFitState state);
- /// Toggle TF Asymmetry mode
- void setTFAsymmState(Muon::TFAsymmState state);
/// Set function in model (fit property browser)
void setFunctionInModel(const Mantid::API::IFunction_sptr &function);
@@ -86,8 +84,6 @@ private:
MantidQt::MantidWidgets::IFunctionBrowser *m_funcBrowser;
/// Whether multi fitting is disabled(function browser is hidden) or enabled
Muon::MultiFitState m_multiFitState;
- /// Whether TF Asymmetry is disabled or enabled
- Muon::TFAsymmState m_TFAsymmState;
};
} // namespace CustomInterfaces
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisHelper.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisHelper.h
index 988912f5392..13360a6f8fe 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisHelper.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisHelper.h
@@ -36,8 +36,6 @@ struct DatasetParams {
};
/// Whether multiple fitting is enabled or disabled
enum class MultiFitState { Enabled, Disabled };
-/// Whether TF Asymmetry is enabled or disabled
-enum class TFAsymmState { Enabled, Disabled };
}
namespace MuonAnalysisHelper {
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisOptionTab.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisOptionTab.h
index 97fb9ab9374..2edd6bebd11 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisOptionTab.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisOptionTab.h
@@ -85,8 +85,7 @@ public:
/// Return multiple fitting mode on/off selection
Muon::MultiFitState getMultiFitState() const;
- /// Return TF Asymmetry mode on/off selection
- Muon::TFAsymmState getTFAsymmState() const;
+
signals:
/// Update the plot because something has changed.
@@ -97,8 +96,7 @@ signals:
/// Emitted when multi fitting mode is turned on/off
void multiFitStateChanged(int state);
- /// Emitted when TF Asymmetry mode is turned on/off
- void TFAsymmStateChanged(int state);
+
private:
/// Default widget values
diff --git a/MantidQt/CustomInterfaces/src/Muon/MuonAnalysis.cpp b/MantidQt/CustomInterfaces/src/Muon/MuonAnalysis.cpp
index 692771f5284..afc86b350b6 100644
--- a/MantidQt/CustomInterfaces/src/Muon/MuonAnalysis.cpp
+++ b/MantidQt/CustomInterfaces/src/Muon/MuonAnalysis.cpp
@@ -531,13 +531,6 @@ Workspace_sptr MuonAnalysis::createAnalysisWorkspace(ItemType itemType,
itemType == ItemType::Group ? m_uiForm.groupTable : m_uiForm.pairTable;
options.groupPairName = table->item(tableRow, 0)->text().toStdString();
m_groupPairName = table->item(tableRow, 0)->text().toStdString();
- /* if (plotType == Muon::PlotType::Asymmetry &&
- m_dataLoader.isContainedIn(options.groupPairName,
- options.grouping.groupNames)) {
- setTFAsymm(Muon::TFAsymmState::Enabled); // turn TFAsymm on
- } else {
- setTFAsymm(Muon::TFAsymmState::Disabled); // turn TFAsymm off
- }*/
return m_dataLoader.createAnalysisWorkspace(loadedWS, options);
}
@@ -2174,9 +2167,6 @@ void MuonAnalysis::loadFittings() {
// Set multi fit mode on/off as appropriate
const auto &multiFitState = m_optionTab->getMultiFitState();
m_fitFunctionPresenter->setMultiFitState(multiFitState);
- // Set TF Asymmetry mode on/off as appropriate
- // const auto &TFAsymmState = m_optionTab->getTFAsymmState();
- //setTFAsymm(TFAsymmState);
}
/**
* Handle "groups" selected/deselected
@@ -2540,18 +2530,27 @@ void MuonAnalysis::changeTab(int newTabIndex) {
// repeat setting the fitting ranges as the above code can set them to an
// unwanted default value
setFittingRanges(xmin, xmax);
+ // work out if data is a group or pair
+ Muon::AnalysisOptions options(m_groupingHelper.parseGroupingTable());
+ m_uiForm.fitBrowser->setGroupNames(options.grouping.groupNames);
+ auto isItGroup = m_dataLoader.isContainedIn(m_groupPairName,
+ options.grouping.groupNames);
// make sure groups are not on if single fit
if (m_optionTab->getMultiFitState() == Muon::MultiFitState::Disabled) {
m_uiForm.fitBrowser->setSingleFitLabel(m_currentDataName.toStdString());
- } else {
- Muon::AnalysisOptions options(m_groupingHelper.parseGroupingTable());
- m_uiForm.fitBrowser->setGroupNames(options.grouping.groupNames);
- auto isItGroup = m_dataLoader.isContainedIn(m_groupPairName,
- options.grouping.groupNames);
- m_uiForm.fitBrowser->setAllGroupsOrPairs(isItGroup);
- m_uiForm.fitBrowser->setAllPeriods();
- }
- } else if (newTab == m_uiForm.ResultsTable) {
+ }
+ else {
+ m_uiForm.fitBrowser->setAllGroupsOrPairs(isItGroup);
+ m_uiForm.fitBrowser->setAllPeriods();
+ }
+ const int plotType = m_uiForm.frontPlotFuncs->currentIndex();
+ if(parsePlotType(m_uiForm.frontPlotFuncs) == PlotType::Asymmetry && isItGroup ){
+ m_uiForm.fitBrowser->setTFAsymm(true);
+ }
+ else {
+ m_uiForm.fitBrowser->setTFAsymm(false);
+ }
+ } else if (newTab == m_uiForm.ResultsTable) {
m_resultTableTab->refresh();
}
@@ -2600,8 +2599,6 @@ void MuonAnalysis::connectAutoUpdate() {
SLOT(updateCurrentPlotStyle()));
connect(m_optionTab, SIGNAL(multiFitStateChanged(int)), this,
SLOT(multiFitCheckboxChanged(int)));
- // connect(m_optionTab, SIGNAL(TFAsymmStateChanged(int)), this,
- // SLOT(changedTFAsymmCheckbox(int)));
}
/**
@@ -3160,34 +3157,6 @@ void MuonAnalysis::multiFitCheckboxChanged(int state) {
: Muon::MultiFitState::Disabled;
m_fitFunctionPresenter->setMultiFitState(multiFitState);
}
-/**
-* Called when the "TF Asymmetry" checkbox is changed (settings tab.)
-* Forward this to the fit function presenter.
-*/
-void MuonAnalysis::changedTFAsymmCheckbox(int state) {
- const Muon::TFAsymmState TFAsymmState = state == Qt::CheckState::Checked
- ? Muon::TFAsymmState::Enabled
- : Muon::TFAsymmState::Disabled;
- if (TFAsymmState == Muon::TFAsymmState::Enabled) {
- m_fitDataPresenter->setTFAsymmState(true);
- } else {
- m_fitDataPresenter->setTFAsymmState(false);
- }
- setTFAsymm(TFAsymmState);
-}
-/**
-* Called when the "TF Asymmetry" is needed (from home tab)
-* Forward this to the fit function presenter.
-*/
-void MuonAnalysis::setTFAsymm(Muon::TFAsymmState TFAsymmState) {
- // check the TFAsymm box
- if (TFAsymmState == Muon::TFAsymmState::Enabled) {
- m_uiForm.chkTFAsymm->setChecked(true);
- } else {
- m_uiForm.chkTFAsymm->setChecked(false);
- }
- m_fitFunctionPresenter->setTFAsymmState(TFAsymmState);
-}
/**
* Update the fit data presenter with current overwrite setting
* @param state :: [input] (not used) Setting of combo box
diff --git a/MantidQt/CustomInterfaces/src/Muon/MuonAnalysisFitFunctionPresenter.cpp b/MantidQt/CustomInterfaces/src/Muon/MuonAnalysisFitFunctionPresenter.cpp
index ef1adaf1962..f7982e51ddf 100644
--- a/MantidQt/CustomInterfaces/src/Muon/MuonAnalysisFitFunctionPresenter.cpp
+++ b/MantidQt/CustomInterfaces/src/Muon/MuonAnalysisFitFunctionPresenter.cpp
@@ -251,17 +251,7 @@ void MuonAnalysisFitFunctionPresenter::setMultiFitState(
m_fitBrowser->setMultiFittingMode(state == Muon::MultiFitState::Enabled);
m_multiFitState = state;
}
-/**
-* Turn TF Asymmetry mode on/off.
-* Turning it off hides the function browser and data selector so that
-* the fitting works as it used to pre-Mantid 3.8.
-* @param state :: [input] On/off for TF Asymmetry mode.
-*/
-void MuonAnalysisFitFunctionPresenter::setTFAsymmState(
- Muon::TFAsymmState state) {
- //m_fitBrowser->setTFAsymmMode(state == Muon::TFAsymmState::Enabled);
- m_TFAsymmState = state;
-}
+
/**
* Set the given function in the model (fit property browser).
*
diff --git a/MantidQt/CustomInterfaces/src/Muon/MuonAnalysisOptionTab.cpp b/MantidQt/CustomInterfaces/src/Muon/MuonAnalysisOptionTab.cpp
index 00b41a04f62..411c6b60a0b 100644
--- a/MantidQt/CustomInterfaces/src/Muon/MuonAnalysisOptionTab.cpp
+++ b/MantidQt/CustomInterfaces/src/Muon/MuonAnalysisOptionTab.cpp
@@ -72,7 +72,6 @@ void MuonAnalysisOptionTab::initLayout() {
m_autoSaver.registerWidget(m_uiForm.spinBoxNPlotsToKeep, "fitsToKeep", 0);
m_autoSaver.registerWidget(m_uiForm.chkEnableMultiFit, "enableMultiFit",
false);
- m_autoSaver.registerWidget(m_uiForm.chkTFAsymm, "enableTFAsymm", false);
m_autoSaver.endGroup();
// Set validators for double fields
@@ -135,8 +134,6 @@ void MuonAnalysisOptionTab::initLayout() {
SIGNAL(settingsTabUpdatePlot()));
connect(m_uiForm.chkEnableMultiFit, SIGNAL(stateChanged(int)), this,
SIGNAL(multiFitStateChanged(int)));
- connect(m_uiForm.chkTFAsymm, SIGNAL(stateChanged(int)), this,
- SIGNAL(TFAsymmStateChanged(int)));
}
/**
@@ -397,17 +394,7 @@ Muon::MultiFitState MuonAnalysisOptionTab::getMultiFitState() const {
return Muon::MultiFitState::Disabled;
}
}
-/**
-* Returns whether or not "enable TFAsymmetry" is set.
-* @returns whether the checkbox is ticked
-*/
-Muon::TFAsymmState MuonAnalysisOptionTab::getTFAsymmState() const {
- if (m_uiForm.chkTFAsymm->isChecked()) {
- return Muon::TFAsymmState::Enabled;
- } else {
- return Muon::TFAsymmState::Disabled;
- }
-}
+
}
}
}
diff --git a/MantidQt/CustomInterfaces/test/MuonAnalysisFitFunctionPresenterTest.h b/MantidQt/CustomInterfaces/test/MuonAnalysisFitFunctionPresenterTest.h
index 5b4d7050f1a..b9dbd08b501 100644
--- a/MantidQt/CustomInterfaces/test/MuonAnalysisFitFunctionPresenterTest.h
+++ b/MantidQt/CustomInterfaces/test/MuonAnalysisFitFunctionPresenterTest.h
@@ -65,7 +65,6 @@ public:
MOCK_CONST_METHOD0(getWorkspaceNamesToFit, std::vector<std::string>());
MOCK_METHOD1(userChangedDatasetIndex, void(int));
MOCK_METHOD1(setMultiFittingMode, void(bool));
- MOCK_METHOD1(setTFAsymmMode, void(bool));
MOCK_METHOD1(fitRawDataClicked, void(bool));
MOCK_METHOD0(doRemoveGuess, void());
MOCK_METHOD0(doPlotGuess, void());
@@ -224,17 +223,6 @@ public:
EXPECT_CALL(*m_fitBrowser, setMultiFittingMode(false)).Times(1);
m_presenter->setMultiFitState(MultiFitState::Disabled);
}
- void test_setTFAsymmMode_On() {
- EXPECT_CALL(*m_fitBrowser, setTFAsymmMode(true)).Times(1);
- m_presenter->setTFAsymmState(
- MantidQt::CustomInterfaces::Muon::TFAsymmState::Enabled);
- }
-
- void test_setTFAsymmMode_Off() {
- EXPECT_CALL(*m_fitBrowser, setTFAsymmMode(false)).Times(1);
- m_presenter->setTFAsymmState(
- MantidQt::CustomInterfaces::Muon::TFAsymmState::Disabled);
- }
void test_setFunctionInModel_multiFitOn_hasGuess() {
doTest_setFunctionInModel(MultiFitState::Enabled, true);
}
diff --git a/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/MuonFitPropertyBrowser.h b/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/MuonFitPropertyBrowser.h
index 0fd3f6a52dd..6df96a866b9 100644
--- a/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/MuonFitPropertyBrowser.h
+++ b/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/MuonFitPropertyBrowser.h
@@ -106,6 +106,7 @@ public:
QStringList getChosenGroups() const;
QStringList getChosenPeriods() const;
+ void setTFAsymm(bool state);
/// Clear list of selected groups
void clearChosenGroups() const;
void setAllGroups();
diff --git a/MantidQt/MantidWidgets/src/MuonFitPropertyBrowser.cpp b/MantidQt/MantidWidgets/src/MuonFitPropertyBrowser.cpp
index ac2fb2e0d18..efbeb9813ad 100644
--- a/MantidQt/MantidWidgets/src/MuonFitPropertyBrowser.cpp
+++ b/MantidQt/MantidWidgets/src/MuonFitPropertyBrowser.cpp
@@ -282,6 +282,9 @@ void MuonFitPropertyBrowser::init() {
// Update tooltips when function structure is (or might've been) changed in
// any way
connect(this, SIGNAL(functionChanged()), SLOT(updateStructureTooltips()));
+ //disable TFAsymm mode by default
+ setTFAsymmMode(TFAsymmMode);
+
}
// Set up the execution of the muon fit menu
void MuonFitPropertyBrowser::executeFitMenu(const QString &item) {
@@ -1638,6 +1641,10 @@ void MuonFitPropertyBrowser::setGroupNames(
std::vector<std::string> groupNames) {
m_groupsList = groupNames;
}
+void MuonFitPropertyBrowser::setTFAsymm(bool state) {
+ m_boolManager->setValue(m_TFAsymmMode, state);
+
+}
} // MantidQt
} // API
--
GitLab