From 042bbb775ab7938ad1390521b5a967e381aca8f5 Mon Sep 17 00:00:00 2001 From: Martin Falk Date: Thu, 6 Feb 2025 10:49:11 +0100 Subject: [PATCH] TensorVis,VectorVis,MolVis: linter --- molvis/vasp/src/processors/chgcarsource.cpp | 8 ++++++-- .../src/algorithm/tensorfieldsampling.cpp | 3 ++- .../src/datastructures/deformablecube.cpp | 4 +++- .../src/datastructures/deformablecylinder.cpp | 4 +++- .../src/datastructures/deformablesphere.cpp | 4 +++- .../src/datastructures/hyperstreamlinetracer.cpp | 3 ++- .../src/properties/eigenvalueproperty.cpp | 2 +- tensorvis/tensorvisbase/src/util/tensorutil.cpp | 7 +++---- .../inviwo/tensorvisio/tensorvisiomoduledefine.h | 2 +- .../processors/integrallinestodataframe.h | 2 +- .../src/processors/integrallinestodataframe.cpp | 11 ++++++----- .../tests/unittests/shannonentropy-test.cpp | 2 +- .../tests/unittests/sparsehistorgram-test.cpp | 2 +- 13 files changed, 33 insertions(+), 21 deletions(-) diff --git a/molvis/vasp/src/processors/chgcarsource.cpp b/molvis/vasp/src/processors/chgcarsource.cpp index 5003ce591..251b23285 100644 --- a/molvis/vasp/src/processors/chgcarsource.cpp +++ b/molvis/vasp/src/processors/chgcarsource.cpp @@ -390,8 +390,12 @@ std::shared_ptr createMolecularStructure( auto bonds = molvis::computeCovalentBonds(atoms); - auto ms = std::make_shared(molvis::MolecularData{ - .source = source, .atoms = std::move(atoms), .bonds = std::move(bonds)}); + auto ms = std::make_shared( + molvis::MolecularData{.source = source, + .atoms = std::move(atoms), + .residues = {}, + .chains = {}, + .bonds = std::move(bonds)}); ms->setModelMatrix(chg.model); diff --git a/tensorvis/tensorvisbase/src/algorithm/tensorfieldsampling.cpp b/tensorvis/tensorvisbase/src/algorithm/tensorfieldsampling.cpp index 55e25bea4..d6956ea26 100644 --- a/tensorvis/tensorvisbase/src/algorithm/tensorfieldsampling.cpp +++ b/tensorvis/tensorvisbase/src/algorithm/tensorfieldsampling.cpp @@ -166,4 +166,5 @@ std::pair sample(std::shared_ptr tensorF } return std::pair(glm::uint8{1}, dmat3()); } -} // namespace inviwo \ No newline at end of file + +} // namespace inviwo diff --git a/tensorvis/tensorvisbase/src/datastructures/deformablecube.cpp b/tensorvis/tensorvisbase/src/datastructures/deformablecube.cpp index 685857f31..e73f8d12d 100644 --- a/tensorvis/tensorvisbase/src/datastructures/deformablecube.cpp +++ b/tensorvis/tensorvisbase/src/datastructures/deformablecube.cpp @@ -30,6 +30,7 @@ #include namespace inviwo { + DeformableCube::DeformableCube(const vec4& color) { createCube(color); @@ -183,4 +184,5 @@ void DeformableCube::calculateNormals() { i++; } } -} // namespace inviwo \ No newline at end of file + +} // namespace inviwo diff --git a/tensorvis/tensorvisbase/src/datastructures/deformablecylinder.cpp b/tensorvis/tensorvisbase/src/datastructures/deformablecylinder.cpp index d67af398e..d12a09311 100644 --- a/tensorvis/tensorvisbase/src/datastructures/deformablecylinder.cpp +++ b/tensorvis/tensorvisbase/src/datastructures/deformablecylinder.cpp @@ -30,6 +30,7 @@ #include namespace inviwo { + DeformableCylinder::DeformableCylinder(const size_t& numTheta, const vec4& color) { createCylinder(numTheta, color); @@ -204,4 +205,5 @@ void DeformableCylinder::calculateNormals() { for (auto& normal : normals) normal = -glm::normalize(normal); } -} // namespace inviwo \ No newline at end of file + +} // namespace inviwo diff --git a/tensorvis/tensorvisbase/src/datastructures/deformablesphere.cpp b/tensorvis/tensorvisbase/src/datastructures/deformablesphere.cpp index 3015c0dd7..b123d167b 100644 --- a/tensorvis/tensorvisbase/src/datastructures/deformablesphere.cpp +++ b/tensorvis/tensorvisbase/src/datastructures/deformablesphere.cpp @@ -30,6 +30,7 @@ #include namespace inviwo { + DeformableSphere::DeformableSphere(const size_t& numTheta, const size_t& numPhi, const vec4& color) { createSphere(numTheta, numPhi, color); @@ -312,4 +313,5 @@ void DeformableSphere::calculateNormals() { i++; } } -} // namespace inviwo \ No newline at end of file + +} // namespace inviwo diff --git a/tensorvis/tensorvisbase/src/datastructures/hyperstreamlinetracer.cpp b/tensorvis/tensorvisbase/src/datastructures/hyperstreamlinetracer.cpp index 8bf50aa73..cca71a257 100644 --- a/tensorvis/tensorvisbase/src/datastructures/hyperstreamlinetracer.cpp +++ b/tensorvis/tensorvisbase/src/datastructures/hyperstreamlinetracer.cpp @@ -161,4 +161,5 @@ IntegralLine::TerminationReason HyperStreamLineTracer::integrate(size_t steps, c return IntegralLine::TerminationReason::Steps; } -} // namespace inviwo \ No newline at end of file + +} // namespace inviwo diff --git a/tensorvis/tensorvisbase/src/properties/eigenvalueproperty.cpp b/tensorvis/tensorvisbase/src/properties/eigenvalueproperty.cpp index eede10fa5..26df6223c 100644 --- a/tensorvis/tensorvisbase/src/properties/eigenvalueproperty.cpp +++ b/tensorvis/tensorvisbase/src/properties/eigenvalueproperty.cpp @@ -68,4 +68,4 @@ void EigenValueProperty::set(const double lambda, const glm::uint8 index) { lambdas[index]->set(lambda); } -} // namespace inviwo \ No newline at end of file +} // namespace inviwo diff --git a/tensorvis/tensorvisbase/src/util/tensorutil.cpp b/tensorvis/tensorvisbase/src/util/tensorutil.cpp index 6b15fe7e1..c45f46938 100644 --- a/tensorvis/tensorvisbase/src/util/tensorutil.cpp +++ b/tensorvis/tensorvisbase/src/util/tensorutil.cpp @@ -32,8 +32,8 @@ #include -namespace inviwo { -namespace tensorutil { +namespace inviwo::tensorutil { + vec4 tensor2DToDvec4(const dmat2& tensor) { return vec4(tensor[0][0], tensor[1][0], tensor[1][1], 1.0); } @@ -315,5 +315,4 @@ dmat3 reconstruct(const std::array& eigenvalues, return S * lambda * S_inv; } -} // namespace tensorutil -} // namespace inviwo \ No newline at end of file +} // namespace inviwo::tensorutil diff --git a/tensorvis/tensorvisio/include/inviwo/tensorvisio/tensorvisiomoduledefine.h b/tensorvis/tensorvisio/include/inviwo/tensorvisio/tensorvisiomoduledefine.h index 62b5e3536..7b84e271b 100644 --- a/tensorvis/tensorvisio/include/inviwo/tensorvisio/tensorvisiomoduledefine.h +++ b/tensorvis/tensorvisio/include/inviwo/tensorvisio/tensorvisiomoduledefine.h @@ -20,4 +20,4 @@ #define IVW_MODULE_TENSORVISIO_API #endif -#endif /* _IVW_MODULE_TENSORFIELDIO_DEFINE_H_ */ \ No newline at end of file +#endif /* _IVW_MODULE_TENSORFIELDIO_DEFINE_H_ */ diff --git a/vectorvis/integrallinefiltering/include/inviwo/integrallinefiltering/processors/integrallinestodataframe.h b/vectorvis/integrallinefiltering/include/inviwo/integrallinefiltering/processors/integrallinestodataframe.h index d229b0f09..a16ad62f6 100644 --- a/vectorvis/integrallinefiltering/include/inviwo/integrallinefiltering/processors/integrallinestodataframe.h +++ b/vectorvis/integrallinefiltering/include/inviwo/integrallinefiltering/processors/integrallinestodataframe.h @@ -134,7 +134,7 @@ class IVW_MODULE_INTEGRALLINEFILTERING_API IntegralLinesToDataFrame : public Pro ->getEditableRAMRepresentation() ->getDataContainer()); } - funcs.push_back([=](const IntegralLine& line) { + funcs.push_back([=, this](const IntegralLine& line) { auto& vec = line.getMetaData(Property::getDisplayName()); std::vector values; std::transform(vec.begin() + 1, vec.end() - 1, std::back_inserter(values), diff --git a/vectorvis/integrallinefiltering/src/processors/integrallinestodataframe.cpp b/vectorvis/integrallinefiltering/src/processors/integrallinestodataframe.cpp index bae5b6925..46806fb0c 100644 --- a/vectorvis/integrallinefiltering/src/processors/integrallinestodataframe.cpp +++ b/vectorvis/integrallinefiltering/src/processors/integrallinestodataframe.cpp @@ -124,11 +124,12 @@ void IntegralLinesToDataFrame::MetaDataSettings::initFunctions( } if (c == 1) { // scalars - ram->dispatch([=, &funcs, df = &dataFrame](auto ramT) { - using T = typename util::PrecisionValueType; - createFunction(funcs, *df, percentiles, name, - [=](const T& v) -> float { return static_cast(v); }); - }); + ram->dispatch( + [=, this, &funcs, df = &dataFrame](auto ramT) { + using T = typename util::PrecisionValueType; + createFunction(funcs, *df, percentiles, name, + [=](const T& v) -> float { return static_cast(v); }); + }); } else { // vectors return ram->dispatch([this, &funcs, name, percentiles, c, diff --git a/vectorvis/integrallinefiltering/tests/unittests/shannonentropy-test.cpp b/vectorvis/integrallinefiltering/tests/unittests/shannonentropy-test.cpp index dca7a9c39..95e8135ab 100644 --- a/vectorvis/integrallinefiltering/tests/unittests/shannonentropy-test.cpp +++ b/vectorvis/integrallinefiltering/tests/unittests/shannonentropy-test.cpp @@ -159,4 +159,4 @@ TEST(ShannonEntroyTest, Vectors3D2) { } } -} // namespace inviwo \ No newline at end of file +} // namespace inviwo diff --git a/vectorvis/integrallinefiltering/tests/unittests/sparsehistorgram-test.cpp b/vectorvis/integrallinefiltering/tests/unittests/sparsehistorgram-test.cpp index 8f7112e2e..e11c378fc 100644 --- a/vectorvis/integrallinefiltering/tests/unittests/sparsehistorgram-test.cpp +++ b/vectorvis/integrallinefiltering/tests/unittests/sparsehistorgram-test.cpp @@ -79,4 +79,4 @@ TEST(SpraseHistgoramTest, SizeAndCleanup) { EXPECT_EQ(histogram.numberOfBins(), 1); } -} // namespace inviwo \ No newline at end of file +} // namespace inviwo