Skip to content

Commit b9e7137

Browse files
imikejacksonimikejackson
committed
ENH: Format all source codes according to clang formatting rules.
Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
1 parent bba46c1 commit b9e7137

12 files changed

+67
-81
lines changed

‎Source/EbsdLib/Core/EbsdSetGetMacros.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
//-- Qt includes
5353
#include <QtCore/QSharedPointer>
5454
#include <string>
55-
//#define RAW_PTR data
55+
// #define RAW_PTR data
5656
#endif
5757

5858
/**

‎Source/EbsdLib/IO/HKL/CtfConstants.h

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ const std::string LatticeConstants("LatticeConstants");
193193
const std::string BravaisLattice("BravaisLattice");
194194
} // namespace CtfFile
195195

196-
197196
//-----------------------------------------------------------------------------
198197
// https://github.com/oinanoanalysis/h5oina/blob/master/H5OINAFile.md#ebsd-data
199198
//-----------------------------------------------------------------------------
@@ -202,8 +201,8 @@ namespace H5OINA
202201

203202
const std::string H5FileExt("h5oina");
204203
const std::string Index("Index");
205-
const std::string FormatVersion("Format Version"); // String 2.0 is the earliest that I seem to have
206-
const std::string Manufacturer("Manufacturer"); // String
204+
const std::string FormatVersion("Format Version"); // String 2.0 is the earliest that I seem to have
205+
const std::string Manufacturer("Manufacturer"); // String
207206
const std::string SoftwareVersion("Software Version"); // String
208207

209208
const std::string FormatVersion_2("2.0");
@@ -247,27 +246,21 @@ const std::string SpaceGroup("Space Group");
247246
// Data: Format Version 2
248247
const std::string EBSD("EBSD");
249248
const std::string Data("Data");
250-
const std::string BandContrast("Band Contrast"); // uint8
251-
const std::string BandSlope("Band Slope"); // uint8
252-
const std::string Bands("Bands"); // uint8
253-
const std::string Error("Error"); // uint8
254-
const std::string Euler("Euler"); // 3xFloat32
249+
const std::string BandContrast("Band Contrast"); // uint8
250+
const std::string BandSlope("Band Slope"); // uint8
251+
const std::string Bands("Bands"); // uint8
252+
const std::string Error("Error"); // uint8
253+
const std::string Euler("Euler"); // 3xFloat32
255254
const std::string MeanAngularDeviation("Mean Angular Deviation"); // Float
256-
const std::string Phase("Phase"); // uint8
257-
const std::string X("X"); // uint8
258-
const std::string Y("Y"); // uint8
259-
255+
const std::string Phase("Phase"); // uint8
256+
const std::string X("X"); // uint8
257+
const std::string Y("Y"); // uint8
260258

261259
// Data Format Version 5
262260

263261
const std::string UnprocessedPatterns("Unprocessed Patterns");
264262
const std::string ProcessedPatterns("Processed Patterns");
265263

266-
267-
268-
269-
270-
271-
}
264+
} // namespace H5OINA
272265

273266
} // namespace EbsdLib

‎Source/EbsdLib/IO/HKL/CtfReader.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545
#include "EbsdLib/Math/EbsdLibMath.h"
4646
#include "EbsdLib/Utilities/EbsdStringUtils.hpp"
4747

48-
//#define PI_OVER_2f 90.0f
49-
//#define THREE_PI_OVER_2f 270.0f
50-
//#define TWO_PIf 360.0f
51-
//#define ONE_PIf 180.0f
48+
// #define PI_OVER_2f 90.0f
49+
// #define THREE_PI_OVER_2f 270.0f
50+
// #define TWO_PIf 360.0f
51+
// #define ONE_PIf 180.0f
5252

5353
namespace
5454
{

‎Source/EbsdLib/IO/HKL/DataParser.hpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,6 @@ class Int32Parser : public DataParser
328328
Int32Parser& operator=(Int32Parser&&) = delete; // Move Assignment Not Implemented
329329
};
330330

331-
332331
// -----------------------------------------------------------------------------
333332
class FloatParser : public DataParser
334333
{
@@ -432,7 +431,7 @@ class FloatParser : public DataParser
432431
FloatParser& operator=(FloatParser&&) = delete; // Move Assignment Not Implemented
433432
};
434433

435-
template<typename T>
434+
template <typename T>
436435
class NumericParser : public DataParser
437436
{
438437
public:
@@ -534,4 +533,3 @@ class NumericParser : public DataParser
534533
NumericParser& operator=(const NumericParser&) = delete; // Copy Assignment Not Implemented
535534
NumericParser& operator=(NumericParser&&) = delete; // Move Assignment Not Implemented
536535
};
537-

‎Source/EbsdLib/IO/HKL/H5OINAReader.cpp

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -123,31 +123,31 @@ void* H5OINAReader::getPointerByName(const std::string& featureName)
123123
{
124124
return m_BandSlope.data();
125125
}
126-
if(featureName == EbsdLib::H5OINA::Bands)
126+
if(featureName == EbsdLib::H5OINA::Bands)
127127
{
128128
return m_Bands.data();
129129
}
130-
if(featureName == EbsdLib::H5OINA::Error)
130+
if(featureName == EbsdLib::H5OINA::Error)
131131
{
132132
return m_Error.data();
133133
}
134-
if(featureName == EbsdLib::H5OINA::Euler)
134+
if(featureName == EbsdLib::H5OINA::Euler)
135135
{
136136
return m_Euler.data();
137137
}
138-
if(featureName == EbsdLib::H5OINA::MeanAngularDeviation)
138+
if(featureName == EbsdLib::H5OINA::MeanAngularDeviation)
139139
{
140140
return m_MeanAngularDeviation.data();
141141
}
142-
if(featureName == EbsdLib::H5OINA::Phase)
142+
if(featureName == EbsdLib::H5OINA::Phase)
143143
{
144144
return m_Phase.data();
145145
}
146-
if(featureName == EbsdLib::H5OINA::X)
146+
if(featureName == EbsdLib::H5OINA::X)
147147
{
148148
return m_X.data();
149149
}
150-
if(featureName == EbsdLib::H5OINA::Y)
150+
if(featureName == EbsdLib::H5OINA::Y)
151151
{
152152
return m_Y.data();
153153
}
@@ -202,19 +202,18 @@ EbsdLib::NumericTypes::Type H5OINAReader::getPointerType(const std::string& feat
202202
return EbsdLib::NumericTypes::Type::UnknownNumType;
203203
}
204204

205-
void H5OINAReader::setReadPatternData(bool value)
205+
void H5OINAReader::setReadPatternData(bool value)
206206
{
207207
m_ReadPatternData = value;
208208
}
209209

210-
211210
uint16_t* H5OINAReader::getPatternData()
212211
{
213212
return nullptr;
214213
}
215-
void H5OINAReader::getPatternDims(std::array<int32_t,2 > dims)
214+
void H5OINAReader::getPatternDims(std::array<int32_t, 2> dims)
216215
{
217-
;
216+
;
218217
}
219218

220219
// -----------------------------------------------------------------------------

‎Source/EbsdLib/IO/HKL/H5OINAReader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ class EbsdLib_EXPORT H5OINAReader : public EbsdReader
123123

124124
void setReadPatternData(bool value);
125125
uint16_t* getPatternData();
126-
void getPatternDims(std::array<int32_t,2 > dims);
126+
void getPatternDims(std::array<int32_t, 2> dims);
127127

128128
/**
129129
* @brief Returns the pointer to the data for a given feature

‎Source/EbsdLib/IO/TSL/AngConstants.h

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -170,67 +170,67 @@ const std::string EDAX("EDAX");
170170
// LAUE Symmetry Identifiers
171171

172172
// Old Style LAUE Symmetry Identifiers
173-
#define CIs 1 // triclinic (S2, Ci) [-1] a!=b!=c a!=b!=g!=90
174-
#define D2H 22 // orthrohombic (D2h) [mmm] a!=b!=c a=b=g=90
175-
#define C4H 4 // tetragonal (C4h) [4/m] a=b!=c a=b=g=90
176-
#define D4H 42 // ditetragonal (D4h) [4/mmm] a=b!=c a=b=g=90
177-
#define C3I 3 // trigonal (S6, C3i) [-3] a=b=c a=b=g!=90
178-
#define D3D 32 // ditrigonal (D3d) [-3m] a=b=c a=b=g!=90
179-
#define C6H 6 // hexagonal (C6h) [6/m] a=b!=c a=b=90 g=120
180-
#define D6H 62 // dihexagonal (D6h) [6/mmm] a=b!=c a=b=90 g=120
181-
#define TH 23 // tetrahedral (Th) [m3] a=b=c a=b=g=90
182-
#define OH 43 // cubic (Oh) [m3m] a=b=c a=b=g=90
183-
#define C2H_c 2 // monoclinic c (C2h) [2/m] a!=b!=c a=b=90!=g
173+
#define CIs 1 // triclinic (S2, Ci) [-1] a!=b!=c a!=b!=g!=90
174+
#define D2H 22 // orthrohombic (D2h) [mmm] a!=b!=c a=b=g=90
175+
#define C4H 4 // tetragonal (C4h) [4/m] a=b!=c a=b=g=90
176+
#define D4H 42 // ditetragonal (D4h) [4/mmm] a=b!=c a=b=g=90
177+
#define C3I 3 // trigonal (S6, C3i) [-3] a=b=c a=b=g!=90
178+
#define D3D 32 // ditrigonal (D3d) [-3m] a=b=c a=b=g!=90
179+
#define C6H 6 // hexagonal (C6h) [6/m] a=b!=c a=b=90 g=120
180+
#define D6H 62 // dihexagonal (D6h) [6/mmm] a=b!=c a=b=90 g=120
181+
#define TH 23 // tetrahedral (Th) [m3] a=b=c a=b=g=90
182+
#define OH 43 // cubic (Oh) [m3m] a=b=c a=b=g=90
183+
#define C2H_c 2 // monoclinic c (C2h) [2/m] a!=b!=c a=b=90!=g
184184
#define C2H_b 20 // monoclinic b (C2h) [2/m] a!=b!=c a=g=90!=b
185185
#define C2H_a 21 // monoclinic a (C2h) [2/m] a!=b!=c b=g=90!=a
186186

187187
// New Style Full Point Group Symmetry Identifiers
188188
#define Sym_C1 100 // Triclinic (C1) [1]
189189
#define Sym_S2 101 // Triclinic (S2, Ci) [-1]
190190

191-
#define Sym_D2 105 // Orthorhombic (D2) [222]
191+
#define Sym_D2 105 // Orthorhombic (D2) [222]
192192
#define Sym_C2v 106 // Orthorhombic (C2v) [mm2]
193193
#define Sym_D2h 107 // Orthorhombic (D2h) [mmm]
194194

195-
#define Sym_C4 108 // Tetragonal (C4) [4]
196-
#define Sym_S4 109 // Tetragonal (S4) [-4]
195+
#define Sym_C4 108 // Tetragonal (C4) [4]
196+
#define Sym_S4 109 // Tetragonal (S4) [-4]
197197
#define Sym_C4h 110 // Tetragonal (C4h) [4/m]
198198

199-
#define Sym_D4 111 // Tetragonal (D4) [422]
199+
#define Sym_D4 111 // Tetragonal (D4) [422]
200200
#define Sym_C4v 112 // Tetragonal (C4v) [4mm]
201201
#define Sym_D2d 113 // Tetragonal (D2d) [-42m]
202202
#define Sym_D4h 114 // Tetragonal (D4h) [4/mmm]
203203

204204
#define Sym_C3 115 // Trigonal (C3) [3]
205205
#define Sym_S6 116 // Trigonal (S6, C3i) [-3]
206206

207-
#define Sym_D3 117 // Trigonal (D3) [32]
207+
#define Sym_D3 117 // Trigonal (D3) [32]
208208
#define Sym_C3v 118 // Trigonal (C3v) [3m]
209209
#define Sym_D3d 119 // Trigonal (D3d) [-3m]
210210

211-
#define Sym_C6 120 // Hexagonal (C6) [6]
211+
#define Sym_C6 120 // Hexagonal (C6) [6]
212212
#define Sym_C3h 121 // Hexagonal (C3h) [-6]
213213
#define Sym_C6h 122 // Hexagonal (C6h) [6/m]
214214

215-
#define Sym_D6 123 // Hexagonal (D6) [622]
215+
#define Sym_D6 123 // Hexagonal (D6) [622]
216216
#define Sym_C6v 124 // Hexagonal (C6v) [6mm]
217217
#define Sym_D3h 125 // Hexagonal (D3h) [-6m2]
218218
#define Sym_D6h 126 // Hexagonal (D6h) [6/mmm]
219219

220-
#define Sym_T 127 // Cubic (T) [23]
220+
#define Sym_T 127 // Cubic (T) [23]
221221
#define Sym_Th 128 // Cubic (Th) [m-3]
222222

223-
#define Sym_O 129 // Cubic (O) [432]
223+
#define Sym_O 129 // Cubic (O) [432]
224224
#define Sym_Td 130 // Cubic (Td) [-43m]
225225
#define Sym_Oh 131 // Cubic (Oh) [m3m]
226226

227-
#define Sym_C2_c 102 // Monoclinic c (C2)[2]
227+
#define Sym_C2_c 102 // Monoclinic c (C2)[2]
228228
#define Sym_C1h_c 103 // Monoclinic c (C1h, Cs) [m]
229229
#define Sym_C2h_c 104 // Monoclinic c (C2h) [2/m]
230-
#define Sym_C2_b 132 // Monoclinic b (C2)[2]
230+
#define Sym_C2_b 132 // Monoclinic b (C2)[2]
231231
#define Sym_C1h_b 133 // Monoclinic b (C1h, Cs) [m]
232232
#define Sym_C2h_b 134 // Monoclinic b (C2h) [2/m]
233-
#define Sym_C2_a 135 // Monoclinic a (C2)[2]
233+
#define Sym_C2_a 135 // Monoclinic a (C2)[2]
234234
#define Sym_C1h_a 136 // Monoclinic a (C1h, Cs) [m]
235235
#define Sym_C2h_a 137 // Monoclinic a (C2h) [2/m]
236236
namespace PhaseSymmetry
@@ -401,7 +401,7 @@ const std::string ColumnUnits(COLUMN_UNITS);
401401
#define ANG_Y_STEP_LOWER "ystep"
402402
#define ANG_NCOLS_ODD_LOWER "ncols_odd"
403403
#define ANG_NCOLS_EVEN_LOWER "ncols_even"
404-
//#define ANG_NCOLS_LOWER "ncols"
404+
// #define ANG_NCOLS_LOWER "ncols"
405405
#define ANG_NROWS_LOWER "nrows"
406406

407407
#define ANG_OPERATOR_LOWER "operator"

‎Source/EbsdLib/IO/TSL/AngPhase.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#include "EbsdLib/Core/EbsdSetGetMacros.h"
4343
#include "EbsdLib/EbsdLib.h"
4444

45-
//#pragma pack(push, r1, 1) /* push current alignment to stack. set alignment to 1 byte boundary */
45+
// #pragma pack(push, r1, 1) /* push current alignment to stack. set alignment to 1 byte boundary */
4646
/*!
4747
* @struct HKLFamily_t is used to write the HKL Family to an HDF5 file using a
4848
* compound data type.
@@ -223,4 +223,4 @@ class EbsdLib_EXPORT AngPhase
223223
// std::string m_Info = {};
224224
};
225225

226-
//#pragma pack(pop, r1)
226+
// #pragma pack(pop, r1)

‎Source/EbsdLib/Utilities/ColorTable.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include <algorithm>
3939
#include <iostream>
4040

41-
//#include <QtCore/QJsonArray>
41+
// #include <QtCore/QJsonArray>
4242

4343
using namespace EbsdLib;
4444
// -----------------------------------------------------------------------------

‎Source/EbsdLib/Utilities/EbsdStringUtils.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ enum SplitType : uint8_t
169169
AllowEmptyRightAnalyze
170170
};
171171

172-
inline std::vector<std::string> specific_split(std::string_view str, std::vector<char>&& delimiters, SplitType splitType)
172+
inline std::vector<std::string> specific_split(std::string_view str, std::vector<char>&& delimiters, SplitType splitType)
173173
{
174174
switch(splitType)
175175
{

0 commit comments

Comments
 (0)