From faa435e491c9ec9c8efc3fae28433ae48d579eb1 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 21 Apr 2021 11:17:26 +0200
Subject: [PATCH] clang-format
---
Core/Fitting/SimDataPair.cpp | 6 +++---
Device/Detector/RectangularDetector.cpp | 2 +-
Device/Detector/SimpleUnitConverters.cpp | 2 +-
Device/Detector/SphericalDetector.cpp | 2 +-
Device/InputOutput/OutputDataReadWriteNicos.cpp | 14 ++++++--------
GUI/coregui/Models/DataViewUtils.cpp | 2 +-
.../UnitTests/Core/Core/SimulationElementTest.cpp | 2 +-
7 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/Core/Fitting/SimDataPair.cpp b/Core/Fitting/SimDataPair.cpp
index 9e3a160d7b6..c742da02ce9 100644
--- a/Core/Fitting/SimDataPair.cpp
+++ b/Core/Fitting/SimDataPair.cpp
@@ -14,13 +14,13 @@
#include "Core/Fitting/SimDataPair.h"
#include "Base/Math/Numeric.h"
-#include "Core/Simulation/ISimulation.h"
-#include "Core/Simulation/UnitConverterUtils.h"
+#include "Core/Scan/UnitConverter1D.h"
#include "Core/Simulation/DepthProbeSimulation.h"
#include "Core/Simulation/GISASSimulation.h"
+#include "Core/Simulation/ISimulation.h"
#include "Core/Simulation/OffSpecularSimulation.h"
#include "Core/Simulation/SpecularSimulation.h"
-#include "Core/Scan/UnitConverter1D.h"
+#include "Core/Simulation/UnitConverterUtils.h"
#include "Device/Data/DataUtils.h"
namespace {
diff --git a/Device/Detector/RectangularDetector.cpp b/Device/Detector/RectangularDetector.cpp
index 115b418a950..0df7be112a2 100644
--- a/Device/Detector/RectangularDetector.cpp
+++ b/Device/Detector/RectangularDetector.cpp
@@ -15,9 +15,9 @@
#include "Device/Detector/RectangularDetector.h"
#include "Base/Const/Units.h"
#include "Base/Math/Constants.h"
+#include "Base/Pixel/RectangularPixel.h"
#include "Base/Pixel/SimulationElement.h"
#include "Device/Beam/Beam.h"
-#include "Base/Pixel/RectangularPixel.h"
#include "Device/Detector/RegionOfInterest.h"
#include "Device/Resolution/IDetectorResolution.h"
diff --git a/Device/Detector/SimpleUnitConverters.cpp b/Device/Detector/SimpleUnitConverters.cpp
index 0f50d062c52..48e7d8e9bad 100644
--- a/Device/Detector/SimpleUnitConverters.cpp
+++ b/Device/Detector/SimpleUnitConverters.cpp
@@ -15,9 +15,9 @@
#include "Device/Detector/SimpleUnitConverters.h"
#include "Base/Const/Units.h"
#include "Base/Math/Constants.h"
+#include "Base/Pixel/RectangularPixel.h"
#include "Device/Beam/Beam.h"
#include "Device/Detector/RectangularDetector.h"
-#include "Base/Pixel/RectangularPixel.h"
#include "Device/Detector/RegionOfInterest.h"
#include "Device/Detector/SphericalDetector.h"
#include "Device/Unit/AxisNames.h"
diff --git a/Device/Detector/SphericalDetector.cpp b/Device/Detector/SphericalDetector.cpp
index bf01f6237f7..6c4803f6529 100644
--- a/Device/Detector/SphericalDetector.cpp
+++ b/Device/Detector/SphericalDetector.cpp
@@ -16,8 +16,8 @@
#include "Base/Const/Units.h"
#include "Base/Math/Constants.h"
#include "Base/Pixel/SimulationElement.h"
-#include "Device/Beam/Beam.h"
#include "Base/Pixel/SphericalPixel.h"
+#include "Device/Beam/Beam.h"
#include "Device/Resolution/IDetectorResolution.h"
SphericalDetector::SphericalDetector()
diff --git a/Device/InputOutput/OutputDataReadWriteNicos.cpp b/Device/InputOutput/OutputDataReadWriteNicos.cpp
index 68a336aeb73..6f81ea01955 100644
--- a/Device/InputOutput/OutputDataReadWriteNicos.cpp
+++ b/Device/InputOutput/OutputDataReadWriteNicos.cpp
@@ -23,7 +23,7 @@ OutputData<double>* OutputDataReadWriteNicos::readOutputData(std::istream& input
unsigned int width = 0;
unsigned int height = 0;
-
+
// -- read dimensions
bool inFileSection = false;
bool fileSectionFound = false;
@@ -97,10 +97,9 @@ OutputData<double>* OutputDataReadWriteNicos::readOutputData(std::istream& input
+ ") does not match DataSizeX (" + std::to_string(width) + ")."));
for (unsigned col = 0; col < width; ++col) {
- const size_t global_index =
- result->toGlobalIndex({col, height - 1
- - dataRow}); // y-axis "0" is at bottom => invert y
- // to show first line at top of image
+ const size_t global_index = result->toGlobalIndex(
+ {col, height - 1 - dataRow}); // y-axis "0" is at bottom => invert y
+ // to show first line at top of image
int value = 0;
if (!StringUtils::to_int(valuesAsString[col], &value))
@@ -136,9 +135,8 @@ unsigned int OutputDataReadWriteNicos::readAssignedPositiveIntValue(const std::s
lineRelatedError("Can't parse assigned value '" + parts[1] + "'."));
if (value <= 0)
- throw std::runtime_error
- (lineRelatedError("Value of '" + parts[1] + "' is nonpositive."));
-
+ throw std::runtime_error(lineRelatedError("Value of '" + parts[1] + "' is nonpositive."));
+
return value;
}
diff --git a/GUI/coregui/Models/DataViewUtils.cpp b/GUI/coregui/Models/DataViewUtils.cpp
index d9db76fcee6..852eefd0af9 100644
--- a/GUI/coregui/Models/DataViewUtils.cpp
+++ b/GUI/coregui/Models/DataViewUtils.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/coregui/Models/DataViewUtils.h"
-#include "Device/Unit/Axes.h"
#include "Core/Simulation/UnitConverterUtils.h"
+#include "Device/Unit/Axes.h"
#include "GUI/coregui/Models/Data1DViewItem.h"
#include "GUI/coregui/Models/DataItem.h"
#include "GUI/coregui/Models/DataPropertyContainer.h"
diff --git a/Tests/UnitTests/Core/Core/SimulationElementTest.cpp b/Tests/UnitTests/Core/Core/SimulationElementTest.cpp
index dcd3032cdb6..91f92172124 100644
--- a/Tests/UnitTests/Core/Core/SimulationElementTest.cpp
+++ b/Tests/UnitTests/Core/Core/SimulationElementTest.cpp
@@ -1,8 +1,8 @@
#include "Base/Pixel/SimulationElement.h"
#include "Base/Axis/Bin.h"
#include "Base/Const/Units.h"
-#include "Base/Vector/Direction.h"
#include "Base/Pixel/SphericalPixel.h"
+#include "Base/Vector/Direction.h"
#include "Tests/GTestWrapper/google_test.h"
#include <memory>
--
GitLab