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

Fixed parabola calculation if vornonoi edge starts close to its location.

Browse Source
This commit is contained in:
Markus Lampert
2020-10-18 16:36:24 -07:00
parent 0d747d7abd
commit 3c4bccbf6c
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Mod/Path/App/VoronoiEdgePyImp.cpp
View File

@@ -397,7 +397,8 @@ PyObject* VoronoiEdgePy::toShape(PyObject *args)
{
double z0 = 0.0;
double z1 = DBL_MAX;
if (!PyArg_ParseTuple(args, "|dd", &z0, &z1)) {
int dbg = 0;
if (!PyArg_ParseTuple(args, "|ddp", &z0, &z1, &dbg)) {
throw Py::RuntimeError("no, one or two arguments of type double accepted");
}
if (z1 == DBL_MAX) {
@@ -545,7 +546,7 @@ PyObject* VoronoiEdgePy::toShape(PyObject *args)
double flenX;
double flenY;
// if one of the points is the location, we have to use the other to get sensible values
if (fabs(dist0) > 0.001) {
if (fabs(dist0) > fabs(dist1)) {
flenX = flenX0;
flenY = distanceBetween(loc, pt0x, e->dia->getScale());
} else {
@@ -554,6 +555,12 @@ PyObject* VoronoiEdgePy::toShape(PyObject *args)
}
// parabola: (x - p)^2 = 4*focal*(y - q) | (p,q) ... location of parabola
focal = (flenX * flenX) / (4 * fabs(flenY));
if (dbg) {
std::cerr << "segement" << segment << ", point" << point << std::endl;
std::cerr << " loc" << loc << ", axis" << axis << std::endl;
std::cerr << " dist0(" << dist0 << " : " << flenX0 << ", dist1(" << dist1 << " : " << flenX1 << ")" << std::endl;
std::cerr << " z(" << z0 << ", " << zx << ", " << z1 << ")" << std::endl;
}
// use new X values to set the parameters
dist0 = dist0 >= 0 ? flenX0 : -flenX0;
dist1 = dist1 >= 0 ? flenX1 : -flenX1;