From 298ffa5f0dd00b81b053b7f2886af5aaaa8f503a Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de>
Date: Mon, 12 Jun 2023 16:50:03 +0200
Subject: [PATCH] clang-format
---
Device/IO/ReadRefsans.cpp | 13 +++++++------
GUI/View/Import/RealDataSelectorWidget.cpp | 9 +++------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/Device/IO/ReadRefsans.cpp b/Device/IO/ReadRefsans.cpp
index 376a6d33ee4..f9c4530f4c0 100644
--- a/Device/IO/ReadRefsans.cpp
+++ b/Device/IO/ReadRefsans.cpp
@@ -36,14 +36,15 @@ bool getNextLine(std::istream& input_stream, std::string& line)
}
return false;
}
-}
+} // namespace
// From issue #580:
// 1. There is no header or metadata in any csv-file.
-// 2. Each csv-matrix has 257 rows and 257 columns of comma-separated floating-point values with a period as the decimal separator.
+// 2. Each csv-matrix has 257 rows and 257 columns of comma-separated floating-point values with a
+// period as the decimal separator.
// 3. The first row and the first column are Q-values for each matrix element.
// 4. q-units are A^-1
-Datafield *Util::RW::readRefsans(std::istream &input_stream)
+Datafield* Util::RW::readRefsans(std::istream& input_stream)
{
// read qx coords from first line
std::string line;
@@ -65,11 +66,11 @@ Datafield *Util::RW::readRefsans(std::istream &input_stream)
ASSERT(qz.front() != qz.back());
// sort axes
- if(qz.front() > qz.back()) {
+ if (qz.front() > qz.back()) {
std::reverse(qz.begin(), qz.end());
DataUtil::Data::invertAxis(1, matrix);
}
- if(qy.front() > qy.back()) {
+ if (qy.front() > qy.back()) {
std::reverse(qy.begin(), qy.end());
DataUtil::Data::invertAxis(0, matrix);
}
@@ -79,7 +80,7 @@ Datafield *Util::RW::readRefsans(std::istream &input_stream)
// flatten values
std::vector<double> values;
- for(const auto& row : matrix)
+ for (const auto& row : matrix)
values.insert(values.end(), row.begin(), row.end());
// create datafield
diff --git a/GUI/View/Import/RealDataSelectorWidget.cpp b/GUI/View/Import/RealDataSelectorWidget.cpp
index 734d397ab71..454fa825d36 100644
--- a/GUI/View/Import/RealDataSelectorWidget.cpp
+++ b/GUI/View/Import/RealDataSelectorWidget.cpp
@@ -320,12 +320,9 @@ void RealDataSelectorWidget::importData1D()
void RealDataSelectorWidget::importData2D()
{
static const std::vector<std::pair<const QString, IO::Filetype2D>> filters2D{
- {"TIFF (*.tif *.tiff *.tif.gz)", IO::tiff},
- {"Nicos/SANSDRaw (*.001)", IO::nicos2D},
- {"BornAgain (*.int.gz)", IO::bornagain2D},
- {"CSV (*.csv *.dat *.tab *.txt)", IO::csv2D},
- {"REFSANS (*.csv)", IO::refsans2D},
- {"all (*.*)", IO::unknown2D}};
+ {"TIFF (*.tif *.tiff *.tif.gz)", IO::tiff}, {"Nicos/SANSDRaw (*.001)", IO::nicos2D},
+ {"BornAgain (*.int.gz)", IO::bornagain2D}, {"CSV (*.csv *.dat *.tab *.txt)", IO::csv2D},
+ {"REFSANS (*.csv)", IO::refsans2D}, {"all (*.*)", IO::unknown2D}};
QString filters = ::join_filterkeys(filters2D, ";;");
--
GitLab