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

fix readability-identifier-length

Browse Source
This commit is contained in:
wmayer
2023-11-14 20:15:02 +01:00
parent 57a333e2b2
commit 9c7d00ffcb
38 changed files with 281 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
src/Base/GeometryPyCXX.cpp
View File

@@ -30,6 +30,7 @@
#include "VectorPy.h"
// NOLINTBEGIN(readability-identifier-length)
int Py::Vector::Vector_TypeCheck(PyObject* obj)
{
return PyObject_TypeCheck(obj, &(Base::VectorPy::Type));
@@ -47,15 +48,15 @@ bool Py::Vector::accepts(PyObject* obj) const
return false;
}
Py::Vector::Vector(const Base::Vector3d& v)
Py::Vector::Vector(const Base::Vector3d& vec)
{
set(new Base::VectorPy(v), true);
set(new Base::VectorPy(vec), true);
validate();
}
Py::Vector::Vector(const Base::Vector3f& v)
Py::Vector::Vector(const Base::Vector3f& vec)
{
set(new Base::VectorPy(v), true);
set(new Base::VectorPy(vec), true);
validate();
}
@@ -68,15 +69,15 @@ Py::Vector& Py::Vector::operator=(PyObject* rhsp)
return *this;
}
Py::Vector& Py::Vector::operator=(const Base::Vector3d& v)
Py::Vector& Py::Vector::operator=(const Base::Vector3d& vec)
{
set(new Base::VectorPy(v), true);
set(new Base::VectorPy(vec), true);
return *this;
}
Py::Vector& Py::Vector::operator=(const Base::Vector3f& v)
Py::Vector& Py::Vector::operator=(const Base::Vector3f& vec)
{
set(new Base::VectorPy(v), true);
set(new Base::VectorPy(vec), true);
return *this;
}
@@ -103,48 +104,48 @@ PyTypeObject* Vector2dPy::type_object()
return Py::PythonClass<Vector2dPy>::type_object();
}
bool Vector2dPy::check(PyObject* p)
bool Vector2dPy::check(PyObject* py)
{
return Py::PythonClass<Vector2dPy>::check(p);
return Py::PythonClass<Vector2dPy>::check(py);
}
Py::PythonClassObject<Vector2dPy> Vector2dPy::create(const Vector2d& v)
Py::PythonClassObject<Vector2dPy> Vector2dPy::create(const Vector2d& vec)
{
return create(v.x, v.y);
return create(vec.x, vec.y);
}
Py::PythonClassObject<Vector2dPy> Vector2dPy::create(double x, double y)
Py::PythonClassObject<Vector2dPy> Vector2dPy::create(double vx, double vy)
{
Py::Callable class_type(type());
Py::Tuple arg(2);
arg.setItem(0, Py::Float(x));
arg.setItem(1, Py::Float(y));
Py::PythonClassObject<Vector2dPy> o =
arg.setItem(0, Py::Float(vx));
arg.setItem(1, Py::Float(vy));
Py::PythonClassObject<Vector2dPy> py =
Py::PythonClassObject<Vector2dPy>(class_type.apply(arg, Py::Dict()));
return o;
return py;
}
Vector2dPy::Vector2dPy(Py::PythonClassInstance* self, Py::Tuple& args, Py::Dict& kwds)
: Py::PythonClass<Vector2dPy>::PythonClass(self, args, kwds)
{
double x = 0, y = 0;
if (!PyArg_ParseTuple(args.ptr(), "|dd", &x, &y)) {
double vx = 0, vy = 0;
if (!PyArg_ParseTuple(args.ptr(), "|dd", &vx, &vy)) {
throw Py::Exception();
}
v.x = x;
v.y = y;
v.x = vx;
v.y = vy;
}
Vector2dPy::~Vector2dPy() = default;
Py::Object Vector2dPy::repr()
{
Py::Float x(v.x);
Py::Float y(v.y);
Py::Float vx(v.x);
Py::Float vy(v.y);
std::stringstream str;
str << "Vector2 (";
str << static_cast<std::string>(x.repr()) << ", " << static_cast<std::string>(y.repr());
str << static_cast<std::string>(vx.repr()) << ", " << static_cast<std::string>(vy.repr());
str << ")";
return Py::String(str.str());
@@ -223,28 +224,28 @@ Py::Object Vector2dPy::number_float()
Py::Object Vector2dPy::number_add(const Py::Object& py)
{
Vector2d u(Py::toVector2d(py));
u = v + u;
return create(u);
Vector2d vec(Py::toVector2d(py));
vec = v + vec;
return create(vec);
}
Py::Object Vector2dPy::number_subtract(const Py::Object& py)
{
Vector2d u(Py::toVector2d(py));
u = v - u;
return create(u);
Vector2d vec(Py::toVector2d(py));
vec = v - vec;
return create(vec);
}
Py::Object Vector2dPy::number_multiply(const Py::Object& py)
{
if (PyObject_TypeCheck(py.ptr(), Vector2dPy::type_object())) {
Vector2d u(Py::toVector2d(py));
double d = v * u;
return Py::Float(d);
Vector2d vec(Py::toVector2d(py));
double scalar = v * vec;
return Py::Float(scalar);
}
else if (py.isNumeric()) {
double d = static_cast<double>(Py::Float(py));
return create(v * d);
double scale = static_cast<double>(Py::Float(py));
return create(v * scale);
}
else {
throw Py::TypeError("Argument must be Vector2d or Float");
@@ -321,16 +322,16 @@ PYCXX_VARARGS_METHOD_DECL(Vector2dPy, square)
Py::Object Vector2dPy::scale(const Py::Tuple& args)
{
double f = static_cast<double>(Py::Float(args[0]));
v.Scale(f);
double value = static_cast<double>(Py::Float(args[0]));
v.Scale(value);
return Py::None();
}
PYCXX_VARARGS_METHOD_DECL(Vector2dPy, scale)
Py::Object Vector2dPy::rotate(const Py::Tuple& args)
{
double f = static_cast<double>(Py::Float(args[0]));
v.Rotate(f);
double value = static_cast<double>(Py::Float(args[0]));
v.Rotate(value);
return Py::None();
}
PYCXX_VARARGS_METHOD_DECL(Vector2dPy, rotate)
@@ -344,42 +345,43 @@ PYCXX_VARARGS_METHOD_DECL(Vector2dPy, normalize)
Py::Object Vector2dPy::perpendicular(const Py::Tuple& args)
{
bool f = static_cast<bool>(Py::Boolean(args[0]));
Base::Vector2d p = v.Perpendicular(f);
return create(p);
bool value = static_cast<bool>(Py::Boolean(args[0]));
Base::Vector2d pnt = v.Perpendicular(value);
return create(pnt);
}
PYCXX_VARARGS_METHOD_DECL(Vector2dPy, perpendicular)
Py::Object Vector2dPy::distance(const Py::Tuple& args)
{
Base::Vector2d p = Py::toVector2d(args[0]);
return Py::Float(p.Distance(v));
Base::Vector2d pnt = Py::toVector2d(args[0]);
return Py::Float(pnt.Distance(v));
}
PYCXX_VARARGS_METHOD_DECL(Vector2dPy, distance)
Py::Object Vector2dPy::isEqual(const Py::Tuple& args)
{
Base::Vector2d p = Py::toVector2d(args[0]);
double f = static_cast<double>(Py::Float(args[1]));
return Py::Boolean(v.IsEqual(p, f));
Base::Vector2d pnt = Py::toVector2d(args[0]);
double tol = static_cast<double>(Py::Float(args[1]));
return Py::Boolean(v.IsEqual(pnt, tol));
}
PYCXX_VARARGS_METHOD_DECL(Vector2dPy, isEqual)
Py::Object Vector2dPy::getAngle(const Py::Tuple& args)
{
Base::Vector2d p = Py::toVector2d(args[0]);
return Py::Float(v.GetAngle(p));
Base::Vector2d vec = Py::toVector2d(args[0]);
return Py::Float(v.GetAngle(vec));
}
PYCXX_VARARGS_METHOD_DECL(Vector2dPy, getAngle)
Py::Object Vector2dPy::projectToLine(const Py::Tuple& args)
{
Base::Vector2d p = Py::toVector2d(args[0]);
Base::Vector2d d = Py::toVector2d(args[1]);
v.ProjectToLine(p, d);
Base::Vector2d pnt1 = Py::toVector2d(args[0]);
Base::Vector2d pnt2 = Py::toVector2d(args[1]);
v.ProjectToLine(pnt1, pnt2);
return Py::None();
}
PYCXX_VARARGS_METHOD_DECL(Vector2dPy, projectToLine)
// NOLINTEND(readability-identifier-length)
void Vector2dPy::init_type()
{