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

Sketcher: App - Clang-format

Browse Source
This commit is contained in:
Abdullah Tahiri
2023-05-18 19:01:34 +02:00
committed by abdullahtahiriyo
parent c33cdcd68a
commit 987b4bda2a
40 changed files with 9714 additions and 7322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/Mod/Sketcher/App/SketchPyImp.cpp
View File

@@ -28,9 +28,10 @@
// inclusion of the generated files (generated out of SketchPy.xml)
#include "SketchPy.h"
#include "SketchPy.cpp"
#include "ConstraintPy.h"
#include "SketchPy.cpp"
#include "ConstraintPy.h"
using namespace Sketcher;
using namespace Part;
@@ -41,7 +42,7 @@ std::string SketchPy::representation() const
return std::string("<Sketch object>");
}
PyObject *SketchPy::PyMake(struct _typeobject *, PyObject *, PyObject *) // Python wrapper
PyObject* SketchPy::PyMake(struct _typeobject*, PyObject*, PyObject*)// Python wrapper
{
// create a new instance of SketchPy and the Twin object
return new SketchPy(new Sketch());
@@ -55,7 +56,7 @@ int SketchPy::PyInit(PyObject* /*args*/, PyObject* /*kwd*/)
// +++ methods implementer ++++++++++++++++++++++++++++++++++++++++++++++++
PyObject* SketchPy::solve(PyObject *args)
PyObject* SketchPy::solve(PyObject* args)
{
if (!PyArg_ParseTuple(args, ""))
return nullptr;
@@ -63,23 +64,23 @@ PyObject* SketchPy::solve(PyObject *args)
return Py::new_reference_to(Py::Long(getSketchPtr()->solve()));
}
PyObject* SketchPy::addGeometry(PyObject *args)
PyObject* SketchPy::addGeometry(PyObject* args)
{
PyObject *pcObj;
PyObject* pcObj;
if (!PyArg_ParseTuple(args, "O", &pcObj))
return nullptr;
if (PyObject_TypeCheck(pcObj, &(Part::GeometryPy::Type))) {
Part::Geometry *geo = static_cast<Part::GeometryPy*>(pcObj)->getGeometryPtr();
Part::Geometry* geo = static_cast<Part::GeometryPy*>(pcObj)->getGeometryPtr();
return Py::new_reference_to(Py::Long(this->getSketchPtr()->addGeometry(geo)));
}
else if (PyObject_TypeCheck(pcObj, &(PyList_Type)) ||
PyObject_TypeCheck(pcObj, &(PyTuple_Type))) {
std::vector<Part::Geometry *> geoList;
else if (PyObject_TypeCheck(pcObj, &(PyList_Type))
|| PyObject_TypeCheck(pcObj, &(PyTuple_Type))) {
std::vector<Part::Geometry*> geoList;
Py::Sequence list(pcObj);
for (Py::Sequence::iterator it = list.begin(); it != list.end(); ++it) {
if (PyObject_TypeCheck((*it).ptr(), &(Part::GeometryPy::Type))) {
Part::Geometry *geo = static_cast<Part::GeometryPy*>((*it).ptr())->getGeometryPtr();
Part::Geometry* geo = static_cast<Part::GeometryPy*>((*it).ptr())->getGeometryPtr();
geoList.push_back(geo);
}
}
@@ -87,7 +88,7 @@ PyObject* SketchPy::addGeometry(PyObject *args)
int ret = this->getSketchPtr()->addGeometry(geoList) + 1;
std::size_t numGeo = geoList.size();
Py::Tuple tuple(numGeo);
for (std::size_t i=0; i<numGeo; ++i) {
for (std::size_t i = 0; i < numGeo; ++i) {
int geoId = ret - int(numGeo - i);
tuple.setItem(i, Py::Long(geoId));
}
@@ -99,9 +100,9 @@ PyObject* SketchPy::addGeometry(PyObject *args)
throw Py::TypeError(error);
}
PyObject* SketchPy::addConstraint(PyObject *args)
PyObject* SketchPy::addConstraint(PyObject* args)
{
PyObject *pcObj;
PyObject* pcObj;
if (!PyArg_ParseTuple(args, "O", &pcObj))
return nullptr;
@@ -110,7 +111,7 @@ PyObject* SketchPy::addConstraint(PyObject *args)
Py::Sequence list(pcObj);
for (Py::Sequence::iterator it = list.begin(); it != list.end(); ++it) {
if (PyObject_TypeCheck((*it).ptr(), &(ConstraintPy::Type))) {
Constraint *con = static_cast<ConstraintPy*>((*it).ptr())->getConstraintPtr();
Constraint* con = static_cast<ConstraintPy*>((*it).ptr())->getConstraintPtr();
values.push_back(con);
}
}
@@ -118,14 +119,14 @@ PyObject* SketchPy::addConstraint(PyObject *args)
int ret = getSketchPtr()->addConstraints(values) + 1;
std::size_t numCon = values.size();
Py::Tuple tuple(numCon);
for (std::size_t i=0; i<numCon; ++i) {
for (std::size_t i = 0; i < numCon; ++i) {
int conId = ret - int(numCon - i);
tuple.setItem(i, Py::Long(conId));
}
return Py::new_reference_to(tuple);
}
else if(PyObject_TypeCheck(pcObj, &(ConstraintPy::Type))) {
ConstraintPy *pcObject = static_cast<ConstraintPy*>(pcObj);
else if (PyObject_TypeCheck(pcObj, &(ConstraintPy::Type))) {
ConstraintPy* pcObject = static_cast<ConstraintPy*>(pcObj);
int ret = getSketchPtr()->addConstraint(pcObject->getConstraintPtr());
return Py::new_reference_to(Py::Long(ret));
}
@@ -136,7 +137,7 @@ PyObject* SketchPy::addConstraint(PyObject *args)
}
}
PyObject* SketchPy::clear(PyObject *args)
PyObject* SketchPy::clear(PyObject* args)
{
if (!PyArg_ParseTuple(args, ""))
return nullptr;
@@ -146,23 +147,25 @@ PyObject* SketchPy::clear(PyObject *args)
Py_RETURN_NONE;
}
PyObject* SketchPy::movePoint(PyObject *args)
PyObject* SketchPy::movePoint(PyObject* args)
{
int index1,index2;
PyObject *pcObj;
int relative=0;
if (!PyArg_ParseTuple(args, "iiO!|i", &index1,&index2,&(Base::VectorPy::Type),&pcObj,&relative))
int index1, index2;
PyObject* pcObj;
int relative = 0;
if (!PyArg_ParseTuple(
args, "iiO!|i", &index1, &index2, &(Base::VectorPy::Type), &pcObj, &relative))
return nullptr;
Base::Vector3d* toPoint = static_cast<Base::VectorPy*>(pcObj)->getVectorPtr();
return Py::new_reference_to(Py::Long(getSketchPtr()->movePoint(index1,static_cast<Sketcher::PointPos>(index2),*toPoint,(relative>0))));
return Py::new_reference_to(Py::Long(getSketchPtr()->movePoint(
index1, static_cast<Sketcher::PointPos>(index2), *toPoint, (relative > 0))));
}
// +++ attributes implementer ++++++++++++++++++++++++++++++++++++++++++++++++
Py::Long SketchPy::getConstraint() const
{
//return Py::Int();
// return Py::Int();
throw Py::AttributeError("Not yet implemented");
}
@@ -170,7 +173,7 @@ Py::Tuple SketchPy::getConflicts() const
{
std::vector<int> c = getSketchPtr()->getConflicting();
Py::Tuple t(c.size());
for (std::size_t i=0; i<c.size(); i++) {
for (std::size_t i = 0; i < c.size(); i++) {
t.setItem(i, Py::Long(c[i]));
}
@@ -181,7 +184,7 @@ Py::Tuple SketchPy::getRedundancies() const
{
std::vector<int> c = getSketchPtr()->getRedundant();
Py::Tuple t(c.size());
for (std::size_t i=0; i<c.size(); i++) {
for (std::size_t i = 0; i < c.size(); i++) {
t.setItem(i, Py::Long(c[i]));
}
@@ -202,7 +205,7 @@ Py::Object SketchPy::getShape() const
// +++ custom attributes implementer ++++++++++++++++++++++++++++++++++++++++
PyObject *SketchPy::getCustomAttributes(const char* /*attr*/) const
PyObject* SketchPy::getCustomAttributes(const char* /*attr*/) const
{
return nullptr;
}
@@ -211,5 +214,3 @@ int SketchPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/)
{
return 0;
}