kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

MeshFlattening: fixes for windows

Browse Source
This commit is contained in:
looooo
2017-11-04 21:33:48 +01:00
committed by wmayer
parent e2eb12d6c6
commit fbb9ee7d72
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/MeshPart/App/MeshFlatteningLscmRelax.cpp
View File

@@ -523,7 +523,7 @@ void LscmRelax::rotate_by_min_bound_area()
double x_distance = x_proj.maxCoeff() - x_proj.minCoeff();
double y_distance = y_proj.maxCoeff() - y_proj.minCoeff();
double area = x_distance * y_distance;
if (min_area == 0 or area < min_area)
if (min_area == 0 || area < min_area)
{
min_area = area;
min_phi = phi;

12
src/Mod/MeshPart/App/MeshFlatteningNurbs.cpp
View File

@@ -70,8 +70,8 @@ std::function<double(double)> get_basis(int degree, int i, Eigen::VectorXd knots
double t_this = knots[i];
double t_next = knots[i+1];
if (t == knots[0])
return (double)(t_next >= t and t >= t_this);
return (double)(t_next >= t and t > t_this);
return (double)(t_next >= t && t >= t_this);
return (double)(t_next >= t && t > t_this);
};
}
else
@@ -114,12 +114,12 @@ std::function<double(double)> get_basis_derivative(int order, int degree, int i,
return [degree, i, knots, order](double t)
{
double out = 0;
if (not (knots[i + degree] - knots[i] == 0))
if (!(knots[i + degree] - knots[i] == 0))
{
out += get_basis(degree - 1, i, knots)(t) *
degree / (knots[i + degree] - knots[i]);
}
if (not (knots[i + degree + 1] - knots[i + 1] == 0))
if (!(knots[i + degree + 1] - knots[i + 1] == 0))
{
out -= get_basis(degree - 1, i + 1, knots)(t) *
degree / (knots[i + degree + 1] - knots[i + 1]);
@@ -132,12 +132,12 @@ std::function<double(double)> get_basis_derivative(int order, int degree, int i,
return [degree, i, knots, order](double t)
{
double out = 0;
if (not (knots[i + degree] - knots[i] == 0))
if (!(knots[i + degree] - knots[i] == 0))
{
out += get_basis_derivative(order - 1, degree - 1, i, knots)(t) *
degree / (knots[i + degree] - knots[i]);
}
if (not (knots[i + degree + 1] - knots[i + 1] == 0))
if (!(knots[i + degree + 1] - knots[i + 1] == 0))
{
out -= get_basis_derivative(order - 1, degree - 1, i + 1, knots)(t) *
degree / (knots[i + degree + 1] - knots[i + 1]);