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

make class ViewProviderPythonFeaturePy obsolete

Browse Source
This commit is contained in:
wmayer 2016-11-09 11:39:27 +01:00
parent 3e2400aec1
commit ebb174cd02
2 changed files with 26 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Gui/ViewProviderPyImp.cpp
View File

@ -245,14 +245,35 @@ PyObject* ViewProviderPy::setTransformation(PyObject *args)
return 0;
}
PyObject *ViewProviderPy::getCustomAttributes(const char*) const
PyObject *ViewProviderPy::getCustomAttributes(const char* attr) const
{
return 0;
// search for dynamic property
App::Property* prop = getViewProviderPtr()->getDynamicPropertyByName(attr);
if (prop)
return prop->getPyObject();
else
return 0;
}
int ViewProviderPy::setCustomAttributes(const char*, PyObject *)
int ViewProviderPy::setCustomAttributes(const char* attr, PyObject* value)
{
return 0;
// search for dynamic property
try {
App::Property* prop = getViewProviderPtr()->getDynamicPropertyByName(attr);
if (prop) {
prop->setPyObject(value);
return 1;
}
return 0;
}
catch (Base::Exception &exc) {
PyErr_Format(PyExc_AttributeError, "Attribute (Name: %s) error: '%s' ", attr, exc.what());
return -1;
}
catch (...) {
PyErr_Format(PyExc_AttributeError, "Unknown error in attribute %s", attr);
return -1;
}
}
Py::Object ViewProviderPy::getAnnotation(void) const

35
src/Gui/ViewProviderPythonFeaturePyImp.cpp
View File

@ -41,43 +41,10 @@ std::string ViewProviderPythonFeaturePy::representation(void) const
PyObject *ViewProviderPythonFeaturePy::getCustomAttributes(const char* attr) const
{
PY_TRY{
if (Base::streq(attr, "__dict__")){
PyObject* dict = ViewProviderDocumentObjectPy::getCustomAttributes(attr);
if (dict){
std::vector<std::string> Props = getViewProviderPythonFeaturePtr()->getDynamicPropertyNames();
for (std::vector<std::string>::const_iterator it = Props.begin(); it != Props.end(); ++it)
PyDict_SetItem(dict, PyString_FromString(it->c_str()), PyString_FromString(""));
}
return dict;
}
// search for dynamic property
App::Property* prop = getViewProviderPythonFeaturePtr()->getDynamicPropertyByName(attr);
if (prop) return prop->getPyObject();
} PY_CATCH;
return 0;
}
int ViewProviderPythonFeaturePy::setCustomAttributes(const char* attr, PyObject *value)
{
// search for dynamic property
App::Property* prop = getViewProviderPythonFeaturePtr()->getDynamicPropertyByName(attr);
if (!prop)
return ViewProviderDocumentObjectPy::setCustomAttributes(attr, value);
else {
try {
prop->setPyObject(value);
} catch (Base::Exception &exc) {
PyErr_Format(PyExc_AttributeError, "Attribute (Name: %s) error: '%s' ", attr, exc.what());
return -1;
} catch (...) {
PyErr_Format(PyExc_AttributeError, "Unknown error in attribute %s", attr);
return -1;
}
return 1;
}
return 0;
}