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

Mesh: Apply clang-format

Browse Source
This commit is contained in:
wmayer
2023-09-22 19:59:39 +02:00
committed by wwmayer
parent 14cbc5f1e5
commit 4e328682d9
116 changed files with 15683 additions and 12447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/Mod/Mesh/App/EdgePyImp.cpp
View File

@@ -26,9 +26,11 @@
#include <Base/GeometryPyCXX.h>
#include <Base/VectorPy.h>
// clang-format off
#include "Edge.h"
#include "EdgePy.h"
#include "EdgePy.cpp"
// clang-format on
using namespace Mesh;
@@ -36,18 +38,28 @@ using namespace Mesh;
// returns a string which represent the object e.g. when printed in python
std::string EdgePy::representation() const
{
// clang-format off
EdgePy::PointerType ptr = getEdgePtr();
std::stringstream str;
str << "Edge (";
str << "(" << ptr->_aclPoints[0].x << ", " << ptr->_aclPoints[0].y << ", " << ptr->_aclPoints[0].z << ", Idx=" << ptr->PIndex[0] << "), ";
str << "(" << ptr->_aclPoints[1].x << ", " << ptr->_aclPoints[1].y << ", " << ptr->_aclPoints[1].z << ", Idx=" << ptr->PIndex[1] << "), ";
str << "Idx=" << ptr->Index << ", (" << ptr->NIndex[0] << ", " << ptr->NIndex[1] << ")";
str << "(" << ptr->_aclPoints[0].x << ", "
<< ptr->_aclPoints[0].y << ", "
<< ptr->_aclPoints[0].z << ", Idx="
<< ptr->PIndex[0] << "), ";
str << "(" << ptr->_aclPoints[1].x << ", "
<< ptr->_aclPoints[1].y << ", "
<< ptr->_aclPoints[1].z << ", Idx="
<< ptr->PIndex[1] << "), ";
str << "Idx=" << ptr->Index << ", ("
<< ptr->NIndex[0] << ", "
<< ptr->NIndex[1] << ")";
str << ")";
// clang-format on
return str.str();
}
PyObject *EdgePy::PyMake(struct _typeobject *, PyObject *, PyObject *) // Python wrapper
PyObject* EdgePy::PyMake(struct _typeobject*, PyObject*, PyObject*) // Python wrapper
{
// create a new instance of EdgePy and the Twin object
return new EdgePy(new Edge);
@@ -58,28 +70,38 @@ int EdgePy::PyInit(PyObject* args, PyObject* /*kwds*/)
{
PyObject* pt1 = nullptr;
PyObject* pt2 = nullptr;
if (!PyArg_ParseTuple(args, "|O!O!", &Base::VectorPy::Type, &pt1
, &Base::VectorPy::Type, &pt2))
if (!PyArg_ParseTuple(args,
"|O!O!",
&Base::VectorPy::Type,
&pt1,
&Base::VectorPy::Type,
&pt2)) {
return -1;
}
if (pt1)
getEdgePtr()->_aclPoints[0] = Base::convertTo<Base::Vector3f>(Py::Vector(pt1, false).toVector());
if (pt2)
getEdgePtr()->_aclPoints[1] = Base::convertTo<Base::Vector3f>(Py::Vector(pt2, false).toVector());
if (pt1) {
getEdgePtr()->_aclPoints[0] =
Base::convertTo<Base::Vector3f>(Py::Vector(pt1, false).toVector());
}
if (pt2) {
getEdgePtr()->_aclPoints[1] =
Base::convertTo<Base::Vector3f>(Py::Vector(pt2, false).toVector());
}
return 0;
}
Py::Long EdgePy::getIndex() const
{
return Py::Long((long) getEdgePtr()->Index);
return Py::Long((long)getEdgePtr()->Index);
}
PyObject* EdgePy::intersectWithEdge(PyObject *args)
PyObject* EdgePy::intersectWithEdge(PyObject* args)
{
PyObject* object;
if (!PyArg_ParseTuple(args, "O!", &EdgePy::Type, &object))
if (!PyArg_ParseTuple(args, "O!", &EdgePy::Type, &object)) {
return nullptr;
EdgePy *edge = static_cast<EdgePy*>(object);
}
EdgePy* edge = static_cast<EdgePy*>(object);
EdgePy::PointerType edge_ptr = edge->getEdgePtr();
EdgePy::PointerType this_ptr = this->getEdgePtr();
Base::Vector3f p;
@@ -101,34 +123,37 @@ PyObject* EdgePy::intersectWithEdge(PyObject *args)
}
}
PyObject* EdgePy::isParallel(PyObject *args)
PyObject* EdgePy::isParallel(PyObject* args)
{
PyObject* object;
if (!PyArg_ParseTuple(args, "O!", &EdgePy::Type, &object))
if (!PyArg_ParseTuple(args, "O!", &EdgePy::Type, &object)) {
return nullptr;
EdgePy *edge = static_cast<EdgePy*>(object);
}
EdgePy* edge = static_cast<EdgePy*>(object);
EdgePy::PointerType edge_ptr = edge->getEdgePtr();
EdgePy::PointerType this_ptr = this->getEdgePtr();
bool ok = this_ptr->IsParallel(*edge_ptr);
return Py::new_reference_to(Py::Boolean(ok));
}
PyObject* EdgePy::isCollinear(PyObject *args)
PyObject* EdgePy::isCollinear(PyObject* args)
{
PyObject* object;
if (!PyArg_ParseTuple(args, "O!", &EdgePy::Type, &object))
if (!PyArg_ParseTuple(args, "O!", &EdgePy::Type, &object)) {
return nullptr;
EdgePy *edge = static_cast<EdgePy*>(object);
}
EdgePy* edge = static_cast<EdgePy*>(object);
EdgePy::PointerType edge_ptr = edge->getEdgePtr();
EdgePy::PointerType this_ptr = this->getEdgePtr();
bool ok = this_ptr->IsCollinear(*edge_ptr);
return Py::new_reference_to(Py::Boolean(ok));
}
PyObject* EdgePy::unbound(PyObject *args)
PyObject* EdgePy::unbound(PyObject* args)
{
if (!PyArg_ParseTuple(args, ""))
if (!PyArg_ParseTuple(args, "")) {
return nullptr;
}
getEdgePtr()->unbound();
Py_Return;
}
@@ -143,7 +168,7 @@ Py::List EdgePy::getPoints() const
EdgePy::PointerType edge = this->getEdgePtr();
Py::List pts;
for (const auto & pnt : edge->_aclPoints) {
for (const auto& pnt : edge->_aclPoints) {
Py::Tuple pt(3);
pt.setItem(0, Py::Float(pnt.x));
pt.setItem(1, Py::Float(pnt.y));
@@ -159,7 +184,7 @@ Py::Tuple EdgePy::getPointIndices() const
EdgePy::PointerType edge = this->getEdgePtr();
Py::Tuple idxTuple(2);
for (int i=0; i<2; i++) {
for (int i = 0; i < 2; i++) {
idxTuple.setItem(i, Py::Long(edge->PIndex[i]));
}
return idxTuple;
@@ -170,7 +195,7 @@ Py::Tuple EdgePy::getNeighbourIndices() const
EdgePy::PointerType edge = this->getEdgePtr();
Py::Tuple idxTuple(2);
for (int i=0; i<2; i++) {
for (int i = 0; i < 2; i++) {
idxTuple.setItem(i, Py::Long(edge->NIndex[i]));
}
return idxTuple;
@@ -182,12 +207,12 @@ Py::Float EdgePy::getLength() const
return Py::Float(Base::Distance(edge->_aclPoints[0], edge->_aclPoints[1]));
}
PyObject *EdgePy::getCustomAttributes(const char* /*attr*/) const
PyObject* EdgePy::getCustomAttributes(const char* /*attr*/) const
{
return nullptr;
}
int EdgePy::setCustomAttributes(const char* /*attr*/, PyObject * /*obj*/)
int EdgePy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/)
{
return 0;
}