From 785da38a22cad50ffb2ec96de5c173878dc67be4 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Thu, 16 Apr 2020 09:53:59 +0200
Subject: [PATCH] [MaL] Fix google-readability-braces-around-statements.
---
MeshLib/CoordinateSystem.h | 4 ++++
MeshLib/IO/VtkIO/VtuInterface-impl.h | 8 +++++++-
MeshLib/IO/VtkIO/VtuInterface.cpp | 4 +++-
MeshLib/MeshEditing/ElementValueModification.h | 2 ++
MeshLib/MeshEditing/MeshRevision.cpp | 5 ++++-
MeshLib/MeshGenerators/MeshLayerMapper.cpp | 2 ++
MeshLib/MeshGenerators/RasterToMesh.h | 5 ++++-
MeshLib/MeshGenerators/VtkMeshConverter.h | 4 ++++
MeshLib/MeshQuality/ElementSizeMetric.cpp | 2 ++
MeshLib/MeshQuality/MeshValidation.cpp | 4 ++++
MeshLib/MeshSearch/ElementSearch.h | 4 ++++
MeshLib/MeshSurfaceExtraction.cpp | 2 ++
12 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/MeshLib/CoordinateSystem.h b/MeshLib/CoordinateSystem.h
index 107d954a138..8bad010138a 100644
--- a/MeshLib/CoordinateSystem.h
+++ b/MeshLib/CoordinateSystem.h
@@ -55,9 +55,13 @@ public:
/// get dimension size
unsigned getDimension() const {
if (hasZ())
+ {
return 3;
+ }
if (hasY())
+ {
return 2;
+ }
return 1;
}
diff --git a/MeshLib/IO/VtkIO/VtuInterface-impl.h b/MeshLib/IO/VtkIO/VtuInterface-impl.h
index 579c9f10afc..61474590fa0 100644
--- a/MeshLib/IO/VtkIO/VtuInterface-impl.h
+++ b/MeshLib/IO/VtkIO/VtuInterface-impl.h
@@ -49,14 +49,20 @@ bool VtuInterface::writeVTU(std::string const& file_name,
vtkSource->Update();
vtuWriter->SetInputData(vtkSource->GetOutput());
- if(_use_compressor)
+ if (_use_compressor)
+ {
vtuWriter->SetCompressorTypeToZLib();
+ }
else
+ {
vtuWriter->SetCompressorTypeToNone();
+ }
vtuWriter->SetDataMode(_data_mode);
if (_data_mode == vtkXMLWriter::Appended)
+ {
vtuWriter->SetEncodeAppendedData(1);
+ }
if (_data_mode == vtkXMLWriter::Ascii)
{
vtkSource->Update();
diff --git a/MeshLib/IO/VtkIO/VtuInterface.cpp b/MeshLib/IO/VtkIO/VtuInterface.cpp
index 99a66282258..e7c26b0eafc 100644
--- a/MeshLib/IO/VtkIO/VtuInterface.cpp
+++ b/MeshLib/IO/VtkIO/VtuInterface.cpp
@@ -43,8 +43,10 @@ namespace IO
VtuInterface::VtuInterface(const MeshLib::Mesh* mesh, int dataMode, bool compress) :
_mesh(mesh), _data_mode(dataMode), _use_compressor(compress)
{
- if(_data_mode == vtkXMLWriter::Ascii && compress)
+ if (_data_mode == vtkXMLWriter::Ascii && compress)
+ {
WARN("Ascii data cannot be compressed, ignoring compression flag.");
+ }
}
MeshLib::Mesh* VtuInterface::readVTUFile(std::string const &file_name)
diff --git a/MeshLib/MeshEditing/ElementValueModification.h b/MeshLib/MeshEditing/ElementValueModification.h
index f565ed4c1a2..490deeb2ba7 100644
--- a/MeshLib/MeshEditing/ElementValueModification.h
+++ b/MeshLib/MeshEditing/ElementValueModification.h
@@ -66,7 +66,9 @@ private:
}
}
if (!exists)
+ {
value_mapping.push_back(value);
+ }
}
std::sort(value_mapping.begin(), value_mapping.end());
diff --git a/MeshLib/MeshEditing/MeshRevision.cpp b/MeshLib/MeshEditing/MeshRevision.cpp
index fbcc446b5cb..2570421137a 100644
--- a/MeshLib/MeshEditing/MeshRevision.cpp
+++ b/MeshLib/MeshEditing/MeshRevision.cpp
@@ -117,8 +117,11 @@ MeshLib::Mesh* MeshRevision::simplifyMesh(const std::string &new_mesh_name,
}
new_material_vec->insert(new_material_vec->end(),
n_new_elements, (*material_vec)[k]);
- } else
+ }
+ else
+ {
ERR ("Something is wrong, more unique nodes than actual nodes");
+ }
}
this->resetNodeIDs();
diff --git a/MeshLib/MeshGenerators/MeshLayerMapper.cpp b/MeshLib/MeshGenerators/MeshLayerMapper.cpp
index 1fe12fe6539..726fc20d39c 100644
--- a/MeshLib/MeshGenerators/MeshLayerMapper.cpp
+++ b/MeshLib/MeshGenerators/MeshLayerMapper.cpp
@@ -42,8 +42,10 @@ MeshLib::Mesh* MeshLayerMapper::createStaticLayers(MeshLib::Mesh const& mesh, st
thickness.push_back(layer_thickness_vector[i]);
}
else
+ {
WARN("Ignoring layer {:d} with thickness {:f}.", i,
layer_thickness_vector[i]);
+ }
}
const std::size_t nLayers(thickness.size());
diff --git a/MeshLib/MeshGenerators/RasterToMesh.h b/MeshLib/MeshGenerators/RasterToMesh.h
index bd8e582ea64..0d38b744026 100644
--- a/MeshLib/MeshGenerators/RasterToMesh.h
+++ b/MeshLib/MeshGenerators/RasterToMesh.h
@@ -97,8 +97,11 @@ private:
{
auto val(static_cast<T>(img[idx + j]));
prop_vec.push_back(val);
- if (elem_type == MeshElemType::TRIANGLE || elem_type == MeshElemType::PRISM)
+ if (elem_type == MeshElemType::TRIANGLE ||
+ elem_type == MeshElemType::PRISM)
+ {
prop_vec.push_back(val); // because each pixel is represented by two cells
+ }
}
}
}
diff --git a/MeshLib/MeshGenerators/VtkMeshConverter.h b/MeshLib/MeshGenerators/VtkMeshConverter.h
index 266ab9bfdba..f0d58beb133 100644
--- a/MeshLib/MeshGenerators/VtkMeshConverter.h
+++ b/MeshLib/MeshGenerators/VtkMeshConverter.h
@@ -79,7 +79,9 @@ private:
for (std::size_t j = 0; j < imgWidth; j++)
{
if (!pix_vis[i * imgWidth + j])
+ {
continue;
+ }
T val(static_cast<T>(pix_val[i * (imgWidth + 1) + j]));
if (elem_type == MeshElemType::TRIANGLE)
{
@@ -87,7 +89,9 @@ private:
prop_vec.push_back(val);
}
else if (elem_type == MeshElemType::QUAD)
+ {
prop_vec.push_back(val);
+ }
}
}
}
diff --git a/MeshLib/MeshQuality/ElementSizeMetric.cpp b/MeshLib/MeshQuality/ElementSizeMetric.cpp
index 52383aeeade..245b695b2ba 100644
--- a/MeshLib/MeshQuality/ElementSizeMetric.cpp
+++ b/MeshLib/MeshQuality/ElementSizeMetric.cpp
@@ -43,7 +43,9 @@ void ElementSizeMetric::calculateQuality()
_min,
_max);
if (error_count > 0)
+ {
WARN("Warning: {:d} elements with zero volume found.", error_count);
+ }
}
std::size_t ElementSizeMetric::calc1dQuality()
diff --git a/MeshLib/MeshQuality/MeshValidation.cpp b/MeshLib/MeshQuality/MeshValidation.cpp
index 8a0a29dd8ab..56db3a14098 100644
--- a/MeshLib/MeshQuality/MeshValidation.cpp
+++ b/MeshLib/MeshQuality/MeshValidation.cpp
@@ -104,13 +104,17 @@ std::vector<ElementErrorCode> MeshValidation::testElementGeometry(const MeshLib:
for (std::size_t i = 0; i < nErrorCodes; ++i)
{
if (error_count[i])
+ {
INFO("{:d} elements found with {:s}.",
error_count[i],
ElementErrorCode::toString(flags[i]));
+ }
}
}
else
+ {
INFO ("No errors found.");
+ }
return error_code_vector;
}
diff --git a/MeshLib/MeshSearch/ElementSearch.h b/MeshLib/MeshSearch/ElementSearch.h
index f852681958a..e958074b8b2 100644
--- a/MeshLib/MeshSearch/ElementSearch.h
+++ b/MeshLib/MeshSearch/ElementSearch.h
@@ -96,7 +96,9 @@ public:
{
if ((*pv)[i] < min_property_value ||
(*pv)[i] > max_property_value)
+ {
matchedIDs.push_back(i);
+ }
}
}
else
@@ -105,7 +107,9 @@ public:
{
if ((*pv)[i] >= min_property_value &&
(*pv)[i] <= max_property_value)
+ {
matchedIDs.push_back(i);
+ }
}
}
updateUnion(matchedIDs);
diff --git a/MeshLib/MeshSurfaceExtraction.cpp b/MeshLib/MeshSurfaceExtraction.cpp
index bc60c273396..1478ec282b7 100644
--- a/MeshLib/MeshSurfaceExtraction.cpp
+++ b/MeshLib/MeshSurfaceExtraction.cpp
@@ -257,7 +257,9 @@ void MeshSurfaceExtraction::get2DSurfaceElements(
const MathLib::Vector3& dir, double angle, unsigned mesh_dimension)
{
if (mesh_dimension < 2 || mesh_dimension > 3)
+ {
ERR("Cannot handle meshes of dimension {:i}", mesh_dimension);
+ }
bool const complete_surface = (MathLib::scalarProduct(dir, dir) == 0);
--
GitLab