diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/freestyle/intern/python/BPy_ViewShape.cpp | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/freestyle/intern/python/BPy_ViewShape.cpp')
-rw-r--r-- | source/blender/freestyle/intern/python/BPy_ViewShape.cpp | 489 |
1 files changed, 254 insertions, 235 deletions
diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp index 1cd55f512f7..743a0ba79dc 100644 --- a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp +++ b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp @@ -35,336 +35,355 @@ extern "C" { int ViewShape_Init(PyObject *module) { - if (module == NULL) - return -1; + if (module == NULL) + return -1; - if (PyType_Ready(&ViewShape_Type) < 0) - return -1; - Py_INCREF(&ViewShape_Type); - PyModule_AddObject(module, "ViewShape", (PyObject *)&ViewShape_Type); + if (PyType_Ready(&ViewShape_Type) < 0) + return -1; + Py_INCREF(&ViewShape_Type); + PyModule_AddObject(module, "ViewShape", (PyObject *)&ViewShape_Type); - return 0; + return 0; } /*----------------------ViewShape methods ----------------------------*/ PyDoc_STRVAR(ViewShape_doc, -"Class gathering the elements of the ViewMap (i.e., :class:`ViewVertex`\n" -"and :class:`ViewEdge`) that are issued from the same input shape.\n" -"\n" -".. method:: __init__()\n" -"\n" -" Default constructor.\n" -"\n" -".. method:: __init__(brother)\n" -"\n" -" Copy constructor.\n" -"\n" -" :arg brother: A ViewShape object.\n" -" :type brother: :class:`ViewShape`\n" -"\n" -".. method:: __init__(sshape)\n" -"\n" -" Builds a ViewShape from an SShape.\n" -"\n" -" :arg sshape: An SShape object.\n" -" :type sshape: :class:`SShape`"); + "Class gathering the elements of the ViewMap (i.e., :class:`ViewVertex`\n" + "and :class:`ViewEdge`) that are issued from the same input shape.\n" + "\n" + ".. method:: __init__()\n" + "\n" + " Default constructor.\n" + "\n" + ".. method:: __init__(brother)\n" + "\n" + " Copy constructor.\n" + "\n" + " :arg brother: A ViewShape object.\n" + " :type brother: :class:`ViewShape`\n" + "\n" + ".. method:: __init__(sshape)\n" + "\n" + " Builds a ViewShape from an SShape.\n" + "\n" + " :arg sshape: An SShape object.\n" + " :type sshape: :class:`SShape`"); static int ViewShape_init(BPy_ViewShape *self, PyObject *args, PyObject *kwds) { - static const char *kwlist_1[] = {"brother", NULL}; - static const char *kwlist_2[] = {"sshape", NULL}; - PyObject *obj = 0; - - if (PyArg_ParseTupleAndKeywords(args, kwds, "|O!", (char **)kwlist_1, &ViewShape_Type, &obj)) { - if (!obj) { - self->vs = new ViewShape(); - self->py_ss = NULL; - } - else { - self->vs = new ViewShape(*(((BPy_ViewShape *)obj)->vs)); - self->py_ss = ((BPy_ViewShape *)obj)->py_ss; - } - } - else if (PyErr_Clear(), - PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist_2, &SShape_Type, &obj)) - { - BPy_SShape *py_ss = (BPy_SShape *)obj; - self->vs = new ViewShape(py_ss->ss); - self->py_ss = (!py_ss->borrowed) ? py_ss : NULL; - } - else { - PyErr_SetString(PyExc_TypeError, "invalid argument(s)"); - return -1; - } - self->borrowed = false; - Py_XINCREF(self->py_ss); - return 0; + static const char *kwlist_1[] = {"brother", NULL}; + static const char *kwlist_2[] = {"sshape", NULL}; + PyObject *obj = 0; + + if (PyArg_ParseTupleAndKeywords(args, kwds, "|O!", (char **)kwlist_1, &ViewShape_Type, &obj)) { + if (!obj) { + self->vs = new ViewShape(); + self->py_ss = NULL; + } + else { + self->vs = new ViewShape(*(((BPy_ViewShape *)obj)->vs)); + self->py_ss = ((BPy_ViewShape *)obj)->py_ss; + } + } + else if (PyErr_Clear(), + PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist_2, &SShape_Type, &obj)) { + BPy_SShape *py_ss = (BPy_SShape *)obj; + self->vs = new ViewShape(py_ss->ss); + self->py_ss = (!py_ss->borrowed) ? py_ss : NULL; + } + else { + PyErr_SetString(PyExc_TypeError, "invalid argument(s)"); + return -1; + } + self->borrowed = false; + Py_XINCREF(self->py_ss); + return 0; } static void ViewShape_dealloc(BPy_ViewShape *self) { - if (self->py_ss) { - self->vs->setSShape((SShape *)NULL); - Py_DECREF(self->py_ss); - } - if (self->vs && !self->borrowed) - delete self->vs; - Py_TYPE(self)->tp_free((PyObject *)self); + if (self->py_ss) { + self->vs->setSShape((SShape *)NULL); + Py_DECREF(self->py_ss); + } + if (self->vs && !self->borrowed) + delete self->vs; + Py_TYPE(self)->tp_free((PyObject *)self); } static PyObject *ViewShape_repr(BPy_ViewShape *self) { - return PyUnicode_FromFormat("ViewShape - address: %p", self->vs); + return PyUnicode_FromFormat("ViewShape - address: %p", self->vs); } PyDoc_STRVAR(ViewShape_add_edge_doc, -".. method:: add_edge(edge)\n" -"\n" -" Adds a ViewEdge to the list of ViewEdge objects.\n" -"\n" -" :arg edge: A ViewEdge object.\n" -" :type edge: :class:`ViewEdge`\n"); + ".. method:: add_edge(edge)\n" + "\n" + " Adds a ViewEdge to the list of ViewEdge objects.\n" + "\n" + " :arg edge: A ViewEdge object.\n" + " :type edge: :class:`ViewEdge`\n"); static PyObject *ViewShape_add_edge(BPy_ViewShape *self, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"edge", NULL}; - PyObject *py_ve = 0; + static const char *kwlist[] = {"edge", NULL}; + PyObject *py_ve = 0; - if (PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist, &ViewEdge_Type, &py_ve)) - return NULL; - self->vs->AddEdge(((BPy_ViewEdge *)py_ve)->ve); - Py_RETURN_NONE; + if (PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist, &ViewEdge_Type, &py_ve)) + return NULL; + self->vs->AddEdge(((BPy_ViewEdge *)py_ve)->ve); + Py_RETURN_NONE; } PyDoc_STRVAR(ViewShape_add_vertex_doc, -".. method:: add_vertex(vertex)\n" -"\n" -" Adds a ViewVertex to the list of the ViewVertex objects.\n" -"\n" -" :arg vertex: A ViewVertex object.\n" -" :type vertex: :class:`ViewVertex`"); + ".. method:: add_vertex(vertex)\n" + "\n" + " Adds a ViewVertex to the list of the ViewVertex objects.\n" + "\n" + " :arg vertex: A ViewVertex object.\n" + " :type vertex: :class:`ViewVertex`"); static PyObject *ViewShape_add_vertex(BPy_ViewShape *self, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"vertex", NULL}; - PyObject *py_vv = 0; + static const char *kwlist[] = {"vertex", NULL}; + PyObject *py_vv = 0; - if (PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist, &ViewVertex_Type, &py_vv)) - return NULL; - self->vs->AddVertex(((BPy_ViewVertex *)py_vv)->vv); - Py_RETURN_NONE; + if (PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist, &ViewVertex_Type, &py_vv)) + return NULL; + self->vs->AddVertex(((BPy_ViewVertex *)py_vv)->vv); + Py_RETURN_NONE; } // virtual ViewShape *duplicate() static PyMethodDef BPy_ViewShape_methods[] = { - {"add_edge", (PyCFunction)ViewShape_add_edge, METH_VARARGS | METH_KEYWORDS, ViewShape_add_edge_doc}, - {"add_vertex", (PyCFunction)ViewShape_add_vertex, METH_VARARGS | METH_KEYWORDS, ViewShape_add_vertex_doc}, - {NULL, NULL, 0, NULL}, + {"add_edge", + (PyCFunction)ViewShape_add_edge, + METH_VARARGS | METH_KEYWORDS, + ViewShape_add_edge_doc}, + {"add_vertex", + (PyCFunction)ViewShape_add_vertex, + METH_VARARGS | METH_KEYWORDS, + ViewShape_add_vertex_doc}, + {NULL, NULL, 0, NULL}, }; /*----------------------ViewShape get/setters ----------------------------*/ PyDoc_STRVAR(ViewShape_sshape_doc, -"The SShape on top of which this ViewShape is built.\n" -"\n" -":type: :class:`SShape`"); + "The SShape on top of which this ViewShape is built.\n" + "\n" + ":type: :class:`SShape`"); static PyObject *ViewShape_sshape_get(BPy_ViewShape *self, void *UNUSED(closure)) { - SShape *ss = self->vs->sshape(); - if (!ss) - Py_RETURN_NONE; - return BPy_SShape_from_SShape(*ss); + SShape *ss = self->vs->sshape(); + if (!ss) + Py_RETURN_NONE; + return BPy_SShape_from_SShape(*ss); } static int ViewShape_sshape_set(BPy_ViewShape *self, PyObject *value, void *UNUSED(closure)) { - if (!BPy_SShape_Check(value)) { - PyErr_SetString(PyExc_TypeError, "value must be an SShape"); - return -1; - } - BPy_SShape *py_ss = (BPy_SShape *)value; - self->vs->setSShape(py_ss->ss); - if (self->py_ss) - Py_DECREF(self->py_ss); - if (!py_ss->borrowed) { - self->py_ss = py_ss; - Py_INCREF(self->py_ss); - } - return 0; + if (!BPy_SShape_Check(value)) { + PyErr_SetString(PyExc_TypeError, "value must be an SShape"); + return -1; + } + BPy_SShape *py_ss = (BPy_SShape *)value; + self->vs->setSShape(py_ss->ss); + if (self->py_ss) + Py_DECREF(self->py_ss); + if (!py_ss->borrowed) { + self->py_ss = py_ss; + Py_INCREF(self->py_ss); + } + return 0; } PyDoc_STRVAR(ViewShape_vertices_doc, -"The list of ViewVertex objects contained in this ViewShape.\n" -"\n" -":type: List of :class:`ViewVertex` objects"); + "The list of ViewVertex objects contained in this ViewShape.\n" + "\n" + ":type: List of :class:`ViewVertex` objects"); static PyObject *ViewShape_vertices_get(BPy_ViewShape *self, void *UNUSED(closure)) { - vector<ViewVertex *> vertices = self->vs->vertices(); - vector<ViewVertex *>::iterator it; - PyObject *py_vertices = PyList_New(vertices.size()); - unsigned int i = 0; - - for (it = vertices.begin(); it != vertices.end(); it++) { - PyList_SET_ITEM(py_vertices, i++, Any_BPy_ViewVertex_from_ViewVertex(*(*it))); - } - return py_vertices; + vector<ViewVertex *> vertices = self->vs->vertices(); + vector<ViewVertex *>::iterator it; + PyObject *py_vertices = PyList_New(vertices.size()); + unsigned int i = 0; + + for (it = vertices.begin(); it != vertices.end(); it++) { + PyList_SET_ITEM(py_vertices, i++, Any_BPy_ViewVertex_from_ViewVertex(*(*it))); + } + return py_vertices; } static int ViewShape_vertices_set(BPy_ViewShape *self, PyObject *value, void *UNUSED(closure)) { - PyObject *item; - vector< ViewVertex *> v; - - if (!PyList_Check(value)) { - PyErr_SetString(PyExc_TypeError, "value must be a list of ViewVertex objects"); - return -1; - } - - v.reserve(PyList_GET_SIZE(value)); - for (unsigned int i = 0; i < PyList_GET_SIZE(value); i++) { - item = PyList_GET_ITEM(value, i); - if (BPy_ViewVertex_Check(item)) { - v.push_back(((BPy_ViewVertex *)item)->vv); - } - else { - PyErr_SetString(PyExc_TypeError, "value must be a list of ViewVertex objects"); - return -1; - } - } - self->vs->setVertices(v); - return 0; + PyObject *item; + vector<ViewVertex *> v; + + if (!PyList_Check(value)) { + PyErr_SetString(PyExc_TypeError, "value must be a list of ViewVertex objects"); + return -1; + } + + v.reserve(PyList_GET_SIZE(value)); + for (unsigned int i = 0; i < PyList_GET_SIZE(value); i++) { + item = PyList_GET_ITEM(value, i); + if (BPy_ViewVertex_Check(item)) { + v.push_back(((BPy_ViewVertex *)item)->vv); + } + else { + PyErr_SetString(PyExc_TypeError, "value must be a list of ViewVertex objects"); + return -1; + } + } + self->vs->setVertices(v); + return 0; } PyDoc_STRVAR(ViewShape_edges_doc, -"The list of ViewEdge objects contained in this ViewShape.\n" -"\n" -":type: List of :class:`ViewEdge` objects"); + "The list of ViewEdge objects contained in this ViewShape.\n" + "\n" + ":type: List of :class:`ViewEdge` objects"); static PyObject *ViewShape_edges_get(BPy_ViewShape *self, void *UNUSED(closure)) { - vector<ViewEdge *> edges = self->vs->edges(); - vector<ViewEdge *>::iterator it; - PyObject *py_edges = PyList_New(edges.size()); - unsigned int i = 0; - - for (it = edges.begin(); it != edges.end(); it++) { - PyList_SET_ITEM(py_edges, i++, BPy_ViewEdge_from_ViewEdge(*(*it))); - } - return py_edges; + vector<ViewEdge *> edges = self->vs->edges(); + vector<ViewEdge *>::iterator it; + PyObject *py_edges = PyList_New(edges.size()); + unsigned int i = 0; + + for (it = edges.begin(); it != edges.end(); it++) { + PyList_SET_ITEM(py_edges, i++, BPy_ViewEdge_from_ViewEdge(*(*it))); + } + return py_edges; } static int ViewShape_edges_set(BPy_ViewShape *self, PyObject *value, void *UNUSED(closure)) { - PyObject *item; - vector<ViewEdge *> v; - - if (!PyList_Check(value)) { - PyErr_SetString(PyExc_TypeError, "value must be a list of ViewEdge objects"); - return -1; - } - - v.reserve(PyList_GET_SIZE(value)); - for (int i = 0; i < PyList_GET_SIZE(value); i++) { - item = PyList_GET_ITEM(value, i); - if (BPy_ViewEdge_Check(item)) { - v.push_back(((BPy_ViewEdge *)item)->ve); - } - else { - PyErr_SetString(PyExc_TypeError, "argument must be list of ViewEdge objects"); - return -1; - } - } - self->vs->setEdges(v); - return 0; + PyObject *item; + vector<ViewEdge *> v; + + if (!PyList_Check(value)) { + PyErr_SetString(PyExc_TypeError, "value must be a list of ViewEdge objects"); + return -1; + } + + v.reserve(PyList_GET_SIZE(value)); + for (int i = 0; i < PyList_GET_SIZE(value); i++) { + item = PyList_GET_ITEM(value, i); + if (BPy_ViewEdge_Check(item)) { + v.push_back(((BPy_ViewEdge *)item)->ve); + } + else { + PyErr_SetString(PyExc_TypeError, "argument must be list of ViewEdge objects"); + return -1; + } + } + self->vs->setEdges(v); + return 0; } PyDoc_STRVAR(ViewShape_name_doc, -"The name of the ViewShape.\n" -"\n" -":type: str"); + "The name of the ViewShape.\n" + "\n" + ":type: str"); static PyObject *ViewShape_name_get(BPy_ViewShape *self, void *UNUSED(closure)) { - return PyUnicode_FromString(self->vs->getName().c_str()); + return PyUnicode_FromString(self->vs->getName().c_str()); } PyDoc_STRVAR(ViewShape_library_path_doc, -"The library path of the ViewShape.\n" -"\n" -":type: str, or None if the ViewShape is not part of a library"); + "The library path of the ViewShape.\n" + "\n" + ":type: str, or None if the ViewShape is not part of a library"); static PyObject *ViewShape_library_path_get(BPy_ViewShape *self, void *UNUSED(closure)) { - return PyUnicode_FromString(self->vs->getLibraryPath().c_str()); + return PyUnicode_FromString(self->vs->getLibraryPath().c_str()); } PyDoc_STRVAR(ViewShape_id_doc, -"The Id of this ViewShape.\n" -"\n" -":type: :class:`Id`"); + "The Id of this ViewShape.\n" + "\n" + ":type: :class:`Id`"); static PyObject *ViewShape_id_get(BPy_ViewShape *self, void *UNUSED(closure)) { - Id id(self->vs->getId()); - return BPy_Id_from_Id(id); // return a copy + Id id(self->vs->getId()); + return BPy_Id_from_Id(id); // return a copy } static PyGetSetDef BPy_ViewShape_getseters[] = { - {(char *)"sshape", (getter)ViewShape_sshape_get, (setter)ViewShape_sshape_set, (char *)ViewShape_sshape_doc, NULL}, - {(char *)"vertices", (getter)ViewShape_vertices_get, (setter)ViewShape_vertices_set, - (char *)ViewShape_vertices_doc, NULL}, - {(char *)"edges", (getter)ViewShape_edges_get, (setter)ViewShape_edges_set, (char *)ViewShape_edges_doc, NULL}, - {(char *)"name", (getter)ViewShape_name_get, (setter)NULL, (char *)ViewShape_name_doc, NULL}, - {(char *)"library_path", (getter)ViewShape_library_path_get, (setter)NULL, (char *)ViewShape_library_path_doc, NULL}, - {(char *)"id", (getter)ViewShape_id_get, (setter)NULL, (char *)ViewShape_id_doc, NULL}, - {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ + {(char *)"sshape", + (getter)ViewShape_sshape_get, + (setter)ViewShape_sshape_set, + (char *)ViewShape_sshape_doc, + NULL}, + {(char *)"vertices", + (getter)ViewShape_vertices_get, + (setter)ViewShape_vertices_set, + (char *)ViewShape_vertices_doc, + NULL}, + {(char *)"edges", + (getter)ViewShape_edges_get, + (setter)ViewShape_edges_set, + (char *)ViewShape_edges_doc, + NULL}, + {(char *)"name", (getter)ViewShape_name_get, (setter)NULL, (char *)ViewShape_name_doc, NULL}, + {(char *)"library_path", + (getter)ViewShape_library_path_get, + (setter)NULL, + (char *)ViewShape_library_path_doc, + NULL}, + {(char *)"id", (getter)ViewShape_id_get, (setter)NULL, (char *)ViewShape_id_doc, NULL}, + {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; /*-----------------------BPy_ViewShape type definition ------------------------------*/ PyTypeObject ViewShape_Type = { - PyVarObject_HEAD_INIT(NULL, 0) - "ViewShape", /* tp_name */ - sizeof(BPy_ViewShape), /* tp_basicsize */ - 0, /* tp_itemsize */ - (destructor)ViewShape_dealloc, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_reserved */ - (reprfunc)ViewShape_repr, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - 0, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ - ViewShape_doc, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - BPy_ViewShape_methods, /* tp_methods */ - 0, /* tp_members */ - BPy_ViewShape_getseters, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc)ViewShape_init, /* tp_init */ - 0, /* tp_alloc */ - PyType_GenericNew, /* tp_new */ + PyVarObject_HEAD_INIT(NULL, 0) "ViewShape", /* tp_name */ + sizeof(BPy_ViewShape), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor)ViewShape_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_reserved */ + (reprfunc)ViewShape_repr, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + ViewShape_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + BPy_ViewShape_methods, /* tp_methods */ + 0, /* tp_members */ + BPy_ViewShape_getseters, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)ViewShape_init, /* tp_init */ + 0, /* tp_alloc */ + PyType_GenericNew, /* tp_new */ }; /////////////////////////////////////////////////////////////////////////////////////////// |