From 2f98a1ea4d02af6ce87c30e59b57a551ce4705a2 Mon Sep 17 00:00:00 2001
From: Ross Whitfield <whitfieldre@ornl.gov>
Date: Thu, 9 Jun 2016 09:38:23 -0400
Subject: [PATCH] Fix clang-format oon master
---
.../CustomInterfaces/src/Indirect/Iqt.cpp | 10 ++++---
.../CustomInterfaces/src/Indirect/IqtFit.cpp | 28 ++++++++++---------
2 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/MantidQt/CustomInterfaces/src/Indirect/Iqt.cpp b/MantidQt/CustomInterfaces/src/Indirect/Iqt.cpp
index d669a9fe0c8..d52f37de505 100644
--- a/MantidQt/CustomInterfaces/src/Indirect/Iqt.cpp
+++ b/MantidQt/CustomInterfaces/src/Indirect/Iqt.cpp
@@ -294,8 +294,10 @@ void Iqt::calculateBinning() {
// Get data from property table
const auto energyWidth = propsTable->getColumn("EnergyWidth")->cell<float>(0);
- const auto sampleBins = propsTable->getColumn("SampleOutputBins")->cell<int>(0);
- const auto resolutionBins = propsTable->getColumn("ResolutionBins")->cell<int>(0);
+ const auto sampleBins =
+ propsTable->getColumn("SampleOutputBins")->cell<int>(0);
+ const auto resolutionBins =
+ propsTable->getColumn("ResolutionBins")->cell<int>(0);
disconnect(m_dblManager, SIGNAL(valueChanged(QtProperty *, double)), this,
SLOT(updatePropertyValues(QtProperty *, double)));
@@ -315,12 +317,12 @@ void Iqt::calculateBinning() {
showMessageBox("Number of resolution bins is less than 5.\nResults may be "
"inaccurate.");
- IAlgorithm_sptr deleteAlg = AlgorithmManager::Instance().create("DeleteWorkspace");
+ IAlgorithm_sptr deleteAlg =
+ AlgorithmManager::Instance().create("DeleteWorkspace");
deleteAlg->initialize();
deleteAlg->setChild(true);
deleteAlg->setProperty("Workspace", paramTableName);
deleteAlg->execute();
-
}
void Iqt::loadSettings(const QSettings &settings) {
diff --git a/MantidQt/CustomInterfaces/src/Indirect/IqtFit.cpp b/MantidQt/CustomInterfaces/src/Indirect/IqtFit.cpp
index 087f8fba978..6867d479093 100644
--- a/MantidQt/CustomInterfaces/src/Indirect/IqtFit.cpp
+++ b/MantidQt/CustomInterfaces/src/Indirect/IqtFit.cpp
@@ -26,8 +26,8 @@ namespace CustomInterfaces {
namespace IDA {
IqtFit::IqtFit(QWidget *parent)
: IndirectDataAnalysisTab(parent), m_stringManager(NULL), m_iqtFTree(NULL),
- m_iqtFRangeManager(NULL), m_fixedProps(), m_iqtFInputWS(), m_iqtFOutputWS(),
- m_iqtFInputWSName(), m_ties() {
+ m_iqtFRangeManager(NULL), m_fixedProps(), m_iqtFInputWS(),
+ m_iqtFOutputWS(), m_iqtFInputWSName(), m_ties() {
m_uiForm.setupUi(parent);
}
@@ -205,8 +205,8 @@ void IqtFit::run() {
m_batchAlgoRunner->executeBatchAsync();
} else {
- m_baseName = constructBaseName(m_iqtFInputWSName.toStdString(), fitType, true,
- specMin, specMax);
+ m_baseName = constructBaseName(m_iqtFInputWSName.toStdString(), fitType,
+ true, specMin, specMax);
auto iqtFitMultiple = AlgorithmManager::Instance().create("IqtFitMultiple");
iqtFitMultiple->initialize();
iqtFitMultiple->setProperty("InputWorkspace",
@@ -567,8 +567,9 @@ void IqtFit::updatePlot() {
m_uiForm.ppPlot->getRangeSelector("IqtFitRange")
->setRange(range.first, range.second);
m_iqtFRangeManager->setRange(m_properties["StartX"], range.first,
- range.second);
- m_iqtFRangeManager->setRange(m_properties["EndX"], range.first, range.second);
+ range.second);
+ m_iqtFRangeManager->setRange(m_properties["EndX"], range.first,
+ range.second);
setDefaultParameters("Exponential1");
setDefaultParameters("Exponential2");
@@ -822,8 +823,8 @@ void IqtFit::singleFit() {
m_iqtFInputWSName.toStdString());
m_singleFitAlg->setProperty("WorkspaceIndex",
m_uiForm.spPlotSpectrum->text().toInt());
- m_singleFitAlg->setProperty("StartX",
- m_iqtFRangeManager->value(m_properties["StartX"]));
+ m_singleFitAlg->setProperty(
+ "StartX", m_iqtFRangeManager->value(m_properties["StartX"]));
m_singleFitAlg->setProperty("EndX",
m_iqtFRangeManager->value(m_properties["EndX"]));
m_singleFitAlg->setProperty(
@@ -867,7 +868,8 @@ void IqtFit::singleFitComplete(bool error) {
for (size_t i = 0; i < parNames.size(); ++i)
parameters[QString(parNames[i].c_str())] = parVals[i];
- m_iqtFRangeManager->setValue(m_properties["BackgroundA0"], parameters["f0.A0"]);
+ m_iqtFRangeManager->setValue(m_properties["BackgroundA0"],
+ parameters["f0.A0"]);
const int fitType = m_uiForm.cbFitType->currentIndex();
if (fitType != 2) {
@@ -924,10 +926,10 @@ void IqtFit::plotGuess(QtProperty *) {
CompositeFunction_sptr function = createFunction(true);
// Create the double* array from the input workspace
- const size_t binIndxLow =
- m_iqtFInputWS->binIndexOf(m_iqtFRangeManager->value(m_properties["StartX"]));
- const size_t binIndxHigh =
- m_iqtFInputWS->binIndexOf(m_iqtFRangeManager->value(m_properties["EndX"]));
+ const size_t binIndxLow = m_iqtFInputWS->binIndexOf(
+ m_iqtFRangeManager->value(m_properties["StartX"]));
+ const size_t binIndxHigh = m_iqtFInputWS->binIndexOf(
+ m_iqtFRangeManager->value(m_properties["EndX"]));
const size_t nData = binIndxHigh - binIndxLow;
std::vector<double> inputXData(nData);
--
GitLab