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

App: Apply clang format (part 1)

Browse Source
This commit is contained in:
wmayer
2024-11-15 17:43:49 +01:00
committed by wwmayer
parent ee18317e08
commit 4e82a0af48
124 changed files with 6733 additions and 4886 deletions
Download Patch File Download Diff File Expand all files Collapse all files

268
src/App/GroupExtensionPyImp.cpp
View File

@@ -39,14 +39,15 @@ std::string GroupExtensionPy::representation() const
return {"<group extension object>"};
}
PyObject* GroupExtensionPy::newObject(PyObject *args)
PyObject* GroupExtensionPy::newObject(PyObject* args)
{
char *sType,*sName=nullptr;
if (!PyArg_ParseTuple(args, "s|s", &sType,&sName))
char *sType, *sName = nullptr;
if (!PyArg_ParseTuple(args, "s|s", &sType, &sName)) {
return nullptr;
}
DocumentObject *object = getGroupExtensionPtr()->addObject(sType, sName);
if ( object ) {
DocumentObject* object = getGroupExtensionPtr()->addObject(sType, sName);
if (object) {
return object->getPyObject();
}
else {
@@ -55,20 +56,24 @@ PyObject* GroupExtensionPy::newObject(PyObject *args)
}
}
PyObject* GroupExtensionPy::addObject(PyObject *args)
PyObject* GroupExtensionPy::addObject(PyObject* args)
{
PyObject *object;
if (!PyArg_ParseTuple(args, "O!", &(DocumentObjectPy::Type), &object))
PyObject* object;
if (!PyArg_ParseTuple(args, "O!", &(DocumentObjectPy::Type), &object)) {
return nullptr;
}
DocumentObjectPy* docObj = static_cast<DocumentObjectPy*>(object);
if (!docObj->getDocumentObjectPtr() || !docObj->getDocumentObjectPtr()->isAttachedToDocument()) {
if (!docObj->getDocumentObjectPtr()
|| !docObj->getDocumentObjectPtr()->isAttachedToDocument()) {
PyErr_SetString(Base::PyExc_FC_GeneralError, "Cannot add an invalid object");
return nullptr;
}
if (docObj->getDocumentObjectPtr()->getDocument() != getGroupExtensionPtr()->getExtendedObject()->getDocument()) {
PyErr_SetString(Base::PyExc_FC_GeneralError, "Cannot add an object from another document to this group");
if (docObj->getDocumentObjectPtr()->getDocument()
!= getGroupExtensionPtr()->getExtendedObject()->getDocument()) {
PyErr_SetString(Base::PyExc_FC_GeneralError,
"Cannot add an object from another document to this group");
return nullptr;
}
if (docObj->getDocumentObjectPtr() == this->getGroupExtensionPtr()->getExtendedObject()) {
@@ -76,110 +81,123 @@ PyObject* GroupExtensionPy::addObject(PyObject *args)
return nullptr;
}
if (docObj->getDocumentObjectPtr()->hasExtension(GroupExtension::getExtensionClassTypeId())) {
App::GroupExtension* docGrp = docObj->getDocumentObjectPtr()->getExtensionByType<GroupExtension>();
App::GroupExtension* docGrp =
docObj->getDocumentObjectPtr()->getExtensionByType<GroupExtension>();
if (docGrp->hasObject(getGroupExtensionPtr()->getExtendedObject())) {
PyErr_SetString(Base::PyExc_FC_GeneralError, "Cannot add a group object to a child group");
PyErr_SetString(Base::PyExc_FC_GeneralError,
"Cannot add a group object to a child group");
return nullptr;
}
}
GroupExtension* grp = getGroupExtensionPtr();
auto vec = grp->addObject(docObj->getDocumentObjectPtr());
auto vec = grp->addObject(docObj->getDocumentObjectPtr());
Py::List list;
for (App::DocumentObject* obj : vec)
for (App::DocumentObject* obj : vec) {
list.append(Py::asObject(obj->getPyObject()));
}
return Py::new_reference_to(list);
}
PyObject* GroupExtensionPy::addObjects(PyObject *args) {
PyObject *object;
if (!PyArg_ParseTuple(args, "O", &object))
return nullptr;
if (PyTuple_Check(object) || PyList_Check(object)) {
Py::Sequence list(object);
Py::Sequence::size_type size = list.size();
std::vector<DocumentObject*> values;
values.resize(size);
for (Py::Sequence::size_type i = 0; i < size; i++) {
Py::Object item = list[i];
if (!PyObject_TypeCheck(*item, &(DocumentObjectPy::Type))) {
std::string error = std::string("type in list must be 'DocumentObject', not ");
error += (*item)->ob_type->tp_name;
throw Base::TypeError(error);
}
values[i] = static_cast<DocumentObjectPy*>(*item)->getDocumentObjectPtr();
}
GroupExtension* grp = getGroupExtensionPtr();
auto vec = grp->addObjects(values);
Py::List result;
for (App::DocumentObject* obj : vec)
result.append(Py::asObject(obj->getPyObject()));
return Py::new_reference_to(result);
}
std::string error = std::string("type must be list of 'DocumentObject', not ");
error += object->ob_type->tp_name;
throw Base::TypeError(error);
}
PyObject* GroupExtensionPy::setObjects(PyObject *args) {
PyObject *object;
if (!PyArg_ParseTuple(args, "O", &object))
return nullptr;
if (PyTuple_Check(object) || PyList_Check(object)) {
Py::Sequence list(object);
Py::Sequence::size_type size = list.size();
std::vector<DocumentObject*> values;
values.resize(size);
for (Py::Sequence::size_type i = 0; i < size; i++) {
Py::Object item = list[i];
if (!PyObject_TypeCheck(*item, &(DocumentObjectPy::Type))) {
std::string error = std::string("type in list must be 'DocumentObject', not ");
error += (*item)->ob_type->tp_name;
throw Base::TypeError(error);
}
values[i] = static_cast<DocumentObjectPy*>(*item)->getDocumentObjectPtr();
}
GroupExtension* grp = getGroupExtensionPtr();
auto vec = grp->setObjects(values);
Py::List result;
for (App::DocumentObject* obj : vec)
result.append(Py::asObject(obj->getPyObject()));
return Py::new_reference_to(result);
}
std::string error = std::string("type must be list of 'DocumentObject', not ");
error += object->ob_type->tp_name;
throw Base::TypeError(error);
}
PyObject* GroupExtensionPy::removeObject(PyObject *args)
PyObject* GroupExtensionPy::addObjects(PyObject* args)
{
PyObject *object;
if (!PyArg_ParseTuple(args, "O!", &(DocumentObjectPy::Type), &object))
PyObject* object;
if (!PyArg_ParseTuple(args, "O", &object)) {
return nullptr;
}
if (PyTuple_Check(object) || PyList_Check(object)) {
Py::Sequence list(object);
Py::Sequence::size_type size = list.size();
std::vector<DocumentObject*> values;
values.resize(size);
for (Py::Sequence::size_type i = 0; i < size; i++) {
Py::Object item = list[i];
if (!PyObject_TypeCheck(*item, &(DocumentObjectPy::Type))) {
std::string error = std::string("type in list must be 'DocumentObject', not ");
error += (*item)->ob_type->tp_name;
throw Base::TypeError(error);
}
values[i] = static_cast<DocumentObjectPy*>(*item)->getDocumentObjectPtr();
}
GroupExtension* grp = getGroupExtensionPtr();
auto vec = grp->addObjects(values);
Py::List result;
for (App::DocumentObject* obj : vec) {
result.append(Py::asObject(obj->getPyObject()));
}
return Py::new_reference_to(result);
}
std::string error = std::string("type must be list of 'DocumentObject', not ");
error += object->ob_type->tp_name;
throw Base::TypeError(error);
}
PyObject* GroupExtensionPy::setObjects(PyObject* args)
{
PyObject* object;
if (!PyArg_ParseTuple(args, "O", &object)) {
return nullptr;
}
if (PyTuple_Check(object) || PyList_Check(object)) {
Py::Sequence list(object);
Py::Sequence::size_type size = list.size();
std::vector<DocumentObject*> values;
values.resize(size);
for (Py::Sequence::size_type i = 0; i < size; i++) {
Py::Object item = list[i];
if (!PyObject_TypeCheck(*item, &(DocumentObjectPy::Type))) {
std::string error = std::string("type in list must be 'DocumentObject', not ");
error += (*item)->ob_type->tp_name;
throw Base::TypeError(error);
}
values[i] = static_cast<DocumentObjectPy*>(*item)->getDocumentObjectPtr();
}
GroupExtension* grp = getGroupExtensionPtr();
auto vec = grp->setObjects(values);
Py::List result;
for (App::DocumentObject* obj : vec) {
result.append(Py::asObject(obj->getPyObject()));
}
return Py::new_reference_to(result);
}
std::string error = std::string("type must be list of 'DocumentObject', not ");
error += object->ob_type->tp_name;
throw Base::TypeError(error);
}
PyObject* GroupExtensionPy::removeObject(PyObject* args)
{
PyObject* object;
if (!PyArg_ParseTuple(args, "O!", &(DocumentObjectPy::Type), &object)) {
return nullptr;
}
DocumentObjectPy* docObj = static_cast<DocumentObjectPy*>(object);
if (!docObj->getDocumentObjectPtr() || !docObj->getDocumentObjectPtr()->isAttachedToDocument()) {
if (!docObj->getDocumentObjectPtr()
|| !docObj->getDocumentObjectPtr()->isAttachedToDocument()) {
PyErr_SetString(Base::PyExc_FC_GeneralError, "Cannot remove an invalid object");
return nullptr;
}
if (docObj->getDocumentObjectPtr()->getDocument() != getGroupExtensionPtr()->getExtendedObject()->getDocument()) {
PyErr_SetString(Base::PyExc_FC_GeneralError, "Cannot remove an object from another document from this group");
if (docObj->getDocumentObjectPtr()->getDocument()
!= getGroupExtensionPtr()->getExtendedObject()->getDocument()) {
PyErr_SetString(Base::PyExc_FC_GeneralError,
"Cannot remove an object from another document from this group");
return nullptr;
}
@@ -187,18 +205,21 @@ PyObject* GroupExtensionPy::removeObject(PyObject *args)
auto vec = grp->removeObject(docObj->getDocumentObjectPtr());
Py::List list;
for (App::DocumentObject* obj : vec)
for (App::DocumentObject* obj : vec) {
list.append(Py::asObject(obj->getPyObject()));
}
return Py::new_reference_to(list);
}
PyObject* GroupExtensionPy::removeObjects(PyObject *args) {
PyObject* GroupExtensionPy::removeObjects(PyObject* args)
{
PyObject *object;
if (!PyArg_ParseTuple(args, "O", &object))
PyObject* object;
if (!PyArg_ParseTuple(args, "O", &object)) {
return nullptr;
}
if (PyTuple_Check(object) || PyList_Check(object)) {
Py::Sequence list(object);
Py::Sequence::size_type size = list.size();
@@ -217,10 +238,11 @@ PyObject* GroupExtensionPy::removeObjects(PyObject *args) {
}
GroupExtension* grp = getGroupExtensionPtr();
auto vec = grp->removeObjects(values);
auto vec = grp->removeObjects(values);
Py::List result;
for (App::DocumentObject* obj : vec)
for (App::DocumentObject* obj : vec) {
result.append(Py::asObject(obj->getPyObject()));
}
return Py::new_reference_to(result);
}
@@ -230,44 +252,56 @@ PyObject* GroupExtensionPy::removeObjects(PyObject *args) {
throw Base::TypeError(error);
}
PyObject* GroupExtensionPy::removeObjectsFromDocument(PyObject *args)
PyObject* GroupExtensionPy::removeObjectsFromDocument(PyObject* args)
{
if (!PyArg_ParseTuple(args, ""))
if (!PyArg_ParseTuple(args, "")) {
return nullptr;
}
getGroupExtensionPtr()->removeObjectsFromDocument();
Py_Return;
}
PyObject* GroupExtensionPy::getObject(PyObject *args)
PyObject* GroupExtensionPy::getObject(PyObject* args)
{
char* pcName;
if (!PyArg_ParseTuple(args, "s", &pcName))
if (!PyArg_ParseTuple(args, "s", &pcName)) {
return nullptr;
}
DocumentObject* obj = getGroupExtensionPtr()->getObject(pcName);
if ( obj ) {
if (obj) {
return obj->getPyObject();
} else {
}
else {
Py_Return;
}
}
PyObject* GroupExtensionPy::hasObject(PyObject *args)
PyObject* GroupExtensionPy::hasObject(PyObject* args)
{
PyObject *object;
PyObject *recursivePy = Py_False;
if (!PyArg_ParseTuple(args, "O!|O!", &(DocumentObjectPy::Type), &object, &PyBool_Type, &recursivePy))
PyObject* object;
PyObject* recursivePy = Py_False;
if (!PyArg_ParseTuple(args,
"O!|O!",
&(DocumentObjectPy::Type),
&object,
&PyBool_Type,
&recursivePy)) {
return nullptr;
}
DocumentObjectPy* docObj = static_cast<DocumentObjectPy*>(object);
bool recursive = Base::asBoolean(recursivePy);
if (!docObj->getDocumentObjectPtr() || !docObj->getDocumentObjectPtr()->isAttachedToDocument()) {
if (!docObj->getDocumentObjectPtr()
|| !docObj->getDocumentObjectPtr()->isAttachedToDocument()) {
PyErr_SetString(Base::PyExc_FC_GeneralError, "Cannot check an invalid object");
return nullptr;
}
if (docObj->getDocumentObjectPtr()->getDocument() != getGroupExtensionPtr()->getExtendedObject()->getDocument()) {
PyErr_SetString(Base::PyExc_FC_GeneralError, "Cannot check an object from another document with this group");
if (docObj->getDocumentObjectPtr()->getDocument()
!= getGroupExtensionPtr()->getExtendedObject()->getDocument()) {
PyErr_SetString(Base::PyExc_FC_GeneralError,
"Cannot check an object from another document with this group");
return nullptr;
}
@@ -275,7 +309,7 @@ PyObject* GroupExtensionPy::hasObject(PyObject *args)
return PyBool_FromLong(v ? 1 : 0);
}
PyObject *GroupExtensionPy::getCustomAttributes(const char* /*attr*/) const
PyObject* GroupExtensionPy::getCustomAttributes(const char* /*attr*/) const
{
return nullptr;
}