diff --git a/Device/Data/Datafield.cpp b/Device/Data/Datafield.cpp
index e6b055b9defb704d806753d830402d46954e40b3..869939f7f8a57c39c7f9900206e0b9b6b3544bea 100644
--- a/Device/Data/Datafield.cpp
+++ b/Device/Data/Datafield.cpp
@@ -34,13 +34,14 @@ Datafield::Datafield(Frame* frame, const std::vector<double>& values)
ASSERT(m_values.size() == m_frame->size());
}
-Datafield::Datafield(Frame* frame, const std::vector<double>& values, const std::vector<double> &errSigmas)
+Datafield::Datafield(Frame* frame, const std::vector<double>& values,
+ const std::vector<double>& errSigmas)
: m_frame(frame)
, m_values(values)
, m_errSigmas(errSigmas)
{
ASSERT(m_values.size() == m_frame->size());
- ASSERT(m_errSigmas.size()==0 || m_errSigmas.size() == m_values.size());
+ ASSERT(m_errSigmas.size() == 0 || m_errSigmas.size() == m_values.size());
}
Datafield::Datafield(const std::vector<IAxis*>& axes)
@@ -53,7 +54,8 @@ Datafield::Datafield(const std::vector<IAxis*>& axes, const std::vector<double>&
{
}
-Datafield::Datafield(const std::vector<IAxis*>& axes, const std::vector<double>& values, const std::vector<double> &errSigmas)
+Datafield::Datafield(const std::vector<IAxis*>& axes, const std::vector<double>& values,
+ const std::vector<double>& errSigmas)
: Datafield(new Frame(axes), values, errSigmas)
{
}
@@ -78,15 +80,15 @@ double Datafield::valAt(size_t i) const
bool Datafield::hasErrorSigmas() const
{
- return m_errSigmas.size()>0;
+ return m_errSigmas.size() > 0;
}
-const std::vector<double> &Datafield::errorSigmas() const
+const std::vector<double>& Datafield::errorSigmas() const
{
return m_errSigmas;
}
-std::vector<double> &Datafield::errorSigmas()
+std::vector<double>& Datafield::errorSigmas()
{
return m_errSigmas;
}
diff --git a/Device/Data/Datafield.h b/Device/Data/Datafield.h
index 07eecf0c8a97f3d06969dbc6cd538addb07424dd..22cc3bb5a72131cfdac9c01ad22ce7c72935ed2c 100644
--- a/Device/Data/Datafield.h
+++ b/Device/Data/Datafield.h
@@ -34,14 +34,16 @@ public:
//! Constructor that takes ownership of supplied frame and initializes values.
Datafield(Frame* frame, const std::vector<double>& values);
//! Constructor that takes ownership of supplied frame and initializes values and errorbars
- Datafield(Frame* frame, const std::vector<double>& values, const std::vector<double>& errSigmas);
+ Datafield(Frame* frame, const std::vector<double>& values,
+ const std::vector<double>& errSigmas);
//! Constructor that takes ownership of supplied axes.
Datafield(const std::vector<IAxis*>& axes);
//! Constructor that takes ownership of supplied axes and initializes values.
Datafield(const std::vector<IAxis*>& axes, const std::vector<double>& values);
//! Constructor that takes ownership of supplied axes and initializes values and errorbars
- Datafield(const std::vector<IAxis*>& axes, const std::vector<double>& values, const std::vector<double>& errSigmas);
+ Datafield(const std::vector<IAxis*>& axes, const std::vector<double>& values,
+ const std::vector<double>& errSigmas);
Datafield(const Datafield&) = delete;
Datafield(Datafield&&) = default;
diff --git a/Device/IO/ReadWriteINT.cpp b/Device/IO/ReadWriteINT.cpp
index 105a377703add5655e502b784d3716379666ebe6..2f0cb40a92d1b132c034a13283ac06bdb816bab4 100644
--- a/Device/IO/ReadWriteINT.cpp
+++ b/Device/IO/ReadWriteINT.cpp
@@ -58,15 +58,15 @@ void ReadWriteINT::writeDatafield(const Datafield& data, std::ostream& output_st
output_stream << "\n# data\n";
writeDatafieldDoubles(data.flatVector(), output_stream, n_columns);
- if(data.hasErrorSigmas()) {
+ if (data.hasErrorSigmas()) {
output_stream << "\n\n# errorbars\n";
writeDatafieldDoubles(data.errorSigmas(), output_stream, n_columns);
}
output_stream << std::endl;
}
-void ReadWriteINT::writeDatafieldDoubles(const std::vector<double>& dataValues, std::ostream& output_stream,
- size_t n_columns)
+void ReadWriteINT::writeDatafieldDoubles(const std::vector<double>& dataValues,
+ std::ostream& output_stream, size_t n_columns)
{
output_stream.imbue(std::locale::classic());
output_stream << std::scientific << std::setprecision(12);
diff --git a/Device/IO/ReadWriteINT.h b/Device/IO/ReadWriteINT.h
index d4a9cef70811e1e0627a9959438ad789675648aa..62fa535a2d1c042733f0a3bd972600029b1e0241 100644
--- a/Device/IO/ReadWriteINT.h
+++ b/Device/IO/ReadWriteINT.h
@@ -33,8 +33,8 @@ public:
void writeDatafield(const Datafield& data, std::ostream& output_stream);
private:
- static void writeDatafieldDoubles(const std::vector<double> &dataValues, std::ostream& output_stream,
- size_t n_columns);
+ static void writeDatafieldDoubles(const std::vector<double>& dataValues,
+ std::ostream& output_stream, size_t n_columns);
static double ignoreDenormalized(double value);
};
diff --git a/GUI/Model/Data/JobItemUtils.cpp b/GUI/Model/Data/JobItemUtils.cpp
index f7a324e0c5f76869ca22c32e944041c96d17efe5..1a6b94bfc882ffcf1108a5e3792ae5ee25a0280b 100644
--- a/GUI/Model/Data/JobItemUtils.cpp
+++ b/GUI/Model/Data/JobItemUtils.cpp
@@ -55,8 +55,7 @@ void GUI::Model::JobItemUtils::updateDataAxes(DataItem* dataItem,
auto* const converter = instrumentItem->createCoordSystem();
auto newData = std::make_unique<Datafield>(converter->convertedAxes(axes_units),
- oldData->flatVector(),
- oldData->errorSigmas());
+ oldData->flatVector(), oldData->errorSigmas());
dataItem->setDatafield(newData.release());
dataItem->setAxesRangeToData();
diff --git a/GUI/Model/Model/JobModel.cpp b/GUI/Model/Model/JobModel.cpp
index ff6472eef21ff11b76177e15b71485dcf7092fcd..576e942885222fb889e70a3b30aae539b3379562 100644
--- a/GUI/Model/Model/JobModel.cpp
+++ b/GUI/Model/Model/JobModel.cpp
@@ -14,8 +14,8 @@
#include "GUI/Model/Model/JobModel.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/PointwiseAxisItem.h"
#include "GUI/Model/Job/FitSuiteItem.h"
diff --git a/GUI/View/Loaders/QREDataLoader.cpp b/GUI/View/Loaders/QREDataLoader.cpp
index 974eecb0164625c9e9c01949ad3f664574348ef9..f3e64cf57924f5ce56a52e35fb19f7e69a4dfd11 100644
--- a/GUI/View/Loaders/QREDataLoader.cpp
+++ b/GUI/View/Loaders/QREDataLoader.cpp
@@ -547,11 +547,12 @@ void QREDataLoader::datafieldFromParsingResult(RealItem* item) const
// sigma_R for Datafield
std::vector<double> eVec;
- if(m_importSettings.columnDefinitions[DataType::dR].enabled)
+ if (m_importSettings.columnDefinitions[DataType::dR].enabled)
for (auto lineNr : lineNumbers)
eVec.push_back(m_importResult.eValues[lineNr]);
- auto* oData = new Datafield({new PointwiseAxis("qVector", qVec)}, rVec, eVec); // eVec can be empty
+ auto* oData =
+ new Datafield({new PointwiseAxis("qVector", qVec)}, rVec, eVec); // eVec can be empty
// -- Replacement of item->setImportData(std::move(data));
item->initNativeData();
diff --git a/GUI/View/PlotSpecular/SpecularPlot.cpp b/GUI/View/PlotSpecular/SpecularPlot.cpp
index eff4a9f6d26ca3896f4c8faff69b21031d2d0b1a..6c0355c0a3840a072f48c4fd5c67a5cae5f69cf6 100644
--- a/GUI/View/PlotSpecular/SpecularPlot.cpp
+++ b/GUI/View/PlotSpecular/SpecularPlot.cpp
@@ -142,13 +142,13 @@ void SpecularPlot::initPlot()
QCPScatterStyle(item->scatter(), item->scatterSize()));
// create error bars
- if(item->getDatafield()->hasErrorSigmas()) {
+ if (item->getDatafield()->hasErrorSigmas()) {
QCPErrorBars* errorBars = new QCPErrorBars(m_custom_plot->xAxis, m_custom_plot->yAxis);
m_errorbar_map.insert(item, errorBars);
errorBars->removeFromLegend();
errorBars->setAntialiased(false);
errorBars->setDataPlottable(m_custom_plot->graph());
- errorBars->setPen(QPen(QColor(180,180,180)));
+ errorBars->setPen(QPen(QColor(180, 180, 180)));
}
}
@@ -261,7 +261,7 @@ void SpecularPlot::setDataFromItem(SpecularDataItem* item)
}
// set error bars
- if(data->hasErrorSigmas()) {
+ if (data->hasErrorSigmas()) {
ASSERT(m_errorbar_map.contains(item));
QCPErrorBars* errorBars = m_errorbar_map.value(item);
for (size_t i = 0; i < data->size(); ++i) {