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

All: Reformat according to new standard

Browse Source
This commit is contained in:
pre-commit-ci[bot]
2025-11-11 13:49:01 +01:00
committed by Kacper Donat
parent eafd18dac0
commit 25c3ba7338
2390 changed files with 154630 additions and 115818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/Mod/PartDesign/App/AppPartDesignPy.cpp
View File

@@ -27,47 +27,58 @@
#include <Base/Tools.h>
namespace PartDesign {
class Module : public Py::ExtensionModule<Module>
namespace PartDesign
{
class Module: public Py::ExtensionModule<Module>
{
public:
Module() : Py::ExtensionModule<Module>("_PartDesign")
Module()
: Py::ExtensionModule<Module>("_PartDesign")
{
add_varargs_method("makeFilletArc",&Module::makeFilletArc,
"makeFilletArc(...) -- Fillet arc."
);
initialize("This module is the PartDesign module."); // register with Python
add_varargs_method("makeFilletArc", &Module::makeFilletArc, "makeFilletArc(...) -- Fillet arc.");
initialize("This module is the PartDesign module."); // register with Python
}
private:
Py::Object makeFilletArc(const Py::Tuple& args)
{
PyObject *pM1;
PyObject *pP;
PyObject *pQ;
PyObject *pN;
PyObject* pM1;
PyObject* pP;
PyObject* pQ;
PyObject* pN;
double r2;
int ccw;
if (!PyArg_ParseTuple(args.ptr(), "O!O!O!O!di",
&(Base::VectorPy::Type), &pM1,
&(Base::VectorPy::Type), &pP,
&(Base::VectorPy::Type), &pQ,
&(Base::VectorPy::Type), &pN,
&r2, &ccw))
if (!PyArg_ParseTuple(
args.ptr(),
"O!O!O!O!di",
&(Base::VectorPy::Type),
&pM1,
&(Base::VectorPy::Type),
&pP,
&(Base::VectorPy::Type),
&pQ,
&(Base::VectorPy::Type),
&pN,
&r2,
&ccw
)) {
throw Py::Exception();
}
Base::Vector3d M1 = Py::Vector(pM1, false).toVector();
Base::Vector3d P = Py::Vector(pP, false).toVector();
Base::Vector3d Q = Py::Vector(pQ, false).toVector();
Base::Vector3d N = Py::Vector(pN, false).toVector();
Base::Vector3d P = Py::Vector(pP, false).toVector();
Base::Vector3d Q = Py::Vector(pQ, false).toVector();
Base::Vector3d N = Py::Vector(pN, false).toVector();
Base::Vector3d u = Q - P;
Base::Vector3d v = P - M1;
Base::Vector3d b;
if (ccw)
if (ccw) {
b = u % N;
else
}
else {
b = N % u;
}
b.Normalize();
double uu = u * u;
@@ -87,14 +98,16 @@ private:
double t1 = (-uv + sqrt(d)) / uu;
double t2 = (-uv - sqrt(d)) / uu;
if (fabs(t1) < fabs(t2))
if (fabs(t1) < fabs(t2)) {
t = t1;
else
}
else {
t = t2;
}
Base::Vector3d M2 = P + (u*t) + (b*r2);
Base::Vector3d S1 = (r2 * M1 + r1 * M2)/(r1+r2);
Base::Vector3d S2 = M2 - (b*r2);
Base::Vector3d M2 = P + (u * t) + (b * r2);
Base::Vector3d S1 = (r2 * M1 + r1 * M2) / (r1 + r2);
Base::Vector3d S2 = M2 - (b * r2);
Py::Tuple tuple(3);
tuple.setItem(0, Py::Vector(S1));
@@ -110,4 +123,4 @@ PyObject* initModule()
return Base::Interpreter().addModule(new Module);
}
} // namespace PartDesign
} // namespace PartDesign