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

Sketch: replace PyObject_IsTrue with Base::asBoolean

Browse Source
This commit is contained in:
wmayer
2022-07-16 12:41:53 +02:00
parent a34911605c
commit 832bdaa7dd
6 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp
View File

@@ -248,8 +248,8 @@ private:
Base::Vector3d v = Py::Vector(t.getItem(1)).toVector();
pc.SetUV(u, v);
}
pc.EnableSmoothing(PyObject_IsTrue(smooth) ? true : false, weight, grad, bend, curv);
hSurf = pc.CreateSurface(clPoints, iteration, PyObject_IsTrue(correction) ? true : false, factor);
pc.EnableSmoothing(Base::asBoolean(smooth), weight, grad, bend, curv);
hSurf = pc.CreateSurface(clPoints, iteration, Base::asBoolean(correction), factor);
if (!hSurf.IsNull()) {
return Py::asObject(new Part::BSplineSurfacePy(new Part::GeomBSplineSurface(hSurf)));
}

2
src/Mod/Sketcher/App/ExternalGeometryExtensionPyImp.cpp
View File

@@ -128,7 +128,7 @@ PyObject* ExternalGeometryExtensionPy::setFlag(PyObject *args)
if(getExternalGeometryExtensionPtr()->getFlagsFromName(flag, flagtype)) {
this->getExternalGeometryExtensionPtr()->setFlag(flagtype,PyObject_IsTrue(bflag) ? true : false);
this->getExternalGeometryExtensionPtr()->setFlag(flagtype, Base::asBoolean(bflag));
Py_Return;
}

2
src/Mod/Sketcher/App/ExternalGeometryFacadePyImp.cpp
View File

@@ -122,7 +122,7 @@ PyObject* ExternalGeometryFacadePy::setFlag(PyObject *args)
if( pos != ExternalGeometryExtension::flag2str.end()) {
int index = std::distance( ExternalGeometryExtension::flag2str.begin(), pos );
this->getExternalGeometryFacadePtr()->setFlag(index,PyObject_IsTrue(bflag) ? true : false);
this->getExternalGeometryFacadePtr()->setFlag(index, Base::asBoolean(bflag));
Py_Return;
}

2
src/Mod/Sketcher/App/GeometryFacadePyImp.cpp
View File

@@ -154,7 +154,7 @@ PyObject* GeometryFacadePy::setGeometryMode(PyObject *args)
GeometryMode::GeometryMode mode;
if(SketchGeometryExtension::getGeometryModeFromName(flag, mode)) {
getGeometryFacadePtr()->setGeometryMode(mode, PyObject_IsTrue(bflag) ? true : false);
getGeometryFacadePtr()->setGeometryMode(mode, Base::asBoolean(bflag));
Py_Return;
}

2
src/Mod/Sketcher/App/SketchGeometryExtensionPyImp.cpp
View File

@@ -161,7 +161,7 @@ PyObject* SketchGeometryExtensionPy::setGeometryMode(PyObject *args)
GeometryMode::GeometryMode mode;
if(getSketchGeometryExtensionPtr()->getGeometryModeFromName(flag, mode)) {
getSketchGeometryExtensionPtr()->setGeometryMode(mode, PyObject_IsTrue(bflag) ? true : false);
getSketchGeometryExtensionPtr()->setGeometryMode(mode, Base::asBoolean(bflag));
Py_Return;
}

38
src/Mod/Sketcher/App/SketchObjectPyImp.cpp
View File

@@ -78,7 +78,7 @@ PyObject* SketchObjectPy::addGeometry(PyObject *args)
isConstruction=false;
}
else {
isConstruction = PyObject_IsTrue(construction) ? true : false;
isConstruction = Base::asBoolean(construction);
}
if (PyObject_TypeCheck(pcObj, &(Part::GeometryPy::Type))) {
@@ -301,7 +301,7 @@ PyObject* SketchObjectPy::setConstruction(PyObject *args)
if (!PyArg_ParseTuple(args, "iO!", &Index, &PyBool_Type, &Mode))
return nullptr;
if (this->getSketchObjectPtr()->setConstruction(Index, PyObject_IsTrue(Mode) ? true : false)) {
if (this->getSketchObjectPtr()->setConstruction(Index, Base::asBoolean(Mode))) {
std::stringstream str;
str << "Not able to set construction mode of a geometry with the given index: " << Index;
PyErr_SetString(PyExc_ValueError, str.str().c_str());
@@ -503,7 +503,7 @@ PyObject* SketchObjectPy::carbonCopy(PyObject *args)
}
// add the external
if (skObj->carbonCopy(Obj, PyObject_IsTrue(construction) ? true : false) < 0) {
if (skObj->carbonCopy(Obj, Base::asBoolean(construction)) < 0) {
std::stringstream str;
str << "Not able to add the requested geometry";
PyErr_SetString(PyExc_ValueError, str.str().c_str());
@@ -788,7 +788,7 @@ PyObject* SketchObjectPy::setDriving(PyObject *args)
if (!PyArg_ParseTuple(args, "iO!", &constrid, &PyBool_Type, &driving))
return nullptr;
if (this->getSketchObjectPtr()->setDriving(constrid, PyObject_IsTrue(driving) ? true : false)) {
if (this->getSketchObjectPtr()->setDriving(constrid, Base::asBoolean(driving))) {
std::stringstream str;
str << "Not able set Driving/reference for constraint with the given index: " << constrid;
PyErr_SetString(PyExc_ValueError, str.str().c_str());
@@ -805,7 +805,7 @@ PyObject* SketchObjectPy::setDatumsDriving(PyObject *args)
if (!PyArg_ParseTuple(args, "O!", &PyBool_Type, &driving))
return nullptr;
if (this->getSketchObjectPtr()->setDatumsDriving(PyObject_IsTrue(driving) ? true : false)) {
if (this->getSketchObjectPtr()->setDatumsDriving(Base::asBoolean(driving))) {
std::stringstream str;
str << "Not able set all dimensionals driving/reference";
PyErr_SetString(PyExc_ValueError, str.str().c_str());
@@ -883,7 +883,7 @@ PyObject* SketchObjectPy::setVirtualSpace(PyObject *args)
}
try {
int ret = this->getSketchObjectPtr()->setVirtualSpace(constrIds, PyObject_IsTrue(invirtualspace) ? true : false);
int ret = this->getSketchObjectPtr()->setVirtualSpace(constrIds, Base::asBoolean(invirtualspace));
if(ret == -1)
throw Py::TypeError("Impossible to set virtual space!");
@@ -896,7 +896,7 @@ PyObject* SketchObjectPy::setVirtualSpace(PyObject *args)
Py_Return;
}
else if(PyLong_Check(id_or_ids)) {
if (this->getSketchObjectPtr()->setVirtualSpace(PyLong_AsLong(id_or_ids), PyObject_IsTrue(invirtualspace) ? true : false)) {
if (this->getSketchObjectPtr()->setVirtualSpace(PyLong_AsLong(id_or_ids), Base::asBoolean(invirtualspace))) {
std::stringstream str;
str << "Not able set virtual space for constraint with the given index: " << PyLong_AsLong(id_or_ids);
PyErr_SetString(PyExc_ValueError, str.str().c_str());
@@ -953,7 +953,7 @@ PyObject* SketchObjectPy::setActive(PyObject *args)
if (!PyArg_ParseTuple(args, "iO!", &constrid, &PyBool_Type, &isactive))
return nullptr;
if (this->getSketchObjectPtr()->setActive(constrid, PyObject_IsTrue(isactive) ? true : false)) {
if (this->getSketchObjectPtr()->setActive(constrid, Base::asBoolean(isactive))) {
std::stringstream str;
str << "Not able set active/disabled status for constraint with the given index: " << constrid;
PyErr_SetString(PyExc_ValueError, str.str().c_str());
@@ -1080,7 +1080,7 @@ PyObject* SketchObjectPy::fillet(PyObject *args)
Base::Vector3d v1 = static_cast<Base::VectorPy*>(pcObj1)->value();
Base::Vector3d v2 = static_cast<Base::VectorPy*>(pcObj2)->value();
if (this->getSketchObjectPtr()->fillet(geoId1, geoId2, v1, v2, radius, trim, PyObject_IsTrue(createCorner) ? true : false)) {
if (this->getSketchObjectPtr()->fillet(geoId1, geoId2, v1, v2, radius, trim, Base::asBoolean(createCorner))) {
std::stringstream str;
str << "Not able to fillet curves with ids : (" << geoId1 << ", " << geoId2 << ") and points (" << v1.x << ", " << v1.y << ", " << v1.z << ") & "
<< "(" << v2.x << ", " << v2.y << ", " << v2.z << ")";
@@ -1094,7 +1094,7 @@ PyObject* SketchObjectPy::fillet(PyObject *args)
// Point, radius
if (PyArg_ParseTuple(args, "iid|iO!", &geoId1, &posId1, &radius, &trim, &PyBool_Type, &createCorner)) {
if (this->getSketchObjectPtr()->fillet(geoId1, (Sketcher::PointPos) posId1, radius, trim,
PyObject_IsTrue(createCorner) ? true : false)) {
Base::asBoolean(createCorner))) {
std::stringstream str;
str << "Not able to fillet point with ( geoId: " << geoId1 << ", PointPos: " << posId1 << " )";
PyErr_SetString(PyExc_ValueError, str.str().c_str());
@@ -1227,7 +1227,7 @@ PyObject* SketchObjectPy::addCopy(PyObject *args)
}
try {
int ret = this->getSketchObjectPtr()->addCopy(geoIdList, vect, false, PyObject_IsTrue(clone) ? true : false) + 1;
int ret = this->getSketchObjectPtr()->addCopy(geoIdList, vect, false, Base::asBoolean(clone)) + 1;
if(ret == -1)
throw Py::TypeError("Copy operation unsuccessful!");
@@ -1304,8 +1304,8 @@ PyObject* SketchObjectPy::addRectangularArray(PyObject *args)
}
try {
int ret = this->getSketchObjectPtr()->addCopy(geoIdList,vect, false, PyObject_IsTrue(clone) ? true : false,
rows, cols, PyObject_IsTrue(constraindisplacement) ? true : false, perpscale) + 1;
int ret = this->getSketchObjectPtr()->addCopy(geoIdList,vect, false, Base::asBoolean(clone),
rows, cols, Base::asBoolean(constraindisplacement), perpscale) + 1;
if(ret == -1)
throw Py::TypeError("Copy operation unsuccessful!");
@@ -1580,7 +1580,7 @@ PyObject* SketchObjectPy::autoconstraint(PyObject *args)
if (!PyArg_ParseTuple(args, "|ddO!", &precision, &angleprecision, &PyBool_Type, &includeconstruction))
return nullptr;
if (this->getSketchObjectPtr()->autoConstraint(precision, angleprecision, PyObject_IsTrue(includeconstruction) ? true : false)) {
if (this->getSketchObjectPtr()->autoConstraint(precision, angleprecision, Base::asBoolean(includeconstruction))) {
std::stringstream str;
str << "Unable to autoconstraint";
PyErr_SetString(PyExc_ValueError, str.str().c_str());
@@ -1598,7 +1598,7 @@ PyObject* SketchObjectPy::detectMissingPointOnPointConstraints(PyObject *args)
if (!PyArg_ParseTuple(args, "|dO!", &precision, &PyBool_Type, &includeconstruction))
return nullptr;
return Py::new_reference_to(Py::Long(this->getSketchObjectPtr()->detectMissingPointOnPointConstraints(precision, PyObject_IsTrue(includeconstruction) ? true : false)));
return Py::new_reference_to(Py::Long(this->getSketchObjectPtr()->detectMissingPointOnPointConstraints(precision, Base::asBoolean(includeconstruction))));
}
PyObject* SketchObjectPy::detectMissingVerticalHorizontalConstraints(PyObject *args)
@@ -1641,7 +1641,7 @@ PyObject* SketchObjectPy::makeMissingPointOnPointCoincident(PyObject *args)
if (!PyArg_ParseTuple(args, "|O!", &PyBool_Type, &onebyone))
return nullptr;
this->getSketchObjectPtr()->makeMissingPointOnPointCoincident(PyObject_IsTrue(onebyone) ? true : false);
this->getSketchObjectPtr()->makeMissingPointOnPointCoincident(Base::asBoolean(onebyone));
Py_Return;
}
@@ -1653,7 +1653,7 @@ PyObject* SketchObjectPy::makeMissingVerticalHorizontal(PyObject *args)
if (!PyArg_ParseTuple(args, "|O!", &PyBool_Type, &onebyone))
return nullptr;
this->getSketchObjectPtr()->makeMissingVerticalHorizontal(PyObject_IsTrue(onebyone) ? true : false);
this->getSketchObjectPtr()->makeMissingVerticalHorizontal(Base::asBoolean(onebyone));
Py_Return;
}
@@ -1665,7 +1665,7 @@ PyObject* SketchObjectPy::makeMissingEquality(PyObject *args)
if (!PyArg_ParseTuple(args, "|O!", &PyBool_Type, &onebyone))
return nullptr;
this->getSketchObjectPtr()->makeMissingEquality(PyObject_IsTrue(onebyone) ? true : false);
this->getSketchObjectPtr()->makeMissingEquality(Base::asBoolean(onebyone));
Py_Return;
}
@@ -1677,7 +1677,7 @@ PyObject* SketchObjectPy::autoRemoveRedundants(PyObject *args)
if (!PyArg_ParseTuple(args, "|O!", &PyBool_Type, &updategeo))
return nullptr;
this->getSketchObjectPtr()->autoRemoveRedundants(PyObject_IsTrue(updategeo) ? true : false);
this->getSketchObjectPtr()->autoRemoveRedundants(Base::asBoolean(updategeo));
Py_Return;
}