suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ simplify initialization of some Python types

Browse Source
This commit is contained in:
wmayer 2016-05-07 21:18:47 +02:00
parent 7179280138
commit a175c4884d
1 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/App/Application.cpp
View File

@ -190,29 +190,12 @@ Application::Application(std::map<std::string,std::string> &mConfig)
// NOTE: To finish the initialization of our own type objects we must // NOTE: To finish the initialization of our own type objects we must
// call PyType_Ready, otherwise we run into a segmentation fault, later on. // call PyType_Ready, otherwise we run into a segmentation fault, later on.
// This function is responsible for adding inherited slots from a type's base class. // This function is responsible for adding inherited slots from a type's base class.
if (PyType_Ready(&Base::VectorPy::Type) < 0) return; Base::Interpreter().addType(&Base::VectorPy::Type, pAppModule, "Vector");
union PyType_Object pyVecType = {&Base::VectorPy::Type}; Base::Interpreter().addType(&Base::MatrixPy::Type, pAppModule, "Matrix");
PyModule_AddObject(pAppModule, "Vector", pyVecType.o); Base::Interpreter().addType(&Base::BoundBoxPy::Type, pAppModule, "BoundBox");
Base::Interpreter().addType(&Base::PlacementPy::Type, pAppModule, "Placement");
if (PyType_Ready(&Base::MatrixPy::Type) < 0) return; Base::Interpreter().addType(&Base::RotationPy::Type, pAppModule, "Rotation");
union PyType_Object pyMtxType = {&Base::MatrixPy::Type}; Base::Interpreter().addType(&Base::AxisPy::Type, pAppModule, "Axis");
PyModule_AddObject(pAppModule, "Matrix", pyMtxType.o);
if (PyType_Ready(&Base::BoundBoxPy::Type) < 0) return;
union PyType_Object pyBoundBoxType = {&Base::BoundBoxPy::Type};
PyModule_AddObject(pAppModule, "BoundBox", pyBoundBoxType.o);
if (PyType_Ready(&Base::PlacementPy::Type) < 0) return;
union PyType_Object pyPlacementPyType = {&Base::PlacementPy::Type};
PyModule_AddObject(pAppModule, "Placement", pyPlacementPyType.o);
if (PyType_Ready(&Base::RotationPy::Type) < 0) return;
union PyType_Object pyRotationPyType = {&Base::RotationPy::Type};
PyModule_AddObject(pAppModule, "Rotation", pyRotationPyType.o);
if (PyType_Ready(&Base::AxisPy::Type) < 0) return;
union PyType_Object pyAxisPyType = {&Base::AxisPy::Type};
PyModule_AddObject(pAppModule, "Axis", pyAxisPyType.o);
// Note: Create an own module 'Base' which should provide the python // Note: Create an own module 'Base' which should provide the python
// binding classes from the base module. At a later stage we should // binding classes from the base module. At a later stage we should