From aa675315e602f11d94ddfc91594c3ee710a529c2 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Fri, 26 Jun 2020 00:37:40 +0200
Subject: [PATCH] [MeL] Generalize writePropertyVectorInformation().
Uses new getValueBounds().
Handles more types of mesh properties.
Differentiate differentiate more error types.
---
MeshLib/MeshInformation.cpp | 64 ++++++++++++++++++++++++++++---------
1 file changed, 49 insertions(+), 15 deletions(-)
diff --git a/MeshLib/MeshInformation.cpp b/MeshLib/MeshInformation.cpp
index c0dfa29e8b4..9eac8a2a215 100644
--- a/MeshLib/MeshInformation.cpp
+++ b/MeshLib/MeshInformation.cpp
@@ -55,28 +55,62 @@ void MeshInformation::writeAllNumbersOfElementTypes(const MeshLib::Mesh& mesh)
void MeshInformation::writePropertyVectorInformation(const MeshLib::Mesh& mesh)
{
- std::vector<std::string> const& vec_names(
- mesh.getProperties().getPropertyVectorNames());
- INFO("There are {:d} properties in the mesh:", vec_names.size());
- for (const auto& vec_name : vec_names)
+ auto const& properties = mesh.getProperties();
+ INFO("There are {:d} properties in the mesh:", properties.size());
+
+ auto print_bounds = [](auto const& property) {
+ auto const bounds = getValueBounds(property);
+ if (!bounds.has_value())
+ {
+ INFO("\t{:s}: Could not get value bounds for property vector.",
+ property.getPropertyName());
+ return;
+ }
+ INFO("\t{:s}: ({:d} values) [{}, {}]", property.getPropertyName(),
+ property.size(), bounds->first, bounds->second);
+ };
+
+ for (auto [name, property] : properties)
{
- if (auto const vec_bounds =
- MeshLib::MeshInformation::getValueBounds<int>(mesh, vec_name))
+ if (auto p = dynamic_cast<PropertyVector<double>*>(property))
+ {
+ print_bounds(*p);
+ }
+ else if (auto p = dynamic_cast<PropertyVector<float>*>(property))
+ {
+ print_bounds(*p);
+ }
+ else if (auto p = dynamic_cast<PropertyVector<int>*>(property))
{
- INFO("\t{:s}: [{:d}, {:d}]", vec_name, vec_bounds->first,
- vec_bounds->second);
+ print_bounds(*p);
}
- else if (auto const vec_bounds =
- MeshLib::MeshInformation::getValueBounds<double>(mesh,
- vec_name))
+ else if (auto p = dynamic_cast<PropertyVector<unsigned>*>(property))
{
- INFO("\t{:s}: [{:g}, {:g}]", vec_name, vec_bounds->first,
- vec_bounds->second);
+ print_bounds(*p);
+ }
+ else if (auto p = dynamic_cast<PropertyVector<long>*>(property))
+ {
+ print_bounds(*p);
+ }
+ else if (auto p =
+ dynamic_cast<PropertyVector<unsigned long>*>(property))
+ {
+ print_bounds(*p);
+ }
+ else if (auto p = dynamic_cast<PropertyVector<std::size_t>*>(property))
+ {
+ printBounds(*p);
+ }
+ else if (auto p = dynamic_cast<PropertyVector<char>*>(property))
+ {
+ print_bounds(*p);
}
else
{
- INFO("\t{:s}: Could not get value bounds for property vector.",
- vec_name);
+ INFO(
+ "\t{:s}: Could not get value bounds for property vector of "
+ "type '{:s}'.",
+ name, typeid(*p).name());
}
}
}
--
GitLab