clang-format

Base/Vector/WavevectorInfo.h

@@ -20,8 +20,8 @@
 #ifndef BORNAGAIN_BASE_VECTOR_WAVEVECTORINFO_H
 #define BORNAGAIN_BASE_VECTOR_WAVEVECTORINFO_H
 
-#include <heinz/Vectors3D.h>
 #include "Base/Vector/RotMatrix.h"
+#include <heinz/Vectors3D.h>
 
 //! Holds all wavevector information relevant for calculating form factors.
 

GUI/View/Realspace/RealSpaceBuilder.h

@@ -46,9 +46,9 @@ public:
     void populate(RealSpace::Model* model, ItemForRealSpace item,
                   const SceneGeometry& sceneGeometry,
                   const RealSpace::Camera::Position& cameraPosition =
-                  RealSpace::Camera::Position({0, -200, 120}, // eye
-                                              {0, 0, 0},      // center
-                                              {0, 0, 1}))          // up
+                      RealSpace::Camera::Position({0, -200, 120}, // eye
+                                                  {0, 0, 0},      // center
+                                                  {0, 0, 1}))     // up
         const;
 
     void populateParticleFromParticle3DContainer(RealSpace::Model* model,

GUI/View/Realspace/RealSpaceBuilderUtils.h

@@ -15,13 +15,13 @@
 #ifndef BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEBUILDERUTILS_H
 #define BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEBUILDERUTILS_H
 
+#include "GUI/ba3d/def.h"
 #include "Sample/Scattering/Rotations.h"
 #include <QColor>
 #include <QVector3D>
 #include <functional>
 #include <memory>
 #include <utility>
-#include "GUI/ba3d/def.h"
 
 class SessionItem;
 struct SceneGeometry;

GUI/ba3d/mesh/column.cpp

@@ -57,11 +57,11 @@ Geometry::Mesh Geometry::meshColumn(float ratio_Rt_Rb, float numSides)
 
         vs.addTriangle(vb.at(s1), F3(0, 0, 0), vb.at(s2)); // bottom
         if (smooth)
-            ns.addVertex(F3(0,0,-1), 3);
+            ns.addVertex(F3(0, 0, -1), 3);
 
         vs.addTriangle(F3(0, 0, H), vt.at(s1), vt.at(s2)); // top
         if (smooth)
-            ns.addVertex(F3(0,0,1), 3);
+            ns.addVertex(F3(0, 0, 1), 3);
 
         vs.addQuad(vb.at(s1), vb.at(s2), vt.at(s2), vt.at(s1)); // side
         if (smooth) {

GUI/ba3d/mesh/sphere.cpp

@@ -95,7 +95,7 @@ Geometry::Mesh Geometry::meshSphere(float cut, float baseShift, float removedTop
             auto &n0 = nr.at(s0), &n1 = nr.at(s1);
 
             if (r == 0) { // bottom most ring
-                F3 vp, n0, n1, np(F3(0,0,-1));
+                F3 vp, n0, n1, np(F3(0, 0, -1));
                 if (cut > 0) { // South pole absent
                     vp = F3(0, 0, v0.z());
                     n0 = n1 = np;
@@ -110,7 +110,7 @@ Geometry::Mesh Geometry::meshSphere(float cut, float baseShift, float removedTop
 
             if (r + 1 == rings) { // top most ring
                 F3 vp, n0, n1;
-                F3 np(0,0,1);
+                F3 np(0, 0, 1);
                 if (removedTop > 0) { // North pole absent
                     vp = F3(0, 0, v0.z());
                     n0 = n1 = np;

GUI/ba3d/model/layer.cpp

@@ -19,7 +19,7 @@ namespace GUI::RealSpace {
 Layer::Layer(VectorRange d)
     : Object(GeometricID::Key(GeometricID::BaseShape::Box))
 {
-    transform(d.size(), F3(0,0,0), d.mid());
+    transform(d.size(), F3(0, 0, 0), d.mid());
 }
 
 } // namespace GUI::RealSpace

GUI/ba3d/model/model.cpp

@@ -19,7 +19,7 @@
 namespace GUI::RealSpace {
 
 Model::Model()
-    : defCamPos(F3(1,1,1), F3(0,0,0), F3(0,0,1))
+    : defCamPos(F3(1, 1, 1), F3(0, 0, 0), F3(0, 0, 1))
 {
 }
 

GUI/ba3d/model/object.h

@@ -15,10 +15,10 @@
 #ifndef BORNAGAIN_GUI_BA3D_MODEL_OBJECT_H
 #define BORNAGAIN_GUI_BA3D_MODEL_OBJECT_H
 
+#include "GUI/ba3d/def.h"
 #include "GUI/ba3d/model/geometry_inc.h"
 #include <QColor>
 #include <QMatrix4x4>
-#include "GUI/ba3d/def.h"
 
 namespace GUI::RealSpace {
 

GUI/ba3d/model/particles.cpp

@@ -60,13 +60,13 @@ using namespace GeometricID;
 
 Particle::Particle(Key key)
     : Object(key)
-    , scale(F3(1,1,1))
+    , scale(F3(1, 1, 1))
 {
 }
 
 void Particle::set()
 {
-    transform(F3(0,0,0), F3(0,0,0));
+    transform(F3(0, 0, 0), F3(0, 0, 0));
 }
 
 void Particle::transform(F3 rotate_, F3 translate_)

GUI/ba3d/view/camera.cpp

@@ -30,8 +30,8 @@ const F3 LIGHT3 = F3(1.0f, 1.0f, 0.0f) * 1000.0f;
 } // namespace
 
 Camera::Camera()
-    : pos({0,0,1}, {0,0,0}, {1,0,0})
-    , pos3DAxes({0,0,1}, {0,0,0}, {1, 0,0})
+    : pos({0, 0, 1}, {0, 0, 0}, {1, 0, 0})
+    , pos3DAxes({0, 0, 1}, {0, 0, 0}, {1, 0, 0})
     , zoom(1)
     , vertAngle(60)
     , nearPlane(1)

Resample/Particle/ReParticle.h

@@ -20,8 +20,8 @@
 #ifndef BORNAGAIN_RESAMPLE_PARTICLE_REPARTICLE_H
 #define BORNAGAIN_RESAMPLE_PARTICLE_REPARTICLE_H
 
-#include "Resample/Particle/IReParticle.h"
 #include "Base/Vector/RotMatrix.h"
+#include "Resample/Particle/IReParticle.h"
 #include <heinz/Vectors3D.h>
 #include <memory>
 

Sample/Lattice/Lattice3D.h

@@ -15,8 +15,8 @@
 #ifndef BORNAGAIN_SAMPLE_LATTICE_LATTICE3D_H
 #define BORNAGAIN_SAMPLE_LATTICE_LATTICE3D_H
 
-#include "Param/Node/INode.h"
 #include "Base/Vector/RotMatrix.h"
+#include "Param/Node/INode.h"
 #include <heinz/Vectors3D.h>
 #include <memory>
 #include <vector>

Sample/Material/BaseMaterialImpl.h

@@ -20,9 +20,9 @@
 #ifndef BORNAGAIN_SAMPLE_MATERIAL_BASEMATERIALIMPL_H
 #define BORNAGAIN_SAMPLE_MATERIAL_BASEMATERIALIMPL_H
 
+#include "Base/Vector/RotMatrix.h"
 #include <heinz/Complex.h>
 #include <heinz/Vectors3D.h>
-#include "Base/Vector/RotMatrix.h"
 
 class SpinMatrix;
 class WavevectorInfo;

Sample/Material/MagneticMaterialImpl.h

@@ -20,8 +20,8 @@
 #ifndef BORNAGAIN_SAMPLE_MATERIAL_MAGNETICMATERIALIMPL_H
 #define BORNAGAIN_SAMPLE_MATERIAL_MAGNETICMATERIALIMPL_H
 
-#include "Sample/Material/BaseMaterialImpl.h"
 #include "Base/Vector/RotMatrix.h"
+#include "Sample/Material/BaseMaterialImpl.h"
 
 class WavevectorInfo;
 

Sample/Material/Material.h

@@ -15,9 +15,9 @@
 #ifndef BORNAGAIN_SAMPLE_MATERIAL_MATERIAL_H
 #define BORNAGAIN_SAMPLE_MATERIAL_MATERIAL_H
 
+#include "Base/Vector/RotMatrix.h"
 #include <heinz/Complex.h>
 #include <heinz/Vectors3D.h>
-#include "Base/Vector/RotMatrix.h"
 #include <memory>
 #include <ostream>
 #include <vector>