songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'cgal/6.0.x-branch' in master

This commit is contained in:
Sébastien Loriot 2024-12-06 09:58:43 +01:00
parent f6f9da46e1 59657c8a8c
commit caf716cf47
2 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Lab/demo/Lab/Plugins/Mesh_3/Mesh_function.h
View File

@ -139,28 +139,30 @@ QStringList
Mesh_parameters:: Mesh_parameters::
log() const log() const
{ {
auto is_valid = [](const double d)->bool { return d > 0. && d != DBL_MAX; };
QStringList res("Mesh criteria"); QStringList res("Mesh criteria");
// doubles // doubles
if(edge_sizing > 0) if(is_valid(edge_sizing))
res << QString("edge max size: %1").arg(edge_sizing); res << QString("edge max size: %1").arg(edge_sizing);
if(edge_min_sizing > 0) if(is_valid(edge_min_sizing))
res << QString("edge min size: %1").arg(edge_min_sizing); res << QString("edge min size: %1").arg(edge_min_sizing);
if(edge_distance > 0) if(is_valid(edge_distance))
res << QString("edge max distance: %1").arg(edge_distance); res << QString("edge max distance: %1").arg(edge_distance);
if(facet_angle > 0) if(is_valid(facet_angle))
res << QString("facet min angle: %1").arg(facet_angle); res << QString("facet min angle: %1").arg(facet_angle);
if(facet_sizing > 0) if(is_valid(facet_sizing))
res << QString("facet max size: %1").arg(facet_sizing); res << QString("facet max size: %1").arg(facet_sizing);
if(facet_min_sizing > 0) if(is_valid(facet_min_sizing))
res << QString("facet min size: %1").arg(facet_min_sizing); res << QString("facet min size: %1").arg(facet_min_sizing);
if(facet_approx > 0) if(is_valid(facet_approx))
res << QString("facet approx error: %1").arg(facet_approx); res << QString("facet approx error: %1").arg(facet_approx);
if(tet_shape > 0) if(is_valid(tet_shape))
res << QString("tet shape (radius-edge): %1").arg(tet_shape); res << QString("tet shape (radius-edge): %1").arg(tet_shape);
if(tet_sizing > 0) if(is_valid(tet_sizing))
res << QString("tet max size: %1").arg(tet_sizing); res << QString("tet max size: %1").arg(tet_sizing);
if(tet_min_sizing > 0) if(is_valid(tet_min_sizing))
res << QString("tet min size: %1").arg(tet_min_sizing); res << QString("tet min size: %1").arg(tet_min_sizing);
// booleans // booleans

23
Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h
View File

@ -455,32 +455,15 @@ private:
if(dim < 0) if(dim < 0)
dim = -1 - dim; dim = -1 - dim;
const FT s = field(p, dim, index); return field(p, dim, index);
if(s < minimal_size_)
{
std::stringstream msg;
msg.precision(17);
msg << "Error: the field is smaller than minimal size ("
<< minimal_size_ << ") at ";
if(dim == 0) msg << "corner (";
else msg << "point (";
msg << p << ")";
#if CGAL_MESH_3_PROTECTION_DEBUG & 4
CGAL_error_msg(([this, str = msg.str()](){
dump_c3t3(this->c3t3_, "dump-bug");
return str.c_str();
}()));
#else // not CGAL_MESH_3_PROTECTION_DEBUG & 4
CGAL_error_msg(msg.str().c_str());
#endif
}
return s;
} }
/// Query the sizing field and return its value at the point `p` /// Query the sizing field and return its value at the point `p`
FT query_size(const Bare_point& p, int dim, const Index& index) const FT query_size(const Bare_point& p, int dim, const Index& index) const
{ {
FT s = query_field(p, dim, index, size_); FT s = query_field(p, dim, index, size_);
if (use_minimal_size() && s < minimal_size_)
return minimal_size_;
return s; return s;
} }