diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenter.cpp
index 12f2dbf499917e9dd2d58d98dca175e99c0a2e6f..daebeaaee5283fea293dcbc02545c0ebcdd544d9 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenter.cpp
@@ -9,16 +9,15 @@ namespace MantidQt {
namespace CustomInterfaces {
/** Constructor
-* @param view :: The view we are handling
-* @param group :: The group on the parent tab this belongs to
-*/
+ * @param view :: The view we are handling
+ * @param group :: The group on the parent tab this belongs to
+ */
EventPresenter::EventPresenter(IEventView *view)
: m_view(view), m_sliceType(SliceType::None) {
m_view->subscribe(this);
}
-void EventPresenter::acceptMainPresenter(
- IReflBatchPresenter *mainPresenter) {
+void EventPresenter::acceptMainPresenter(IReflBatchPresenter *mainPresenter) {
m_mainPresenter = mainPresenter;
}
@@ -116,5 +115,5 @@ void EventPresenter::notifySliceTypeChanged(SliceType newSliceType) {
m_sliceType = newSliceType;
setSlicingFromView();
}
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenter.h
index 78b16f0bf700cd60937ba3010407c472f04a998b..227fc74e494086c6f3e796cee0889417f3d7fbc1 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenter.h
@@ -2,10 +2,10 @@
#define MANTID_ISISREFLECTOMETRY_REFLEVENTPRESENTER_H
#include "../../DllConfig.h"
+#include "../../Reduction/Slicing.h"
#include "IEventPresenter.h"
-#include "IReflBatchPresenter.h"
#include "IEventView.h"
-#include "../../Reduction/Slicing.h"
+#include "IReflBatchPresenter.h"
namespace MantidQt {
namespace CustomInterfaces {
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenterFactory.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenterFactory.h
index 391499d0929f7d44d4b0ada5192d996ca0b6c49f..bceca1fd37ae5706cc8a73ef844b5d99e027970b 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenterFactory.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenterFactory.h
@@ -1,9 +1,9 @@
#ifndef MANTID_ISISREFLECTOMETRY_REFLEVENTPRESENTERFACTORY_H
#define MANTID_ISISREFLECTOMETRY_REFLEVENTPRESENTERFACTORY_H
#include "DllConfig.h"
-#include "IEventView.h"
-#include "IEventPresenter.h"
#include "EventPresenter.h"
+#include "IEventPresenter.h"
+#include "IEventView.h"
#include <memory>
namespace MantidQt {
@@ -15,6 +15,6 @@ public:
return std::make_unique<EventPresenter>(view);
}
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_REFLEVENTPRESENTERFACTORY_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventView.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventView.cpp
index afe3b8fc58bf4033f86e91d6e258c6bce85ad38e..774ee2b68eea2e837cc422225063aec172b2fe9c 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventView.cpp
@@ -5,9 +5,9 @@ namespace MantidQt {
namespace CustomInterfaces {
/** Constructor
-* @param group :: [input] The group on the parent tab this belongs to
-* @param parent :: [input] The parent of this widget
-*/
+ * @param group :: [input] The group on the parent tab this belongs to
+ * @param parent :: [input] The parent of this widget
+ */
EventView::EventView(QWidget *parent) {
UNUSED_ARG(parent);
initLayout();
@@ -61,8 +61,7 @@ void EventView::onCustomChanged(QString const &listOfSlices) {
m_notifyee->notifyCustomSliceValuesChanged(listOfSlices.toStdString());
}
-void EventView::onLogValuesChanged(
- QString const &listOfSliceBreakpoints) {
+void EventView::onLogValuesChanged(QString const &listOfSliceBreakpoints) {
m_notifyee->notifyLogSliceBreakpointsChanged(
listOfSliceBreakpoints.toStdString());
}
@@ -158,17 +157,13 @@ void EventView::showCustomBreakpointsInvalid() {
showAsInvalid(*m_ui.customEdit);
}
-void EventView::showCustomBreakpointsValid() {
- showAsValid(*m_ui.customEdit);
-}
+void EventView::showCustomBreakpointsValid() { showAsValid(*m_ui.customEdit); }
void EventView::showLogBreakpointsInvalid() {
showAsInvalid(*m_ui.logValueEdit);
}
-void EventView::showLogBreakpointsValid() {
- showAsValid(*m_ui.logValueEdit);
-}
+void EventView::showLogBreakpointsValid() { showAsValid(*m_ui.logValueEdit); }
int EventView::uniformSliceCount() const {
return m_ui.uniformEvenEdit->value();
@@ -186,9 +181,7 @@ void EventView::disableSliceTypeSelection() {
m_sliceTypeRadioButtons.disable();
}
-void EventView::enableSliceTypeSelection() {
- m_sliceTypeRadioButtons.enable();
-}
+void EventView::enableSliceTypeSelection() { m_sliceTypeRadioButtons.enable(); }
void EventView::toggleUniform(bool isChecked) {
if (isChecked)
@@ -216,4 +209,4 @@ void EventView::toggleDisabledSlicing(bool isChecked) {
}
} // namespace CustomInterfaces
-} // namespace Mantid
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventView.h
index d08c3da6a5a7e50fb1d2e9b9937a3743cac49790..eb5d1dea4d6de2a0c5f431d9a187dbe7c358b988 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventView.h
@@ -2,8 +2,8 @@
#define MANTID_CUSTOMINTERFACES_QTREFLEVENTVIEW_H_
#include "IEventView.h"
-#include "ui_EventWidget.h"
#include "QWidgetGroup.h"
+#include "ui_EventWidget.h"
#include <memory>
namespace MantidQt {
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/IEventPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/IEventPresenter.h
index c0b8f93a2311ee68468c477bac45c66d65313858..4f6c5c428a1d8af4677a85e56a740589574eff47 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/IEventPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/IEventPresenter.h
@@ -1,8 +1,8 @@
#ifndef MANTID_ISISREFLECTOMETRY_IREFLEVENTPRESENTER_H
#define MANTID_ISISREFLECTOMETRY_IREFLEVENTPRESENTER_H
-#include <string>
#include "../../IReflBatchPresenter.h"
+#include <string>
namespace MantidQt {
namespace CustomInterfaces {
@@ -39,7 +39,7 @@ enum class SliceType { None, UniformEven, Uniform, Custom, LogValue };
class IEventPresenter {
public:
virtual ~IEventPresenter() = default;
- virtual void acceptMainPresenter(IReflBatchPresenter *mainPresenter) =0;
+ virtual void acceptMainPresenter(IReflBatchPresenter *mainPresenter) = 0;
virtual void onReductionPaused() = 0;
virtual void onReductionResumed() = 0;
};
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.cpp
index f9a048fc0506dcde5b1f583c5d77140e4f65e2c2..2c8947ef687709159ab35e611aaaadc0e3b4e548 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.cpp
@@ -1,6 +1,6 @@
#include "ExperimentPresenter.h"
-#include "../../Reduction/ValidatePerThetaDefaults.h"
#include "../../Reduction/ParseReflectometryStrings.h"
+#include "../../Reduction/ValidatePerThetaDefaults.h"
#include "PerThetaDefaultsTableValidator.h"
namespace MantidQt {
@@ -116,5 +116,5 @@ void ExperimentPresenter::notifySummationTypeChanged() {
Experiment const &ExperimentPresenter::experiment() const {
return m_model.get();
}
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.h
index db365edbb04c26a988299c26404b0fa0cf626f39..79596cdece72f5d5444ccbd377935dc48523eff1 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.h
@@ -2,12 +2,12 @@
#define MANTID_ISISREFLECTOMETRY_EXPERIMENTPRESENTER_H
#include "../../DllConfig.h"
-#include "IReflBatchPresenter.h"
-#include "IExperimentView.h"
-#include "IExperimentPresenter.h"
-#include "PerThetaDefaultsTableValidationError.h"
#include "../../Reduction/Experiment.h"
#include "../../ValidationResult.h"
+#include "IExperimentPresenter.h"
+#include "IExperimentView.h"
+#include "IReflBatchPresenter.h"
+#include "PerThetaDefaultsTableValidationError.h"
#include <boost/optional.hpp>
namespace MantidQt {
@@ -82,13 +82,13 @@ private:
ExperimentValidationResult updateModelFromView();
void showValidationResult(ExperimentValidationResult const &result);
- void showPerThetaTableErrors(
- PerThetaDefaultsTableValidationError const &errors);
+ void
+ showPerThetaTableErrors(PerThetaDefaultsTableValidationError const &errors);
IExperimentView *m_view;
boost::optional<Experiment> m_model;
double m_thetaTolerance;
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_EXPERIMENTPRESENTER_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenterFactory.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenterFactory.h
index 6c464e289fd79c8e31f56e87b8a842a5c44be239..af96a4f33562873b95fc3cd222b805b819ba2a49 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenterFactory.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenterFactory.h
@@ -1,9 +1,9 @@
#ifndef MANTID_ISISREFLECTOMETRY_EXPERIMENTPRESENTERFACTORY_H
#define MANTID_ISISREFLECTOMETRY_EXPERIMENTPRESENTERFACTORY_H
#include "DllConfig.h"
-#include "IExperimentView.h"
-#include "IExperimentPresenter.h"
#include "ExperimentPresenter.h"
+#include "IExperimentPresenter.h"
+#include "IExperimentView.h"
#include <memory>
namespace MantidQt {
@@ -21,6 +21,6 @@ public:
private:
double m_thetaTolerance;
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_EXPERIMENTPRESENTERFACTORY_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentView.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentView.cpp
index f821f2a84e3be24a42b273526f8aa506835e3359..b957d8d40598442d3f67be8e1c88f94af9391f6a 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentView.cpp
@@ -1,15 +1,15 @@
#include "ExperimentView.h"
-#include <boost/algorithm/string/join.hpp>
#include "MantidQtWidgets/Common/AlgorithmHintStrategy.h"
#include <QMessageBox>
#include <QScrollBar>
+#include <boost/algorithm/string/join.hpp>
namespace MantidQt {
namespace CustomInterfaces {
/** Constructor
-* @param parent :: [input] The parent of this widget
-*/
+ * @param parent :: [input] The parent of this widget
+ */
ExperimentView::ExperimentView(
Mantid::API::IAlgorithm_sptr algorithmForTooltips, QWidget *parent) {
UNUSED_ARG(parent);
@@ -352,10 +352,11 @@ std::string toCsv(std::vector<T> const &values, StringConverter toString) {
QString ExperimentView::messageFor(
std::vector<MissingInstrumentParameterValue> const &missingValues) const {
- auto missingNamesCsv =
- toCsv(missingValues,
- [](const MissingInstrumentParameterValue &missingValue)
- -> std::string { return missingValue.parameterName(); });
+ auto missingNamesCsv = toCsv(
+ missingValues,
+ [](const MissingInstrumentParameterValue &missingValue) -> std::string {
+ return missingValue.parameterName();
+ });
return QString::fromStdString(missingNamesCsv) +
QString(missingValues.size() == 1 ? " is" : " are") +
@@ -383,8 +384,8 @@ QLineEdit &ExperimentView::stitchOptionsLineEdit() const {
}
/** Creates hints for 'Stitch1DMany'
-* @param hints :: Hints as a map
-*/
+ * @param hints :: Hints as a map
+ */
void ExperimentView::createStitchHints(
const std::vector<MantidWidgets::Hint> &hints) {
@@ -515,4 +516,4 @@ void showOptionLoadErrors(
std::vector<MissingInstrumentParameterValue> const &missingValues);
} // namespace CustomInterfaces
-} // namespace Mantid
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentView.h
index c7ab835760cfc9d3442e99177679ac9c14bd88d8..a58bb44a29e28b0971a4066605c72d3647b0d646 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentView.h
@@ -2,12 +2,12 @@
#define MANTID_CUSTOMINTERFACES_EXPERIMENTVIEW_H_
#include "DllConfig.h"
-#include "ui_ExperimentWidget.h"
#include "IExperimentView.h"
#include "MantidQtWidgets/Common/HintingLineEdit.h"
-#include <memory>
+#include "ui_ExperimentWidget.h"
#include <QCheckBox>
#include <QShortcut>
+#include <memory>
namespace MantidQt {
namespace CustomInterfaces {
@@ -36,25 +36,25 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class MANTIDQT_ISISREFLECTOMETRY_DLL ExperimentView
- : public QWidget,
- public IExperimentView {
+class MANTIDQT_ISISREFLECTOMETRY_DLL ExperimentView : public QWidget,
+ public IExperimentView {
Q_OBJECT
public:
- ExperimentView(Mantid::API::IAlgorithm_sptr algorithmForTooltips, QWidget *parent = nullptr);
+ ExperimentView(Mantid::API::IAlgorithm_sptr algorithmForTooltips,
+ QWidget *parent = nullptr);
void subscribe(ExperimentViewSubscriber *notifyee) override;
void
createStitchHints(const std::vector<MantidWidgets::Hint> &hints) override;
std::string getAnalysisMode() const override;
- void setAnalysisMode(std::string const& analysisMode) override;
+ void setAnalysisMode(std::string const &analysisMode) override;
std::string getSummationType() const override;
- void setSummationType(std::string const& summationType) override;
+ void setSummationType(std::string const &summationType) override;
std::string getReductionType() const override;
- void setReductionType(std::string const& reductionType) override;
+ void setReductionType(std::string const &reductionType) override;
std::vector<std::array<std::string, 8>> getPerAngleOptions() const override;
void showPerAngleOptionsAsInvalid(int row, int column) override;
@@ -69,7 +69,7 @@ public:
void setTransmissionEndOverlap(double end) override;
std::string getPolarisationCorrectionType() const override;
- void setPolarisationCorrectionType(std::string const& type) override;
+ void setPolarisationCorrectionType(std::string const &type) override;
double getCRho() const override;
void setCRho(double cRho) override;
double getCAlpha() const override;
@@ -80,11 +80,12 @@ public:
void setCPp(double cPp) override;
std::string getStitchOptions() const override;
- void setStitchOptions(std::string const& stitchOptions) override;
+ void setStitchOptions(std::string const &stitchOptions) override;
void showOptionLoadErrors(
std::vector<InstrumentParameterTypeMissmatch> const &typeErrors,
- std::vector<MissingInstrumentParameterValue> const &missingValues) override;
+ std::vector<MissingInstrumentParameterValue> const &missingValues)
+ override;
void showAllPerAngleOptionsAsValid() override;
@@ -108,8 +109,8 @@ public slots:
void onPerAngleDefaultsChanged(int row, int column);
private:
- void initializeTableItems(QTableWidget& table);
- void initializeTableRow(QTableWidget& table, int row);
+ void initializeTableItems(QTableWidget &table);
+ void initializeTableRow(QTableWidget &table, int row);
QString messageFor(
std::vector<MissingInstrumentParameterValue> const &missingValues) const;
QString messageFor(const InstrumentParameterTypeMissmatch &typeError) const;
@@ -139,17 +140,17 @@ private:
void setText(QLineEdit &lineEdit, boost::optional<int> value);
void setText(QLineEdit &lineEdit, boost::optional<double> value);
void setText(QLineEdit &lineEdit, boost::optional<std::string> const &value);
- std::string textFromCell(QTableWidgetItem const* maybeNullItem) const;
-// void setText(QTableWidget &table, std::string const &propertyName,
-// double value);
-// void setText(QTableWidget &table, std::string const &propertyName,
-// boost::optional<double> value);
-// void setText(QTableWidget &table, std::string const &propertyName,
-// boost::optional<std::string> value);
-// void setText(QTableWidget &table, std::string const &propertyName,
-// std::string const &value);
-// void setText(QTableWidget &table, std::string const &propertyName,
-// const QString &value);
+ std::string textFromCell(QTableWidgetItem const *maybeNullItem) const;
+ // void setText(QTableWidget &table, std::string const &propertyName,
+ // double value);
+ // void setText(QTableWidget &table, std::string const &propertyName,
+ // boost::optional<double> value);
+ // void setText(QTableWidget &table, std::string const &propertyName,
+ // boost::optional<std::string> value);
+ // void setText(QTableWidget &table, std::string const &propertyName,
+ // std::string const &value);
+ // void setText(QTableWidget &table, std::string const &propertyName,
+ // const QString &value);
void setChecked(QCheckBox &checkBox, bool checked);
std::string getText(QLineEdit const &lineEdit) const;
std::string getText(QComboBox const &box) const;
@@ -161,7 +162,7 @@ private:
ExperimentViewSubscriber *m_notifyee;
};
-} // namespace Mantid
} // namespace CustomInterfaces
+} // namespace MantidQt
#endif /* MANTID_CUSTOMINTERFACES_EXPERIMENTVIEW_H_ */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/IExperimentPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/IExperimentPresenter.h
index 22cf73e74b63256384b0abcf02ba142cf07421be..742998508687c6994d50b90be6e3f87fe96b7ef9 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/IExperimentPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/IExperimentPresenter.h
@@ -1,8 +1,8 @@
#ifndef MANTID_ISISREFLECTOMETRY_IEXPERIMENTPRESENTER_H
#define MANTID_ISISREFLECTOMETRY_IEXPERIMENTPRESENTER_H
-#include <string>
#include "../../IReflBatchPresenter.h"
+#include <string>
namespace MantidQt {
namespace CustomInterfaces {
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/IExperimentView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/IExperimentView.h
index 1984b75d374b2734c2bd37383b1ca5913f1fcd9c..fb1bdc5198064822b605302a908ab10b7cfae941 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/IExperimentView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/IExperimentView.h
@@ -113,6 +113,6 @@ public:
virtual ~IExperimentView() = default;
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IEXPERIMENTVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/InvalidDefaultsError.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/InvalidDefaultsError.cpp
index e4f5d725ec3b8d3cd9ea9aae116a8fec37a20a02..9302a968cd5b957d5f9a1953752053cf969ee482 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/InvalidDefaultsError.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/InvalidDefaultsError.cpp
@@ -12,5 +12,5 @@ std::vector<int> const &InvalidDefaultsError::invalidColumns() const {
}
int InvalidDefaultsError::row() const { return m_row; }
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/InvalidDefaultsError.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/InvalidDefaultsError.h
index 13d53c9e2f0e4e7ffaa8559258f057da406d2877..77e75d899e3a57ed9b35852c023ddfdec493ff4f 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/InvalidDefaultsError.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/InvalidDefaultsError.h
@@ -1,7 +1,7 @@
#ifndef MANTID_ISISREFLECTOMETRY_INVALIDDEFAULTSERROR_H
#define MANTID_ISISREFLECTOMETRY_INVALIDDEFAULTSERROR_H
-#include <vector>
#include "../../DllConfig.h"
+#include <vector>
namespace MantidQt {
namespace CustomInterfaces {
@@ -17,6 +17,6 @@ private:
int m_row;
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_INVALIDDEFAULTSERROR_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidationError.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidationError.cpp
index 585cea9b8eb0fca00479897faaf7458cbfd1896e..c3b7db024853347df2364d9d069ff9d0738b040d 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidationError.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidationError.cpp
@@ -18,5 +18,5 @@ boost::optional<ThetaValuesValidationError>
PerThetaDefaultsTableValidationError::fullTableError() const {
return m_fullTableError;
}
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidationError.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidationError.h
index 9abf2e7a5e016284d4cbd730cb6e1e7719578771..317679b5a0146d9b4fbb48d88d9a8707292655b4 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidationError.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidationError.h
@@ -1,9 +1,9 @@
#ifndef MANTID_ISISREFLECTOMETRY_PERTHETADEFAULTSTABLEVALIDATIONERROR_H
#define MANTID_ISISREFLECTOMETRY_PERTHETADEFAULTSTABLEVALIDATIONERROR_H
-#include <vector>
+#include "../../Reduction/PerThetaDefaults.h"
#include "InvalidDefaultsError.h"
#include "ThetaValuesValidationError.h"
-#include "../../Reduction/PerThetaDefaults.h"
+#include <vector>
namespace MantidQt {
namespace CustomInterfaces {
@@ -11,7 +11,8 @@ namespace CustomInterfaces {
class PerThetaDefaultsTableValidationError {
public:
PerThetaDefaultsTableValidationError(
- std::vector<InvalidDefaultsError> validationErrors, boost::optional<ThetaValuesValidationError> fullTableError);
+ std::vector<InvalidDefaultsError> validationErrors,
+ boost::optional<ThetaValuesValidationError> fullTableError);
std::vector<InvalidDefaultsError> const &errors() const;
boost::optional<ThetaValuesValidationError> fullTableError() const;
@@ -21,6 +22,6 @@ private:
boost::optional<ThetaValuesValidationError> m_fullTableError;
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_PERTHETADEFAULTSTABLEVALIDATIONERROR_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.cpp
index b02d5960df9f5a1fa69154bd4da9cc01d28a1011..22a14d2069f961da3cc43221f91f7912b2de305b 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.cpp
@@ -68,11 +68,11 @@ bool PerThetaDefaultsTableValidator::hasUniqueThetas(
double tolerance) const {
sortInPlaceWildcardsFirstThenByTheta(perThetaDefaults);
auto thetasWithinTolerance =
- [tolerance](PerThetaDefaults const &lhs, PerThetaDefaults const &rhs)
- -> bool {
- return std::abs(lhs.thetaOrWildcard().get() -
- rhs.thetaOrWildcard().get()) < tolerance;
- };
+ [tolerance](PerThetaDefaults const &lhs,
+ PerThetaDefaults const &rhs) -> bool {
+ return std::abs(lhs.thetaOrWildcard().get() - rhs.thetaOrWildcard().get()) <
+ tolerance;
+ };
return std::adjacent_find(perThetaDefaults.cbegin() + wildcardCount,
perThetaDefaults.cend(),
thetasWithinTolerance) == perThetaDefaults.cend();
@@ -82,21 +82,22 @@ int PerThetaDefaultsTableValidator::countWildcards(
std::vector<PerThetaDefaults> const &perThetaDefaults) const {
return static_cast<int>(
std::count_if(perThetaDefaults.cbegin(), perThetaDefaults.cend(),
- [](PerThetaDefaults const &defaults)
- -> bool { return defaults.isWildcard(); }));
+ [](PerThetaDefaults const &defaults) -> bool {
+ return defaults.isWildcard();
+ }));
}
void PerThetaDefaultsTableValidator::sortInPlaceWildcardsFirstThenByTheta(
std::vector<PerThetaDefaults> &perThetaDefaults) const {
- auto thetaLessThan =
- [](PerThetaDefaults const &lhs, PerThetaDefaults const &rhs) -> bool {
- if (lhs.isWildcard())
- return true;
- else if (rhs.isWildcard())
- return false;
- else
- return lhs.thetaOrWildcard().get() < rhs.thetaOrWildcard().get();
- };
+ auto thetaLessThan = [](PerThetaDefaults const &lhs,
+ PerThetaDefaults const &rhs) -> bool {
+ if (lhs.isWildcard())
+ return true;
+ else if (rhs.isWildcard())
+ return false;
+ else
+ return lhs.thetaOrWildcard().get() < rhs.thetaOrWildcard().get();
+ };
std::sort(perThetaDefaults.begin(), perThetaDefaults.end(), thetaLessThan);
}
@@ -106,5 +107,5 @@ void PerThetaDefaultsTableValidator::appendThetaErrorForAllRows(
for (auto row = 0u; row < rowCount; ++row)
validationErrors.emplace_back(row, std::vector<int>({0}));
}
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.h
index de3ef5050d2ce2b867c05b53c1a6197e6c7ba56b..ec93fd21c57a32a9345a660210f6826a3eda0462 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.h
@@ -1,8 +1,8 @@
#ifndef MANTID_ISISREFLECTOMETRY_PERTHETADEFAULTSTABLEVALIDATOR_H
#define MANTID_ISISREFLECTOMETRY_PERTHETADEFAULTSTABLEVALIDATOR_H
-#include "PerThetaDefaultsTableValidationError.h"
#include "../../Reduction/PerThetaDefaults.h"
#include "../../ValidationResult.h"
+#include "PerThetaDefaultsTableValidationError.h"
namespace MantidQt {
namespace CustomInterfaces {
@@ -37,6 +37,6 @@ public:
std::vector<InvalidDefaultsError> &validationErrors,
std::size_t rowCount) const;
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_PERTHETADEFAULTSTABLEVALIDATOR_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ThetaValuesValidationError.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ThetaValuesValidationError.h
index c52af0093cbf08dca598b2fb8192458c0c7c1f48..dfcee539f8a34468d1cd728aa34189dac24be4ed 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ThetaValuesValidationError.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ThetaValuesValidationError.h
@@ -3,11 +3,7 @@
namespace MantidQt {
namespace CustomInterfaces {
-enum class ThetaValuesValidationError {
- MultipleWildcards,
- NonUniqueTheta
-};
-
-}
+enum class ThetaValuesValidationError { MultipleWildcards, NonUniqueTheta };
}
+} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_THETAVALUESVALIDATIONERROR_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/IInstrumentPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/IInstrumentPresenter.h
index f02fe1b06d68b17bb6ef2e8ba535fe807b2a822b..0c97f4fdc7eb04f97af59d465218942cc1217f0f 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/IInstrumentPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/IInstrumentPresenter.h
@@ -1,8 +1,8 @@
#ifndef MANTID_ISISREFLECTOMETRY_IINSTRUMENTPRESENTER_H
#define MANTID_ISISREFLECTOMETRY_IINSTRUMENTPRESENTER_H
-#include <string>
#include "../../IReflBatchPresenter.h"
+#include <string>
namespace MantidQt {
namespace CustomInterfaces {
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/IInstrumentView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/IInstrumentView.h
index 9763748efa0ec547167519267f85fa9f97c159ea..4c43465f6b96cc02337863ac1753f6f1c93cd2df 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/IInstrumentView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/IInstrumentView.h
@@ -50,6 +50,6 @@ public:
virtual ~IInstrumentView() = default;
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IINSTRUMENTVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.cpp
index 3f150f8e71c6d4862d10da571af26b2af785b487..c8c5817d2180196c87f45bba25f78551bdce58f4 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.cpp
@@ -3,15 +3,14 @@
namespace MantidQt {
namespace CustomInterfaces {
-InstrumentPresenter::InstrumentPresenter(IInstrumentView *view)
- : m_view(view) {
+InstrumentPresenter::InstrumentPresenter(IInstrumentView *view) : m_view(view) {
m_view->subscribe(this);
notifySettingsChanged();
}
void InstrumentPresenter::notifySettingsChanged() {
- //auto validationResult = updateModelFromView();
- //showValidationResult(validationResult);
-}
-}
+ // auto validationResult = updateModelFromView();
+ // showValidationResult(validationResult);
}
+} // namespace CustomInterfaces
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.h
index d8514ad297f8a8bfb9d33c2f5970bb06bd83f343..9200616825c13cfc6e8c2f6bd059fc4ccaaa75cc 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.h
@@ -2,9 +2,9 @@
#define MANTID_ISISREFLECTOMETRY_INSTRUMENTPRESENTER_H
#include "../../DllConfig.h"
-#include "IReflBatchPresenter.h"
-#include "IInstrumentView.h"
#include "IInstrumentPresenter.h"
+#include "IInstrumentView.h"
+#include "IReflBatchPresenter.h"
#include <boost/optional.hpp>
namespace MantidQt {
@@ -46,6 +46,6 @@ public:
private:
IInstrumentView *m_view;
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_INSTRUMENTPRESENTER_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenterFactory.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenterFactory.h
index 312aebc59aabba5d24f1b20328209a8c3c336c1f..eedb13d6a7105d293e9edea0ae9a9e002d49099d 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenterFactory.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenterFactory.h
@@ -1,8 +1,8 @@
#ifndef MANTID_ISISREFLECTOMETRY_INSTRUMENTPRESENTERFACTORY_H
#define MANTID_ISISREFLECTOMETRY_INSTRUMENTPRESENTERFACTORY_H
#include "DllConfig.h"
-#include "IInstrumentView.h"
#include "IInstrumentPresenter.h"
+#include "IInstrumentView.h"
#include "InstrumentPresenter.h"
#include <memory>
@@ -17,6 +17,6 @@ public:
return std::make_unique<InstrumentPresenter>(view);
}
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_INSTRUMENTPRESENTERFACTORY_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentView.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentView.cpp
index ad8c947cb7202e33cddd67bd6eca546d0cbfc32f..a76a894d974f4801c31fa4cac32e5d0e28c23f9d 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentView.cpp
@@ -1,14 +1,14 @@
#include "InstrumentView.h"
-#include <boost/algorithm/string/join.hpp>
#include <QMessageBox>
#include <QScrollBar>
+#include <boost/algorithm/string/join.hpp>
namespace MantidQt {
namespace CustomInterfaces {
/** Constructor
-* @param parent :: [input] The parent of this widget
-*/
+ * @param parent :: [input] The parent of this widget
+ */
InstrumentView::InstrumentView(
Mantid::API::IAlgorithm_sptr algorithmForTooltips, QWidget *parent) {
UNUSED_ARG(parent);
@@ -23,9 +23,7 @@ void InstrumentView::subscribe(InstrumentViewSubscriber *notifyee) {
/**
Initialise the Interface
*/
-void InstrumentView::initLayout() {
- m_ui.setupUi(this);
-}
+void InstrumentView::initLayout() { m_ui.setupUi(this); }
void InstrumentView::connectSettingsChange(QLineEdit &edit) {
connect(&edit, SIGNAL(textChanged(QString const &)), this,
@@ -168,14 +166,15 @@ std::string toCsv(std::vector<T> const &values, StringConverter toString) {
QString InstrumentView::messageFor(
std::vector<MissingInstrumentParameterValue> const &missingValues) const {
- auto missingNamesCsv =
- toCsv(missingValues,
- [](const MissingInstrumentParameterValue &missingValue)
- -> std::string { return missingValue.parameterName(); });
+ auto missingNamesCsv = toCsv(
+ missingValues,
+ [](const MissingInstrumentParameterValue &missingValue) -> std::string {
+ return missingValue.parameterName();
+ });
return QString::fromStdString(missingNamesCsv) +
QString(missingValues.size() == 1 ? " is" : " are") +
" not set in the instrument parameter file but should be.\n";
}
} // namespace CustomInterfaces
-} // namespace Mantid
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentView.h
index 8d3406ceb26e0f47617692cade0cc4acee88fae2..90a181759d47fa44df88deca2429e7b63216d455 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentView.h
@@ -35,12 +35,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class MANTIDQT_ISISREFLECTOMETRY_DLL InstrumentView
- : public QWidget,
- public IInstrumentView {
+class MANTIDQT_ISISREFLECTOMETRY_DLL InstrumentView : public QWidget,
+ public IInstrumentView {
Q_OBJECT
public:
- InstrumentView(Mantid::API::IAlgorithm_sptr algorithmForTooltips, QWidget *parent = nullptr);
+ InstrumentView(Mantid::API::IAlgorithm_sptr algorithmForTooltips,
+ QWidget *parent = nullptr);
void subscribe(InstrumentViewSubscriber *notifyee) override;
void disableAll() override;
@@ -85,7 +85,7 @@ private:
InstrumentViewSubscriber *m_notifyee;
};
-} // namespace Mantid
} // namespace CustomInterfaces
+} // namespace MantidQt
#endif /* MANTID_CUSTOMINTERFACES_INSTRUMENTVIEW_H_ */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/JobsViewUpdater.h b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/JobsViewUpdater.h
index 8942445e900f43ed7563dc96d6a50091f8dee6a8..bc566eaa1aa2411b98cce7140c3e57e78ddbe221 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/JobsViewUpdater.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/JobsViewUpdater.h
@@ -61,7 +61,7 @@ std::vector<MantidQt::MantidWidgets::Batch::Cell> cellsFromRow(Row const &row) {
MantidQt::MantidWidgets::Batch::Cell(
MantidWidgets::optionsToString(row.reductionOptions()))});
}
-} // unnamed
+} // namespace
class JobsViewUpdater {
public:
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenter.cpp
index c2ba2939271ce7b9d6ecd3188a898fc66c354057..502203bf01d4dda937a9f76ee964625a8df84de4 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenter.cpp
@@ -15,11 +15,10 @@
namespace MantidQt {
namespace CustomInterfaces {
-RunsTablePresenter::RunsTablePresenter(IRunsTableView *view,
- std::vector<std::string> const &instruments,
- double thetaTolerance,
- WorkspaceNamesFactory workspaceNamesFactory,
- Jobs jobs)
+RunsTablePresenter::RunsTablePresenter(
+ IRunsTableView *view, std::vector<std::string> const &instruments,
+ double thetaTolerance, WorkspaceNamesFactory workspaceNamesFactory,
+ Jobs jobs)
: m_view(view), m_instruments(instruments), m_model(std::move(jobs)),
m_thetaTolerance(thetaTolerance), m_jobViewUpdater(m_view->jobs()),
m_workspaceNameFactory(std::move(workspaceNamesFactory)) {
@@ -144,7 +143,9 @@ void RunsTablePresenter::notifyInsertGroupRequested() {
}
}
-void RunsTablePresenter::appendEmptyGroupInModel() { appendEmptyGroup(m_model); }
+void RunsTablePresenter::appendEmptyGroupInModel() {
+ appendEmptyGroup(m_model);
+}
void RunsTablePresenter::appendEmptyGroupInView() {
auto location = m_view->jobs().appendChildRowOf(
@@ -167,7 +168,9 @@ void RunsTablePresenter::insertEmptyGroupInView(int beforeGroup) {
applyGroupStylingToRow(location);
}
-void RunsTablePresenter::notifyExpandAllRequested() { m_view->jobs().expandAll(); }
+void RunsTablePresenter::notifyExpandAllRequested() {
+ m_view->jobs().expandAll();
+}
void RunsTablePresenter::notifyCollapseAllRequested() {
m_view->jobs().collapseAll();
@@ -187,7 +190,8 @@ void RunsTablePresenter::clearInvalidCellStyling(
clearInvalidCellStyling(cell);
}
-void RunsTablePresenter::clearInvalidCellStyling(MantidWidgets::Batch::Cell &cell) {
+void RunsTablePresenter::clearInvalidCellStyling(
+ MantidWidgets::Batch::Cell &cell) {
cell.setIconFilePath("");
cell.setBorderColor("darkGrey");
}
@@ -199,7 +203,8 @@ void RunsTablePresenter::showAllCellsOnRowAsValid(
m_view->jobs().setCellsAt(itemIndex, cells);
}
-void RunsTablePresenter::applyInvalidCellStyling(MantidWidgets::Batch::Cell &cell) {
+void RunsTablePresenter::applyInvalidCellStyling(
+ MantidWidgets::Batch::Cell &cell) {
cell.setIconFilePath(":/invalid.png");
cell.setBorderColor("darkRed");
}
@@ -234,8 +239,7 @@ void RunsTablePresenter::updateRowField(
auto const rowIndex = rowOf(itemIndex);
auto rowValidationResult = validateRow(m_model, m_workspaceNameFactory,
cellTextFromViewAt(itemIndex));
- updateRow(m_model, groupIndex, rowIndex,
- rowValidationResult.validElseNone());
+ updateRow(m_model, groupIndex, rowIndex, rowValidationResult.validElseNone());
if (rowValidationResult.isValid()) {
showAllCellsOnRowAsValid(itemIndex);
} else {
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenter.h
index 259479a140716d7aa3b6f8cd9f4e35b36645cf90..5959ceb1022f14b57ed8844e6d24f22d5bbaa2a4 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenter.h
@@ -36,10 +36,11 @@ namespace CustomInterfaces {
class MANTIDQT_ISISREFLECTOMETRY_DLL RunsTablePresenter
: public RunsTableViewSubscriber {
public:
- RunsTablePresenter(IRunsTableView *view, std::vector<std::string> const &instruments,
- double thetaTolerance,
- WorkspaceNamesFactory workspaceNamesFactory,
- Jobs reductionJobs);
+ RunsTablePresenter(IRunsTableView *view,
+ std::vector<std::string> const &instruments,
+ double thetaTolerance,
+ WorkspaceNamesFactory workspaceNamesFactory,
+ Jobs reductionJobs);
void notifyProcessRequested() override;
void notifyPauseRequested() override;
@@ -122,6 +123,6 @@ private:
JobsViewUpdater m_jobViewUpdater;
WorkspaceNamesFactory m_workspaceNameFactory;
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_RUNSTABLEPRESENTER_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenterFactory.h b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenterFactory.h
index a147467b88f69c23f76301009e7a7c66c689be72..823ade05192b87a26174a58912889759e5fe1a41 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenterFactory.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenterFactory.h
@@ -23,11 +23,10 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
#ifndef MANTID_CUSTOMINTERFACES_BATCHPRESENTERFACTORY_H_
#define MANTID_CUSTOMINTERFACES_BATCHPRESENTERFACTORY_H_
#include "DllConfig.h"
+#include "RunsTablePresenter.h"
#include <memory>
#include <string>
#include <vector>
-#include <string>
-#include "RunsTablePresenter.h"
namespace MantidQt {
namespace CustomInterfaces {
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTableView.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTableView.cpp
index 2c1c2f1b91b9d21686a7111749addea205eeb3e7..1b1e5f0f6789e7486c353cc13b18695737fe7449 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTableView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTableView.cpp
@@ -8,7 +8,7 @@
namespace MantidQt {
namespace CustomInterfaces {
RunsTableView::RunsTableView(std::vector<std::string> const &instruments,
- int defaultInstrumentIndex)
+ int defaultInstrumentIndex)
: m_jobs(), m_instruments(instruments) {
m_ui.setupUi(this);
m_jobs =
@@ -89,7 +89,7 @@ void RunsTableView::showAlgorithmPropertyHintsInOptionsColumn() {
}
QAction *RunsTableView::addToolbarItem(std::string const &iconPath,
- std::string const &description) {
+ std::string const &description) {
return m_ui.toolBar->addAction(QIcon(QString::fromStdString(iconPath)),
QString::fromStdString(description));
}
@@ -132,7 +132,9 @@ void RunsTableView::subscribe(RunsTableViewSubscriber *notifyee) {
SLOT(onProcessPressed(bool)));
}
-void RunsTableView::setProgress(int value) { m_ui.progressBar->setValue(value); }
+void RunsTableView::setProgress(int value) {
+ m_ui.progressBar->setValue(value);
+}
void RunsTableView::onExpandAllGroupsPressed(bool) {
m_notifyee->notifyExpandAllRequested();
@@ -142,7 +144,9 @@ void RunsTableView::onCollapseAllGroupsPressed(bool) {
m_notifyee->notifyCollapseAllRequested();
}
-void RunsTableView::onProcessPressed(bool) { m_notifyee->notifyProcessRequested(); }
+void RunsTableView::onProcessPressed(bool) {
+ m_notifyee->notifyProcessRequested();
+}
void RunsTableView::onPausePressed(bool) { m_notifyee->notifyPauseRequested(); }
void RunsTableView::onInsertRowPressed(bool) {
@@ -161,23 +165,31 @@ void RunsTableView::onDeleteGroupPressed(bool) {
m_notifyee->notifyDeleteGroupRequested();
}
-void RunsTableView::onCopyPressed(bool) { m_notifyee->notifyCopyRowsRequested(); }
+void RunsTableView::onCopyPressed(bool) {
+ m_notifyee->notifyCopyRowsRequested();
+}
void RunsTableView::onCutPressed(bool) { m_notifyee->notifyCutRowsRequested(); }
-void RunsTableView::onPastePressed(bool) { m_notifyee->notifyPasteRowsRequested(); }
+void RunsTableView::onPastePressed(bool) {
+ m_notifyee->notifyPasteRowsRequested();
+}
-RunsTableViewFactory::RunsTableViewFactory(std::vector<std::string> const &instruments)
+RunsTableViewFactory::RunsTableViewFactory(
+ std::vector<std::string> const &instruments)
: m_instruments(instruments) {}
RunsTableView *RunsTableViewFactory::operator()() const {
return new RunsTableView(m_instruments, defaultInstrumentFromConfig());
}
-int RunsTableViewFactory::indexOfElseFirst(std::string const &instrument) const {
- return indexOf(m_instruments, [&instrument](std::string const &inst) {
- return instrument == inst;
- }).get_value_or(0);
+int RunsTableViewFactory::indexOfElseFirst(
+ std::string const &instrument) const {
+ return indexOf(m_instruments,
+ [&instrument](std::string const &inst) {
+ return instrument == inst;
+ })
+ .get_value_or(0);
}
int RunsTableViewFactory::defaultInstrumentFromConfig() const {
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTableView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTableView.h
index 6b7f246104bcef80fa317d922b5500da5a11f0c1..76d1c95b0140c2523f03dc7b61865f5c52796f56 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTableView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTableView.h
@@ -23,11 +23,11 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
#ifndef MANTID_CUSTOMINTERFACES_RUNSTABLEVIEW_H_
#define MANTID_CUSTOMINTERFACES_RUNSTABLEVIEW_H_
#include "DllConfig.h"
-#include <memory>
-#include <vector>
-#include "MantidQtWidgets/Common/Batch/JobTreeView.h"
#include "IRunsTableView.h"
+#include "MantidQtWidgets/Common/Batch/JobTreeView.h"
#include "ui_RunsTableView.h"
+#include <memory>
+#include <vector>
namespace MantidQt {
namespace CustomInterfaces {
@@ -87,6 +87,6 @@ public:
private:
std::vector<std::string> m_instruments;
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_RUNSTABLEVIEW_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/IReflBatchView.h b/qt/scientific_interfaces/ISISReflectometry/IReflBatchView.h
index cb3540944b543cd9d45cc7b12cb4744120507722..262c1211e7e5b0ab669f934fd0c1872d35c8c30b 100644
--- a/qt/scientific_interfaces/ISISReflectometry/IReflBatchView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/IReflBatchView.h
@@ -41,13 +41,13 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
class IReflBatchView {
public:
- virtual IReflRunsTabView* runs() const = 0;
- virtual IEventView* eventHandling() const = 0;
- virtual IReflSaveTabView* save() const = 0;
- virtual IExperimentView* experiment() const = 0;
+ virtual IReflRunsTabView *runs() const = 0;
+ virtual IEventView *eventHandling() const = 0;
+ virtual IReflSaveTabView *save() const = 0;
+ virtual IExperimentView *experiment() const = 0;
virtual IInstrumentView *instrument() const = 0;
virtual ~IReflBatchView() = default;
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IREFLBATCHVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/IReflMainWindowPresenter.h b/qt/scientific_interfaces/ISISReflectometry/IReflMainWindowPresenter.h
index 462e97131e8a5013fe4e247606610024aaff3373..542a8b8f4ee4c3265605a2d98721aab5ac91c356 100644
--- a/qt/scientific_interfaces/ISISReflectometry/IReflMainWindowPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/IReflMainWindowPresenter.h
@@ -1,9 +1,9 @@
#ifndef MANTID_ISISREFLECTOMETRY_IREFLMAINWINDOWPRESENTER_H
#define MANTID_ISISREFLECTOMETRY_IREFLMAINWINDOWPRESENTER_H
+#include "IReflMainWindowView.h"
#include "MantidQtWidgets/Common/DataProcessorUI/OptionsQMap.h"
#include "MantidQtWidgets/Common/DataProcessorUI/TreeData.h"
-#include "IReflMainWindowView.h"
#include <string>
namespace MantidQt {
@@ -39,7 +39,7 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class IReflMainWindowPresenter : public ReflMainWindowSubscriber {
public:
virtual std::string runPythonAlgorithm(const std::string &pythonCode) = 0;
-// virtual void setInstrumentName(const std::string &instName) const = 0;
+ // virtual void setInstrumentName(const std::string &instName) const = 0;
virtual bool isProcessing() const = 0;
virtual ~IReflMainWindowPresenter() = default;
};
diff --git a/qt/scientific_interfaces/ISISReflectometry/IReflMainWindowView.h b/qt/scientific_interfaces/ISISReflectometry/IReflMainWindowView.h
index 4a88df4789e79af1f87c5757aa49128d11229a6d..73680599463ae8051dc56b98b4a98e27198eadd1 100644
--- a/qt/scientific_interfaces/ISISReflectometry/IReflMainWindowView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/IReflMainWindowView.h
@@ -1,9 +1,9 @@
#ifndef MANTID_ISISREFLECTOMETRY_IREFLMAINWINDOWVIEW_H
#define MANTID_ISISREFLECTOMETRY_IREFLMAINWINDOWVIEW_H
+#include "IReflBatchView.h"
#include <string>
#include <vector>
-#include "IReflBatchView.h"
namespace MantidQt {
namespace CustomInterfaces {
diff --git a/qt/scientific_interfaces/ISISReflectometry/IReflRunsTabPresenter.h b/qt/scientific_interfaces/ISISReflectometry/IReflRunsTabPresenter.h
index 2d37ec7108d6e1e0e57a9130e1abc06a12bc9de8..040e62267cbeea9385df5bd3c7cdf71f9052efdf 100644
--- a/qt/scientific_interfaces/ISISReflectometry/IReflRunsTabPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/IReflRunsTabPresenter.h
@@ -1,8 +1,8 @@
#ifndef MANTID_ISISREFLECTOMETRY_IREFLRUNSTABPRESENTER_H
#define MANTID_ISISREFLECTOMETRY_IREFLRUNSTABPRESENTER_H
-#include "MantidQtWidgets/Common/DataProcessorUI/OptionsMap.h"
#include "IReflBatchPresenter.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/OptionsMap.h"
namespace MantidQt {
namespace CustomInterfaces {
diff --git a/qt/scientific_interfaces/ISISReflectometry/IReflRunsTabView.h b/qt/scientific_interfaces/ISISReflectometry/IReflRunsTabView.h
index 112ddc99256fd1f8add3ab13b2042d84e1c0409b..e9c5331c0de30d215bba057fd4543055453bbb13 100644
--- a/qt/scientific_interfaces/ISISReflectometry/IReflRunsTabView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/IReflRunsTabView.h
@@ -1,14 +1,13 @@
#ifndef MANTID_ISISREFLECTOMETRY_IREFLRUNSTABVIEW_H
#define MANTID_ISISREFLECTOMETRY_IREFLRUNSTABVIEW_H
+#include "DllConfig.h"
+#include "GUI/RunsTable/IRunsTableView.h"
+#include "MantidQtWidgets/Common/ProgressableView.h"
#include <boost/shared_ptr.hpp>
#include <set>
#include <string>
#include <vector>
-#include <boost/shared_ptr.hpp>
-#include "GUI/RunsTable/IRunsTableView.h"
-#include "DllConfig.h"
-#include "MantidQtWidgets/Common/ProgressableView.h"
namespace MantidQt {
diff --git a/qt/scientific_interfaces/ISISReflectometry/IReflSaveTabPresenter.h b/qt/scientific_interfaces/ISISReflectometry/IReflSaveTabPresenter.h
index 87dd7c2319eb8f74ea398e558bce260d086644a7..5e70e250fdb04b93ce61acd40ca09e572d84f64c 100644
--- a/qt/scientific_interfaces/ISISReflectometry/IReflSaveTabPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/IReflSaveTabPresenter.h
@@ -1,7 +1,7 @@
#ifndef MANTID_ISISREFLECTOMETRY_IREFLSAVETABPRESENTER_H
#define MANTID_ISISREFLECTOMETRY_IREFLSAVETABPRESENTER_H
-#include "MantidQtWidgets/Common/DataProcessorUI/TreeData.h"
#include "IReflBatchPresenter.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/TreeData.h"
namespace MantidQt {
namespace CustomInterfaces {
diff --git a/qt/scientific_interfaces/ISISReflectometry/IReflSaveTabView.h b/qt/scientific_interfaces/ISISReflectometry/IReflSaveTabView.h
index 5a5e9dd97f5745323e38c41fcd4b903af4f7df11..efcda09bc29555a634302247c290799d2ec35e06 100644
--- a/qt/scientific_interfaces/ISISReflectometry/IReflSaveTabView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/IReflSaveTabView.h
@@ -2,14 +2,13 @@
#define MANTID_ISISREFLECTOMETRY_IREFLSAVETABVIEW_H
#include "DllConfig.h"
+#include "IReflSaveTabPresenter.h"
#include <string>
#include <vector>
-#include "IReflSaveTabPresenter.h"
namespace MantidQt {
namespace CustomInterfaces {
-
/** @class IReflSaveTabView
IReflSaveTabView is the base view class for the tab "Save ASCII" in the
@@ -73,7 +72,7 @@ public:
virtual void warnInvalidSaveDirectory() = 0;
virtual void noWorkspacesSelected() = 0;
virtual void cannotSaveWorkspaces() = 0;
- virtual void cannotSaveWorkspaces(std::string const& fullError) = 0;
+ virtual void cannotSaveWorkspaces(std::string const &fullError) = 0;
};
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Parse.cpp b/qt/scientific_interfaces/ISISReflectometry/Parse.cpp
index 701327f8517bc1036c26295e0675eade9a0adfb7..6f45b6abefe17437ced392225ab2944ff1f5a16b 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Parse.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Parse.cpp
@@ -63,5 +63,5 @@ boost::optional<int> parseNonNegativeInt(std::string string) {
else
return boost::none;
}
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Parse.h b/qt/scientific_interfaces/ISISReflectometry/Parse.h
index 64ef611df0fa400e58ca2141fb519188db07950a..48056e2fd2a1a267bd02d3d764d634d659712358 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Parse.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Parse.h
@@ -23,9 +23,9 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
#ifndef MANTID_CUSTOMINTERFACES_PARSE_H_
#define MANTID_CUSTOMINTERFACES_PARSE_H_
#include "DllConfig.h"
-#include <vector>
#include <boost/algorithm/string.hpp>
#include <boost/optional.hpp>
+#include <vector>
namespace MantidQt {
namespace CustomInterfaces {
@@ -71,6 +71,6 @@ parseList(std::string commaSeparatedValues, ParseItemFunction parseItem) {
return std::vector<ParsedItem>();
}
}
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_PARSE_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/QtReflBatchView.cpp b/qt/scientific_interfaces/ISISReflectometry/QtReflBatchView.cpp
index 9792726192ce20aabc3e1b46aef8c64b69e98496..beb7e382c118f63fd20a7716aa8cabb5b160a497 100644
--- a/qt/scientific_interfaces/ISISReflectometry/QtReflBatchView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/QtReflBatchView.cpp
@@ -1,13 +1,13 @@
#include "QtReflBatchView.h"
#include "GUI/Event/EventView.h"
+#include "MantidAPI/AlgorithmManager.h"
+#include "MantidKernel/make_unique.h"
#include "QtReflRunsTabView.h"
#include "QtReflSaveTabView.h"
-#include "ReflSaveTabPresenter.h"
-#include "ReflBatchPresenter.h"
#include "ReflAsciiSaver.h"
-#include "MantidKernel/make_unique.h"
-#include "MantidAPI/AlgorithmManager.h"
+#include "ReflBatchPresenter.h"
#include "ReflRunsTabPresenter.h"
+#include "ReflSaveTabPresenter.h"
#include <QMessageBox>
@@ -27,7 +27,8 @@ void QtReflBatchView::initLayout() {
m_eventHandling = createEventTab();
m_ui.batchTabs->addTab(m_eventHandling.get(), "Event Handling");
- m_experiment = Mantid::Kernel::make_unique<ExperimentView>(createReductionAlg(), this);
+ m_experiment =
+ Mantid::Kernel::make_unique<ExperimentView>(createReductionAlg(), this);
m_ui.batchTabs->addTab(m_experiment.get(), "Experiment Settings");
m_instrument =
@@ -38,7 +39,7 @@ void QtReflBatchView::initLayout() {
m_ui.batchTabs->addTab(m_save.get(), "Save ASCII");
}
-IExperimentView* QtReflBatchView::experiment() const {
+IExperimentView *QtReflBatchView::experiment() const {
return m_experiment.get();
}
@@ -73,5 +74,5 @@ Mantid::API::IAlgorithm_sptr QtReflBatchView::createReductionAlg() {
std::unique_ptr<QtReflSaveTabView> QtReflBatchView::createSaveTab() {
return Mantid::Kernel::make_unique<QtReflSaveTabView>(this);
}
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/QtReflBatchView.h b/qt/scientific_interfaces/ISISReflectometry/QtReflBatchView.h
index bcb3c8c368e02c0f4a8435f6891611cdec5aa4a1..324900c2227b3d0543f533a063d5fda047dc745c 100644
--- a/qt/scientific_interfaces/ISISReflectometry/QtReflBatchView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/QtReflBatchView.h
@@ -48,7 +48,7 @@ public:
IReflRunsTabView *runs() const override;
IEventView *eventHandling() const override;
IReflSaveTabView *save() const override;
- IExperimentView* experiment() const override;
+ IExperimentView *experiment() const override;
IInstrumentView *instrument() const override;
private:
@@ -67,6 +67,6 @@ private:
std::unique_ptr<ExperimentView> m_experiment;
std::unique_ptr<InstrumentView> m_instrument;
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_QTREFLBATCHVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/QtReflMainWindowView.cpp b/qt/scientific_interfaces/ISISReflectometry/QtReflMainWindowView.cpp
index 774182474a8185cb3dbef637524570c0bfd826c9..5bd55b7b5f965a63a710cba50d470b1384f1840d 100644
--- a/qt/scientific_interfaces/ISISReflectometry/QtReflMainWindowView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/QtReflMainWindowView.cpp
@@ -49,7 +49,8 @@ void QtReflMainWindowView::initLayout() {
auto makeRunsTablePresenter = RunsTablePresenterFactory(
instruments, thetaTolerance, makeWorkspaceNames);
auto defaultInstrumentIndex = 0;
- // TODO: Look this up properly by comparing the default instrument to the values in the list;
+ // TODO: Look this up properly by comparing the default instrument to the
+ // values in the list;
auto searcher = boost::shared_ptr<IReflSearcher>();
auto messageHandler = this;
diff --git a/qt/scientific_interfaces/ISISReflectometry/QtReflMainWindowView.h b/qt/scientific_interfaces/ISISReflectometry/QtReflMainWindowView.h
index 48d09909d2634785712a45bbf01d0dedc8eef9f6..a3b5316ed3b93b9da2f10ceae4f0d018750ae241 100644
--- a/qt/scientific_interfaces/ISISReflectometry/QtReflMainWindowView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/QtReflMainWindowView.h
@@ -45,17 +45,17 @@ class QtReflMainWindowView : public MantidQt::API::UserSubWindow,
Q_OBJECT
public:
explicit QtReflMainWindowView(QWidget *parent = nullptr);
- void subscribe(ReflMainWindowSubscriber* notifyee) override;
+ void subscribe(ReflMainWindowSubscriber *notifyee) override;
static std::string name() { return "ISIS Reflectometry"; }
static QString categoryInfo() { return "Reflectometry"; }
std::string runPythonAlgorithm(const std::string &pythonCode) override;
- virtual std::vector<IReflBatchView*> batches() const override;
+ virtual std::vector<IReflBatchView *> batches() const override;
void closeEvent(QCloseEvent *event) override;
- IReflBatchView* newBatch() override;
+ IReflBatchView *newBatch() override;
void removeBatch(int batchIndex) override;
void giveUserCritical(const std::string &prompt,
@@ -74,9 +74,9 @@ private:
/// Interface definition with widgets for the main interface window
Ui::ReflMainWindowWidget m_ui;
/// The presenter handling this view
- ReflMainWindowSubscriber* m_notifyee;
+ ReflMainWindowSubscriber *m_notifyee;
boost::optional<ReflMainWindowPresenter> m_presenter;
- std::vector<IReflBatchView*> m_batchViews;
+ std::vector<IReflBatchView *> m_batchViews;
};
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.cpp b/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.cpp
index 459a022e4eedbde56487ab71db836738e787be39..c32a55dc8df4e3f3ecf4580f7a102e4031e0df12 100644
--- a/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.cpp
@@ -11,11 +11,6 @@
#include "MantidQtWidgets/Common/SlitCalculator.h"
#include "ReflRunsTabPresenter.h"
#include "ReflSearchModel.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/QtCommandAdapter.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h"
-#include "MantidQtWidgets/Common/HintingLineEditFactory.h"
-#include "MantidQtWidgets/Common/SlitCalculator.h"
#include <QMessageBox>
namespace MantidQt {
@@ -25,9 +20,9 @@ using namespace MantidQt::MantidWidgets;
//----------------------------------------------------------------------------------------------
/** Constructor
-* @param parent :: The parent of this view
-* @param makeRunsTableView :: The factory for the RunsTableView.
-*/
+ * @param parent :: The parent of this view
+ * @param makeRunsTableView :: The factory for the RunsTableView.
+ */
QtReflRunsTabView::QtReflRunsTabView(QWidget *parent,
RunsTableViewFactory makeRunsTableView)
: m_presenter(nullptr), m_calculator(new SlitCalculator(this)),
@@ -154,9 +149,9 @@ void QtReflRunsTabView::setInstrumentComboEnabled(bool enabled) {
}
/**
-* Sets the search text box enabled or disabled
-* @param enabled : Whether to enable or disable the button
-*/
+ * Sets the search text box enabled or disabled
+ * @param enabled : Whether to enable or disable the button
+ */
void QtReflRunsTabView::setSearchTextEntryEnabled(bool enabled) {
ui.textSearch->setEnabled(enabled);
diff --git a/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.h b/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.h
index f037f4ba021b9b0d0c3337aa658e889da8a813e5..c8bb542811934e72b9e392bac00c8254c6b181f8 100644
--- a/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.h
@@ -2,14 +2,11 @@
#define MANTID_ISISREFLECTOMETRY_QTREFLRUNSTABVIEW_H_
#include "DllConfig.h"
+#include "GUI/RunsTable/RunsTableView.h"
#include "IReflRunsTabView.h"
#include "MantidKernel/System.h"
#include "MantidQtWidgets/Common/DataProcessorUI/QtCommandAdapter.h"
#include "MantidQtWidgets/Common/MantidWidget.h"
-#include "DllConfig.h"
-#include "IReflRunsTabView.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/QtCommandAdapter.h"
-#include "GUI/RunsTable/RunsTableView.h"
#include "ui_ReflRunsTabWidget.h"
@@ -21,9 +18,9 @@ namespace MantidWidgets {
namespace DataProcessor {
// Forward decs
class Command;
-}
+} // namespace DataProcessor
class SlitCalculator;
-}
+} // namespace MantidWidgets
namespace API {
class AlgorithmRunner;
}
@@ -69,7 +66,7 @@ public:
QtReflRunsTabView(QWidget *parent, RunsTableViewFactory makeView);
void subscribe(IReflRunsTabPresenter *presenter) override;
- IRunsTableView * table() const override;
+ IRunsTableView *table() const override;
// Connect the model
void showSearch(boost::shared_ptr<ReflSearchModel> model) override;
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/AllInitialized.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/AllInitialized.h
index e9664e8e31592f10dc53d5b3a5fa53c8888fc7da..dc039bcd53fe7f708a1ec23cda9c776db8127d01 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/AllInitialized.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/AllInitialized.h
@@ -26,6 +26,6 @@ makeIfAllInitialized(boost::optional<Params> const &... params) {
return boost::none;
}
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_ALLINITIALIZED_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/AnalysisMode.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/AnalysisMode.h
index 95184b7a650b9a597659aa5639c307502642fbd0..d439e3d5bce72429e8c2c71edd62d73f59cd470e 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/AnalysisMode.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/AnalysisMode.h
@@ -6,7 +6,7 @@ namespace MantidQt {
namespace CustomInterfaces {
enum class AnalysisMode { PointDetector, MultiDetector };
-inline AnalysisMode analysisModeFromString(std::string const& analysisMode) {
+inline AnalysisMode analysisModeFromString(std::string const &analysisMode) {
if (analysisMode == "PointDetectorAnalysis")
return AnalysisMode::PointDetector;
else if (analysisMode == "MultiDetectorAnalysis")
@@ -14,6 +14,6 @@ inline AnalysisMode analysisModeFromString(std::string const& analysisMode) {
else
throw std::runtime_error("Unexpected analysis mode.");
}
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_ANALYSISMODE_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/DetectorCorrections.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/DetectorCorrections.cpp
index a07bac7e6d7f4b3c95ec2f00d974e36d23913cf3..d37d61e36d5984a671a25237e4da5e4e48bca8dc 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/DetectorCorrections.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/DetectorCorrections.cpp
@@ -13,5 +13,5 @@ bool DetectorCorrections::correctPositions() const {
DetectorCorrectionType DetectorCorrections::correctionType() const {
return m_correctionType;
}
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/DetectorCorrections.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/DetectorCorrections.h
index bebd78fb30904f2b2539ca6522e41ae1d09986cf..21dea69d22b84a60b2ad45609f9fdd600d2ef5f3 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/DetectorCorrections.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/DetectorCorrections.h
@@ -5,18 +5,18 @@ namespace MantidQt {
namespace CustomInterfaces {
enum class DetectorCorrectionType { VerticalShift, RotateAroundSample };
-
+
class MANTIDQT_ISISREFLECTOMETRY_DLL DetectorCorrections {
public:
DetectorCorrections(bool correctPositions,
DetectorCorrectionType correctionType);
bool correctPositions() const;
DetectorCorrectionType correctionType() const;
-
+
private:
bool m_correctPositions;
DetectorCorrectionType m_correctionType;
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_DETECTORCORRECTIONS_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Experiment.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/Experiment.cpp
index 1e7028ec7ec3c11afce3c523f29339e0a334ac7c..7fb25e2434567cd10433a33437a8e01d8fe5a3e8 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Experiment.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Experiment.cpp
@@ -51,8 +51,9 @@ PerThetaDefaults const *Experiment::defaultsForTheta(double thetaAngle,
} else {
auto wildcardMatch =
std::find_if(m_perThetaDefaults.cbegin(), m_perThetaDefaults.cend(),
- [](PerThetaDefaults const &candidate)
- -> bool { return candidate.isWildcard(); });
+ [](PerThetaDefaults const &candidate) -> bool {
+ return candidate.isWildcard();
+ });
if (wildcardMatch != m_perThetaDefaults.cend()) {
return &(*wildcardMatch);
} else {
@@ -60,5 +61,5 @@ PerThetaDefaults const *Experiment::defaultsForTheta(double thetaAngle,
}
}
}
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Experiment.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/Experiment.h
index df1706b2a02370a552450e93b5bbcc402f45ed3c..2cf2d9661bf051961aa1911ce11e81f900f69df9 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Experiment.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Experiment.h
@@ -24,14 +24,14 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
#include "../DllConfig.h"
#include "AnalysisMode.h"
-#include "ReductionType.h"
-#include "SummationType.h"
+#include "PerThetaDefaults.h"
#include "PolarizationCorrections.h"
#include "RangeInLambda.h"
-#include "PerThetaDefaults.h"
+#include "ReductionType.h"
+#include "SummationType.h"
+#include <map>
#include <string>
#include <vector>
-#include <map>
namespace MantidQt {
namespace CustomInterfaces {
@@ -67,6 +67,6 @@ private:
std::map<std::string, std::string> m_stitchParameters;
std::vector<PerThetaDefaults> m_perThetaDefaults;
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_EXPERIMENT_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Instrument.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/Instrument.cpp
index 86c80718b4427246bb0ef0c135db932a3e2c21ae..098abafa8a2c9301a3b688e8c68d64a49ddb58db 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Instrument.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Instrument.cpp
@@ -20,5 +20,5 @@ MonitorCorrections Instrument::monitorCorrections() const {
DetectorCorrections Instrument::detectorCorrections() const {
return m_detectorCorrections;
}
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Instrument.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/Instrument.h
index a07835b0546f2ed5c449fef029dd31681713e176..af89412f485619446f67ed230bf967d273bec90c 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Instrument.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Instrument.h
@@ -45,6 +45,6 @@ private:
MonitorCorrections m_monitorCorrections;
DetectorCorrections m_detectorCorrections;
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_INSTRUMENT_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/MonitorCorrections.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/MonitorCorrections.cpp
index 71f209e216e49e91373a7b764e64f9b9ab3c6761..166eddb1c88bec341949f7cfb76e4e4e1aeaec2a 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/MonitorCorrections.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/MonitorCorrections.cpp
@@ -12,8 +12,12 @@ size_t MonitorCorrections::monitorIndex() const { return m_monitorIndex; }
bool MonitorCorrections::integrate() const { return m_integrate; }
-RangeInLambda MonitorCorrections::backgroundRange() const { return m_backgroundRange; }
-
-RangeInLambda MonitorCorrections::integralRange() const { return m_integralRange; }
+RangeInLambda MonitorCorrections::backgroundRange() const {
+ return m_backgroundRange;
}
+
+RangeInLambda MonitorCorrections::integralRange() const {
+ return m_integralRange;
}
+} // namespace CustomInterfaces
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/MonitorCorrections.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/MonitorCorrections.h
index 92d78c0b57aae6c854bc949d15906f4c2b740af8..51d484d712277da367dff51bb0f1d4c4191c59ef 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/MonitorCorrections.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/MonitorCorrections.h
@@ -9,7 +9,8 @@ namespace CustomInterfaces {
class MANTIDQT_ISISREFLECTOMETRY_DLL MonitorCorrections {
public:
MonitorCorrections(size_t monitorIndex, bool integrate,
- RangeInLambda backgroundRange, RangeInLambda integralRange);
+ RangeInLambda backgroundRange,
+ RangeInLambda integralRange);
size_t monitorIndex() const;
bool integrate() const;
@@ -22,6 +23,6 @@ private:
RangeInLambda m_backgroundRange;
RangeInLambda m_integralRange;
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_MONITORCORRECTIONS_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ParseReflectometryStrings.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/ParseReflectometryStrings.cpp
index 1de68335c9f92ab866b09fa0efeac1d24bcccb7c..11904c9e42a34c9ff15d190ee45ccaf7a018998c 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ParseReflectometryStrings.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ParseReflectometryStrings.cpp
@@ -1,7 +1,7 @@
#include "ParseReflectometryStrings.h"
-#include "MantidQtWidgets/Common/ParseKeyValueString.h"
-#include "AllInitialized.h"
#include "../Parse.h"
+#include "AllInitialized.h"
+#include "MantidQtWidgets/Common/ParseKeyValueString.h"
namespace MantidQt {
namespace CustomInterfaces {
@@ -138,5 +138,5 @@ parseTransmissionRuns(std::string const &firstTransmissionRun,
}
}
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ParseReflectometryStrings.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/ParseReflectometryStrings.h
index 7ccf2d6f8f956d64ae68ba18ccb626e57371825c..9f46b570168f8acfcafc44be91b92a3545cbdff2 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ParseReflectometryStrings.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ParseReflectometryStrings.h
@@ -1,13 +1,13 @@
#ifndef MANTID_CUSTOMINTERFACES_PARSEREFLECTOMETRYSTRINGS_H_
#define MANTID_CUSTOMINTERFACES_PARSEREFLECTOMETRYSTRINGS_H_
#include "../DllConfig.h"
+#include "RangeInQ.h"
#include "TransmissionRunPair.h"
#include <boost/optional.hpp>
-#include <boost/variant.hpp>
#include <boost/tokenizer.hpp>
-#include "RangeInQ.h"
-#include <vector>
+#include <boost/variant.hpp>
#include <map>
+#include <vector>
namespace MantidQt {
namespace CustomInterfaces {
@@ -42,6 +42,6 @@ MANTIDQT_ISISREFLECTOMETRY_DLL
boost::optional<std::map<std::string, std::string>>
parseOptions(std::string const &options);
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_PARSEREFLECTOMETRYSTRINGS_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/PerThetaDefaults.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/PerThetaDefaults.cpp
index cc6e1e4fdd8fed1b32de8af7d25c53175466da81..86e0dff99fc0b38b56ef1477b1da0befc84bfa9b 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/PerThetaDefaults.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/PerThetaDefaults.cpp
@@ -4,7 +4,8 @@ namespace MantidQt {
namespace CustomInterfaces {
PerThetaDefaults::PerThetaDefaults(
- boost::optional<double> theta, std::pair<std::string, std::string> transmissionRuns,
+ boost::optional<double> theta,
+ std::pair<std::string, std::string> transmissionRuns,
boost::optional<RangeInQ> qRange, boost::optional<double> scaleFactor,
ReductionOptionsMap reductionOptions)
: m_theta(std::move(theta)),
@@ -17,9 +18,7 @@ PerThetaDefaults::transmissionWorkspaceNames() const {
return m_transmissionRuns;
}
-bool PerThetaDefaults::isWildcard() const {
- return !m_theta.is_initialized();
-}
+bool PerThetaDefaults::isWildcard() const { return !m_theta.is_initialized(); }
boost::optional<double> PerThetaDefaults::thetaOrWildcard() const {
return m_theta;
@@ -36,5 +35,5 @@ boost::optional<double> PerThetaDefaults::scaleFactor() const {
ReductionOptionsMap const &PerThetaDefaults::reductionOptions() const {
return m_reductionOptions;
}
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/PerThetaDefaults.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/PerThetaDefaults.h
index e68e7d9471aa2d1f36b13965ff85fb3337a8afc5..e9a16fcada2073e17465103ba43fc9ea4bbdcfdf 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/PerThetaDefaults.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/PerThetaDefaults.h
@@ -1,9 +1,9 @@
#ifndef MANTID_CUSTOMINTERFACES_PERTHETADEFAULTS_H_
#define MANTID_CUSTOMINTERFACES_PERTHETADEFAULTS_H_
-#include <boost/optional.hpp>
-#include "ReductionOptionsMap.h"
-#include "RangeInQ.h"
#include "../DllConfig.h"
+#include "RangeInQ.h"
+#include "ReductionOptionsMap.h"
+#include <boost/optional.hpp>
#include <vector>
namespace MantidQt {
namespace CustomInterfaces {
@@ -23,7 +23,6 @@ public:
boost::optional<double> scaleFactor() const;
ReductionOptionsMap const &reductionOptions() const;
-
private:
boost::optional<double> m_theta;
std::pair<std::string, std::string> m_transmissionRuns;
@@ -31,6 +30,6 @@ private:
boost::optional<double> m_scaleFactor;
ReductionOptionsMap m_reductionOptions;
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_PERTHETADEFAULTS_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/PolarizationCorrections.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/PolarizationCorrections.cpp
index 76de495360bde7519dc24f6c0dd215609ac8d696..85bc102222387610afac6cc7fc1a30db87d096cb 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/PolarizationCorrections.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/PolarizationCorrections.cpp
@@ -13,5 +13,5 @@ double PolarizationCorrections::cAlpha() const { return CAlpha; }
double PolarizationCorrections::cAp() const { return CAp; }
double PolarizationCorrections::cPp() const { return CPp; }
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/PolarizationCorrections.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/PolarizationCorrections.h
index 963c4ec84e183563e4df64c92988eab8e0f07b9f..63249b94bbf86565139a630be9c799d0b15a60c7 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/PolarizationCorrections.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/PolarizationCorrections.h
@@ -19,6 +19,6 @@ private:
double CAp;
double CPp;
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_POLARIZATIONCORRECTIONS_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInLambda.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInLambda.cpp
index 16b9d73fe25c945a9764216f089e00f9dc2cdff9..cc7e3251abf61accd13ca576cabf462087f29552 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInLambda.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInLambda.cpp
@@ -5,5 +5,5 @@ namespace CustomInterfaces {
RangeInLambda::RangeInLambda(double min, double max) : m_min(min), m_max(max) {}
double RangeInLambda::min() const { return m_min; }
double RangeInLambda::max() const { return m_max; }
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInLambda.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInLambda.h
index 6a6b336f949b1ca6e98249756762b501de4fd5e5..5ea58e1afa5c9efeb3c6daf660f259bc517c8801 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInLambda.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInLambda.h
@@ -13,6 +13,6 @@ public:
private:
double m_min, m_max;
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_RANGEINLAMBDA_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionJobs.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionJobs.cpp
index 203f9fd12e772a8413a31d6a0d5717ec4a1c1fef..841b1f1f26244c7648eed048e2b4916c0e255abd 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionJobs.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionJobs.cpp
@@ -20,7 +20,7 @@ Group &findOrMakeGroupWithName(Jobs &jobs, std::string const &groupName) {
else
return jobs.appendGroup(Group(groupName));
} // unnamed
-}
+} // namespace
Jobs::Jobs(std::vector<Group> groups) : m_groups(std::move(groups)) {}
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionOptionsMap.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionOptionsMap.h
index 1004c3375c35b963928856e5faf0cd5a7b297dd4..248225372bc7df25117db926aa627fcdfe1ec6d9 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionOptionsMap.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionOptionsMap.h
@@ -5,5 +5,5 @@ namespace MantidQt {
namespace CustomInterfaces {
using ReductionOptionsMap = std::map<std::string, std::string>;
}
-}
+} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_REDUCTIONOPTIONSMAP_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionType.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionType.h
index f90b3b543fe81a79b93e926a65ee4bf712b1274b..47074bbc1d13158063922318bf7fbaa77ba1fc84 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionType.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionType.h
@@ -16,6 +16,6 @@ inline ReductionType reductionTypeFromString(std::string const &reductionType) {
else
throw std::runtime_error("Unexpected reduction type.");
}
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_REDUCTIONTYPE_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Row.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/Row.h
index 3e47540d659f3f1da676787aaeba87b9ae4f06e1..96673ada02e5d59613891338b17879c82a3ed9c4 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Row.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Row.h
@@ -23,21 +23,19 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
#ifndef MANTID_CUSTOMINTERFACES_RUN_H_
#define MANTID_CUSTOMINTERFACES_RUN_H_
#include "../DllConfig.h"
-#include <string>
-#include <vector>
-#include <boost/variant.hpp>
-#include <boost/range/algorithm/set_algorithm.hpp>
-#include <boost/optional.hpp>
#include "RangeInQ.h"
-#include "ReductionWorkspaces.h"
#include "ReductionOptionsMap.h"
+#include "ReductionWorkspaces.h"
#include "WorkspaceNamesFactory.h"
-#include "../DllConfig.h"
+#include <boost/optional.hpp>
+#include <boost/range/algorithm/set_algorithm.hpp>
+#include <boost/variant.hpp>
+#include <string>
+#include <vector>
namespace MantidQt {
namespace CustomInterfaces {
-
// Immutability here makes update notification easier.
class MANTIDQT_ISISREFLECTOMETRY_DLL Row {
public:
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Slicing.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/Slicing.cpp
index a62482043dceeeafb09e34a23bc810b3bffe54f3..c5ab6c26227b9535849b7f4053fdeb94d6f0fab6 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Slicing.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Slicing.cpp
@@ -119,5 +119,5 @@ std::ostream &operator<<(std::ostream &os, Slicing const &slicing) {
os << "Slicing: ";
return boost::apply_visitor(PrintSlicingVisitor(os), slicing);
}
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Slicing.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/Slicing.h
index 6d95c8a63ebb4155a2f64e95a6d3b501b956bf02..36866f241130cc3e0f61c4d300403273e1651f36 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Slicing.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Slicing.h
@@ -22,11 +22,11 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
#ifndef MANTID_CUSTOMINTERFACES_SLICING_H_
#define MANTID_CUSTOMINTERFACES_SLICING_H_
+#include "../DllConfig.h"
#include <boost/variant.hpp>
+#include <ostream>
#include <string>
#include <vector>
-#include <ostream>
-#include "../DllConfig.h"
namespace MantidQt {
namespace CustomInterfaces {
@@ -40,7 +40,8 @@ private:
double m_secondsPerSlice;
};
-MANTIDQT_ISISREFLECTOMETRY_DLL std::ostream& operator<<(std::ostream& os, UniformSlicingByTime const& slicing);
+MANTIDQT_ISISREFLECTOMETRY_DLL std::ostream &
+operator<<(std::ostream &os, UniformSlicingByTime const &slicing);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(UniformSlicingByTime const &lhs,
UniformSlicingByTime const &rhs);
@@ -54,7 +55,8 @@ private:
int m_numberOfSlices;
};
-MANTIDQT_ISISREFLECTOMETRY_DLL std::ostream& operator<<(std::ostream& os, UniformSlicingByNumberOfSlices const& slicing);
+MANTIDQT_ISISREFLECTOMETRY_DLL std::ostream &
+operator<<(std::ostream &os, UniformSlicingByNumberOfSlices const &slicing);
MANTIDQT_ISISREFLECTOMETRY_DLL bool
operator==(UniformSlicingByNumberOfSlices const &lhs,
@@ -69,7 +71,8 @@ private:
std::vector<double> m_sliceTimes;
};
-MANTIDQT_ISISREFLECTOMETRY_DLL std::ostream& operator<<(std::ostream& os, CustomSlicingByList const& slicing);
+MANTIDQT_ISISREFLECTOMETRY_DLL std::ostream &
+operator<<(std::ostream &os, CustomSlicingByList const &slicing);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(CustomSlicingByList const &lhs,
CustomSlicingByList const &rhs);
@@ -85,7 +88,8 @@ private:
std::string m_blockName;
};
-MANTIDQT_ISISREFLECTOMETRY_DLL std::ostream& operator<<(std::ostream& os, SlicingByEventLog const& slicing);
+MANTIDQT_ISISREFLECTOMETRY_DLL std::ostream &
+operator<<(std::ostream &os, SlicingByEventLog const &slicing);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(SlicingByEventLog const &lhs,
SlicingByEventLog const &rhs);
@@ -94,18 +98,20 @@ class InvalidSlicing {};
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(InvalidSlicing const &lhs,
InvalidSlicing const &rhs);
-MANTIDQT_ISISREFLECTOMETRY_DLL std::ostream& operator<<(std::ostream& os, InvalidSlicing const& slicing);
+MANTIDQT_ISISREFLECTOMETRY_DLL std::ostream &
+operator<<(std::ostream &os, InvalidSlicing const &slicing);
using Slicing =
boost::variant<boost::blank, InvalidSlicing, UniformSlicingByTime,
UniformSlicingByNumberOfSlices, CustomSlicingByList,
SlicingByEventLog>;
-MANTIDQT_ISISREFLECTOMETRY_DLL std::ostream &operator<<(std::ostream &os, Slicing const &slicing);
+MANTIDQT_ISISREFLECTOMETRY_DLL std::ostream &operator<<(std::ostream &os,
+ Slicing const &slicing);
MANTIDQT_ISISREFLECTOMETRY_DLL bool isInvalid(Slicing const &slicing);
MANTIDQT_ISISREFLECTOMETRY_DLL bool isValid(Slicing const &slicing);
MANTIDQT_ISISREFLECTOMETRY_DLL bool isNoSlicing(Slicing const &slicing);
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_SLICING_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/SummationType.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/SummationType.h
index af8f84baf3a596d91209e8cb1aea41d6aaf54d57..4c052f8bf4f032a3bd25f93bb1dfc8ab05b1305f 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/SummationType.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/SummationType.h
@@ -1,15 +1,15 @@
#ifndef MANTID_CUSTOMINTERFACES_SUMMATIONTYPE_H_
#define MANTID_CUSTOMINTERFACES_SUMMATIONTYPE_H_
-#include <string>
-#include <stdexcept>
#include <boost/optional.hpp>
+#include <stdexcept>
+#include <string>
namespace MantidQt {
namespace CustomInterfaces {
enum class SummationType { SumInLambda, SumInQ };
-inline SummationType summationTypeFromString(std::string const& summationType) {
+inline SummationType summationTypeFromString(std::string const &summationType) {
if (summationType == "SumInLambda")
return SummationType::SumInLambda;
else if (summationType == "SumInQ")
@@ -17,6 +17,6 @@ inline SummationType summationTypeFromString(std::string const& summationType) {
else
throw std::runtime_error("Unexpected summation type.");
}
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_SUMMATIONTYPE_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionRunPair.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionRunPair.h
index 023e2ad3655112498c82122b8514d5e947787870..ea92285254baaf158733cbb5ee962377cb3f6ff6 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionRunPair.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionRunPair.h
@@ -1,12 +1,12 @@
#ifndef MANTID_CUSTOMINTERFACES_TRANSMISSIONRUNPAIR_H_
#define MANTID_CUSTOMINTERFACES_TRANSMISSIONRUNPAIR_H_
#include "../DllConfig.h"
-#include <utility>
#include <string>
+#include <utility>
namespace MantidQt {
namespace CustomInterfaces {
- using TransmissionRunPair = std::pair<std::string, std::string>;
-}
+using TransmissionRunPair = std::pair<std::string, std::string>;
}
+} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_TRANSMISSIONRUNPAIR_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidatePerThetaDefaults.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidatePerThetaDefaults.cpp
index b0ae9721d79f6d28f40281eefc50e02c0b87ed50..87e111268eb7b48487346813dac6d99647ea74be 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidatePerThetaDefaults.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidatePerThetaDefaults.cpp
@@ -1,8 +1,8 @@
#include "ValidatePerThetaDefaults.h"
-#include "AllInitialized.h"
-#include "Reduction/WorkspaceNamesFactory.h"
#include "../Parse.h"
+#include "AllInitialized.h"
#include "MantidQtWidgets/Common/ParseKeyValueString.h"
+#include "Reduction/WorkspaceNamesFactory.h"
#include <boost/algorithm/string/trim.hpp>
#include <boost/tokenizer.hpp>
#include <boost/variant.hpp>
@@ -112,5 +112,5 @@ validatePerThetaDefaults(CellText const &cells) {
auto validate = PerThetaDefaultsValidator();
return validate(cells);
}
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidatePerThetaDefaults.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidatePerThetaDefaults.h
index ffdfaae781c939425ce3c9cb1311d96f9062a083..101c99d46221f38ca955c024b31025382009e304 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidatePerThetaDefaults.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidatePerThetaDefaults.h
@@ -22,13 +22,13 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
#ifndef MANTID_CUSTOMINTERFACES_PERTHETADEFAUTSVALIDATOR_H_
#define MANTID_CUSTOMINTERFACES_PERTHETADEFAUTSVALIDATOR_H_
-#include "PerThetaDefaults.h"
-#include <boost/optional.hpp>
-#include "ValidationResult.h"
+#include "../ValidationResult.h"
+#include "DllConfig.h"
#include "ParseReflectometryStrings.h"
+#include "PerThetaDefaults.h"
#include "TransmissionRunPair.h"
-#include "DllConfig.h"
-#include "../ValidationResult.h"
+#include "ValidationResult.h"
+#include <boost/optional.hpp>
namespace MantidQt {
namespace CustomInterfaces {
@@ -40,9 +40,10 @@ public:
operator()(std::array<std::string, INPUT_FIELD_COUNT> const &cellText);
private:
- boost::optional<boost::optional<double>> parseThetaOrWhitespace(std::array<std::string, INPUT_FIELD_COUNT> const &cellText);
- boost::optional<TransmissionRunPair>
- parseTransmissionRuns(std::array<std::string, INPUT_FIELD_COUNT> const &cellText);
+ boost::optional<boost::optional<double>> parseThetaOrWhitespace(
+ std::array<std::string, INPUT_FIELD_COUNT> const &cellText);
+ boost::optional<TransmissionRunPair> parseTransmissionRuns(
+ std::array<std::string, INPUT_FIELD_COUNT> const &cellText);
boost::optional<boost::optional<RangeInQ>>
parseQRange(std::array<std::string, INPUT_FIELD_COUNT> const &cellText);
boost::optional<boost::optional<double>>
@@ -53,9 +54,10 @@ private:
std::vector<int> m_invalidColumns;
};
-ValidationResult<PerThetaDefaults, std::vector<int>>
-validatePerThetaDefaults(std::array<std::string, PerThetaDefaultsValidator::INPUT_FIELD_COUNT> const &cellText);
+ValidationResult<PerThetaDefaults, std::vector<int>> validatePerThetaDefaults(
+ std::array<std::string, PerThetaDefaultsValidator::INPUT_FIELD_COUNT> const
+ &cellText);
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_PERTHETADEFAUTSVALIDATOR_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidateRow.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidateRow.cpp
index ab15cb6bdad50eaa2defe607bccd88ff0d6891d4..5ccc1409d741c14ca355fd6ac9ae3fec06a4c85d 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidateRow.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidateRow.cpp
@@ -1,7 +1,7 @@
#include "ValidateRow.h"
+#include "../Parse.h"
#include "AllInitialized.h"
#include "Reduction/WorkspaceNamesFactory.h"
-#include "../Parse.h"
#include <boost/algorithm/string/trim.hpp>
#include <boost/tokenizer.hpp>
#include <boost/variant.hpp>
@@ -117,13 +117,13 @@ validateRow(Jobs const &, WorkspaceNamesFactory const &workspaceNamesFactory,
std::vector<std::string> const &cells) {
auto validate = RowValidator();
RowValidationResult result = validate(
- cells, [&workspaceNamesFactory](
- std::vector<std::string> const &runNumbers,
- std::pair<std::string, std::string> const &transmissionRuns)
- -> boost::optional<ReductionWorkspaces> {
- return workspaceNamesFactory.makeNames(runNumbers,
- transmissionRuns);
- });
+ cells,
+ [&workspaceNamesFactory](
+ std::vector<std::string> const &runNumbers,
+ std::pair<std::string, std::string> const &transmissionRuns)
+ -> boost::optional<ReductionWorkspaces> {
+ return workspaceNamesFactory.makeNames(runNumbers, transmissionRuns);
+ });
return result;
}
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidateRow.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidateRow.h
index dab2c5272e44d5c8505cbb61c91d90f7fb7a1ad9..12ade5ed566f3320aa09f613ab12c920da7eba25 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidateRow.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidateRow.h
@@ -22,13 +22,13 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
#ifndef MANTID_CUSTOMINTERFACES_VALIDATEROW_H_
#define MANTID_CUSTOMINTERFACES_VALIDATEROW_H_
-#include "Row.h"
-#include <boost/optional.hpp>
-#include "Reduction/ReductionJobs.h"
-#include "ValidationResult.h"
+#include "DllConfig.h"
#include "ParseReflectometryStrings.h"
+#include "Reduction/ReductionJobs.h"
+#include "Row.h"
#include "TransmissionRunPair.h"
-#include "DllConfig.h"
+#include "ValidationResult.h"
+#include <boost/optional.hpp>
namespace MantidQt {
namespace CustomInterfaces {
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflBatchPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/ReflBatchPresenter.cpp
index 1be2fe7d84fbf0919787cbf3f3172ac0360a8f9b..27067a317b39c972fbb967d4d25f6e4f76a8a854 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflBatchPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflBatchPresenter.cpp
@@ -12,14 +12,14 @@ namespace MantidQt {
namespace CustomInterfaces {
/** Constructor
-* @param view :: [input] The view we are managing
-* @param runsPresenter :: [input] A pointer to the 'Runs' tab presenter
-* @param eventPresenter :: [input] A pointer to the 'Event Handling' tab
-* presenter
-* @param instrumentPresenter :: [input] A pointer to the 'Instrument' tab
-* presenter
-* @param savePresenter :: [input] A pointer to the 'Save ASCII' tab presenter
-*/
+ * @param view :: [input] The view we are managing
+ * @param runsPresenter :: [input] A pointer to the 'Runs' tab presenter
+ * @param eventPresenter :: [input] A pointer to the 'Event Handling' tab
+ * presenter
+ * @param instrumentPresenter :: [input] A pointer to the 'Instrument' tab
+ * presenter
+ * @param savePresenter :: [input] A pointer to the 'Save ASCII' tab presenter
+ */
ReflBatchPresenter::ReflBatchPresenter(
IReflBatchView *view, std::unique_ptr<IReflRunsTabPresenter> runsPresenter,
std::unique_ptr<IEventPresenter> eventPresenter,
@@ -70,13 +70,13 @@ void ReflBatchPresenter::settingsChanged() {
}
/** Returns default values specified for 'Transmission run(s)' for the
-* given angle
-*
-* @param group :: Index of the group in 'Settings' tab from which to get the
-*values
-* @param angle :: the run angle to look up transmission runs for
-* @return :: Values passed for 'Transmission run(s)'
-*/
+ * given angle
+ *
+ * @param group :: Index of the group in 'Settings' tab from which to get the
+ *values
+ * @param angle :: the run angle to look up transmission runs for
+ * @return :: Values passed for 'Transmission run(s)'
+ */
OptionsQMap
ReflBatchPresenter::getOptionsForAngle(const double /*angle*/) const {
return OptionsQMap(); // TODO m_settingsPresenter->getOptionsForAngle(angle);
@@ -105,5 +105,5 @@ Checks whether or not data is currently being processed in the Runs Tab
bool ReflBatchPresenter::isProcessing() const {
return m_runsPresenter->isProcessing();
}
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflBatchPresenter.h b/qt/scientific_interfaces/ISISReflectometry/ReflBatchPresenter.h
index f36b2d8889649ebed0dc86768837c28f46acbab8..666fc82bb228cfb0a5d016531e5d71f552daf484 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflBatchPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflBatchPresenter.h
@@ -2,8 +2,8 @@
#define MANTID_ISISREFLECTOMETRY_REFLBATCHPRESENTER_H
#include "DllConfig.h"
-#include "IReflBatchPresenter.h"
#include "GUI/Experiment/IExperimentPresenter.h"
+#include "IReflBatchPresenter.h"
#include <memory>
namespace MantidQt {
@@ -45,13 +45,12 @@ class MANTIDQT_ISISREFLECTOMETRY_DLL ReflBatchPresenter
: public IReflBatchPresenter {
public:
/// Constructor
- ReflBatchPresenter(
- IReflBatchView *view,
- std::unique_ptr<IReflRunsTabPresenter> runsPresenter,
- std::unique_ptr<IEventPresenter> eventPresenter,
- std::unique_ptr<IExperimentPresenter> experimentPresenter,
- std::unique_ptr<IInstrumentPresenter> instrumentPresenter,
- std::unique_ptr<IReflSaveTabPresenter> savePresenter);
+ ReflBatchPresenter(IReflBatchView *view,
+ std::unique_ptr<IReflRunsTabPresenter> runsPresenter,
+ std::unique_ptr<IEventPresenter> eventPresenter,
+ std::unique_ptr<IExperimentPresenter> experimentPresenter,
+ std::unique_ptr<IInstrumentPresenter> instrumentPresenter,
+ std::unique_ptr<IReflSaveTabPresenter> savePresenter);
/// Returns values passed for 'Transmission run(s)'
MantidWidgets::DataProcessor::OptionsQMap
@@ -92,6 +91,6 @@ private:
/// The presenter of tab 'Save ASCII'
std::unique_ptr<IReflSaveTabPresenter> m_savePresenter;
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_REFLBATCHPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflBatchPresenterFactory.h b/qt/scientific_interfaces/ISISReflectometry/ReflBatchPresenterFactory.h
index da38b907323eabc603161a48f0f5e25fcaf558a3..10e73a7f35b3c9c1555786b439362d2ecb809a4c 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflBatchPresenterFactory.h
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflBatchPresenterFactory.h
@@ -49,6 +49,6 @@ private:
InstrumentPresenterFactory m_instrumentPresenterFactory;
SavePresenterFactory m_savePresenterFactory;
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_REFLBATCHPRESENTERFACTORY_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflMainWindowPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/ReflMainWindowPresenter.cpp
index 2c46c7dc6c102d7ca76ba1495b1ae35cbe110657..7cd32d455beb6f58f0ff7721b64bf75a3761e53a 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflMainWindowPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflMainWindowPresenter.cpp
@@ -1,7 +1,7 @@
#include "ReflMainWindowPresenter.h"
+#include "GUI/Event/IEventPresenter.h"
#include "IReflMainWindowView.h"
#include "IReflRunsTabPresenter.h"
-#include "GUI/Event/IEventPresenter.h"
#include "IReflSaveTabPresenter.h"
#include "MantidQtWidgets/Common/HelpWindow.h"
@@ -62,5 +62,5 @@ std::string
ReflMainWindowPresenter::runPythonAlgorithm(const std::string &pythonCode) {
return m_view->runPythonAlgorithm(pythonCode);
}
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflMainWindowPresenter.h b/qt/scientific_interfaces/ISISReflectometry/ReflMainWindowPresenter.h
index 7823ad60198be98daa0ca89bbfabfe53c334782d..cc398affa9ee6e38d6726d6c05399ef25646deec 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflMainWindowPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflMainWindowPresenter.h
@@ -49,9 +49,10 @@ public:
void notifyHelpPressed() override;
void notifyNewBatchRequested() override;
void notifyCloseBatchRequested(int batchIndex) override;
+
private:
void showHelp();
- IReflMainWindowView* m_view;
+ IReflMainWindowView *m_view;
ReflBatchPresenterFactory m_batchPresenterFactory;
std::vector<std::unique_ptr<IReflBatchPresenter>> m_batchPresenters;
};
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflRunsPresenterFactory.h b/qt/scientific_interfaces/ISISReflectometry/ReflRunsPresenterFactory.h
index adefe9930617c3e34b4a3e8e9e0c9be9ca4122e6..e602768c868f0944209e6827385552b57f8e368f 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflRunsPresenterFactory.h
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflRunsPresenterFactory.h
@@ -1,13 +1,13 @@
#ifndef MANTID_ISISREFLECTOMETRY_REFLRUNSPRESENTERFACTORY_H
#define MANTID_ISISREFLECTOMETRY_REFLRUNSPRESENTERFACTORY_H
+#include "../General/IReflSearcher.h"
#include "DllConfig.h"
#include "GUI/Event/IEventPresenter.h"
+#include "GUI/RunsTable/RunsTablePresenterFactory.h"
#include "IReflRunsTabPresenter.h"
#include "IReflRunsTabView.h"
-#include "ReflRunsTabPresenter.h"
#include "MantidQtWidgets/Common/ProgressableView.h"
-#include "GUI/RunsTable/RunsTablePresenterFactory.h"
-#include "../General/IReflSearcher.h"
+#include "ReflRunsTabPresenter.h"
#include <memory>
namespace MantidQt {
@@ -45,6 +45,6 @@ private:
IReflMessageHandler *m_messageHandler;
boost::shared_ptr<IReflSearcher> m_searcher;
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_REFLRUNSPRESENTERFACTORY_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.cpp
index ef14febbd5d1b7a9130ba0d96749644f90dec002..af4a203e43e388f30ac101eb203c915e66b38679 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.cpp
@@ -46,19 +46,19 @@ Mantid::Kernel::Logger g_log("Reflectometry GUI");
}
/** Constructor
-* @param mainView :: [input] The view we're managing
-* @param progressableView :: [input] The view reporting progress
-* @param makeRunsTablePresenter :: A generator for the child presenters.
-* @param workspaceNamesFactory :: A generator for the workspace names used in
-* the reduction.
-* @param thetaTolerance The tolerance used to determine if two runs should be
-* summed in a reduction.
-* @param instruments The names of the instruments to show as options for the
-* search.
-* @param defaultInstrumentIndex The index of the instrument to have selected by
-* default.
-* @param searcher :: [input] The search implementation
-*/
+ * @param mainView :: [input] The view we're managing
+ * @param progressableView :: [input] The view reporting progress
+ * @param makeRunsTablePresenter :: A generator for the child presenters.
+ * @param workspaceNamesFactory :: A generator for the workspace names used in
+ * the reduction.
+ * @param thetaTolerance The tolerance used to determine if two runs should be
+ * summed in a reduction.
+ * @param instruments The names of the instruments to show as options for the
+ * search.
+ * @param defaultInstrumentIndex The index of the instrument to have selected by
+ * default.
+ * @param searcher :: [input] The search implementation
+ */
ReflRunsTabPresenter::ReflRunsTabPresenter(
IReflRunsTabView *mainView, ProgressableView *progressableView,
RunsTablePresenterFactory makeRunsTablePresenter,
@@ -266,7 +266,7 @@ bool ReflRunsTabPresenter::requireNewAutoreduction() const {
}
bool ReflRunsTabPresenter::setupNewAutoreduction(
- const std::string &searchString) {
+ const std::string &searchString) {
return m_autoreduction.setupNewAutoreduction(searchString);
}
@@ -295,7 +295,7 @@ void ReflRunsTabPresenter::autoreduceNewRuns() {
// tablePresenter->setPromptUser(false);
// tablePresenter->notify(DataProcessorPresenter::ProcessAllFlag);
} else {
- //confirmReductionCompleted();
+ // confirmReductionCompleted();
}
}
@@ -314,7 +314,6 @@ bool ReflRunsTabPresenter::isAutoreducing() const {
return m_autoreduction.running();
}
-
bool ReflRunsTabPresenter::isProcessing() const {
// TODO define this properly.
return false;
@@ -452,10 +451,10 @@ void ReflRunsTabPresenter::updateWidgetEnabledState() const {
}
/** Changes the current instrument in the data processor widget. Also clears
-* the
-* and the table selection model and updates the config service, printing an
-* information message
-*/
+ * the
+ * and the table selection model and updates the config service, printing an
+ * information message
+ */
void ReflRunsTabPresenter::changeInstrument() {
auto const instrument = m_view->getSearchInstrument();
m_mainPresenter->setInstrumentName(instrument);
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.h b/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.h
index dd1655314d06e8f51ad051e3ae570ab656cf66e2..acff9569d6d945275acf399d8426ad8232206dda 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.h
@@ -21,7 +21,7 @@ namespace MantidQt {
namespace MantidWidgets {
// Forward decs
class ProgressableView;
-}
+} // namespace MantidWidgets
namespace CustomInterfaces {
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflSavePresenterFactory.h b/qt/scientific_interfaces/ISISReflectometry/ReflSavePresenterFactory.h
index 03521a4cfda46f84a4b80f9d3c6868d12a1adaa2..ee9a9ade6a5d963c141b988eac8ce5b84bf6fed0 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflSavePresenterFactory.h
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflSavePresenterFactory.h
@@ -1,10 +1,10 @@
#ifndef MANTID_ISISREFLECTOMETRY_REFLSAVEPRESENTERFACTORY_H
#define MANTID_ISISREFLECTOMETRY_REFLSAVEPRESENTERFACTORY_H
#include "DllConfig.h"
-#include "IReflSaveTabView.h"
#include "IReflSaveTabPresenter.h"
-#include "ReflSaveTabPresenter.h"
+#include "IReflSaveTabView.h"
#include "ReflAsciiSaver.h"
+#include "ReflSaveTabPresenter.h"
#include <memory>
namespace MantidQt {
@@ -17,6 +17,6 @@ public:
view, Mantid::Kernel::make_unique<ReflAsciiSaver>());
}
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_REFLSETTINGSPRESENTERFACTORY_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflSaveTabPresenter.h b/qt/scientific_interfaces/ISISReflectometry/ReflSaveTabPresenter.h
index b58a14d35849ba10e5e1dd792c06071153a75f1b..93af1a76e0967980e2da4f83eac696b95424c0a0 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflSaveTabPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflSaveTabPresenter.h
@@ -5,12 +5,11 @@
#include "IReflAsciiSaver.h"
#include "IReflSaveTabPresenter.h"
#include "IReflSaveTabView.h"
-#include <vector>
-#include <string>
-#include <memory>
#include <MantidKernel/ConfigPropertyObserver.h>
#include <boost/optional.hpp>
-#include "IReflAsciiSaver.h"
+#include <memory>
+#include <string>
+#include <vector>
namespace MantidQt {
namespace CustomInterfaces {
@@ -44,7 +43,7 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class MANTIDQT_ISISREFLECTOMETRY_DLL ReflSaveTabPresenter
: public IReflSaveTabPresenter {
public:
- ReflSaveTabPresenter(IReflSaveTabView* view,
+ ReflSaveTabPresenter(IReflSaveTabView *view,
std::unique_ptr<IReflAsciiSaver> saver);
/// Accept a main presenter
void acceptMainPresenter(IReflBatchPresenter *mainPresenter) override;
@@ -88,7 +87,7 @@ private:
bool shouldAutosave() const;
/// The view
- IReflSaveTabView* m_view;
+ IReflSaveTabView *m_view;
std::unique_ptr<IReflAsciiSaver> m_saver;
/// The main presenter
IReflBatchPresenter *m_mainPresenter;
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflSearchModel.cpp b/qt/scientific_interfaces/ISISReflectometry/ReflSearchModel.cpp
index 4724c5d85019066c117c25ec79b4ae37cc0c8565..0050925835caaa21d5face65bc224d93cd128860 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflSearchModel.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflSearchModel.cpp
@@ -1,7 +1,6 @@
#include "ReflSearchModel.h"
#include "MantidAPI/ITableWorkspace.h"
#include "MantidAPI/TableRow.h"
-#include <boost/regex.hpp>
#include <QColor>
#include <boost/regex.hpp>
diff --git a/qt/scientific_interfaces/ISISReflectometry/ValidationResult.h b/qt/scientific_interfaces/ISISReflectometry/ValidationResult.h
index 0e2b29d4fa7abfb781d9373cda8a59a52aa3e45b..267c9e80da10a9599c27bc67e057f67896ca17c2 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ValidationResult.h
+++ b/qt/scientific_interfaces/ISISReflectometry/ValidationResult.h
@@ -1,7 +1,7 @@
#ifndef MANTID_ISISREFLECTOMETRY_RESULT_H
#define MANTID_ISISREFLECTOMETRY_RESULT_H
-#include <boost/variant.hpp>
#include <boost/optional.hpp>
+#include <boost/variant.hpp>
namespace MantidQt {
namespace CustomInterfaces {
@@ -63,6 +63,6 @@ ValidationResult<Validated, Error>::validElseNone() const {
else
return boost::none;
}
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_RESULT_H
diff --git a/qt/scientific_interfaces/test/ISISReflectometry/Event/EventPresenterTest.h b/qt/scientific_interfaces/test/ISISReflectometry/Event/EventPresenterTest.h
index d1f8692cf5e52d5cae8bb5e0a9d369a795930524..7c5e6ae95ce6aff064748ff0f2acc01f26eab6aa 100644
--- a/qt/scientific_interfaces/test/ISISReflectometry/Event/EventPresenterTest.h
+++ b/qt/scientific_interfaces/test/ISISReflectometry/Event/EventPresenterTest.h
@@ -1,16 +1,16 @@
#ifndef MANTID_CUSTOMINTERFACES_REFLEVENTPRESENTERTEST_H_
#define MANTID_CUSTOMINTERFACES_REFLEVENTPRESENTERTEST_H_
-#include "MockEventView.h"
#include "../../../ISISReflectometry/GUI/Event/EventPresenter.h"
+#include "MockEventView.h"
#include <cxxtest/TestSuite.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
using namespace MantidQt::CustomInterfaces;
-using testing::Return;
using testing::Mock;
using testing::NiceMock;
+using testing::Return;
class EventPresenterTest : public CxxTest::TestSuite {
public:
@@ -21,9 +21,7 @@ public:
EventPresenter makePresenter() { return EventPresenter(&m_view); }
- bool verifyAndClear() {
- return Mock::VerifyAndClearExpectations(&m_view);
- }
+ bool verifyAndClear() { return Mock::VerifyAndClearExpectations(&m_view); }
void testNoEventSlicingByDefault() {
auto presenter = makePresenter();
diff --git a/qt/scientific_interfaces/test/ISISReflectometry/Event/MockEventView.h b/qt/scientific_interfaces/test/ISISReflectometry/Event/MockEventView.h
index 525eb7722bf886a255e9ed132f20c52a86ce0fda..98316f497935e45e24cde3d07d6f1915564a1b9d 100644
--- a/qt/scientific_interfaces/test/ISISReflectometry/Event/MockEventView.h
+++ b/qt/scientific_interfaces/test/ISISReflectometry/Event/MockEventView.h
@@ -1,6 +1,6 @@
#include "../../../ISISReflectometry/GUI/Event/IEventView.h"
-#include <gmock/gmock.h>
#include "MantidKernel/WarningSuppressions.h"
+#include <gmock/gmock.h>
GNU_DIAG_OFF_SUGGEST_OVERRIDE
@@ -27,6 +27,6 @@ public:
MOCK_METHOD0(enableSliceTypeSelection, void());
MOCK_METHOD0(disableSliceTypeSelection, void());
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
GNU_DIAG_ON_SUGGEST_OVERRIDE
diff --git a/qt/scientific_interfaces/test/ISISReflectometry/Experiment/ExperimentPresenterTest.h b/qt/scientific_interfaces/test/ISISReflectometry/Experiment/ExperimentPresenterTest.h
index 3304a61318cb195214f6d7ae6be426c03fab1d47..321abf05f292f66361adff4d2735e6656e7787b3 100644
--- a/qt/scientific_interfaces/test/ISISReflectometry/Experiment/ExperimentPresenterTest.h
+++ b/qt/scientific_interfaces/test/ISISReflectometry/Experiment/ExperimentPresenterTest.h
@@ -9,12 +9,12 @@
#include <gtest/gtest.h>
using namespace MantidQt::CustomInterfaces;
-using testing::Return;
using testing::Mock;
using testing::NiceMock;
+using testing::Return;
using testing::_;
-class ExperimentPresenterTest : public CxxTest::TestSuite {
+class ExperimentPresenterTest : public CxxTest::TestSuite {
public:
// This pair of boilerplate methods prevent the suite being created statically
// This means the constructor isn't called when running other tests
diff --git a/qt/scientific_interfaces/test/ISISReflectometry/Experiment/MockExperimentView.h b/qt/scientific_interfaces/test/ISISReflectometry/Experiment/MockExperimentView.h
index 4aac2fed93932b17892ef085dbd1179e07df1459..61b5bb0cdb828ebabe58389436f210595f68033f 100644
--- a/qt/scientific_interfaces/test/ISISReflectometry/Experiment/MockExperimentView.h
+++ b/qt/scientific_interfaces/test/ISISReflectometry/Experiment/MockExperimentView.h
@@ -1,6 +1,6 @@
#include "../../../ISISReflectometry/GUI/Experiment/IExperimentView.h"
-#include <gmock/gmock.h>
#include "MantidKernel/WarningSuppressions.h"
+#include <gmock/gmock.h>
GNU_DIAG_OFF_SUGGEST_OVERRIDE
@@ -54,6 +54,6 @@ public:
MOCK_METHOD1(removePerThetaDefaultsRow, void(int));
MOCK_METHOD1(showPerAngleThetasNonUnique, void(double));
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
GNU_DIAG_ON_SUGGEST_OVERRIDE
diff --git a/qt/scientific_interfaces/test/ISISReflectometry/Experiment/PerThetaDefaultsTableValidatorTest.h b/qt/scientific_interfaces/test/ISISReflectometry/Experiment/PerThetaDefaultsTableValidatorTest.h
index 99fdd9b5b4688c591523410f079de8d5a14bf192..9f91cfc7a9b0245b3fa53632425f496e19977bce 100644
--- a/qt/scientific_interfaces/test/ISISReflectometry/Experiment/PerThetaDefaultsTableValidatorTest.h
+++ b/qt/scientific_interfaces/test/ISISReflectometry/Experiment/PerThetaDefaultsTableValidatorTest.h
@@ -1,7 +1,7 @@
#ifndef MANTID_CUSTOMINTERFACES_VALIDATEPERTHETADEFAULTSTABLETEST_H_
#define MANTID_CUSTOMINTERFACES_VALIDATEPERTHETADEFAULTSTABLETEST_H_
-#include <cxxtest/TestSuite.h>
#include "../../../ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.h"
+#include <cxxtest/TestSuite.h>
using namespace MantidQt::CustomInterfaces;
@@ -9,13 +9,14 @@ class ValidatePerThetaDefaultsTableTest : public CxxTest::TestSuite {
public:
// This pair of boilerplate methods prevent the suite being created statically
// This means the constructor isn't called when running other tests
- static ValidatePerThetaDefaultsTableTest *createSuite() { return new ValidatePerThetaDefaultsTableTest(); }
- static void destroySuite(ValidatePerThetaDefaultsTableTest *suite) { delete suite; }
- static auto constexpr TOLERANCE = 0.000001;
-
- void testThing() {
-
+ static ValidatePerThetaDefaultsTableTest *createSuite() {
+ return new ValidatePerThetaDefaultsTableTest();
+ }
+ static void destroySuite(ValidatePerThetaDefaultsTableTest *suite) {
+ delete suite;
}
+ static auto constexpr TOLERANCE = 0.000001;
+ void testThing() {}
};
#endif // MANTID_CUSTOMINTERFACES_VALIDATEPERTHETADEFAULTSTABLETEST_H_
diff --git a/qt/scientific_interfaces/test/ISISReflectometry/Reduction/ValidatePerThetaDefaultsTest.h b/qt/scientific_interfaces/test/ISISReflectometry/Reduction/ValidatePerThetaDefaultsTest.h
index 601bd643fbc98b85459f8a55dec5913e51ac1009..116ef55df6f5c68067a8a0de3ddca6bf1ec9b08c 100644
--- a/qt/scientific_interfaces/test/ISISReflectometry/Reduction/ValidatePerThetaDefaultsTest.h
+++ b/qt/scientific_interfaces/test/ISISReflectometry/Reduction/ValidatePerThetaDefaultsTest.h
@@ -1,7 +1,7 @@
#ifndef MANTID_CUSTOMINTERFACES_VALIDATEPERTHETADEFAULTSTEST_H_
#define MANTID_CUSTOMINTERFACES_VALIDATEPERTHETADEFAULTSTEST_H_
-#include <cxxtest/TestSuite.h>
#include "../../../ISISReflectometry/Reduction/ValidatePerThetaDefaults.h"
+#include <cxxtest/TestSuite.h>
using namespace MantidQt::CustomInterfaces;
@@ -9,12 +9,15 @@ class ValidatePerThetaDefaultsTest : public CxxTest::TestSuite {
public:
// This pair of boilerplate methods prevent the suite being created statically
// This means the constructor isn't called when running other tests
- static ValidatePerThetaDefaultsTest *createSuite() { return new ValidatePerThetaDefaultsTest(); }
- static void destroySuite(ValidatePerThetaDefaultsTest *suite) { delete suite; }
+ static ValidatePerThetaDefaultsTest *createSuite() {
+ return new ValidatePerThetaDefaultsTest();
+ }
+ static void destroySuite(ValidatePerThetaDefaultsTest *suite) {
+ delete suite;
+ }
static auto constexpr TOLERANCE = 0.000001;
void testThing() {}
-
};
#endif // MANTID_CUSTOMINTERFACES_VALIDATEPERTHETADEFAULTSTEST_H_
diff --git a/qt/scientific_interfaces/test/ISISReflectometry/Reduction/ValidateRowTest.h b/qt/scientific_interfaces/test/ISISReflectometry/Reduction/ValidateRowTest.h
index 339ffd583d995f25635de8275d6b63be70773df1..26c5e3b3e605c0e3661eb94f406e680474d4d962 100644
--- a/qt/scientific_interfaces/test/ISISReflectometry/Reduction/ValidateRowTest.h
+++ b/qt/scientific_interfaces/test/ISISReflectometry/Reduction/ValidateRowTest.h
@@ -1,8 +1,8 @@
#ifndef MANTID_CUSTOMINTERFACES_VALIDATEROWTEST_H_
#define MANTID_CUSTOMINTERFACES_VALIDATEROWTEST_H_
-#include <cxxtest/TestSuite.h>
#include "../../../ISISReflectometry/Parse.h"
#include "../../../ISISReflectometry/Reduction/ValidateRow.h"
+#include <cxxtest/TestSuite.h>
using namespace MantidQt::CustomInterfaces;
@@ -15,7 +15,7 @@ public:
static auto constexpr TOLERANCE = 0.000001;
void test() {}
-
+
void testParsesTriviallyValidDoubles() {
TS_ASSERT_DELTA(1.0, parseDouble("1.0").get(), TOLERANCE);
TS_ASSERT_DELTA(6.4, parseDouble("6.4").get(), TOLERANCE);
diff --git a/qt/scientific_interfaces/test/ISISReflectometry/RunsTable/MockRunsTableView.h b/qt/scientific_interfaces/test/ISISReflectometry/RunsTable/MockRunsTableView.h
index 88090d6246aa7c90bb8f0cdd9352015ca488e2d5..c7b01e798938b201c40aaf857c2cfe6be7cac4ba 100644
--- a/qt/scientific_interfaces/test/ISISReflectometry/RunsTable/MockRunsTableView.h
+++ b/qt/scientific_interfaces/test/ISISReflectometry/RunsTable/MockRunsTableView.h
@@ -26,7 +26,7 @@ public:
MOCK_METHOD0(mustNotSelectGroup, void());
MOCK_METHOD0(mustSelectGroupOrRow, void());
};
-}
-}
+} // namespace CustomInterfaces
+} // namespace MantidQt
GNU_DIAG_ON_SUGGEST_OVERRIDE
#endif // MANTID_CUSTOMINTERFACES_MOCKRUNSTABLEVIEW_H_
diff --git a/qt/scientific_interfaces/test/ISISReflectometry/RunsTable/RunsTablePresenterRowInsertionTest.h b/qt/scientific_interfaces/test/ISISReflectometry/RunsTable/RunsTablePresenterRowInsertionTest.h
index 16c0ad3e3868d920875960f2d76faa34375318f0..53e857e3d2d516d66082af950c54fd93fb07acb0 100644
--- a/qt/scientific_interfaces/test/ISISReflectometry/RunsTable/RunsTablePresenterRowInsertionTest.h
+++ b/qt/scientific_interfaces/test/ISISReflectometry/RunsTable/RunsTablePresenterRowInsertionTest.h
@@ -14,7 +14,7 @@ using testing::NiceMock;
using testing::Return;
class RunsTablePresenterRowInsertionTest : public CxxTest::TestSuite,
- RunsTablePresenterTest {
+ RunsTablePresenterTest {
public:
static RunsTablePresenterRowInsertionTest *createSuite() {
return new RunsTablePresenterRowInsertionTest();
diff --git a/qt/scientific_interfaces/test/ISISReflectometry/RunsTable/RunsTablePresenterTest.h b/qt/scientific_interfaces/test/ISISReflectometry/RunsTable/RunsTablePresenterTest.h
index 01a580989c966352fbf9d13f0784d527b1687358..04c57894e997852b58951a75797b96083e36c5f7 100644
--- a/qt/scientific_interfaces/test/ISISReflectometry/RunsTable/RunsTablePresenterTest.h
+++ b/qt/scientific_interfaces/test/ISISReflectometry/RunsTable/RunsTablePresenterTest.h
@@ -3,8 +3,8 @@
#include "../../../ISISReflectometry/GUI/RunsTable/RunsTablePresenter.h"
#include "../../../ISISReflectometry/Reduction/Slicing.h"
-#include "MockRunsTableView.h"
#include "MantidQtWidgets/Common/Batch/MockJobTreeView.h"
+#include "MockRunsTableView.h"
#include <cxxtest/TestSuite.h>
#include <gmock/gmock.h>
diff --git a/qt/scientific_interfaces/test/ReflMockObjects.h b/qt/scientific_interfaces/test/ReflMockObjects.h
index c4654d985111f0d18f803dbca9b81e746e40eb8b..d10f443af3d8c44b903abe0b164a3004ccf95221 100644
--- a/qt/scientific_interfaces/test/ReflMockObjects.h
+++ b/qt/scientific_interfaces/test/ReflMockObjects.h
@@ -2,9 +2,9 @@
#define MANTID_CUSTOMINTERFACES_REFLMOCKOBJECTS_H
#include "../ISISReflectometry/ExperimentOptionDefaults.h"
-#include "../ISISReflectometry/IReflAsciiSaver.h"
#include "../ISISReflectometry/IEventPresenter.h"
#include "../ISISReflectometry/IEventView.h"
+#include "../ISISReflectometry/IReflAsciiSaver.h"
#include "../ISISReflectometry/IReflMainWindowPresenter.h"
#include "../ISISReflectometry/IReflMainWindowView.h"
#include "../ISISReflectometry/IReflRunsTabPresenter.h"
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmHintStrategy.h b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmHintStrategy.h
index 61f3a64a3c918be64422b86b118eca8fe9bcc73a..4d32c56d93e34d4060269023694ef4bc0b089731 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmHintStrategy.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmHintStrategy.h
@@ -52,8 +52,9 @@ public:
auto properties = m_algorithm->getProperties();
properties.erase(
std::remove_if(properties.begin(), properties.end(),
- [this](Mantid::Kernel::Property *property)
- -> bool { return isBlacklisted(property->name()); }),
+ [this](Mantid::Kernel::Property *property) -> bool {
+ return isBlacklisted(property->name());
+ }),
properties.end());
hints.reserve(properties.size());
std::transform(properties.cbegin(), properties.cend(),
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/IJobTreeView.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/IJobTreeView.h
index 5f8b6bbac115e1b9a807fdd4225113c357062cfa..7e4a2378ea24d664460357450b246322d5dc7557 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/IJobTreeView.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/IJobTreeView.h
@@ -1,13 +1,13 @@
#ifndef MANTIDQTMANTIDWIDGETS_IJOBTREEVIEW_H_
#define MANTIDQTMANTIDWIDGETS_IJOBTREEVIEW_H_
+#include "MantidQtWidgets/Common/Batch/Cell.h"
+#include "MantidQtWidgets/Common/Batch/Row.h"
#include "MantidQtWidgets/Common/Batch/RowLocation.h"
#include "MantidQtWidgets/Common/Batch/RowLocationAdapter.h"
#include "MantidQtWidgets/Common/Batch/RowPredicate.h"
-#include "MantidQtWidgets/Common/HintStrategy.h"
-#include "MantidQtWidgets/Common/Batch/Cell.h"
-#include "MantidQtWidgets/Common/Batch/Row.h"
#include "MantidQtWidgets/Common/Batch/Subtree.h"
#include "MantidQtWidgets/Common/DllOption.h"
+#include "MantidQtWidgets/Common/HintStrategy.h"
#include <boost/optional.hpp>
namespace MantidQt {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/JobTreeView.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/JobTreeView.h
index 463f2aaa022b261ddbec9ba44c7264a9069d0dc1..df6ab20626f23e2a3d0ea947eada7eee27051092 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/JobTreeView.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/JobTreeView.h
@@ -33,7 +33,6 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
#include "MantidQtWidgets/Common/Batch/QtTreeCursorNavigation.h"
#include "MantidQtWidgets/Common/Batch/RowLocation.h"
#include "MantidQtWidgets/Common/Batch/RowLocationAdapter.h"
-#include "MantidQtWidgets/Common/Batch/Cell.h"
#include "MantidQtWidgets/Common/DllOption.h"
#include <boost/optional.hpp>
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/MockJobTreeView.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/MockJobTreeView.h
index 69e2d505f0c6bb60e48c22d40812bc4803a7e6be..9151a949dc0fa79f0d362a2662cac444f81426ce 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/MockJobTreeView.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/MockJobTreeView.h
@@ -1,8 +1,8 @@
#ifndef MANTIDQTMANTIDWIDGETS_MOCKJOBTREEVIEW_H_
#define MANTIDQTMANTIDWIDGETS_MOCKJOBTREEVIEW_H_
-#include <gmock/gmock.h>
-#include "MantidQtWidgets/Common/Batch/IJobTreeView.h"
#include "MantidKernel/WarningSuppressions.h"
+#include "MantidQtWidgets/Common/Batch/IJobTreeView.h"
+#include <gmock/gmock.h>
using testing::Return;
@@ -81,7 +81,7 @@ private:
};
GNU_DIAG_ON_SUGGEST_OVERRIDE
-}
-}
-}
+} // namespace Batch
+} // namespace MantidWidgets
+} // namespace MantidQt
#endif // MANTIDQTMANTIDWIDGETS_MOCKJOBTREEVIEW_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/RowPredicate.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/RowPredicate.h
index 58d8bed3326b9bcdcc83dcf3f682de7605d5a1b1..5195d45d088a68c4e3212fa345000a34fea32b4b 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/RowPredicate.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/RowPredicate.h
@@ -25,8 +25,8 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
#ifndef MANTIDQTMANTIDWIDGETS_ROWPREDICATE_H_
#define MANTIDQTMANTIDWIDGETS_ROWPREDICATE_H_
-#include "MantidQtWidgets/Common/Batch/RowLocation.h"
#include "MantidKernel/make_unique.h"
+#include "MantidQtWidgets/Common/Batch/RowLocation.h"
#include <memory>
namespace MantidQt {
@@ -60,7 +60,7 @@ template <typename Predicate>
std::unique_ptr<RowPredicate> makeFilterFromLambda(Predicate predicate) {
return Mantid::Kernel::make_unique<LambdaRowPredicate<Predicate>>(predicate);
}
-}
-}
-}
+} // namespace Batch
+} // namespace MantidWidgets
+} // namespace MantidQt
#endif // MANTIDQTMANTIDWIDGETS_ROWPREDICATE_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h
index 60c051436302d276e49321317d052494be535729..25e77f2909816b7eb0674500df277e351c223dfb 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h
@@ -60,9 +60,7 @@ public:
/// Return global options for reduction
virtual OptionsQMap getProcessingOptions() const { return OptionsQMap(); }
/// Return global options for post-processing as a string
- virtual QString getPostprocessingOptionsAsString() const {
- return QString();
- }
+ virtual QString getPostprocessingOptionsAsString() const { return QString(); }
/// Return time-slicing values
virtual QString getTimeSlicingValues() const { return QString(); }
/// Return time-slicing type
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Hint.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Hint.h
index 3a727dad9b84e503ad8e25847832121032aed0db..77caa76ed2bca08bfe0b7bec416851e3244095fb 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Hint.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Hint.h
@@ -1,7 +1,7 @@
#ifndef MANTID_MANTIDWIDGETS_HINT_H_
#define MANTID_MANTIDWIDGETS_HINT_H_
-#include <string>
#include "DllOption.h"
+#include <string>
namespace MantidQt {
namespace MantidWidgets {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/HintStrategy.h b/qt/widgets/common/inc/MantidQtWidgets/Common/HintStrategy.h
index b2edce7634775ff280d81021cacece5d832a6402..4613b6706c1ee64901312af27f49b33595e139d4 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/HintStrategy.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/HintStrategy.h
@@ -1,10 +1,10 @@
#ifndef MANTID_MANTIDWIDGETS_HINTSTRATEGY_H
#define MANTID_MANTIDWIDGETS_HINTSTRATEGY_H
+#include "DllOption.h"
+#include "MantidQtWidgets/Common/Hint.h"
#include <map>
#include <string>
-#include "MantidQtWidgets/Common/Hint.h"
-#include "DllOption.h"
namespace MantidQt {
namespace MantidWidgets {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/HintingLineEdit.h b/qt/widgets/common/inc/MantidQtWidgets/Common/HintingLineEdit.h
index 6dd4799cc5c2edb2e786ea60d709b69dc3195374..97ca4f54190322a9c5accb49cc2bf8ad776d9b0b 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/HintingLineEdit.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/HintingLineEdit.h
@@ -5,9 +5,6 @@
#include "Hint.h"
#include "MantidAPI/AlgorithmFactory.h"
#include "MantidKernel/System.h"
-#include "MantidAPI/AlgorithmFactory.h"
-#include "DllOption.h"
-#include "Hint.h"
#include <QLineEdit>
diff --git a/qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp b/qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp
index e7f0a864205df106ebb772249eeebd6839da6dd5..7cb8eb96b4a9952d9241a5dc4f5c1adc6bb47dd5 100644
--- a/qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp
@@ -231,9 +231,9 @@ GenericDataProcessorPresenter::~GenericDataProcessorPresenter() {}
namespace {
std::vector<std::string> toStdStringVector(std::set<QString> in) {
auto out = std::vector<std::string>();
- std::transform(in.cbegin(), in.cend(), std::back_inserter(out),
- [](QString const &inStr)
- -> std::string { return inStr.toStdString(); });
+ std::transform(
+ in.cbegin(), in.cend(), std::back_inserter(out),
+ [](QString const &inStr) -> std::string { return inStr.toStdString(); });
return out;
}
} // namespace
diff --git a/qt/widgets/common/src/ParseKeyValueString.cpp b/qt/widgets/common/src/ParseKeyValueString.cpp
index f36314a69dcca7a81cb852a7ebfbc2b9ab0964e8..aae98b6dd598faf6dd13b27ba659821a2387b3ea 100644
--- a/qt/widgets/common/src/ParseKeyValueString.cpp
+++ b/qt/widgets/common/src/ParseKeyValueString.cpp
@@ -210,5 +210,5 @@ std::string optionsToString(std::map<std::string, std::string> const &options) {
return std::string();
}
}
-}
-}
+} // namespace MantidWidgets
+} // namespace MantidQt