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

Moved ObjectStatusLocker template class to Base/Tools.h

Browse Source
This commit is contained in:
Eivind Kvedalen
2017-11-29 23:04:37 +01:00
committed by wmayer
parent b3db1deecb
commit 8b4adfa513
5 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/App/FeaturePython.cpp
View File

@@ -30,6 +30,7 @@
#include <Base/Console.h>
#include <Base/Interpreter.h>
#include <Base/Reader.h>
#include <Base/Tools.h>
#include <App/DocumentObjectPy.h>
#include "FeaturePython.h"
@@ -63,7 +64,7 @@ bool FeaturePythonImp::execute()
Py::Object feature = static_cast<PropertyPythonObject*>(proxy)->getValue();
if (feature.hasAttr(std::string("execute"))) {
if (feature.hasAttr("__object__")) {
ObjectStatusLocker<ObjectStatus, DocumentObject> exe(App::PythonCall, object);
Base::ObjectStatusLocker<ObjectStatus, DocumentObject> exe(App::PythonCall, object);
Py::Callable method(feature.getAttr(std::string("execute")));
Py::Tuple args;
Py::Object res = method.apply(args);
@@ -72,7 +73,7 @@ bool FeaturePythonImp::execute()
return true;
}
else {
ObjectStatusLocker<ObjectStatus, DocumentObject> exe(App::PythonCall, object);
Base::ObjectStatusLocker<ObjectStatus, DocumentObject> exe(App::PythonCall, object);
Py::Callable method(feature.getAttr(std::string("execute")));
Py::Tuple args(1);
args.setItem(0, Py::Object(object->getPyObject(), true));